Changeset 12299

Timestamp:

Mar 7, 2007, 2:41:32 PM (19 years ago)

Author:

Paul Price

Message:

pmFPAfilenameFromRule: Adding const. Changing return type to psString to indicate that the result needs to be returned.

Location:

trunk/psModules/src/camera

Files:

• pmFPAfile.c (modified) (3 diffs)
• pmFPAfile.h (modified) (5 diffs)

trunk/psModules/src/camera/pmFPAfile.c

@@ -51 +51 @@
     psFree (file->extxtra);
 
+    psFree(file->detrend);
+
     psFree (file->filename);
     psFree (file->extname);
@@ -91 +93 @@
     file->state = PM_FPA_STATE_CLOSED;
 
+    file->detrend = NULL;
+
     file->xBin = 1;
     file->yBin = 1;
@@ -173 +177 @@
 
 // select the rule from the camera configuration, perform substitutions as needed
-char *pmFPAfileNameFromRule (char *rule, pmFPAfile *file, const pmFPAview *view)
+psString pmFPAfileNameFromRule(const char *rule, const pmFPAfile *file, const pmFPAview *view)
 {
     PS_ASSERT_PTR_NON_NULL(rule, NULL);

trunk/psModules/src/camera/pmFPAfile.h

@@ -4 +4 @@
  * @author EAM, IfA
  *
- * @version $Revision: 1.13 $ $Name: not supported by cvs2svn $
- * @date $Date: 2007-02-15 00:34:00 $
+ * @version $Revision: 1.14 $ $Name: not supported by cvs2svn $
+ * @date $Date: 2007-03-08 00:41:32 $
  * Copyright 2004-2005 Institute for Astronomy, University of Hawaii
  */
@@ -19 +19 @@
 #include "pmFPA.h"
 #include "pmFPAview.h"
+#include "pmDetrendDB.h"
 
 typedef enum {
@@ -88 +89 @@
     char *extname;   // the current name of an active file extension
 
-    bool save;
+    pmDetrendSelectResults *detrend;    // Detrend information, from pmDetrendSelect
+
+    bool save;                          // Should the file be saved?
 
     // the following elements are used for WRITE-mode IMAGE-type pmFPAfiles to inform
@@ -96 +99 @@
     int yBin;    // desired binning in y direction
 
-    psMetadata *camera;
-    psMetadata *format;
+    psMetadata *camera;                 // Camera configuration
+    psMetadata *format;                 // Camera format
 }
 pmFPAfile;
@@ -117 +120 @@
 
 // convert the rule to a name based on the current view
-char *pmFPAfileNameFromRule (char *rule, pmFPAfile *file, const pmFPAview *view);
+psString pmFPAfileNameFromRule(const char *rule, const pmFPAfile *file, const pmFPAview *view);
 
 bool pmFPAfileCopyView (pmFPA *out, pmFPA *in, const pmFPAview *view);