Changeset 23197 for branches/cnb_branches/cnb_branch_20090215/psModules/src/config/pmConfigCamera.c

Timestamp:

Mar 5, 2009, 11:13:29 AM (17 years ago)

Author:

beaumont

Message:

Finished ppStack visualization. Unified the way in which visualizations are invoked, plotting windows are closed, etc

Location:

branches/cnb_branches/cnb_branch_20090215

Files:

• . (modified) (1 prop)
• psModules/src/config/pmConfigCamera.c (modified) (1 diff)

branches/cnb_branches/cnb_branch_20090215/psModules/src/config/pmConfigCamera.c

@@ -280 +280 @@
         psMetadata *translation = psMetadataAlloc(); // The TRANSLATION --- how to read the FITS headers
 
-        psList *concepts;               // List of concepts for each level
-        psListIterator *iter;           // Iterator for concepts
-        psString name;                  // Concept name, from iteration
-
-        concepts = pmConceptsList(PM_FPA_LEVEL_FPA); // FPA-level concepts
-        iter = psListIteratorAlloc(concepts, PS_LIST_HEAD, false);
-        while ((name = psListGetAndIncrement(iter))) {
-            const char *new = skycellConceptName(name, skycellConceptsFPA, system); // Name for skycell
+        psMetadata *concepts;           // List of concepts for each level
+        psMetadataIterator *iter;       // Iterator for concepts
+        psMetadataItem *item;           // Concept specification item, from iteration
+
+        concepts = pmConceptsSpecs(PM_FPA_LEVEL_FPA); // FPA-level concepts
+        iter = psMetadataIteratorAlloc(concepts, PS_LIST_HEAD, NULL);
+        while ((item = psMetadataGetAndIncrement(iter))) {
+            const char *new = skycellConceptName(item->name, skycellConceptsFPA, system); // Name for skycell
             if (new) {
-                psMetadataAddStr(translation, PS_LIST_TAIL, name, 0, NULL, new);
+                psMetadataAddStr(translation, PS_LIST_TAIL, item->name, 0, NULL, new);
             }
         }
         psFree(iter);
-        psFree(concepts);
-
-        concepts = pmConceptsList(PM_FPA_LEVEL_CHIP);
-        iter = psListIteratorAlloc(concepts, PS_LIST_HEAD, false);
-        while ((name = psListGetAndIncrement(iter))) {
-            const char *new = skycellConceptName(name, skycellConceptsChip, system); // Name for skycell
+
+        concepts = pmConceptsSpecs(PM_FPA_LEVEL_CHIP);
+        iter = psMetadataIteratorAlloc(concepts, PS_LIST_HEAD, NULL);
+        while ((item = psMetadataGetAndIncrement(iter))) {
+            const char *new = skycellConceptName(item->name, skycellConceptsChip, system); // Name for skycell
             if (new) {
-                psMetadataAddStr(translation, PS_LIST_TAIL, name, 0, NULL, new);
+                psMetadataAddStr(translation, PS_LIST_TAIL, item->name, 0, NULL, new);
             }
         }
         psFree(iter);
-        psFree(concepts);
-
-        concepts = pmConceptsList(PM_FPA_LEVEL_CELL);
-        iter = psListIteratorAlloc(concepts, PS_LIST_HEAD, false);
-        while ((name = psListGetAndIncrement(iter))) {
-            const char *new = skycellConceptName(name, skycellConceptsCell, system); // Name for skycell
+
+        concepts = pmConceptsSpecs(PM_FPA_LEVEL_CELL);
+        iter = psMetadataIteratorAlloc(concepts, PS_LIST_HEAD, false);
+        while ((item = psMetadataGetAndIncrement(iter))) {
+            const char *new = skycellConceptName(item->name, skycellConceptsCell, system); // Name for skycell
             if (new) {
-                psMetadataAddStr(translation, PS_LIST_TAIL, name, 0, NULL, new);
+                psMetadataAddStr(translation, PS_LIST_TAIL, item->name, 0, NULL, new);
             }
         }
         psFree(iter);
-        psFree(concepts);
 
         psMetadataAddMetadata(format, PS_LIST_TAIL, "TRANSLATION", 0, "How to translate the FITS headers",