Changeset 193 for trunk/src/set_object.m

Timestamp:

Feb 20, 2011, 10:42:19 AM (13 years ago)

Author:

sommeria

Message:

improves the use of get_field, no projection object by default in uvmat( allows usual 1D plots),

various bug repairs, elimination of get_plot_handles.m (not useful)

File:

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

trunk/src/set_object.m

@@ -703 +703 @@
 testnew=0;
 ObjectData=read_set_object(handles);%read the input parameters defining the object in the GUI set_object
-PlotHandles=get_plot_handles(hhuvmat);
-projview='view_field';%default
 if strcmp(ListObject{IndexObj_1},ObjectName)% we are editing the object whose projection is viewed in the uvmat frame
     IndexObj=IndexObj_1;
     projview='uvmat';
-     plotaxes=hhuvmat.axes3;%handle of axes3 in view_field
 elseif ~isempty(IndexObj_2) && IndexObj_2<=numel(ListObject)&& strcmp(ListObject{IndexObj_2},ObjectName)% we are editing the object whose projection is viewed in view_field  
     IndexObj=IndexObj_2;
+    projview='view_field';
 else %new object 
     testnew=1;
     IndexObj=numel(ListObject)+1;
-    hview_field=findobj(allchild(0),'tag','view_field');
-    if ~isempty(hview_field)
-        PlotHandles=guidata(hview_field);
-        plotaxes=PlotHandles.axes3;%handle of axes3 in view_field
-    end
+    projview='view_field';
 end
 if strcmp(projview,'view_field')
@@ -728 +722 @@
     PlotHandles=guidata(hview_field);
     plotaxes=PlotHandles.axes3;%handle of axes3 in view_field
+else
+    PlotHandles=hhuvmat;
+    plotaxes=hhuvmat.axes3;%handle of axes3 in view_field
 end   
-
 
 %% naming the object
@@ -780 +776 @@
 %% plot the field projected on the object and store in the corresponding figue
 ProjData= proj_field(UvData.Field,ObjectData);%project the current interface field on ObjectData
-[PlotType,Object_out{IndexObj}.PlotParam,plotaxes]=plot_field(ProjData,plotaxes,PlotHandles);%update an existing field plot
+PlotParam=read_plot_param(PlotHandles);
+[PlotType,Object_out{IndexObj}.PlotParam,plotaxes]=plot_field(ProjData,plotaxes,PlotParam);%update an existing field plot
 
 %% update the GUI uvmat