Changeset 1164 for trunk/src/find_file_series.m

Timestamp:

Jul 29, 2024, 9:43:17 AM (2 months ago)

Author:

sommeria

Message:

civ3D updated

File:

• trunk/src/find_file_series.m (modified) (7 diffs)

trunk/src/find_file_series.m

@@ -49 +49 @@
 
 %% get input root name and info on the input file
-if isempty(regexp(FilePath,'^http://','once'))
+if isempty(regexp(FilePath,'^http://','once'))% case of usual file input
 fullfileinput=fullfile(FilePath,fileinput);% input file name with path
 else
-  fullfileinput=[FilePath '/' fileinput];
+  fullfileinput=[FilePath '/' fileinput]; % case of web input
 end
 [FileInfo,MovieObject]=get_file_info(fullfileinput);
@@ -105 +105 @@
         sep2='';
         i1_str='(?<i1>)';%will set i1=[];
-        i1_star='';
         i2_str='(?<i2>)';%will set i2=[];
-        i2_star='';
         j1_str='(?<j1>)';%will set j1=[];
-        j1_star='';
         j2_str='(?<j2>)';%will set j2=[];
-        j2_star='';
+
         %Look for cases with letter indexing for the second index
         r=regexp(NomType,'^(?<sep1>_?)(?<i1>\d+)(?<sep2>_?)(?<j1>[a|A])(?<j2>[b|B]?)$','names');
@@ -118 +115 @@
             sep2=r.sep2;
             i1_str='(?<i1>\d+)';
-            i1_star='*';
             if strcmp(lower(r.j1),r.j1)% lower case index
                 j1_str='(?<j1>[a-z])';
@@ -124 +120 @@
                 j1_str='(?<j1>[A-Z])'; % upper case index
             end
-            j1_star='*';
             if ~isempty(r.j2)
                 if strcmp(lower(r.j1),r.j1)
@@ -131 +126 @@
                     j2_str='(?<j2>[A-Z])';
                 end
-                j2_star='*';
             end
         else %numerical indexing
@@ -138 +132 @@
                 sep1=r.sep1;
                 i1_str='(?<i1>\d+)';
-                i1_star='*';
                 if ~isempty(r.i2)
                     i2_str='(?<i2>-\d+)';
-                    i2_star='-*';
                 end
                 if ~isempty(r.j1)
                     j1_str='(?<j1>_\d+)';
-                    j1_star='_*';
                 end
                 if ~isempty(r.j2)
                     j2_str='(?<j2>-\d+)';
-                    j2_star='-*';
                 end
             end
@@ -290 +280 @@
             i1_series=i1_series(:,2)*ones(1,FileInfo.NumberOfFrames);%
             i1_series=[zeros(size(i1_series,1),1) i1_series];
+            if ~isempty(i2_series)
+                i2_series=i2_series(:,2)*ones(1,FileInfo.NumberOfFrames);%
+            i2_series=[zeros(size(i2_series,1),1) i2_series];
+            end
             j1_series=ones(size(i1_series,1),1)*(1:FileInfo.NumberOfFrames);%
             j1_series=[zeros(size(i1_series,1),1) j1_series];