Changeset 191 for trunk/src/uvmat.m

Timestamp:

Feb 5, 2011, 11:25:38 PM (13 years ago)

Author:

sommeria

Message:

introduce edit boxes to set axis limits. rationalisation of names FixScal?, FixLimits?....
introduce volume scan in calibration procedures

File:

• trunk/src/uvmat.m (modified) (23 diffs)

trunk/src/uvmat.m

@@ -309 +309 @@
 set(handles.transform_fct,'UserData',fct_handle)% store the list of path in UserData of ACTION
 set(handles.uvmat,'UserData',UvData)
-%initiates menu of vector colors 
-% list_menu=calc_field;
-% %list_menu=[{'ima_cor'};{'black'};{'white'};list_menu(3:end)];
-% set(handles.col_vec,'String',list_menu)
+%set(handles.FixEqual,'Value',1)% by default: axes free to adapt in aspect ratio
+%set(handles.FixEqual,'BackgroundColor',[1 1 0])
 
 %check the path and date of modification of all functions in uvmat
@@ -352 +350 @@
         testinputfield=1;
     end
-%     if ~isempty(Field)
-%         menu_str=update_menu(handles.Fields,'get_field...');
-% %         set(handles.Fields,'Value',1)
-% %         set(handles.Fields,'String',{'get_field...'})    
-%         testinputfield=1;
-%     elseif ischar(input)
-%         scan_i_Callback(handles.scan_i, eventdata, handles);    
-%     end
 else
    if ishandle(handles.UVMAT_title)
@@ -749 +739 @@
     drawnow
     if isfield(XmlData, 'GeometryCalib') && ~isempty(XmlData.GeometryCalib)
+        XmlData.GeometryCalib
+        if isfield(XmlData.GeometryCalib,'VolumeScan') && isequal(XmlData.GeometryCalib.VolumeScan,'y')
+            'TESTvol'
+            set (handles.nb_slice,'String','volume')
+        end
         hgeometry_calib=findobj('tag','geometry_calib');
         if ~isempty(hgeometry_calib)
@@ -837 +832 @@
             set(handles.pycm,'String',num2str(pixcmy))
         end
-        if ~get(handles.FixedLimits,'Value')
+        if ~get(handles.FixLimits,'Value')
             set(handles.transform_fct,'Value',2); % phys transform by default if fixedLimits is off
         end
@@ -848 +843 @@
                set(handles.slices,'Value',1)
            end
-           if isfield(GeometryCalib,'NbSlice') && isequal(GeometryCalib.NbSlice,'volume')
+           if isfield(GeometryCalib,'VolumeScan') && isequal(GeometryCalib.VolumeScan,'y')
                set(handles.nb_slice,'String','volume')
            else
@@ -2098 +2093 @@
 %update the z position index
 nbslice_str=get(handles.nb_slice,'String');
-if isequal(nbslice_str,'volume')
+if isequal(nbslice_str,'volume')%NOT USED
     z_index=num_j1;
     set(handles.z_index,'String',num2str(z_index))
@@ -2523 +2518 @@
     UvData.Object{1}.plotaxes=handles.axes3;%default plotting axis 
 end
+testnewseries=UvData.NewSeries;
 UvData.NewSeries=0;% put to 0 the test for a new field series (set by RootPath_callback)
 set(handles.uvmat,'UserData',UvData)
@@ -2543 +2539 @@
 haxes(1)=handles.axes3;
 PlotParam{1}=read_plot_param(handles);%read plotting parameters on the uvmat interfac
-keeplim(1)=get(handles.FixedLimits,'Value');% test for fixed graph limits
+keeplim(1)=get(handles.FixLimits,'Value');% test for fixed graph limits
 PosColorbar{1}=UvData.OpenParam.PosColorbar;%prescribe the colorbar position on the uvmat interface
 
@@ -2564 +2560 @@
     iobj=IndexObj(imap);    
     [ObjectData,errormsg]=proj_field(UvData.Field,UvData.Object{iobj});% project field on the object
+    if testnewseries && isfield(ObjectData,'CoordUnit')
+        PlotParam{imap}=rmfield(PlotParam{imap},'FixEqual'); %set FixEqual to depend on the field (=1 if Data.CoordUnit=1 in plot_field)
+    end 
     if ~isempty(errormsg)
         return
@@ -2610 +2609 @@
             ObjectData.DimValue(ind_off)=[];
         end
-    end
-    
+    end   
     if ~isempty(ObjectData)
         PlotType='none'; %default
@@ -2622 +2620 @@
                 ObjectData.Mesh=Field.Mesh; % gives an estimated mesh size (useful for mouse action on the plot)
             end
-%             if imap==1            
-%                 UvData.axes3=ObjectData;
-%             else
-%                 ViewFieldData=get(view_field_handle,'UserData');
-%                 ViewFieldData.axes3=ObjectData;
-%                 set(view_field_handle,'UserData',ViewFieldData)
-%             end
         end
         if isequal(PlotType,'none')
@@ -2640 +2631 @@
     end
 end
-
 
 %% update the mask
@@ -2764 +2754 @@
 
 %-------------------------------------------------------------------
-% --- Executes on button press in 'FixedLimits'.
-%-------------------------------------------------------------------
-function FixedLimits_Callback(hObject, eventdata, handles)
-test=get(handles.FixedLimits,'Value');
+% --- Executes on button press in 'FixLimits'.
+%-------------------------------------------------------------------
+function FixLimits_Callback(hObject, eventdata, handles)
+test=get(handles.FixLimits,'Value');
 if test
-    set(handles.FixedLimits,'BackgroundColor',[1 1 0])
-else
-    set(handles.FixedLimits,'BackgroundColor',[0.7 0.7 0.7])
+    set(handles.FixLimits,'BackgroundColor',[1 1 0])
+else
+    set(handles.FixLimits,'BackgroundColor',[0.7 0.7 0.7])
     update_plot(handles);
 end
 
 %-------------------------------------------------------------------
-% --- Executes on button press in auto_xy.
-function auto_xy_Callback(hObject, eventdata, handles)
-test=get(handles.auto_xy,'Value');
+% --- Executes on button press in FixEqual.
+function FixEqual_Callback(hObject, eventdata, handles)
+test=get(handles.FixEqual,'Value');
 if test
-    set(handles.auto_xy,'BackgroundColor',[1 1 0])
+    set(handles.FixEqual,'BackgroundColor',[1 1 0])
     cla(handles.axes3)
     update_plot(handles);
 else
-    set(handles.auto_xy,'BackgroundColor',[0.7 0.7 0.7])
+    set(handles.FixEqual,'BackgroundColor',[0.7 0.7 0.7])
     update_plot(handles);
 %     axis(handles.axes3,'image')
@@ -2799 +2789 @@
 if (get(handles.zoom,'Value') == 1); 
     set(handles.zoom,'BackgroundColor',[1 1 0])
-    set(handles.FixedLimits,'Value',1)% propose by default fixed limits for the plotting axes
-    set(handles.FixedLimits,'BackgroundColor',[1 1 0]) 
+    set(handles.FixLimits,'Value',1)% propose by default fixed limits for the plotting axes
+    set(handles.FixLimits,'BackgroundColor',[1 1 0]) 
 else
     set(handles.zoom,'BackgroundColor',[0.7 0.7 0.7])
@@ -3148 +3138 @@
 setfield(handles);% update the field structure ('civ1'....)
 
-if ~isfield(UvData,'NewSeries')||isequal(UvData.NewSeries,0)
+if ~(isfield(UvData,'NewSeries')&&isequal(UvData.NewSeries,1))
     run0_Callback(hObject, eventdata, handles)
 end
@@ -3353 +3343 @@
 set(handles.uvmat,'UserData',UvData)
 setfield(handles);% update the field structure ('civ1'....)
-if ~isfield(UvData,'NewSeries')||isequal(UvData.NewSeries,0)
+if ~(isfield(UvData,'NewSeries')&&isequal(UvData.NewSeries,1))
     run0_Callback(hObject, eventdata, handles)
 end
@@ -3883 +3873 @@
 end
 
-set(handles.FixedLimits,'Value',0)
-set(handles.FixedLimits,'BackgroundColor',[0.7 0.7 0.7])
+set(handles.FixLimits,'Value',0)
+set(handles.FixLimits,'BackgroundColor',[0.7 0.7 0.7])
 
 UvData=get(huvmat,'UserData');
@@ -4004 +3994 @@
 %         set(haxes,'XLimMode','auto')%reset auto mode (after zoom effect)
 %         set(haxes,'YLimMode','auto')
-        PlotParam.Auto_xy=1;
-        plot_field(Histo,haxes,PlotParam);
-    end
-end
-
-
+%         PlotParam.Auto_xy=1;
+        plot_field(Histo,haxes);
+    end
+end
 
 %------------------------------------------------
 %CALLBACKS FOR PLOTTING PARAMETERS
 %-------------------------------------------------
+%-----------------------------------------------------------------
+function MinX_Callback(hObject, eventdata, handles)
+%------------------------------------------
+set(handles.FixLimits,'Value',1) %suppress auto mode
+set(handles.FixLimits,'BackgroundColor',[1 1 0])
+update_plot(handles);
+
+%-----------------------------------------------------------------
+function MaxX_Callback(hObject, eventdata, handles)
+%------------------------------------------
+set(handles.FixLimits,'Value',1) %suppress auto mode
+set(handles.FixLimits,'BackgroundColor',[1 1 0])
+update_plot(handles);
+
+%-----------------------------------------------------------------
+function MinY_Callback(hObject, eventdata, handles)
+%------------------------------------------
+set(handles.FixLimits,'Value',1) %suppress auto mode
+set(handles.FixLimits,'BackgroundColor',[1 1 0])
+update_plot(handles);
+
+%-----------------------------------------------------------------
+function MaxY_Callback(hObject, eventdata, handles)
+%------------------------------------------
+set(handles.FixLimits,'Value',1) %suppress auto mode
+set(handles.FixLimits,'BackgroundColor',[1 1 0])
+update_plot(handles);
 
 %-----------------------------------------------------------------
 function MinA_Callback(hObject, eventdata, handles)
 %------------------------------------------
-set(handles.AutoScal,'Value',1) %suppress auto mode
-set(handles.AutoScal,'BackgroundColor',[1 1 0])
+set(handles.FixScal,'Value',1) %suppress auto mode
+set(handles.FixScal,'BackgroundColor',[1 1 0])
 update_plot(handles);
 
@@ -4025 +4040 @@
 function MaxA_Callback(hObject, eventdata, handles)
 %--------------------------------------------
-set(handles.AutoScal,'Value',1) %suppress auto mode
-set(handles.AutoScal,'BackgroundColor',[1 1 0])
+set(handles.FixScal,'Value',1) %suppress auto mode
+set(handles.FixScal,'BackgroundColor',[1 1 0])
 update_plot(handles);
 
 %-----------------------------------------------
-function AutoScal_Callback(hObject, eventdata, handles)
+function FixScal_Callback(hObject, eventdata, handles)
 %--------------------------------------------
-test=get(handles.AutoScal,'Value');
+test=get(handles.FixScal,'Value');
 if test
-    set(handles.AutoScal,'BackgroundColor',[1 1 0])
-else
-    set(handles.AutoScal,'BackgroundColor',[0.7 0.7 0.7])
+    set(handles.FixScal,'BackgroundColor',[1 1 0])
+else
+    set(handles.FixScal,'BackgroundColor',[0.7 0.7 0.7])
     update_plot(handles);
 end
@@ -4076 +4091 @@
 function VecScale_Callback(hObject, eventdata, handles)
 %-------------------------------------------------------------------
-set(handles.AutoVec,'Value',1);
-set(handles.AutoVec,'BackgroundColor',[1 1 0])
+set(handles.FixVec,'Value',1);
+set(handles.FixVec,'BackgroundColor',[1 1 0])
 update_plot(handles);
 
 %-------------------------------------------------------------------
-function AutoVec_Callback(hObject, eventdata, handles)
-%-------------------------------------------------------------------
-test=get(handles.AutoVec,'Value');
+function FixVec_Callback(hObject, eventdata, handles)
+%-------------------------------------------------------------------
+test=get(handles.FixVec,'Value');
 if test
-    set(handles.AutoVec,'BackgroundColor',[1 1 0])
+    set(handles.FixVec,'BackgroundColor',[1 1 0])
 else
     update_plot(handles);
     %set(handles.VecScale,'String',num2str(ScalOut.VecScale,3))
-    set(handles.AutoVec,'BackgroundColor',[0.7 0.7 0.7])
+    set(handles.FixVec,'BackgroundColor',[0.7 0.7 0.7])
 end
 
@@ -4187 +4202 @@
 AxeData=UvData.axes3;
 PlotParam=read_plot_param(handles);
+PlotParam.Scalar
 [PP,PlotParamOut]= plot_field(AxeData,haxes,PlotParam);
 write_plot_param(handles,PlotParamOut); %update the auto plot parameters
@@ -4308 +4324 @@
     PlotHandles=guidata(hview_field);
 end
-% if ~isempty(ProjData)
-'TEST'
-ProjData
-    plot_field(ProjData,PlotHandles.axes3,PlotHandles);
-% end
+plot_field(ProjData,PlotHandles.axes3,PlotHandles);
 set(handles.uvmat,'UserData',UvData)
 hother=findobj('Tag','proj_object');%find all the proj objects
@@ -4982 +4994 @@
     delete_object(IndexObj)
 end
-    
-
-
-
-
+
+