Changeset 675 for trunk/src/set_object.m

Timestamp:

Aug 27, 2013, 11:25:21 PM (11 years ago)

Author:

sommeria

Message:

various bugs corrected

File:

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

trunk/src/set_object.m

@@ -270 +270 @@
 %------------------------------------------------------------------------
 % --- Executes on selection change in ProjMode.
+%------------------------------------------------------------------------
+
 function ProjMode_Callback(hObject, eventdata, handles)
 menu=get(handles.ProjMode,'String');
@@ -305 +307 @@
 switch ObjectStyle
     case 'points'
-        set(handles.num_RangeY_2,'TooltipString','num_YMax: range of projection around each point') 
+        set(handles.num_RangeY_2,'TooltipString','num_RangeY_2: range of projection around each point') 
 %         set(handles.XObject,'TooltipString','XObject: set of x coordinates of the points')
 %         set(handles.YObject,'TooltipString','YObject: set of y coordinates of the points')
 %         set(handles.ZObject,'TooltipString','ZObject: set of z coordinates of the points')
     case {'line','polyline','polygon'}
-        set(handles.num_RangeY_2,'TooltipString','num_YMax: range of projection around the line')
+        set(handles.num_RangeY_2,'TooltipString','num_RangeY_2: range of projection around the line')
          set(handles.Coord,'TooltipString','Coord: table of x,y, z coordinates defining the line')
 %         set(handles.YObject,'TooltipString','YObject: set of y coordinates defining the line')
@@ -319 +321 @@
         end       
     case {'rectangle','ellipse'}
-        set(handles.num_RangeX_2,'TooltipString',['num_XMax: half length of the ' ObjectStyle])
-        set(handles.num_RangeY_2,'TooltipString',['num_YMax: half width of the ' ObjectStyle])
+        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])
 %         set(handles.XObject,'TooltipString',['XObject:  x coordinate of the ' Type ' centre'])
 %         set(handles.YObject,'TooltipString',['YObject:  y coordinate of the ' Type ' centre'])
@@ -636 +638 @@
 dir_save=uigetfile_uvmat('select the folder for the new xml object file:',RootPath,'uigetdir');
 if ~isempty(dir_save)
-    % dir_save=uigetdir(RootPath);
     ObjectName=get(handles.Name,'String');
     if ~isempty(ObjectName)&&~strcmp(ObjectName,'')
-        def={fullfile(dir_save,[ObjectName '.xml'])};
+        def=[ObjectName '.xml'];
     else
-        def={fullfile(dir_save,[Object.Style '.xml'])};
-    end
-    displ_txt='save object as an .xml file';%default display
+        def=[Object.Style '.xml'];
+    end
+    displ_txt={'save object as an .xml file in';dir_save};%default display
     menu=get(handles.ProjMode,'String');
     value=get(handles.ProjMode,'Value');
     ProjMode=menu{value};
     if strcmp(ProjMode,'mask_inside')||strcmp(ProjMode,'mask_outside')
-        displ_txt='save mask contour as an .xml file: to create a mask image, use save_mask on the GUI uvmat (lower right)';
-    end
-    answer=msgbox_uvmat('INPUT_TXT','save object as an .xml file',def);
-    if ~isempty(answer)
+        displ_txt={'save mask contour as an .xml file:'; 'to create a mask image, use save_mask on the GUI uvmat (lower right)'};
+    end
+    answer=msgbox_uvmat('INPUT_TXT',displ_txt,def);
+    if iscell(answer)
+        FullName=fullfile(dir_save,answer{1});
         t=struct2xml(Object);
         t=set(t,1,'name','ProjObject');
-        save(t,answer{1})
-    end
-    msgbox_uvmat('CONFIRMATION',[answer{1}  ' saved'])
+        save(t,FullName)
+        msgbox_uvmat('CONFIRMATION',[FullName  ' saved'])
+    end
 end