Changeset 651 for trunk/src/series

Timestamp:

Jun 25, 2013, 12:48:10 AM (11 years ago)

Author:

sommeria

Message:

various bugs corrected. Introduction of campaign lists in Open menu

File:

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

trunk/src/series/civ_input.m

@@ -56 +56 @@
 guidata(hObject, handles); % Update handles structure
 set(hObject,'WindowButtonDownFcn',{'mouse_down'}) % allows mouse action with right button (zoom for uicontrol display)
-SeriesData.ParentHandle=gcbf;
-SeriesData=get(gcbf,'UserData');
+hseries=findobj(allchild(0),'Tag','series');
+SeriesData.ParentHandle=hseries;
+SeriesData=get(hseries,'UserData');
 % relevant data in gcbf:.FileType,.FileInfo,.Time,.TimeUnit,.GeometryCalib{1};
 
@@ -1944 +1945 @@
 %     set(handles.num_FieldSmooth,'Visible','on')
 % else
+
 %     set(handles.num_subdomainsize,'Visible','off')
 %     set(handles.num_FieldSmooth,'Visible','off')
@@ -1955 +1957 @@
 drawnow
 if get(handles.TestCiv1,'Value')
-    set(handles.TestCiv1,'BackgroundColor',[0.7 0.7 0.7])% paint TestCiv1 button to grey to confirm civ launch
+    set(handles.TestCiv1,'BackgroundColor',[1 1 0])% paint TestCiv1 button to yellow to confirm civ launch
     ref_i=str2double(get(handles.ref_i,'String'));% read reference i index
     if strcmp(get(handles.ref_j,'Visible'),'on')
@@ -1962 +1964 @@
         ref_j=1;%default j index
     end
-    [filecell,i1,i2]=set_civ_filenames(handles,ref_i,ref_j,[1 0 0 0 0 0]);% get the corresponding file name and indices
+   % [filecell,i1,i2]=set_civ_filenames(handles,ref_i,ref_j,[1 0 0 0 0 0]);% get the corresponding file name and indices
     Data.ListVarName={'ny','nx','A'};
     Data.VarDimName= {'ny','nx',{'ny','nx'}};
-
+    hseries=findobj(allchild(0),'Tag','series');
+    hhseries=guidata(hseries);
+    InputTable=get(hhseries.InputTable,'Data');
+    ind_A=1;
+    if strcmp(InputTable{1,5},'.nc');
+        ind_A=2;
+    end
+    [i1_series_Civ1,i2_series_Civ1,j1_series_Civ1,j2_series_Civ1,check_bounds,NomTypeNc]=...
+            find_pair_indices(PairCiv1,i_series{1},j_series{1},MinIndex_i,MaxIndex_i,MinIndex_j,MaxIndex_j);
+ 
+    ImageName_A=fullfile_uvmat(InputTable{ind_A,1},InputTable{ind_A,2},InputTable{ind_A,3},InputTable{ind_A,5},InputTable{ind_A,4},...
+        ref_i,[],ref_j);
     Data.A=imread(filecell.ima1.civ1{1}); % read the first image
     if ndims(Data.A)==3 %case of color image