Changeset 14647 for trunk/psModules/src/camera/pmFPAfileIO.c

Timestamp:

Aug 23, 2007, 1:42:41 PM (19 years ago)

Author:

magnier

Message:

added formatName to pmFPAfile (needed in some cases)
dropped const from pmConfig argument to pmFPAfileBindFromArgs
changed instances of psErrorStackPrint to psError (should only be used if we abort)
changed API names for pmPSFmodel I/O functions to put pmPSFmodel at front

File:

• trunk/psModules/src/camera/pmFPAfileIO.c (modified) (6 diffs)

trunk/psModules/src/camera/pmFPAfileIO.c

@@ -26 +26 @@
 #include "pmMoments.h"
 #include "pmResiduals.h"
+#include "pmGrowthCurve.h"
+#include "pmPSF.h"
 #include "pmModel.h"
 #include "pmSource.h"
 #include "pmSourceIO.h"
-#include "pmGrowthCurve.h"
 #include "pmResiduals.h"
-#include "pmPSF.h"
 #include "pmPSF_IO.h"
 #include "pmFPA_JPEG.h"
@@ -188 +188 @@
         break;
       case PM_FPA_FILE_PSF:
-        status = pmFPAviewReadPSFmodel (view, file, config);
+        status = pmPSFmodelReadForView (view, file, config);
         break;
       case PM_FPA_FILE_JPEG:
@@ -335 +335 @@
     // (existing) fpa
     if (file->type == PM_FPA_FILE_PSF) {
-      if (!pmFPAviewCheckDataStatusForPSFmodel (view, file)) {
+      if (!pmPSFmodelCheckDataStatusForView (view, file)) {
         psTrace("psModules.camera", 6, "skip write for %s, no data for this entry", file->name);
         return true;
@@ -402 +402 @@
 
       case PM_FPA_FILE_PSF:
-        status = pmFPAviewWritePSFmodel (view, file, config);
+        status = pmPSFmodelWriteForView (view, file, config);
         break;
 
@@ -757 +757 @@
             return false;
         }
+        file->formatName = psStringCopy(config->formatName);
+
     } else {
         bool valid;
@@ -798 +800 @@
         break;
       case PM_FPA_FILE_PSF:
-        status = pmPSF_WritePHU (view, file, config);
+        status = pmPSFmodelWritePHU (view, file, config);
         break;
       case PM_FPA_FILE_SX: