Changeset 379 for trunk/src/mouse_up.m

Timestamp:

Jan 27, 2012, 1:59:18 AM (13 years ago)

Author:

sommeria

Message:

several bugs corrected
set_object.fig rationalized so that read_set_object is replaced by the rgeneral fct read_GUI.

File:

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

trunk/src/mouse_up.m

@@ -78 +78 @@
     %creating object   
     else   
-        if strcmp(ObjectData.Style,'line')||strcmp(ObjectData.Style,'polyline')||...
-                strcmp(ObjectData.Style,'polygon')||strcmp(ObjectData.Style,'points')
+        if strcmp(ObjectData.Type,'line')||strcmp(ObjectData.Type,'polyline')||...
+                strcmp(ObjectData.Type,'polygon')||strcmp(ObjectData.Type,'points')
             if isfield(AxeData,'ObjectCoord') && size(AxeData.ObjectCoord,2)==3
               xy(1,3)=AxeData.ObjectCoord(1,3); % z coordinate of the mouse: to generalise ...
@@ -86 +86 @@
             end
             if ~isequal(ObjectData.Coord,xy(1,:))
-                ObjectData.Coord=[ObjectData.Coord ;xy(1,:)];% append the coordiantes marked by the mouse to the eobject
-            end
-        elseif isequal(ObjectData.Style,'rectangle')||isequal(ObjectData.Style,'ellipse')||isequal(ObjectData.Style,'volume')
+                ObjectData.Coord=[ObjectData.Coord ;xy(1,1:2)];% append the coordiantes marked by the mouse to the eobject
+            end
+        elseif isequal(ObjectData.Type,'rectangle')||isequal(ObjectData.Type,'ellipse')||isequal(ObjectData.Type,'volume')
             XYData=AxeData.CurrentOrigin;
             ObjectData.Coord(1,1)=(xy(1,1)+XYData(1))/2;%origin rectangle, x coordinate
@@ -94 +94 @@
             ObjectData.RangeX=abs(xy(1,1)-XYData(1))/2;%rectangle width
             ObjectData.RangeY=abs(xy(1,2)-XYData(2))/2;%rectangle height
-        elseif isequal(ObjectData.Style,'plane') %case of 'plane'
+        elseif isequal(ObjectData.Type,'plane') %case of 'plane'
             DX=(xy(1,1)-ObjectData.Coord(1,1));
             DY=(xy(1,2)-ObjectData.Coord(1,2));
@@ -106 +106 @@
         end
     end
-    if strcmp(ObjectData.Style,'rectangle')||strcmp(ObjectData.Style,'ellipse')
+    if strcmp(ObjectData.Type,'rectangle')||strcmp(ObjectData.Type,'ellipse')
         NbDefPoint=1;  
-    elseif strcmp(ObjectData.Style,'line')|| strcmp(ObjectData.Style,'plane');
+    elseif strcmp(ObjectData.Type,'line')|| strcmp(ObjectData.Type,'plane');
         NbDefPoint=2; 
     else
@@ -117 +117 @@
     h_set_object=findobj(allchild(0),'Tag','set_object');
     hh_set_object=guidata(h_set_object);
-    set(hh_set_object.XObject,'String',num2str(ObjectData.Coord(:,1),4)); 
-    set(hh_set_object.YObject,'String',num2str(ObjectData.Coord(:,2),4)); 
-    set(hh_set_object.ZObject,'String',num2str(ObjectData.Coord(:,3),4));
-    if strcmp(ObjectData.Style,'rectangle')||strcmp(ObjectData.Style,'ellipse')
+    set(hh_set_object.Coord,'Data',ObjectData.Coord);
+%     set(hh_set_object.XObject,'String',num2str(ObjectData.Coord(:,1),4)); 
+%     set(hh_set_object.YObject,'String',num2str(ObjectData.Coord(:,2),4)); 
+%     set(hh_set_object.ZObject,'String',num2str(ObjectData.Coord(:,3),4));
+    if strcmp(ObjectData.Type,'rectangle')||strcmp(ObjectData.Type,'ellipse')
         set(hh_set_object.XMax,'String',num2str(ObjectData.RangeX,4));
         set(hh_set_object.YMax,'String',num2str(ObjectData.RangeY,4));
@@ -127 +128 @@
               strcmp(AxeData.Drawing,'translate') || strcmp(AxeData.Drawing,'deform');%stop drawing
         AxeData.CurrentOrigin=[]; %suppress the current origin
-       if isequal(ObjectData.Style,'line') && size(ObjectData.Coord,1)<=1
+       if isequal(ObjectData.Type,'line') && size(ObjectData.Coord,1)<=1
            AxeData.Drawing='off';
            set(currentaxes,'UserData',AxeData);