Changeset 25930 for trunk/psModules/src/concepts/pmConceptsStandard.c

Timestamp:

Oct 22, 2009, 4:54:27 PM (17 years ago)

Author:

watersc1

Message:

Updated fringe fitting code.

Corrected Bool->S32 bug for BTOOLAPP header concept.

File:

• trunk/psModules/src/concepts/pmConceptsStandard.c (modified) (2 diffs)

trunk/psModules/src/concepts/pmConceptsStandard.c

@@ -753 +753 @@
     psError(PS_ERR_BAD_PARAMETER_TYPE, true, "Type for %s (%x) is not BOOL\n",
             concept->name, concept->type);
-    return NULL;
+    if (concept->type != PS_DATA_S32) {
+      psError(PS_ERR_BAD_PARAMETER_TYPE, true, "Wasn't the type I'd guessed either.\n");
+      return NULL;
+    }
+    psError(PS_ERR_BAD_PARAMETER_TYPE, true, "Looks like an S32 value? (%d)\n",
+            concept->data.S32);
+
+    if (concept->data.S32 == 0) {
+      bt_status = 1;
+    }
+    else if (concept->data.S32 == 1) {
+      bt_status = -2;
+    }
   }
 
@@ -765 +777 @@
   return psMetadataItemAllocS32(concept->name, concept->comment, bt_status);
 }  
+psMetadataItem *p_pmConceptFormat_BTOOLAPP(const psMetadataItem *concept,
+                                           pmConceptSource source,
+                                           const psMetadata *cameraFormat,
+                                           const pmFPA *fpa,
+                                           const pmChip *chip,
+                                           const pmCell *cell)
+{
+  assert(concept);
+
+  if (concept->type != PS_DATA_S32) {
+    return NULL;
+  }
+
+  if (concept->data.S32 == 0) {
+    return NULL;
+  }
+  else if (concept->data.S32 == -2) {
+    return psMetadataItemAllocBool(concept->name,concept->comment,true);
+  }
+  else if (concept->data.S32 == 1) {
+    return psMetadataItemAllocBool(concept->name,concept->comment,false);
+  }
+  else {
+    return NULL;
+  }
+
+}  
+
 
 // Get the current value of a concept