Changeset 206 for trunk/src/set_object.m

Timestamp:

Feb 27, 2011, 10:40:29 PM (14 years ago)

Author:

sommeria

Message:

bug fixes to deal with volumes, storage of ACTION menu in series fixed

File:

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

trunk/src/set_object.m

@@ -80 +80 @@
 
 %default
-if ~exist('ZBound','var')
-    ZBound=0; %default 
+if ~exist('ZBounds','var')
+    ZBounds=0; %default 
 end
 set(hObject,'KeyPressFcn',{'keyboard_callback',handles})%set keyboard action function (allow action on uvmat when set_object is in front)
@@ -177 +177 @@
         set(handles.ZMax,'String',num2str(max(data.RangeZ),3))
         DZ=max(data.RangeZ);%slider step
-        if ZBounds(2)~=ZBounds(1)
+        if ~isnan(ZBounds(1)) && ZBounds(2)~=ZBounds(1)
             rel_step(1)=min(DZ/(ZBounds(2)-ZBounds(1)),0.2);%must be smaller than 1
             rel_step(2)=0.1;
@@ -422 +422 @@
             set(handles.DY,'Visible','off')
         end
-        if isequal(ObjectStyle,'volume') && isequal(ProjMode,'interp')
+        if  isequal(ProjMode,'interp')
             set(handles.DZ,'Visible','on')  
         end
@@ -433 +433 @@
         set(handles.XObject,'TooltipString',['XObject:  x coordinate of the axis origin for the ' ObjectStyle])
         set(handles.YObject,'TooltipString',['YObject:  y coordinate of the axis origin for the ' ObjectStyle])
-        if test3D
+%         if test3D
             set(handles.Theta,'Visible','on')
             set(handles.Psi,'Visible','on')
             set(handles.ZMin,'Visible','on')
             set(handles.ZMax,'Visible','on')
-        end
+%         end
         if isequal(ProjMode,'interp')|| isequal(ProjMode,'filter')
             set(handles.DX,'Visible','on')
             set(handles.DY,'Visible','on')
+            set(handles.DZ,'Visible','on')
         else
             set(handles.DX,'Visible','off')
             set(handles.DY,'Visible','off')
-        end
-        if isequal(ObjectStyle,'volume') && isequal(ProjMode,'interp')
-            set(handles.DZ,'Visible','on')  
+            set(handles.DZ,'Visible','off')
         end
 end
@@ -775 +774 @@
 
 %% 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
+'TESTproj'
+ProjData= proj_field(UvData.Field,ObjectData)%project the current interface field on ObjectData
 PlotParam=read_plot_param(PlotHandles);
 [PlotType,Object_out{IndexObj}.PlotParam,plotaxes]=plot_field(ProjData,plotaxes,PlotParam);%update an existing field plot