Changeset 1030 for trunk/src/series

Timestamp:

Feb 7, 2018, 7:48:52 PM (6 years ago)

Author:

sommeria

Message:

updated for Matlab 2016

File:

• trunk/src/series/merge_proj.m (modified) (2 diffs)

trunk/src/series/merge_proj.m

@@ -143 +143 @@
     [FileInfo{iview},MovieObject{iview}]=get_file_info(filecell{iview,1});
     FileType{iview}=FileInfo{iview}.FileType;
+    if strcmp(FileType{iview},'civdata')&&  ~isfield(Param.InputFields,'VelType')
+        FileType{iview}='netcdf';
+    end
     CheckImage{iview}=~isempty(find(strcmp(FileType{iview},ImageTypeOptions)));% =1 for images
     if CheckImage{iview}
@@ -313 +316 @@
         
         %% calculate tps coefficients if needed
-        check_proj_tps= isfield(Param,'ProjObject')&&~isempty(Param.ProjObject)&& strcmp(Param.ProjObject.ProjMode,'interp_tps')&&~isfield(Data{iview},'Coord_tps');
+
+        check_proj_tps= strcmp(FileType{iview},'civdata') && isfield(Param,'ProjObject')&&~isempty(Param.ProjObject)...
+            && strcmp(Param.ProjObject.ProjMode,'interp_tps')&&~isfield(Data{iview},'Coord_tps');
         Data{iview}=tps_coeff_field(Data{iview},check_proj_tps);