Index: trunk/src/script_readnc.m
===================================================================
--- trunk/src/script_readnc.m	(revision 1118)
+++ trunk/src/script_readnc.m	(revision 1119)
@@ -1,4 +1,4 @@
-DataFolder=''; %TODO: put the actual path to start browser
-DataFolder='C:\Users\sommeria\Documents\MATLAB_WORK\UVMAT_DEMO_SOURCES\UVMAT_DEMO03_PIVchallenge_2005C';
+DataFolder='.fsnet/project/meige/2019/19TORE';
+fileinput={'Tore_a8b40_T22s_N047_A1cm.png.civ.mproj.tfilter_1'}
 fileinput=uigetfile_uvmat('pick an input file',DataFolder);
 Data=nc2struct(fileinput);
Index: trunk/src/series.m
===================================================================
--- trunk/src/series.m	(revision 1118)
+++ trunk/src/series.m	(revision 1119)
@@ -2522,5 +2522,5 @@
 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,5 +2541,5 @@
         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,5 +2567,5 @@
             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,5 +2584,4 @@
         set(handles.Field_text,'Visible','off')
     end
-    
     set(handles_coord,'Visible','on')
     if isempty(find(strcmp('add_field...',FieldList)))
@@ -2591,10 +2590,12 @@
     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,5 +2608,5 @@
             end
             if ~isempty(Coord_z) && isempty(find(strcmp(Coord_z,ListVarName)))
-                FieldList_1={};
+                FieldList_1={'add_field...'};
                 warn_coord=1;
             end
@@ -3027,5 +3028,6 @@
 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,5 +3035,5 @@
     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,6 +3043,6 @@
     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,25 +3067,25 @@
                 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...'}]);
Index: trunk/src/series/sliding_average.m
===================================================================
--- trunk/src/series/sliding_average.m	(revision 1118)
+++ trunk/src/series/sliding_average.m	(revision 1119)
@@ -179,5 +179,5 @@
 if isfield(Param,'InputFields')
     InputFields{1}=Param.InputFields;
-end5.804
+end
 
 nbfiles=0;
Index: trunk/src/series/time_series.m
===================================================================
--- trunk/src/series/time_series.m	(revision 1118)
+++ trunk/src/series/time_series.m	(revision 1119)
@@ -97,14 +97,14 @@
         msgbox_uvmat('WARNING','''time_series'' uses only one or two input lines (two for substraction). To concatene fields first use ''merge_proj''');
     end
-    if size(Param.InputTable,1)>=2
-        answer=msgbox_uvmat('INPUT_Y-N','substract the two input file series?');
-        if strcmp(answer,'Yes')
-            if isempty(Param.FieldTransform.TransformName)
-                set(hhseries.TransformName,'value',2) %select sub_field
-            end
-        else
-            set(hhseries.InputTable,'Data',Param.InputTable(1,:))
-        end
-    end
+%     if size(Param.InputTable,1)>=2
+%         answer=msgbox_uvmat('INPUT_Y-N','substract the two input file series with sub_field.m?');
+%         if strcmp(answer,'Yes')
+%             if isempty(Param.FieldTransform.TransformName)
+%                 set(hhseries.TransformName,'value',2) %select sub_field
+%             end
+%         else
+%             set(hhseries.InputTable,'Data',Param.InputTable(1,:))
+%         end
+%     end
     
     % check the existence of the first and last file in the series
Index: trunk/src/transform_field/ima_filter.m
===================================================================
--- trunk/src/transform_field/ima_filter.m	(revision 1118)
+++ trunk/src/transform_field/ima_filter.m	(revision 1119)
@@ -29,5 +29,5 @@
 %=======================================================================
 
-function DataOut=ima_filter(DataIn,Param)
+function DataOut=ima_filter(DataIn,Param,DataIn_1)
 
 %% request input parameters
@@ -76,3 +76,22 @@
     end
 end
+if exist('DataIn_1','var')
+    [CellInfo,NbDim,errormsg]=find_field_cells(DataIn_1);
+for icell=1:numel(CellInfo)
+    if isfield(CellInfo{icell},'CoordType')&& strcmp(CellInfo{icell}.CoordType,'grid')
+        for ivar=1:numel(CellInfo{icell}.VarIndex)
+            VarName=DataIn_1.ListVarName{CellInfo{icell}.VarIndex(ivar)};
+            Atype=class(DataIn_1.(VarName));% detect integer 8 or 16 bits
+            if numel(size(DataIn_1.(VarName)))==3
+                DataOut.(VarName)=filter2(Mfiltre,sum(DataIn_1.(VarName),3));%filter the input image, after summation on the color component (for color images)
+                DataOut.(VarName)=uint16(DataOut.(VarName)); %transform to 16 bit images
+            else
+                DataOut.(VarName)=filter2(Mfiltre,DataIn_1.(VarName));
+                DataOut.(VarName)=feval(Atype,DataOut.(VarName));%transform to the initial image format
+            end
+        end
+    end
+end
+end
+