Changeset 156 for trunk/src/plot_object.m

Timestamp:

Dec 19, 2010, 10:11:04 PM (14 years ago)

Author:

sommeria

Message:

many bug repairs and corrections for mouse action
create_grid: option for black marjkers for grid detection

File:

• trunk/src/plot_object.m (modified) (8 diffs)

trunk/src/plot_object.m

@@ -37 +37 @@
 
 function [hh]=plot_object(ObjectDataIn,ProjObject,hplot,col)
+%% default output
 hh=[];%default output
 if isequal(ProjObject,ObjectDataIn)% object representation does not appear in its own projection plot
@@ -48 +49 @@
     return % no object representation yet available
 end
-if ~isfield(ObjectData,'Style')|isempty(ObjectData.Style)|~ischar(ObjectData.Style)
+if ~isfield(ObjectData,'Style')||isempty(ObjectData.Style)||~ischar(ObjectData.Style)
     msgbox_uvmat('ERROR','undefined ObjectData.Style in plot_object.m')
     return
 end
-if ~isfield(ObjectData,'Style')|isempty(ObjectData.Style)|~ischar(ObjectData.Style)
+if ~isfield(ObjectData,'Style')||isempty(ObjectData.Style)||~ischar(ObjectData.Style)
     msgbox_uvmat('ERROR','undefined ObjectData.Style in plot_object.m')
     return
@@ -63 +64 @@
 ZMax=0;
 
-%determine the plotting axes (with handle 'haxes')
+%% determine the plotting axes (with handle 'haxes')
 test_newobj=1;
 if ishandle(hplot)
-    if isequal(get(hplot,'Tag'),'proj_object')  
+    if isequal(get(hplot,'Tag'),'proj_object')% hplot is the handle of an object representation  
         test_newobj=0;
         haxes=get(hplot,'parent');
-    elseif isequal(get(hplot,'Type'),'axes')
-        axes(hplot)
+    elseif isequal(get(hplot,'Type'),'axes')% hplot is the handle of an axis 
+        currentfig=get(hplot,'parent');
+        set(0,'CurrentFigure',currentfig)
         haxes=hplot;
-    elseif isequal(get(hplot,'Type'),'figure')
-        figure(hplot);%set the input figure as the current one
+        set(currentfig,'CurrentAxes',haxes);
+    elseif isequal(get(hplot,'Type'),'figure')% hplot is the handle of a figure 
+        set(0,'CurrentFigure',hplot);%set the input figure as the current one
         haxes=findobj(hplot,'Type','axes');%look for axes in the figure
         haxes=haxes(1);
-        axes(haxes); %set the first found axis as the current one
+        set(hplot,'CurrentAxes',haxes);%set the first found axis as the current one
     else
         figure; %create new figure
@@ -88 +91 @@
 end
 
-%default input parameters
+%% default input parameters
 if ~isfield(ObjectData,'ProjMode')|isempty(ObjectData.ProjMode)
      ObjectData.ProjMode='projection';%default
@@ -148 +151 @@
 sizcoord=size(ObjectData.Coord);
 
-%determine the coordinates xline, yline,xsup,xinf, yinf,ysup determining the new object plot
+%% determine the coordinates xline, yline,xsup,xinf, yinf,ysup determining the new object plot
 test_line= isequal(ObjectData.Style,'points')|isequal(ObjectData.Style,'line')|isequal(ObjectData.Style,'polyline')|...
     isequal(ObjectData.Style,'polygon')| isequal(ObjectData.Style,'plane')| isequal(ObjectData.Style,'volume');
@@ -206 +209 @@
 end
 
-%shading image
+%% shading image
 if test_patch
     npMx=512;
@@ -267 +270 @@
 
 PlotData=[];%default
-%MODIFY AN EXISTING OBJECT PLOT
+%% MODIFY AN EXISTING OBJECT PLOT
 if test_newobj==0;
     hh=hplot;
@@ -326 +329 @@
 end
 
-%create the object
+%% create the object
 if test_newobj
     axes(haxes)