Changeset 603 for trunk/src/series.m

Timestamp:

Apr 4, 2013, 12:08:47 PM (11 years ago)

Author:

sommeria

Message:

bugs corrected, improvement of civ_input GUI

File:

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

trunk/src/series.m

@@ -542 +542 @@
 
 %% determine the selected reference field indices for pair display
-ref_i=1; %default ref_i is a reference frame index used to find existing pairs from PIV
-if ~isempty(i1)
-    ref_i=i1;
-    if ~isempty(i2)
-        ref_i=floor((ref_i+i2)/2);% reference image number corresponding to the file
-    end
-end
+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));
-ref_j=1; %default  ref_j is a reference frame index used to find existing pairs from PIV
-if ~isempty(j1)
-    ref_j=j1;
-    if ~isempty(j2)
-        ref_j=floor((j1+j2)/2);
-    end          
-end
+set(handles.num_ref_i,'UserData',[i1 i2])
+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
 set(handles.num_ref_j,'String',num2str(ref_j)); 
+set(handles.num_ref_j,'UserData',[j1 j2])
 
 %% update the list of recent files in the menubar and save it for future opening
@@ -793 +795 @@
 %% update the series info in 'UserData'
 SeriesData=get(handles.series,'UserData');
+SeriesData.Ref_i{iview}=get(handles.num_ref_i,'UserData');
+SeriesData.Ref_j{iview}=get(handles.num_ref_j,'UserData');
 SeriesData.i1_series{iview}=i1_series;
 SeriesData.i2_series{iview}=i2_series;
@@ -2367 +2371 @@
 commandwindow; %brings the Matlab command window to the front
 
+
+% --------------------------------------------------------------------
+function MenuImportConfig_Callback(hObject, eventdata, handles)
+% --------------------------------------------------------------------
+InputTable=get(handles.InputTable,'Data');
+[FileName, PathName] = uigetfile( ...
+       {'*.xml', ' (*.xml)';
+       '*.xml',  '.xml files '; ...
+        '*.*',  'All Files (*.*)'}, ...
+        'Pick a file',InputTable{1,1});
+filexml=[PathName FileName];%complete file name 
+if isempty(filexml),return;end %abandon if no file is introduced by the browser
+Param=xml2struct(filexml);
+fill_GUI(Param,handles.series)
 
 % --- Executes on selection change in RunMode.