Changeset 803 for trunk/src/series.m

Timestamp:

Jul 30, 2014, 8:31:18 PM (10 years ago)

Author:

sommeria

Message:

bugs corrected in series and uigetfile_uvmat (for Windows OS)

File:

• trunk/src/series.m (modified) (4 diffs)

trunk/src/series.m

@@ -240 +240 @@
 end
 
-%% introduce the input file name(s) if defined from input Param, TODO: avoid the file checking if Param.i1_series defined
+%% introduce the input file name(s) if defined from input Param,
 if isfield(Param,'InputFile')
     
@@ -251 +251 @@
     end
     set(handles.InputTable,'Data',InputTable)
+    %% determine the selected reference field indices for pair display
     
-    %     display_file_name(handles,Param,'one')%refresh the input table
+    [tild,tild,tild,i1,i2,j1,j2]=fileparts_uvmat(Param.InputFile.FileIndex);
+    if isempty(i1)
+        i1=1;
+    end
+    if isempty(i2)
+        i2=i1;
+    end
+    ref_i=floor((i1+i2)/2);% reference image number corresponding to the file
+    % set(handles.num_ref_i,'String',num2str(ref_i));
+    if isempty(j1)
+        j1=1;
+    end
+    if isempty(j2)
+        j2=j1;
+    end
+    ref_j=floor((j1+j2)/2);% reference image number corresponding to the file
+    SeriesData.ref_i=ref_i;
+    SeriesData.ref_j=ref_j;
+    set(handles.series,'UserData',SeriesData)
     update_rootinfo(handles,Param.HiddenData.i1_series{1},Param.HiddenData.i2_series{1},Param.HiddenData.j1_series{1},Param.HiddenData.j2_series{1},...
         Param.HiddenData.FileInfo{1},Param.HiddenData.MovieObject{1},1)
-    if isfield(Param,'FileName_1')
-
+    if isfield(Param,'FileName_1')       
         %         display_file_name(handles,Param,2)
         update_rootinfo(handles,Param.HiddenData.i1_series{2},Param.HiddenData.i2_series{2},Param.HiddenData.j1_series{2},Param.HiddenData.j2_series{2},...
@@ -266 +284 @@
 if isfield(Param,'incr_i')
     set(handles.num_incr_i,'String',num2str(Param.incr_i))
+else
+    set(handles.num_incr_i,'String','1')
 end
 if isfield(Param,'incr_j')
     set(handles.num_incr_j,'String',num2str(Param.incr_j))
+else
+    set(handles.num_incr_j,'String','1')
 end
 
@@ -274 +296 @@
 % --- Outputs from this function are returned to the command line.
 function varargout = series_OutputFcn(hObject, eventdata, handles)
-%------------------------------------------------------------------------ 
+%------------------------------------------------------------------------
 varargout{1} = handles.output;