Changeset 6745

Timestamp:

Mar 30, 2006, 4:29:46 PM (20 years ago)

Author:

Paul Price

Message:

Adding .DEPEND to DEFAULTS for camera formats

Location:

branches/rel10_ifa/psModules/src/astrom

Files:

• pmConceptsWrite.c (modified) (2 diffs)
• pmFPACopy.c (modified) (1 diff)

branches/rel10_ifa/psModules/src/astrom/pmConceptsWrite.c

@@ -255 +255 @@
             psMetadataItem *defaultItem = psMetadataLookup(defaults, name); // The item from the DEFAULTS
             if (defaultItem) {
-                psMetadataItem *conceptItem = psMetadataLookup(concepts, name); // The item from the concepts
+                psMetadataItem *conceptItem = NULL; // The item from the concepts
+                if (defaultItem->type == PS_DATA_METADATA) {
+                    // It's a menu --- need to look up the .DEPEND
+                    psString dependName = NULL; // The concept name with ".DEPEND" on the end
+                    psStringAppend(&dependName, ".DEPEND");
+                    psString dependKey = psMetadataLookupStr(&mdok, defaults, dependName); // The keyword
+                    psFree(dependName);
+                    if (!mdok || !dependKey || strlen(dependKey) == 0) {
+                        psLogMsg(__func__, PS_LOG_WARN, "Can't find %s in the DEFAULTS for %s --- ignored.\n",
+                                 dependName, name);
+                        continue;
+                    }
+                    psString dependValue = psMetadataLookupStr(&mdok, concepts, dependName); // The value
+                    if (!mdok || !dependKey || strlen(dependKey) == 0) {
+                        psLogMsg(__func__, PS_LOG_WARN, "Concept %s specified by %s isn't of type STR -- "
+                                 "ignored.\n", name, dependName);
+                        continue;
+                    }
+                    conceptItem = psMetadataLookup(defaultItem->data.V, dependValue);
+                } else {
+                    conceptItem = psMetadataLookup(concepts, name); // The item from the concepts
+                }
                 psMetadataItem *formatted = conceptFormat(spec, conceptItem, cameraFormat, fpa, chip, cell);
                 if (!formatted) {
@@ -273 +294 @@
 }
 
-// XXX need to write multiple headers if I get a list
+
 bool pmConceptsWriteToHeader(psMetadata *specs, // The concept specifications
                              pmFPA *fpa, // The FPA

branches/rel10_ifa/psModules/src/astrom/pmFPACopy.c

@@ -344 +344 @@
         overlay = temp;
     }
-    int numPix = psImageOverlaySection(target, overlay, region.x0, region.y0, "+");
+    int numPix = psImageOverlaySection(target, overlay, region.x0, region.y0, "=");
     psFree(overlay);
     return (numPix > 0);