Changeset 874 for trunk/src/uvmat.m

Timestamp:

Feb 19, 2015, 2:17:59 AM (9 years ago)

Author:

sommeria

Message:

merge_proj corrected + various bugs

File:

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

trunk/src/uvmat.m

@@ -1692 +1692 @@
 % detect the file type, get the movie object if relevant, and look for the corresponding file series:
 [RootPath,SubDir,RootFile,i1_series,i2_series,j1_series,j2_series,tild,FileInfo,MovieObject]=find_file_series(fullfile(RootPath,SubDir),[RootFile FileIndices FileExt]);
+errormsg='';
 if isempty(i1_series)
     fileinput=uigetfile_uvmat('pick an input file',fullfile(RootPath,SubDir));
@@ -2091 +2092 @@
         set(handles.pxcmx,'Visible','off')
         set(handles.pxcmy,'Visible','off')
+        if index==1
         set(handles.TransformName,'Value',1); %  no transform by default
+        end
     else
         set(handles.pxcmx,'Visible','on')
@@ -2105 +2108 @@
             set(handles.pxcmy,'String',num2str(pixcmy))
         end
-        if ~get(handles.CheckFixLimits,'Value')
+        if ~get(handles.CheckFixLimits,'Value')&& index==1
             set(handles.TransformName,'Value',3); % phys transform by default if fixedLimits is off
         end
@@ -3771 +3774 @@
             else
                 [PlotType,PlotParamOut]=plot_field(ObjectData,haxes(imap),PlotParam{imap});
-                if ~isempty(regexp(PlotType,'^error'))
+                if ~isempty(regexp(PlotType,'^error'))%exit in case of plotting error
                     if ~isempty(regexp(PlotType,'attempt to plot two vector fields'))
                         set(handles.CheckEditObject,'Value',1)
-                        CheckEditObject_Callback([], [], handles)
+                        CheckEditObject_Callback([], [], handles)% propose to edit the main projection plane
                         hset_object=findobj(allchild(0),'Tag','set_object');%find the GUI set_object
                         hhset_object=guidata(hset_object);%
@@ -3785 +3788 @@
                     errormsg=fill_GUI(PlotParamOut,handles.uvmat);
                 else
-                    errormsg=fill_GUI(PlotParamOut,view_field_handle);
+                    errormsg=fill_GUI(PlotParamOut,view_field_handle);%TODO: check effect on text display
                 end
                 for list={'Scalar','Vectors'}