Changeset 23428 for trunk/psModules/src/camera

Timestamp:

Mar 19, 2009, 11:45:11 AM (17 years ago)

Author:

Paul Price

Message:

Noticed that the TIMESYS wouldn't necessarily be updated just because we alter it in the format process for a TIME. To remedy this, force it to be written after updating. Reworked the concepts writing so that conceptsWrite() provides the iteration, while the other functions write a single entry only. This allows a new function, pmConceptWriteSingle(), which is used to update the TIMESYS.

Location:

trunk/psModules/src/camera

Files:

• pmFPAWrite.c (modified) (3 diffs)
• pmFPAfileFitsIO.c (modified) (1 diff)

trunk/psModules/src/camera/pmFPAWrite.c

@@ -172 +172 @@
 
     if (writeBlank || writeImage) {
-        pmConceptSource source = PM_CONCEPT_SOURCE_HEADER | PM_CONCEPT_SOURCE_CELLS |
-                                 PM_CONCEPT_SOURCE_DEFAULTS | PM_CONCEPT_SOURCE_DATABASE;
-        if (!pmConceptsWriteCell(cell, source, true, config)) {
+        if (!pmConceptsWriteCell(cell, true, config)) {
             psError(PS_ERR_IO, false, "Unable to write concepts for cell.");
             return false;
@@ -225 +223 @@
 
         if (writeBlank || writeImage) {
-            pmConceptSource source = PM_CONCEPT_SOURCE_HEADER | PM_CONCEPT_SOURCE_CELLS |
-                                     PM_CONCEPT_SOURCE_DEFAULTS | PM_CONCEPT_SOURCE_DATABASE;
-            if (!pmConceptsWriteChip(chip, source, true, true, config)) {
+            if (!pmConceptsWriteChip(chip, true, true, config)) {
                 psError(PS_ERR_IO, false, "Unable to write concepts for chip.\n");
                 return false;
@@ -294 +290 @@
 
         if (writeBlank || writeImage) {
-            pmConceptSource source = PM_CONCEPT_SOURCE_HEADER | PM_CONCEPT_SOURCE_CELLS |
-                                     PM_CONCEPT_SOURCE_DEFAULTS | PM_CONCEPT_SOURCE_DATABASE;
-            if (!pmConceptsWriteFPA(fpa, source, true, config)) {
+            if (!pmConceptsWriteFPA(fpa, true, config)) {
                 psError(PS_ERR_IO, false, "Unable to write concepts for FPA.\n");
                 return false;

trunk/psModules/src/camera/pmFPAfileFitsIO.c

@@ -183 +183 @@
           }
 
-          pmConceptSource sources = PM_CONCEPT_SOURCE_HEADER | PM_CONCEPT_SOURCE_CELLS |
-              PM_CONCEPT_SOURCE_DEFAULTS | PM_CONCEPT_SOURCE_DATABASE; // Concept sources to write
           if (cell) {
-              if (!pmConceptsWriteCell(cell, sources, true, config)) {
+              if (!pmConceptsWriteCell(cell, true, config)) {
                   psError(PS_ERR_IO, false, "Unable to write concepts for cell.\n");
                   return false;
               }
           } else if (chip) {
-              if (!pmConceptsWriteChip(chip, sources, true, true, config)) {
+              if (!pmConceptsWriteChip(chip, true, true, config)) {
                   psError(PS_ERR_IO, false, "Unable to write concepts for chip.\n");
                   return false;
               }
-          } else if (!pmConceptsWriteFPA(fpa, sources, true, config)) {
+          } else if (!pmConceptsWriteFPA(fpa, true, config)) {
               psError(PS_ERR_IO, false, "Unable to write concepts for FPA.\n");
               return false;