Changeset 735 for trunk/src/uvmat.m

Timestamp:

Apr 9, 2014, 9:37:44 AM (11 years ago)

Author:

sommeria

Message:

various corrections

File:

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

trunk/src/uvmat.m

@@ -338 +338 @@
 end
 % desable set_object editing action if detected
-hh=findobj(allchild(0),'tag','set_object');
+hh=findobj(allchild(0),'name','set_object');
 if ~isempty(hh)
     hhh=findobj(hh,'tag','PLOT');
@@ -1376 +1376 @@
     if isempty(MaskFile)
         Mask.File='';
+    elseif ischar(MaskFile)
+        Mask.File=MaskFile;
     else
         Mask.File=MaskFile{1};
@@ -2534 +2536 @@
             UvData.ProjObject{1}.enable_plot=1;
             set_object(UvData.ProjObject{1},handles,ZBounds);
+            set(hset_object,'name','set_object');% rename if set_object already used with series
             set(handles.ListObject,'Value',1);
             set(handles.ListObject,'String',{'1-PLANE'});
@@ -3580 +3583 @@
     [hset_object,UvData.sethandles]=set_object(data,PlotHandles);% call the set_object interface with action on haxes,
                                                       % associate the set_object interface handle to the plotting axes
-    %set(hset_object,'Position',get(handles.uvmat,'Position')+UvData.OpenParam.PosSetObject)
+    set(hset_object,'name','set_object')
     UvData.MouseAction='create_object';
 else
@@ -4245 +4248 @@
     end
     ObjectData.Name=list_str{get(handles.ListObject_1,'Value')};
-    set_object(ObjectData,[],ZBounds);
+    hset_object=set_object(ObjectData,[],ZBounds);
+    set(hset_object,'name','set_object')
     set(handles.CheckViewObject,'Value',1)% show that the selected object in ListObject_1 is currently visualised
 end
@@ -4272 +4276 @@
 %% show object features if view_object isselected
 if get(handles.CheckViewObject,'value')
-    set_object(ObjectData,[],ZBounds);
-end
-
-%% The object  is displayed in set_object if this GUI is already opened
-% 
-% hset_object=findobj(allchild(0),'tag','set_object');
-% if ~isempty(hset_object)
-% 
-%     ObjectData.Name=list_str{IndexObj};
-%     set_object(ObjectData,[],ZBounds);
-%     set(handles.CheckViewField,'Value',1)% show that the selected object in ListObject is currently visualised
-% end
+    hset_object=set_object(ObjectData,[],ZBounds);
+    set(hset_object,'name','set_object')
+end
 
 %%  desactivate the edit object mode for security 
 set(handles.CheckEditObject,'Value',0) 
-
-% set(handles.CheckEditObject,'BackgroundColor',[0.7,0.7,0.7]) 
 
 %% update the  plot on view_field if view_field is already openened
@@ -4423 +4416 @@
     end
     hset_object=set_object(data,[],ZBounds);
+    set(hset_object,'name','set_object')
     hhset_object=guidata(hset_object);
     if get(handles.CheckEditObject,'Value')% edit mode