Changeset 11284

Timestamp:

Jan 24, 2007, 4:11:05 PM (19 years ago)

Author:

Paul Price

Message:

Adding FPA.FILTERID (get abstract name from lookup table) in addition
to FPA.FILTER (plain, straight from header). Not playing any games
with these (could have FPA.FILTERID generated from FPA.FILTER, but
choosing not to yet) so *both* need to be specified in the camera
format configuration file.

File:

• trunk/psModules/src/concepts/pmConcepts.c (modified) (1 diff)

trunk/psModules/src/concepts/pmConcepts.c

@@ -483 +483 @@
         }
 
+        // FPA.FILTERID
+        {
+            psMetadataItem *fpaFilterid = psMetadataItemAllocStr("FPA.FILTERID",
+                                          "Filter used (parsed, abstract name) ", "");
+            pmConceptRegister(fpaFilterid, (pmConceptParseFunc)p_pmConceptParse_FPA_FILTER,
+                              (pmConceptFormatFunc)p_pmConceptFormat_FPA_FILTER, PM_FPA_LEVEL_FPA);
+            psFree(fpaFilterid);
+        }
+
         // FPA.FILTER
         {
             psMetadataItem *fpaFilter = psMetadataItemAllocStr("FPA.FILTER", "Filter used", "");
-            pmConceptRegister(fpaFilter, (pmConceptParseFunc)p_pmConceptParse_FPA_FILTER,
-                              (pmConceptFormatFunc)p_pmConceptFormat_FPA_FILTER, PM_FPA_LEVEL_FPA);
+            pmConceptRegister(fpaFilter, NULL, NULL, PM_FPA_LEVEL_FPA);
             psFree(fpaFilter);
         }