Changeset 339 for trunk/src/uvmat.m

Timestamp:

Dec 19, 2011, 10:12:56 AM (13 years ago)

Author:

sommeria

Message:

name2display replaced by fileparts_uvmat and find_file_series in series.
name2display partially replaced in civ.m (to be continued)
series.fig reorganized with panels.

File:

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

trunk/src/uvmat.m

@@ -474 +474 @@
 end
 % detect root name, nomenclature and indices in the input file name:
-[RootPath,SubDir,RootFile,i1,i2,j1,j2,FileExt]=fileparts_uvmat(fileinput);
+[~,SubDir,~,i1,i2,j1,j2,FileExt]=fileparts_uvmat(fileinput);
 % detect the file type, get the movie object if relevant, and look for the corresponding file series:
-[i1_series,i2_series,j1_series,j2_series,NomType,FileType,MovieObject]=find_file_series(fileinput);
-
+% [i1_series,i2_series,j1_series,j2_series,NomType,FileType,MovieObject]=find_file_series(fileinput);
+[RootPath,RootFile,i1_series,i2_series,j1_series,j2_series,NomType,FileType,MovieObject]=find_file_series(fileinput);
 % open the file or fill the GUI uvmat according to the detected file type
 switch FileType
@@ -822 +822 @@
 
 % set default options in menu 'Fields'
-
 if ~testima
     testcivx=0;
@@ -1909 +1908 @@
 function movie_pair_Callback(hObject, eventdata, handles)
 %------------------------------------------------------------------------
-status=get(handles.movie_pair,'value');
-if isequal(status,0)
+
+%% stop movie action if the movie_pair button is off
+if ~get(handles.movie_pair,'value')
     set(handles.movie_pair,'BusyAction','Cancel')%stop movie pair if button is 'off'
     set(handles.i2,'String','')
@@ -1918 +1918 @@
     set(handles.movie_pair,'BusyAction','queue')
 end
-%initialisation
+
+%% initialisation
 set(handles.movie_pair,'BackgroundColor',[1 1 0])%paint the command button in yellow
 drawnow
@@ -1929 +1930 @@
     [ff,rr,filebase,xx,Ext,SubDir]=read_file_boxes(handles);
     NomType=get(handles.NomType,'String');
-%     NomType=get(handles.FileIndex,'UserData');
 else
     list_fields=get(handles.Fields_1,'String');% list menu fields
@@ -1969 +1969 @@
 end
 
-%read the second image
+%% read the second image
 Field.AName='image';
 if test_1
@@ -1984 +1984 @@
 end
 Field_b.CoordUnit='pixel';
-%determine the input file type
+
+%% determine the input file type
 if (test_1 && isfield(UvData,'MovieObject_1'))||(~test_1 && isfield(UvData,'MovieObject'))
     FileType='movie';