Changeset 29125

Timestamp:

Sep 7, 2010, 9:29:02 AM (16 years ago)

Author:

eugene

Message:

allow user-options to change the simulated camera size : changes all possible formats (since actual format is unknown at this point)

File:

• trunk/ppSim/src/ppSimCreate.c (modified) (1 diff)

trunk/ppSim/src/ppSimCreate.c

@@ -28 +28 @@
     assert (config->camera);
 
-    // int nx = psMetadataLookupS32 (&status, config->arguments, "NX.CELL");
-    // if (nx) {
-    //   psMetadata *defaults = psMetadataLookupPtr(&status, config->camera, "DEFAULTS");
-    //   psMetadataLookupS32 (&status, defaults, "CELL.XSIZE");
-    //   psAssert (status, "CELL.XSIZE should be in DEFAULTS");
-    //   psMetadataAddF32(defaults, PS_LIST_TAIL, "CELL.XSIZE", PS_META_REPLACE, "", nx);
-    // }
-    // int ny = psMetadataLookupS32 (&status, config->arguments, "NY.CELL");
-    // if (ny) {
-    //   psMetadata *defaults = psMetadataLookupPtr(&status, config->camera, "DEFAULTS");
-    //   psMetadataLookupS32 (&status, defaults, "CELL.YSIZE");
-    //   psAssert (status, "CELL.YSIZE should be in DEFAULTS");
-    //   psMetadataAddF32(defaults, PS_LIST_TAIL, "CELL.YSIZE", PS_META_REPLACE, "", ny);
-    // }
+    int nx = psMetadataLookupS32 (&status, config->arguments, "NX.CELL");
+    int ny = psMetadataLookupS32 (&status, config->arguments, "NY.CELL");
+
+    if (nx || ny) {
+      // need to find format(s)
+      psMetadata *formats = psMetadataLookupPtr(&status, config->camera, "FORMATS");
+      psAssert (formats, "FORMATS missing from camera config");
+      
+      psMetadataIterator *iter = psMetadataIteratorAlloc(formats, PS_LIST_HEAD, NULL); // Iterator
+      psMetadataItem *format;               // Item from iteration
+      while ((format = psMetadataGetAndIncrement(iter))) {
+        psAssert (format->type == PS_DATA_METADATA, "unexpected format block");
+        
+        if (nx) {
+          psMetadata *defaults = psMetadataLookupPtr(&status, format->data.md, "DEFAULTS");
+          psMetadataLookupS32 (&status, defaults, "CELL.XSIZE");
+          psAssert (status, "CELL.XSIZE should be in DEFAULTS");
+          psMetadataAddF32(defaults, PS_LIST_TAIL, "CELL.XSIZE", PS_META_REPLACE, "", nx);
+        }
+        if (ny) {
+          psMetadata *defaults = psMetadataLookupPtr(&status, format->data.md, "DEFAULTS");
+          psMetadataLookupS32 (&status, defaults, "CELL.YSIZE");
+          psAssert (status, "CELL.YSIZE should be in DEFAULTS");
+          psMetadataAddF32(defaults, PS_LIST_TAIL, "CELL.YSIZE", PS_META_REPLACE, "", ny);
+        }
+      }
+      psFree(iter);
+    }
 
     // generate the fpa structure used by the output camera (determined from INPUT or specified)