Changeset 701 for trunk/src/mouse_up.m

Timestamp:

Dec 13, 2013, 10:51:21 PM (11 years ago)

Author:

sommeria

Message:

several bugs repaired

File:

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

trunk/src/mouse_up.m

@@ -96 +96 @@
                 if size(ObjectData.Coord,1)==1 % this is the mouse up for the first point, continue until next click
                     check_multiple=1;
-                else
-                    %ObjectData.Coord=[ObjectData.Coord ;CurrentOrigin];% append the second point of the line (the last pointed position during mouse down)
                 end
             case {'rectangle','ellipse','volume'}
-                %                  if size(ObjectData.Coord,1)==1 % this is the mouse up for the first point, continue until next click
-                %                     check_multiple=1;
-                %                  else
                 ObjectData.Coord=(CurrentOrigin+xy(1,1:2))/2;% keep only the first point coordinate
                 ObjectData.RangeX=abs(ObjectData.Coord(1,1)-xy(1,1));%rectangle width
@@ -109 +104 @@
                     check_multiple=1;% pass to next mous up if width of height=0
                 end
-                %                 ObjectData.Coord(1,1)=(xy(1,1)+XYData(1))/2;%origin rectangle, x coordinate
-                %                 ObjectData.Coord(1,2)=(xy(1,2)+XYData(2))/2;
-                %                 ObjectData.RangeX=abs(xy(1,1)-XYData(1))/2;%rectangle width
-                %                 ObjectData.RangeY=abs(xy(1,2)-XYData(2))/2;%rectangle height
-                %                  end
             case 'plane' %case of 'plane'
                 DX=(xy(1,1)-ObjectData.Coord(1,1));
@@ -130 +120 @@
     
     %show object coordinates in the GUI set_object
-    %     h_set_object=findobj(allchild(0),'Tag','set_object');
-    %     hh_set_object=guidata(h_set_object);
-    %     set(hh_set_object.Coord,'Data',ObjectData.Coord);
     if strcmp(ObjectData.Type,'rectangle')||strcmp(ObjectData.Type,'ellipse')
         set(hh_set_object.num_RangeX_2,'String',num2str(ObjectData.RangeX,4));
@@ -179 +166 @@
             end
             set(hhuvmat.CheckViewField,'Value',1);%
-            set(hhuvmat.CheckEditObject,'Value',1);%           
+            set(hhuvmat.CheckEditObject,'Value',1);%   
+            set(hhuvmat.MenuObject,'checked','off'); %desactivate object creation mode
             set(hhuvmat.CheckEditObject,'Enable','on');%
             set(get(h_set_object,'children'),'Enable','on')