Changeset 74 for trunk/src

Timestamp:

Mar 31, 2010, 12:39:26 PM (15 years ago)

Author:

sommeria

Message:

rotate_points: used for geometry_calib was forgotten. It is now added
plot_field now does not consider black the vectors with either vec_F=0 or vec_F=1 (vec_F=0 in the 3D3C software instead of vec_F=1)
set_object and uvmat: improvements for projection plane in volume vel data

Location:

trunk/src

Files:

• plot_field.m (modified) (1 diff)
• rotate_points.fig (added)
• rotate_points.m (added)
• set_object.m (modified) (2 diffs)
• uvmat.m (modified) (3 diffs)

trunk/src/plot_field.m

@@ -998 +998 @@
        colorlist(nbcolor,:)=[0 0 0]; %add black to the list of colors
        if ~isempty(ivar_FF)
-            ind_flag=find(vec_F~=1 & vec_FF==0);  %flag warning but not false
+            ind_flag=find(vec_F~=1 & vec_F~=0 & vec_FF==0);  %flag warning but not false
        else
-            ind_flag=find(vec_F~=1);
+            ind_flag=find(vec_F~=1 & vec_F~=0);
        end
        col_vec(ind_flag)=nbcolor;    

trunk/src/set_object.m

@@ -202 +202 @@
         end
         set(handles.ZMax,'String',num2str(max(data.RangeZ),3))
-        set(handles.ZMin,'String',num2str(min(data.RangeZ),3))
+        if numel(data.RangeZ)>=2
+            set(handles.ZMin,'String',num2str(min(data.RangeZ),3))
+        end
     end  
     if isfield(data,'Phi')
@@ -407 +409 @@
         set(handles.XObject,'TooltipString',['XObject:  x coordinate of the ' ObjectStyle ' centre'])
         set(handles.YObject,'TooltipString',['YObject:  y coordinate of the ' ObjectStyle ' centre'])
-    case {'plane','volume'}  
+    case {'plane'}  
+        set(handles.Phi,'Visible','on')
+        set(handles.XMin,'Visible','on')
+        set(handles.XMax,'Visible','on')
+        set(handles.YMin,'Visible','on')
+        set(handles.YMax,'Visible','on')
+        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])
+        set(handles.ZMax,'TooltipString',['ZMax: range of projection normal to the plane'])
+        if test3D
+            set(handles.Theta,'Visible','on')
+            set(handles.Psi,'Visible','on')
+            set(handles.ZMax,'Visible','on')
+        end
+        if isequal(ProjMode,'interp')|| isequal(ProjMode,'filter')
+            set(handles.DX,'Visible','on')
+            set(handles.DY,'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')  
+        end
+     case {'volume'}  
         set(handles.Phi,'Visible','on')
         set(handles.XMin,'Visible','on')

trunk/src/uvmat.m

@@ -2336 +2336 @@
 end
 
-UvData.NewSeries=0;% put to 0 the test for a new field series (set by RootPath_callback)
 % test 3D , default projection menuplane and typical mesh (needed to menuopen set_object)
 test_x=0;
@@ -2480 +2479 @@
 
 %3D case (menuvolume)
-if NbDim==3
+if NbDim==3 && UvData.NewSeries
     UvData.Object{1}.NbDim=UvData.NbDim;%test for 3D objects
     UvData.Object{1}.RangeZ=UvData.Mesh;%main plotting plane
@@ -2614 +2613 @@
 %display the updated plotting parameters for the base menuplane
 write_plot_param(handles,UvData.Object{1}.PlotParam);% update the display of the plotting parameters
+UvData.NewSeries=0;% put to 0 the test for a new field series (set by RootPath_callback)
 set(handles.uvmat,'UserData',UvData)