Changeset 11292 for trunk/psModules/src/camera

Timestamp:

Jan 25, 2007, 2:05:18 PM (19 years ago)

Author:

jhoblitt

Message:

add first pass nebclient support/linking
change pmConfigConvertFilename() to accept a boolean create [file] parameter

Location:

trunk/psModules/src/camera

Files:

• pmFPA_JPEG.c (modified) (2 diffs)
• pmFPA_MANAPLOT.c (modified) (2 diffs)
• pmFPAfileDefine.c (modified) (4 diffs)
• pmFPAfileIO.c (modified) (1 diff)

trunk/psModules/src/camera/pmFPA_JPEG.c

@@ -5 +5 @@
  *  @author EAM, IfA
  *
- *  @version $Revision: 1.16 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2007-01-03 03:18:21 $
+ *  @version $Revision: 1.17 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2007-01-26 00:05:17 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -207 +207 @@
 
     psString name = pmFPAfileNameFromRule (file->filerule, file, view);
-    psString newName = pmConfigConvertFilename (name, config);
+    bool create = file->mode == PM_FPA_MODE_WRITE ? true : false;
+    psString newName = pmConfigConvertFilename(name, config, create);
 
     psImageJpegColormap *map = psImageJpegColormapSet (NULL, colormapName);

trunk/psModules/src/camera/pmFPA_MANAPLOT.c

@@ -5 +5 @@
  *  @author EAM, IfA
  *
- *  @version $Revision: 1.2 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2006-12-03 18:48:10 $
+ *  @version $Revision: 1.3 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2007-01-26 00:05:17 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -136 +136 @@
     // output : filerule
 
+    bool create = file->mode == PM_FPA_MODE_WRITE ? true : false;
+
     psString tmpName;
     tmpName = pmFPAfileNameFromRule (file->filextra, file, view);
-    psString input = pmConfigConvertFilename (tmpName, config);
+    psString input = pmConfigConvertFilename (tmpName, config, create);
     psFree (tmpName);
 
     tmpName = pmFPAfileNameFromRule (file->filerule, file, view);
-    psString output = pmConfigConvertFilename (tmpName, config);
+    psString output = pmConfigConvertFilename (tmpName, config, create);
     psFree (tmpName);
 
     tmpName = pmFPAfileNameFromRule (file->extname, file, view);
-    psString script = pmConfigConvertFilename (tmpName, config);
+    psString script = pmConfigConvertFilename (tmpName, config, create);
     psFree (tmpName);
 

trunk/psModules/src/camera/pmFPAfileDefine.c

@@ -286 +286 @@
     }
 
-    psString realName = pmConfigConvertFilename (infiles->data[0], config);
+    bool create = file->mode == PM_FPA_MODE_WRITE ? true : false;
+    psString realName = pmConfigConvertFilename (infiles->data[0], config, create);
     if (!realName) {
         psError(PS_ERR_IO, false, "Failed to convert file name %s\n", (char *) infiles->data[0]);
@@ -366 +367 @@
     for (int i = 0; i < infiles->n; i++) {
         if (i > 0) {
-            psString realName = pmConfigConvertFilename (infiles->data[i], config);
+            bool create = file->mode == PM_FPA_MODE_WRITE ? true : false;
+            psString realName = pmConfigConvertFilename (infiles->data[i], config, create);
             if (!realName) {
                 psError(PS_ERR_IO, false, "Failed to convert file name %s", (char *) infiles->data[i]);
@@ -490 +492 @@
     // save the association on file->names
     for (int i = 0; i < infiles->n; i++) {
-        psString realName = pmConfigConvertFilename (infiles->data[i], config);
+        bool create = file->mode == PM_FPA_MODE_WRITE ? true : false;
+        psString realName = pmConfigConvertFilename (infiles->data[i], config, create);
         if (!realName) {
             psError(PS_ERR_IO, false, "Failed to convert file name %s", (char *) infiles->data[i]);
@@ -724 +727 @@
 
     // Prepend the global path to the file rule
-    psString tmpName = pmConfigConvertFilename (file->filerule, config);
+    bool create = file->mode == PM_FPA_MODE_WRITE ? true : false;
+    psString tmpName = pmConfigConvertFilename (file->filerule, config, create);
     psFree (file->filerule);
     file->filerule = tmpName;

trunk/psModules/src/camera/pmFPAfileIO.c

@@ -239 +239 @@
 
     // apply filename mangling rules (file://, path://, neb://)
-    psString tmpName = pmConfigConvertFilename (file->filename, config);
+    bool create = file->mode == PM_FPA_MODE_WRITE ? true : false;
+    psString tmpName = pmConfigConvertFilename (file->filename, config, create);
     psFree (file->filename);
     file->filename = tmpName;