Changeset 6734 for branches/rel10_ifa/psModules/src/astrom/pmConceptsStandard.c

Timestamp:

Mar 30, 2006, 10:08:30 AM (20 years ago)

Author:

Paul Price

Message:

pmFPACopy now working

File:

• branches/rel10_ifa/psModules/src/astrom/pmConceptsStandard.c (modified) (3 diffs)

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

@@ -156 +156 @@
     }
 
-    psMetadataItem *item = psMetadataItemAllocPtr(pattern->name, PS_DATA_UNKNOWN, pattern->comment, trimsec);
+    psMetadataItem *item = psMetadataItemAllocPtr(pattern->name, PS_DATA_REGION, pattern->comment, trimsec);
     psFree(trimsec);
     return item;
@@ -434 +434 @@
 
 
-
+#if 0
 psMetadataItem *pmConceptFormat_CELL_TRIMSEC(psMetadataItem *concept, psMetadata *cameraFormat, pmFPA *fpa, pmChip *chip, pmCell *cell)
 {
@@ -446 +446 @@
     return formatted;
 }
-
-
-bool pmConceptFormat_CELL_BIASSEC(psMetadataItem *concept, psMetadata *cameraFormat, pmFPA *fpa, pmChip *chip, pmCell *cell)
-{
+#endif
+
+psMetadataItem *pmConceptFormat_CELL_BIASSEC(psMetadataItem *concept, psMetadata *cameraFormat, pmFPA *fpa, pmChip *chip, pmCell *cell)
+{
+    // Return a metadata item containing a list of metadata items of region strings
     psList *biassecs = concept->data.V; // The biassecs region list
-    psString biassecString = NULL;      // String containing the biassecs
     psListIterator *biassecsIter = psListIteratorAlloc(biassecs, PS_LIST_HEAD, false); // Iterator
     psRegion *region = NULL;            // Region from iteration
-    bool first = true;                  // Are we on the first one?
+    psList *new = psListAlloc(NULL);    // New list containing metadatas
     while ((region = psListGetAndIncrement(biassecsIter))) {
         psString regionString = psRegionToString(*region); // The string region "[x0:x1,y0:y1]"
-        if (first) {
-            psStringAppend(&biassecString, "%s", regionString);
-            first = false;
-        } else {
-            psStringAppend(&biassecString, ";%s", regionString); // Put in a semi-colon
-        }
-        psFree(regionString);
+        psMetadataItem *item = psMetadataItemAllocStr(concept->name, concept->comment, regionString);
+        psFree(regionString);           // Drop reference
+        psListAdd(new, PS_LIST_TAIL, item);
+        psFree(item);                   // Drop reference
     }
     psFree(biassecsIter);
-    psMetadataItem *formatted = psMetadataItemAllocStr(concept->name, concept->comment, biassecString);
-    psFree(biassecString);              // Drop reference
+    psMetadataItem *formatted = psMetadataItemAllocPtr(concept->name, PS_DATA_LIST, concept->comment, new);
+    psFree(new);                        // Drop reference
     return formatted;
 }
-
 
 // This function actually does both CELL.XBIN and CELL.YBIN if CELL.XBIN and CELL.YBIN are specified by the