Changeset 1193 for trunk

Timestamp:

Feb 8, 2026, 7:10:57 PM (13 days ago)

Author:

sommeria

Message:

bug repaired in series.m

File:

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

trunk/src/series.m

@@ -744 +744 @@
 %% Look for file relabeling option
 [FilePath,RootFile,FileExt]=fileparts(InputFile);
-[RootPath,SubDir]=fileparts(FilePath);
-[XmlFileName,Rank]=find_imadoc(RootPath,SubDir);
+[RootPath,SubDir,SubDirExt]=fileparts(FilePath);
+[XmlFileName,Rank]=find_imadoc(RootPath,[SubDir SubDirExt]);
 Param.Relabel=false;%no file relabeling by default
 XmlData=[];
@@ -2611 +2611 @@
 
 %% Detect the types of input files and set menus and default options in 'VelType'
-if ~isfield(SeriesData,'FileType')
-    SeriesData.FileType={'none'};
-end
-iview_civ=find( strcmp('civx',SeriesData.FileType)|strcmp('civdata',SeriesData.FileType));
-iview_netcdf=find(strcmp('netcdf',SeriesData.FileType)|strcmp('civx',SeriesData.FileType)|strcmp('civdata',SeriesData.FileType)); % all nc files, icluding civ
+% if ~isfield(SeriesData,'FileType')
+%     SeriesData.FileType={'none'};
+% end
+iview_civ=[];
+iview_netcdf=[];
+for iview=1:numel(SeriesData.FileInfo)
+    if strcmp(SeriesData.FileInfo{iview}.FileType,'civx')||strcmp(SeriesData.FileInfo{iview}.FileType,'civdata')
+      iview_civ=[iview_civ iview];
+      iview_netcdf=[iview_netcdf iview];% all nc files, icluding civ
+    elseif strcmp(SeriesData.FileInfo{iview}.FileType,'netcdf')
+      iview_netcdf=[iview_netcdf iview];
+    end
+end
+
 FieldList=get(handles.FieldName,'String'); % previous list as default
 if ~iscell(FieldList),FieldList={FieldList};end
@@ -2623 +2632 @@
 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
-    menu=set_veltype_display(SeriesData.FileInfo{iview_civ(1)}.CivStage,SeriesData.FileType{iview_civ(1)});
+    menu=set_veltype_display(SeriesData.FileInfo{iview_civ(1)}.CivStage,SeriesData.FileInfo{iview_civ(1)}.FileType);
     set(handles.VelType,'Value',1)% set first choice by default
     set(handles.VelType,'String',[{'*'};menu])