Changeset 444 for trunk/src/mouse_up.m

Timestamp:

Jun 7, 2012, 9:56:19 AM (11 years ago)

Author:

sommeria

Message:

masks and calibration updated to fit with the new conventions on file organisation.
bug corrected in mouse_up (object creation)
bug corrected in civ in mode TESTciv

File:

• trunk/src/mouse_up.m (modified) (9 diffs)

trunk/src/mouse_up.m

@@ -55 +55 @@
 %% finalize the fabrication or the translation/deformation of an object and plot the corresponding projected field
 if ~isempty(huvmat) && isfield(AxeData,'Drawing') && ~isequal(AxeData.Drawing,'off') && isfield(AxeData,'CurrentObject')...
-           && ~isempty(AxeData.CurrentObject) && ishandle(AxeData.CurrentObject)
+        && ~isempty(AxeData.CurrentObject) && ishandle(AxeData.CurrentObject)
     xy=get(currentaxes,'CurrentPoint');%xy(1,1),xy(1,2): current x,y positions in axes coordinates
-    PlotData=get(AxeData.CurrentObject,'UserData');%get data attached to the current projection object  
+    PlotData=get(AxeData.CurrentObject,'UserData');%get data attached to the current projection object
     IndexObj=PlotData.IndexObj;
-    ObjectData=UvData.Object{IndexObj};   
-%     ObjectData.enable_plot=1;
-    if strcmp(ObjectData.Type,'rectangle')||strcmp(ObjectData.Type,'ellipse')
-        NbDefPoint=1;  
-    elseif strcmp(ObjectData.Type,'line')|| strcmp(ObjectData.Type,'plane');
-        NbDefPoint=2; 
-    else
-         NbDefPoint=3;
-    end
+    ObjectData=UvData.Object{IndexObj};
+    check_multiple=0;
     % ending translation
     if isequal(AxeData.Drawing,'translate')
@@ -82 +75 @@
         ObjectData.Coord(ind_move,2)=xy(1,2);
         
-    %creating object   
-    else   
+    %creating object
+    else
         switch ObjectData.Type
             case {'line'}
@@ -91 +84 @@
                     xy(1,3)=0; % z coordinate set to 0 by default
                 end
-%                 if ~isequal(ObjectData.Coord,xy(1,:))
-                     if ~isequal(ObjectData.Coord(end,1:2),xy(1,1:2))
+                %                 if ~isequal(ObjectData.Coord,xy(1,:))
+                if ~isequal(ObjectData.Coord(end,1:2),xy(1,1:2))
                     ObjectData.Coord=[ObjectData.Coord ;xy(1,1:2)];% append the second point of the line if different from the first one
-                     end
-%                 end
+                end
+                %                 end
             case {'rectangle','ellipse','volume'}
                 XYData=AxeData.CurrentOrigin;
@@ -112 +105 @@
                     end
                 end
+            otherwise
+                check_multiple=1;
         end
     end
@@ -123 +118 @@
         set(hh_set_object.num_RangeY_2,'String',num2str(ObjectData.RangeY,4));
     end
-    if NbDefPoint<=2 || isequal(get(currentfig,'SelectionType'),'alt') ||...
-              strcmp(AxeData.Drawing,'translate') || strcmp(AxeData.Drawing,'deform');%stop drawing
+
+    %stop drawing and plot projected field if the object manipulation is finished
+    if check_multiple==0  || isequal(get(currentfig,'SelectionType'),'alt')
         AxeData.CurrentOrigin=[]; %suppress the current origin
-       if isequal(ObjectData.Type,'line') && size(ObjectData.Coord,1)>=2
-           AxeData.Drawing='off';
-           set(currentaxes,'UserData',AxeData);
-%             return % line needs at leqst two points
-       end
-       if  ~isempty(ObjectData)
-%              testmask=0;
-%              hmask=findobj(huvmat,'Tag','makemask');
-%              if ~isempty(hmask)
-%                 testmask=get(hmask,'Value');
-%              end
-
-            %% update the object representation
-%             ObjectData.DisplayHandle_uvmat=UvData.Object{IndexObj}.DisplayHandle_uvmat;
-%             ObjectData.DisplayHandle_view_field=UvData.Object{IndexObj}.DisplayHandle_view_field;
-%             UvData.Object{IndexObj}=ObjectData;%update the current object properties
-%             hhuvmat=guidata(huvmat);
-%             IndexObj_1=get(hhuvmat.ListObject_1,'Value');
-%             IndexObj_2=get(hhuvmat.ListObject,'Value');
-%             UvData.Object=update_obj(UvData,IndexObj_1,IndexObj_2);
-
-            %% plot the field projected on the object 
+%         if isequal(ObjectData.Type,'line') && size(ObjectData.Coord,1)>=2
+% %             AxeData.Drawing='off';
+% %             set(currentaxes,'UserData',AxeData);
+%             
+%         end
+        if  ~isempty(ObjectData)
+            %              testmask=0;
+            %              hmask=findobj(huvmat,'Tag','makemask');
+            %              if ~isempty(hmask)
+            %                 testmask=get(hmask,'Value');
+            %              end
+            
+            % plot the field projected on the object
             ProjData= proj_field(UvData.Field,ObjectData);%project the current interface field on ObjectData
             if ~isempty(ProjData)
                 if strcmp(tagfig,'uvmat')% uvmat plot selected, projection plot seen in view_field
-                     hview_field=findobj(allchild(0),'tag','view_field');
+                    hview_field=findobj(allchild(0),'tag','view_field');
                     if isempty(hview_field)
                         hview_field=view_field(ProjData); %open the view_field GUI for plot
@@ -160 +147 @@
                     end
                     ViewFieldData=get(hview_field,'UserData');
-%                     ViewFieldData.axes3=ProjData;
+                    %                     ViewFieldData.axes3=ProjData;
                     haxes=findobj(hview_field,'tag','axes3');
                     if strcmp(get(haxes,'Visible'),'off')%sempty(PlotParam.Coordinates)% case of no plot display (pure text table)
@@ -172 +159 @@
                         set(hview_field,'Position',ViewFieldData.GUISize)
                     end
-                    
-%                     Data=get(hview_field,'UserData');
-%                     if isempty(hview_field)
-%                         hview_field=view_field(ProjData);
-%                     else
-%                        hhview_field=guidata(hview_field);
-%                        [PlotType,PlotParam]=plot_field(ProjData,hhview_field.axes3,read_GUI(hview_field));%update an existing field plot
-%                         write_plot_param(hhview_field,PlotParam); %update the display of plotting parameters for the current object
-%                     end
-%                     ViewFieldData=get(hview_field,'UserData');
-%                     ViewFieldData.axes3=ProjData;
-%                     set(hview_field,'UserData',ViewFieldData)
                 else
                     UvData.axes3=ProjData;
@@ -189 +164 @@
                     write_plot_param(hhuvmat,PlotParam); %update the display of plotting parameters for the current object
                 end
-                %[PlotType,PlotParam]=plot_field(ProjData,hh_plotfield.axes3,read_plot_param(hh_plotfield));%update an existing field plot
-
             end
             set(hhuvmat.ViewField,'Value',1);%
@@ -199 +172 @@
             set(hhuvmat.MenuEdit,'Enable','on');%
         end
-    end    
-       AxeData.CurrentOrigin=[xy(1,1) xy(1,2)]; %the current point becomes the new current origin
-       test_drawing=1;%allow continuation of drawing object
-       UvData.Object{IndexObj}=ObjectData;
-%     end
+    else
+        test_drawing=1;%allow continuation of drawing object
+        AxeData.CurrentOrigin=[xy(1,1) xy(1,2)]; %the current point becomes the next current origin
+    end
+    UvData.Object{IndexObj}=ObjectData;
     hother=findobj('Tag','deformpoint');%find all the deformpoints
-    set(hother,'Color','b');%reset all the deformpoints in 'blue' 
-else
-    test_drawing=0;
+    set(hother,'Color','b');%reset all the deformpoints in 'blue'
 end