Changeset 23358

Timestamp:

Mar 17, 2009, 2:26:38 PM (17 years ago)

Author:

Paul Price

Message:

Adding new substitution for file rules: {FILE.INDEX}. Added a counter to pmFPAfile to provide this value. This is intended for ppStack convolution files, which are multiple (unknown number) output files which would all have the same name but for this new substitution rule.

Location:

trunk/psModules/src/camera

Files:

• pmFPAfile.c (modified) (3 diffs)
• pmFPAfile.h (modified) (1 diff)

trunk/psModules/src/camera/pmFPAfile.c

@@ -20 +20 @@
 #include "pmConceptsCopy.h"
 
+static int fileNum = 0;                 // Number of file
+
 static void pmFPAfileFree(pmFPAfile *file)
 {
@@ -100 +102 @@
 
     file->save = false;
+
+    file->index = fileNum++;
 
     file->imageId = 0;
@@ -350 +354 @@
             psStringSubstitute(&newRule, name, "{OUTPUT}");
         }
+    }
+
+    if (strstr(newRule, "{FILE.INDEX}")) {
+        // Number of the file in list
+        psString num = NULL;            // Number to use
+        psStringAppend(&num, "%d", file->index);
+        psStringSubstitute(&newRule, num, "{FILE.INDEX}");
+        psFree(num);
     }
 

trunk/psModules/src/camera/pmFPAfile.h

@@ -109 +109 @@
     psString formatName;                // name of the camera format
 
+    int index;                          // Index of file
+
     psS64 imageId, sourceId;            // Image and source identifiers
 } pmFPAfile;