Changeset 7469 for trunk/psModules/src/camera/pmFPAConstruct.c

Timestamp:

Jun 9, 2006, 3:55:20 PM (20 years ago)

Author:

Paul Price

Message:

Was having trouble reading and writing concepts at different levels. Added 'propagateUp' and 'propagateDown' flags to the pmConceptsRead and pmConceptsWrite functions so we can read up and down the hierarchy. For example, when you read a header at the chip level, it may be a PHU so that you want the FPA to also read concepts from it if it doesn't have its own HDU, and you want the cell to read concepts from it if it doesn't have its own HDU. But if I add a PHU, I only want to propagate upwards, because the downwards propagation will occur when I read the header lower down.

File:

• trunk/psModules/src/camera/pmFPAConstruct.c (modified) (4 diffs)

trunk/psModules/src/camera/pmFPAConstruct.c

@@ -138 +138 @@
     fpa->hdu = psMemIncrRefCounter(hdu);
     bool success = true;                // Success of reading concepts
-    if (hdu->header && !pmConceptsReadFPA(fpa, PM_CONCEPT_SOURCE_HEADER, NULL)) {
+    if (hdu->header && !pmConceptsReadFPA(fpa, PM_CONCEPT_SOURCE_HEADER, false, NULL)) {
         psError(PS_ERR_UNKNOWN, false, "Unable to read concepts from header.\n");
         success = false;
@@ -164 +164 @@
     chip->hdu = psMemIncrRefCounter(hdu);
     bool success = true;                // Success of reading concepts
-    if (hdu->header && !pmConceptsReadChip(chip, PM_CONCEPT_SOURCE_HEADER, true, NULL)) {
+    if (hdu->header && !pmConceptsReadChip(chip, PM_CONCEPT_SOURCE_HEADER, true, false, NULL)) {
         psError(PS_ERR_UNKNOWN, false, "Unable to read concepts from header.\n");
         success = false;
@@ -299 +299 @@
         }
 
-        if (!pmConceptsReadChip(newChip, PM_CONCEPT_SOURCE_DEFAULTS, false, NULL)) {
+        if (!pmConceptsReadChip(newChip, PM_CONCEPT_SOURCE_DEFAULTS, false, false, NULL)) {
             psError(PS_ERR_UNKNOWN, false, "Unable to read concepts from camera and defaults for chip %s\n",
                     chipName);
@@ -751 +751 @@
     psFree(contentsIter);
 
-    if (!pmConceptsReadFPA(fpa, PM_CONCEPT_SOURCE_DEFAULTS, NULL)) {
+    if (!pmConceptsReadFPA(fpa, PM_CONCEPT_SOURCE_DEFAULTS, true, NULL)) {
         psError(PS_ERR_UNKNOWN, false, "Unable to read concepts from defaults for FPA %s.  Attempting to "
                 "proceed anyway.\n", currentFPAname);