Changeset 71 for trunk/src/update_obj.m

Timestamp:

Mar 29, 2010, 6:34:55 PM (14 years ago)

Author:

sommeria

Message:

civ3D updated: introduction of image size
imadoc2struct: reding of image size from the xml file
set_object, view_field and related functions: improvement of projection object editing
mouse: possibility of adjusting the calibrations points with the mouse

File:

• trunk/src/update_obj.m (modified) (5 diffs)

trunk/src/update_obj.m

@@ -9 +9 @@
 %
 %INPUT:
-%UvIn: structure stored as 'Userdata' on the uvmat interface
+%UvData: structure stored as 'Userdata' on the uvmat interface, it contains
+%    .Object{1},{2}... description of all the projection objects 
+%    .Object{iview}.plotaxes: axes for the plot of the field projected on this object
+%    .Object{iview}.HandlesDisplay(ih): array of handles for plots representing the object #iview in the field #ih
 %IndexObjIn: object index for an existing objects stored in UvData
 %ObjectData: structure containing the input object properties
-%PlotHandles: structure containing the handles of the plotting parameter buttons on the uvmat interface (obtained by get_plot_handles.m)
+%       .Style: style of the object: 'line', 'rectangle'...
+%PlotHandles: structure containing the handles of the plotting parameter buttons on the uvmat or view_field interface 
 %-------------------------------------
 
@@ -35 +39 @@
                  HandlesDisplay=Object_set{IndexObj}.HandlesDisplay;%list of handles of object representations
              end
-             hplot_list=findobj(haxes,'Tag','proj_object');
+             hplot_list=findobj(haxes,'Tag','proj_object');%list of projection objects on the axes
              for ih=1:length(HandlesDisplay)
                  plot_detect=find(hplot_list==HandlesDisplay(ih));
@@ -46 +50 @@
              if ~testupdate% draw new object plot
                 hh=plot_object(ObjectData,Object_set{iview},haxes,'m');%draw the object with the new object data
-                Object_out.HandlesDisplay=[Object_out.HandlesDisplay hh];
+                if isfield(Object_out,'HandlesDisplay')
+                    Object_out.HandlesDisplay=[Object_out.HandlesDisplay hh];
+                else
+                    Object_out.HandlesDisplay=hh;
+                end
                 PlotData=get(hh,'UserData');
                 PlotData.IndexObj=IndexObj;
@@ -55 +63 @@
 end
 % plot the field projected on the object
-if ~isempty(PlotHandles) %&& ~testmask
+% if ~isempty(PlotHandles) %&& ~testmask
     ProjData= proj_field(UvData.Field,ObjectData,IndexObj);%project the current interface field on ObjectData
     if ~isempty(ProjData)   
         plotaxes=[];%default
+%         get(Object_set{IndexObj}.plotaxes)
         if length(Object_set)>= IndexObj && isfield(Object_set{IndexObj},'plotaxes')
             plotaxes=Object_set{IndexObj}.plotaxes;
@@ -73 +82 @@
         end
     end
-end
+% end