Changeset 1119 for trunk/src/series.m

Timestamp:

Aug 16, 2022, 2:02:02 PM (2 years ago)

Author:

sommeria

Message:

 

File:

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

trunk/src/series.m

@@ -2522 +2522 @@
 FieldList_1=get(handles.FieldName_1,'String'); % previous list as default
 if ~iscell(FieldList_1),FieldList_1={FieldList_1};end
-CheckList_1=1; % indicate whether FieldName_1 has been updated
+CheckPivData_1=0; % indicate whether FieldName_1 has been updated with civ data, 0 by default
 handles_coord=[handles.Coord_x handles.Coord_y handles.Coord_z handles.Coord_x_title handles.Coord_y_title handles.Coord_z_title];
 if VelTypeRequest && numel(iview_civ)>=1
@@ -2541 +2541 @@
         set(handles.VelType_title_1,'Visible','on')
         FieldList_1=[set_field_list('U','V');{'C'};{'add_field...'}]; % standard menu for civx data
-        CheckList_1=1;
+        CheckPivData_1=1;
         set(handles.FieldName_1,'Value',1); % velocity vector choice by default
     else
@@ -2567 +2567 @@
             end
         end
-        if ~isempty(FieldList)
+        if ~isempty(FieldList)iview_netcdf
             if isempty(find(strcmp(get(handles.Coord_x,'String'),ListVarName)))||...
                     isempty(find(strcmp(get(handles.Coord_y,'String'),ListVarName)))
@@ -2584 +2584 @@
         set(handles.Field_text,'Visible','off')
     end
-    
     set(handles_coord,'Visible','on')
     if isempty(find(strcmp('add_field...',FieldList)))
@@ -2591 +2590 @@
     if FieldNameRequest_1 && numel(iview_netcdf)>=2
         set(handles.FieldName_1,'Visible','on')
-        if CheckList_1==0        % not civ input made
+        set(handles.Field_text_1,'Visible','on')
+        if CheckPivData_1==0        % not civ input made
+            FieldList_1={'add_field...'}
             ListVarName=SeriesData.FileInfo{iview_netcdf(2)}.ListVarName;
             ind_var=get(handles.FieldName,'Value'); % indices of previously selected variables
             for ilist=1:numel(ind_var)
                 if isempty(find(strcmp(FieldList{ind_var(ilist)},ListVarName)))
-                    FieldList_1={}; % previous choice not consistent with new input field
+                    %FieldList_1={}; % previous choice not consistent with new input field
                     set(handles.FieldName_1,'Value',1)
                     break
@@ -2607 +2608 @@
             end
             if ~isempty(Coord_z) && isempty(find(strcmp(Coord_z,ListVarName)))
-                FieldList_1={};
+                FieldList_1={'add_field...'};
                 warn_coord=1;
             end
@@ -3027 +3028 @@
 field_index=get(handles.FieldName_1,'Value');
 field=field_str{field_index(1)};
-if isequal(field,'add_field...')
+if strcmp(field,'add_field...')
+    %iview=find(ismember(SeriesData.FileType,{'netcdf','civx','civdata'})); % all nc files, icluding civ
     hget_field=findobj(allchild(0),'name','get_field');
     if ~isempty(hget_field)
@@ -3033 +3035 @@
     end
     Param=read_GUI(handles.series);
-    Param.InputTable=Param.InputTable(1,:);
+    InputTable=Param.InputTable(2,:);
     % check the existence of the first file in the series
     first_j=[];
@@ -3041 +3043 @@
     if isfield(Param.IndexRange,'PairString'); PairString=Param.IndexRange.PairString; end
     [i1,i2,j1,j2] = get_file_index(Param.IndexRange.first_i,first_j,PairString);
-    FirstFileName=fullfile_uvmat(Param.InputTable{1,1},Param.InputTable{1,2},Param.InputTable{1,3},...
-        Param.InputTable{1,5},Param.InputTable{1,4},i1,i2,j1,j2);
+    FirstFileName=fullfile_uvmat(Param.InputTable{2,1},Param.InputTable{2,2},Param.InputTable{2,3},...
+        Param.InputTable{2,5},Param.InputTable{2,4},i1,i2,j1,j2);
     if exist(FirstFileName,'file')
         ParamIn.SeriesInput=1;
@@ -3065 +3067 @@
                 set(handles.FieldName,'Value',2) % set menu to 'velocity
         end
-        if ~strcmp(GetFieldData.FieldOption,'civdata...')
-            TimeNameStr=GetFieldData.Time.SwitchVarIndexTime;
-            switch TimeNameStr
-                case 'file index'
-                    set(handles.TimeName,'String','');
-                case 'attribute'
-                    set(handles.TimeName,'String',['att:' GetFieldData.Time.TimeName]);
-                case 'variable'
-                    set(handles.TimeName,'String',['var:' GetFieldData.Time.TimeName])
-                    set(handles.NomType,'String','*')
-                    set(handles.RootFile,'String',[get(handles.RootFile,'String') get(handles.FileIndex,'String')])% A VERIFIER !!!!!!
-                    set(handles.FileIndex,'String','')
-                    ParamIn.TimeVarName=GetFieldData.Time.TimeName;
-                case 'matrix_index'
-                    set(handles.TimeName,'String',['dim:' GetFieldData.Time.TimeName]);
-                    set(handles.NomType,'String','*')
-                    set(handles.RootFile,'String',[get(handles.RootFile,'String') get(handles.FileIndex,'String')])
-                    set(handles.FileIndex,'String','')
-                    ParamIn.TimeDimName=GetFieldData.Time.TimeName;
-            end
-        end
+%         if ~strcmp(GetFieldData.FieldOption,'civdata...')
+%             TimeNameStr=GetFieldData.Time.SwitchVarIndexTime;
+%             switch TimeNameStr
+%                 case 'file index'
+%                     set(handles.TimeName,'String','');
+%                 case 'attribute'
+%                     set(handles.TimeName,'String',['att:' GetFieldData.Time.TimeName]);
+%                 case 'variable'
+%                     set(handles.TimeName,'String',['var:' GetFieldData.Time.TimeName])
+%                     set(handles.NomType,'String','*')
+%                     set(handles.RootFile,'String',[get(handles.RootFile,'String') get(handles.FileIndex,'String')])% A VERIFIER !!!!!!
+%                     set(handles.FileIndex,'String','')
+%                     ParamIn.TimeVarName=GetFieldData.Time.TimeName;
+%                 case 'matrix_index'
+%                     set(handles.TimeName,'String',['dim:' GetFieldData.Time.TimeName]);
+%                     set(handles.NomType,'String','*')
+%                     set(handles.RootFile,'String',[get(handles.RootFile,'String') get(handles.FileIndex,'String')])
+%                     set(handles.FileIndex,'String','')
+%                     ParamIn.TimeDimName=GetFieldData.Time.TimeName;
+%             end
+%         end
         set(handles.FieldName_1,'Value',1)
         set(handles.FieldName_1,'String',[FieldList; {'add_field...'}]);