Changeset 15289

Timestamp:

Oct 11, 2007, 2:12:17 PM (19 years ago)

Author:

Paul Price

Message:

Removing CELL.X0 from the correct place!

File:

• trunk/psModules/src/config/pmConfigCamera.c (modified) (6 diffs)

trunk/psModules/src/config/pmConfigCamera.c

@@ -637 +637 @@
                 psMetadata *contents = psMetadataAlloc(); // List of contents, with chipName:chipType
 
-                // XXX this is using the fpaItem->name not the chipName
+                // XXX this is using the fpaItem->name not the chipName
                 psMetadataIterator *fpaIter = psMetadataIteratorAlloc(fpa, PS_LIST_HEAD, NULL); // Iteratr
                 psMetadataItem *fpaItem;    // Item from iteration
@@ -690 +690 @@
                 while ((contentItem = psMetadataGetAndIncrement(contentIter))) {
                     assert (contentItem->type == PS_DATA_STRING);
-                    char *ptr = strchr (contentItem->data.str, ':');
-                    assert (ptr);
+                    char *ptr = strchr (contentItem->data.str, ':');
+                    assert (ptr);
                     psString content = psStringNCopy (contentItem->data.str, ptr - contentItem->data.str);
                     psStringAppend(&content, ":_mosaicChip ");
-                    psFree (contentItem->data.str);
-                    contentItem->data.str = content;                
+                    psFree (contentItem->data.str);
+                    contentItem->data.str = content;
                 }
                 psFree(contentIter);
 
-                # if (0)
+                # if (0)
                 while (psListLength(contents->list) > 0) {
                     psMetadataRemoveIndex(contents, PS_LIST_TAIL);
@@ -715 +715 @@
                 }
                 psFree(fpaIter);
-                # endif
+                # endif
 
                 psMetadata *chips = psMetadataAlloc(); // List of chip types, with cellName:cellType
@@ -763 +763 @@
         removeCellConceptsSources(defaults);
 
+        psMetadata *conceptFormats = psMetadataLookupMetadata(&mdok, format, "FORMATS"); // Concepts formats
+
         // Add in the positioning concepts
         psMetadataAddS32(defaults, PS_LIST_TAIL, "CELL.XPARITY", 0, NULL, 1);
@@ -768 +770 @@
         psMetadataAddS32(defaults, PS_LIST_TAIL, "CELL.X0",      0, NULL, 0);
         psMetadataAddS32(defaults, PS_LIST_TAIL, "CELL.Y0",      0, NULL, 0);
-        if (formats) {
-            if (psMetadataLookup(formats, "CELL.X0")) {
-                psMetadataRemoveKey(formats, "CELL.X0");
-            }
-            if (psMetadataLookup(formats, "CELL.Y0")) {
-                psMetadataRemoveKey(formats, "CELL.Y0");
+        if (conceptFormats) {
+            if (psMetadataLookup(conceptFormats, "CELL.X0")) {
+                psMetadataRemoveKey(conceptFormats, "CELL.X0");
+            }
+            if (psMetadataLookup(conceptFormats, "CELL.Y0")) {
+                psMetadataRemoveKey(conceptFormats, "CELL.Y0");
             }
         }
@@ -785 +787 @@
             psMetadataAddS32(defaults, PS_LIST_TAIL, "CHIP.X0", 0, NULL, 0);
             psMetadataAddS32(defaults, PS_LIST_TAIL, "CHIP.Y0", 0, NULL, 0);
-            if (formats) {
-                if (psMetadataLookup(formats, "CHIP.X0")) {
-                    psMetadataRemoveKey(formats, "CHIP.X0");
+            if (conceptFormats) {
+                if (psMetadataLookup(conceptFormats, "CHIP.X0")) {
+                    psMetadataRemoveKey(conceptFormats, "CHIP.X0");
                 }
-                if (psMetadataLookup(formats, "CHIP.Y0")) {
-                    psMetadataRemoveKey(formats, "CHIP.Y0");
+                if (psMetadataLookup(conceptFormats, "CHIP.Y0")) {
+                    psMetadataRemoveKey(conceptFormats, "CHIP.Y0");
                 }
             }