Changeset 954 for trunk/src/set_object.m

Timestamp:

Jun 22, 2016, 1:36:50 PM (9 years ago)

Author:

sommeria

Message:

update calib modfied + various updates

File:

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

trunk/src/set_object.m

@@ -111 +111 @@
     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)
@@ -132 +132 @@
         end
     end
-    if isfield(data,'RangeX')
+    if isfield(data,'RangeX')&& ~strcmp(data.Type,'plane_z')%TODO: generalise
         if ischar(data.RangeX)
             data.RangeX=str2num(data.RangeX);
@@ -139 +139 @@
         set(handles.num_RangeX_1,'String',num2str(min(data.RangeX),3))
     end
-    if isfield(data,'RangeY')
+    if isfield(data,'RangeY')&& ~strcmp(data.Type,'plane_z')%TODO: generalise
         if ischar(data.RangeY)
             data.RangeY=str2num(data.RangeY);
@@ -146 +146 @@
         set(handles.num_RangeY_1,'String',num2str(min(data.RangeY),3))
     end
-    if isfield(data,'RangeZ')
+    if isfield(data,'RangeZ')&& ~strcmp(data.Type,'plane_z')%TODO: generalise
         if ischar(data.RangeZ)
             data.RangeZ=str2num(data.RangeZ);
@@ -247 +247 @@
 if isempty(get(handles.ProjMode,'UserData'))
     switch Type
-        case {'points','line','plane'}
-            menu_proj={'projection';'interp_lin';'interp_tps';'none'};
         case 'polyline'
             menu_proj={'interp_lin';'interp_tps';'none'};
@@ -328 +326 @@
         set(handles.num_RangeX_2,'TooltipString',['num_RangeX_2: half length of the ' ObjectStyle])
         set(handles.num_RangeY_2,'TooltipString',['num_RangeY_2: half width of the ' ObjectStyle])
-    case {'plane'}  
+    case {'plane','plane_z'}  
         set(handles.num_Angle_3,'Visible','on')
         set(handles.num_RangeX_1,'Visible','on')
@@ -387 +385 @@
             set(handles.num_RangeY_2,'String',num2str(UvData.Field.YMax))
         end
-        if isempty(get(handles.CoordUnit,'String'))
-            set(handles.CoordUnit,'String',Field.CoordUnit)
+        if isempty(get(handles.CoordUnit,'String'))&& isfield(UvData.Field,'CoordUnit')
+            set(handles.CoordUnit,'String',UvData.Field.CoordUnit)
         end       
     end