Changeset 967 for trunk/src

Timestamp:

Jul 11, 2016, 2:43:53 PM (8 years ago)

Author:

sommeria

Message:

3D cuts improved

Location:

trunk/src

Files:

• mouse_down.m (modified) (2 diffs)
• proj_field.m (modified) (1 diff)
• set_object.m (modified) (2 diffs)
• uvmat.m (modified) (1 diff)

trunk/src/mouse_down.m

@@ -440 +440 @@
         set(hh_set_object.num_Angle_1,'String',num2str(ObjectData.Angle(1)))
         set(hh_set_object.num_Angle_2,'String',num2str(ObjectData.Angle(2)))
-        drawing_status='off';
+         drawing_status='off';
     else
         ObjectData.Coord=[ObjectData.Coord ;xy(1,1:2)];% append the coordinates marked by the mouse to the object
@@ -446 +446 @@
         drawing_status='create';
     end
+    drawing_status='create';
     %TODO replace 0 by z coord for 3D
     hobject=UvData.ProjObject{IndexObj}.DisplayHandle.(CurrentGUI_tag);

trunk/src/proj_field.m

@@ -914 +914 @@
                 end
             end
-    end
+
 end
 if ~isempty(ivar_U) && ~isempty(ivar_V)

trunk/src/set_object.m

@@ -101 +101 @@
 % fill the interface as set in the input data:
 if exist('data','var') 
-    if isfield(data,'Coord') &&size(data.Coord,2)==3
+    if isfield(data,'Coord')
+        set(handles.Coord,'Data',data.Coord)
+        if size(data.Coord,2)==3
         set(handles.z_slider,'Visible','on')
+        end
     else
         set(handles.z_slider,'Visible','off')
@@ -339 +342 @@
             set(handles.num_Angle_1,'Visible','on')
             set(handles.num_Angle_1,'String','90')
-            set(handles.Coord,'Data',[0 0 0])
+            %set(handles.Coord,'Data',[0 0 0])
             set(handles.num_RangeZ_2,'Visible','on')
         end

trunk/src/uvmat.m

@@ -995 +995 @@
                 data.DY=UvData.Field.CoordMesh;
                 data.RangeZ=UvData.Field.CoordMesh;
+                data.Coord=[];
             otherwise
                 data.RangeY=[UvData.Field.YMin UvData.Field.YMax];