Changeset 1072 for trunk/src/set_object.m

Timestamp:

Jan 17, 2020, 8:13:53 PM (4 years ago)

Author:

sommeria

Message:

LIF updated and bug corrections

File:

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

trunk/src/set_object.m

@@ -100 +100 @@
 
 % fill the interface as set in the input data:
-if exist('data','var') 
+if exist('data','var')
     if isfield(data,'Coord')
         set(handles.Coord,'Data',data.Coord)
         if size(data.Coord,2)==3
-        set(handles.z_slider,'Visible','on')
+            set(handles.z_slider,'Visible','on')
         end
     else
@@ -114 +114 @@
     if isfield(data,'ProjModeMenu')
         set(handles.ProjMode,'UserData',data.ProjModeMenu)% data.ProjModeMenu as default menu (used in Type_Callback)
-    end      
+    end
     errormsg=fill_GUI(data,handles.set_object);
     if ~isempty(errormsg)
@@ -120 +120 @@
         return
     end
-    Type_Callback(hObject, eventdata, handles)% update the GUI set_object depending on the object type   
+    Type_Callback(hObject, eventdata, handles)% update the GUI set_object depending on the object type
     set(handles.REFRESH,'BackgroundColor',[1 0 0])
     if isfield(data,'RangeZ')
@@ -151 +151 @@
         set(handles.num_RangeY_1,'String',num2str(min(data.RangeY),3))
     end
-    if isfield(data,'RangeZ')&& ~strcmp(data.Type,'plane_z')%TODO: generalise
+    if isfield(data,'RangeZ')%&& ~strcmp(data.Type,'plane_z')%TODO: generalise
         if ischar(data.RangeZ)
             data.RangeZ=str2num(data.RangeZ);
@@ -159 +159 @@
             set(handles.num_RangeZ_1,'String',num2str(min(data.RangeZ),3))
         end
-    end  
+    end
     if ~isfield(data,'Angle')
         data.Angle=[0 0];
     end
-%     if isfield(data,'Angle') && isequal(numel(data.Angle),3)
-         set(handles.num_Angle_1,'String',num2str(data.Angle(1)))
-%          set(handles.num_Angle_2,'String',num2str(data.Angle(2)))
-%         set(handles.num_Angle_3,'String',num2str(data.Angle(3)))
-%     end
+    set(handles.num_Angle_1,'String',num2str(data.Angle(1)))
+    if numel(data.Angle)==2
+        set(handles.num_Angle_2,'Visible','on')
+        set(handles.num_Angle_2,'String',num2str(data.Angle(2)))
+    end
 end
 set(get(handles.set_object,'children'),'enable','off')
 set(handles.SAVE,'enable','on')
-% set(handles.REFRESH,'enable','off') 
 
 
@@ -245 +244 @@
         end
     case {'rectangle','ellipse','plane','volume'}
+        if ~isempty(Coord)
         Coord=Coord(1,:);
+        end
 end
 set(handles.Coord,'Data',Coord)