Changeset 1114 for trunk/src/series

Timestamp:

Mar 18, 2022, 12:31:32 PM (3 years ago)

Author:

sommeria

Message:

a few bugs repaired

Location:

trunk/src/series

Files:

• merge_proj.m (modified) (1 diff)
• sliding_average.m (modified) (3 diffs)
• time_series.m (modified) (1 diff)

trunk/src/series/merge_proj.m

@@ -113 +113 @@
 RootFile=Param.InputTable(:,3);
 SubDir=Param.InputTable(:,2);
-NomType=Param.InputTable(:,4);
+% NomType=Param.InputTable(:,4);
 FileExt=Param.InputTable(:,5);
 

trunk/src/series/sliding_average.m

@@ -16 +16 @@
 % Param contains the elements:(use the menu bar command 'export/GUI config' in series to 
 % see the current structure Param)
-%    .InputTable: cell of input file names, (several lines for multiple input)
+%    .InputTable: cell of input file names, (several5.804 lines for multiple input)
 %                      each line decomposed as {RootPath,SubDir,Rootfile,NomType,Extension}
 %    .OutputSubDir: name of the subdirectory for data outputs
@@ -179 +179 @@
 if isfield(Param,'InputFields')
     InputFields{1}=Param.InputFields;
-end
+end5.804
 
 nbfiles=0;
 nbmissing=0;
 
-%% initialisation
+%% initialisation manip Coriolis
 char_index=regexp(SubDir{1},'waves_L1_');
 switch(SubDir{1}(char_index+9))
@@ -242 +242 @@
         break
     end
-    [Field,tild,errormsg] = read_field(filecell{1,index},FileType{iview},InputFields{iview},frame_index{iview}(index));
+    [Field,tild,~] = read_field(filecell{1,index},FileType{iview},InputFields{iview},frame_index{iview}(index));
     
     %%%%%%%%%%% MAIN RUNNING OPERATIONS  %%%%%%%%%%%%

trunk/src/series/time_series.m

@@ -214 +214 @@
 
 %% coordinate transform or other user defined transform
-transform_fct=[];%default
+transform_fct='';%default fct handle
 if isfield(Param,'FieldTransform')&&~isempty(Param.FieldTransform.TransformName)
-    %addpath(Param.FieldTransform.TransformPath)
+    currentdir=pwd;
+    cd(Param.FieldTransform.TransformPath)
     transform_fct=str2func(Param.FieldTransform.TransformName);
-    %rmpath(Param.FieldTransform.TransformPath)
+    cd (currentdir)
     if isfield(Param,'TransformInput')
-        XmlData{1}.TransformInput=Param.TransformInput;
-    end
+        for iview=1:NbView
+            XmlData{iview}.TransformInput=Param.TransformInput;
+        end
+    end       
 end