Changeset 12354

Timestamp:

Mar 8, 2007, 3:38:06 PM (19 years ago)

Author:

Paul Price

Message:

Adding file level for stand-alone (command-line) version only.

Location:

trunk/ppStats/src

Files:

• ppStatsData.c (modified) (1 diff)
• ppStatsData.h (modified) (1 diff)
• ppStatsSetupFromArgs.c (modified) (2 diffs)
• ppStatsStandAlone.c (modified) (3 diffs)

trunk/ppStats/src/ppStatsData.c

@@ -41 +41 @@
     data->stats = psStatsAlloc(0);
     data->doStats = false;
+    data->fileLevel = false;
 
     data->sample = 0;

trunk/ppStats/src/ppStatsData.h

@@ -13 +13 @@
     psStats *stats;                     // Statistics to calculate
     bool doStats;                       // Do statistics?
+    bool fileLevel;                     // Output file level?
     psList *headers;                    // Headers to read
     psList *concepts;                   // Concepts to read

trunk/ppStats/src/ppStatsSetupFromArgs.c

@@ -109 +109 @@
     psMetadataAddF32(arguments, PS_LIST_TAIL, "-rej", 0, "Clipping level", 0.0);
     psMetadataAddF32(arguments, PS_LIST_TAIL, "-sample", 0, "Sampling fraction", 0.0);
+    psMetadataAddBool(arguments, PS_LIST_TAIL, "-level", 0, "File level", 0);
 
     if (*config->argc == 1) {
@@ -145 +146 @@
     data->stats->clipIter = psMetadataLookupS32(NULL, arguments, "-iter");
     data->sample = psMetadataLookupF32(NULL, arguments, "-sample");
-
+    data->fileLevel = psMetadataLookupBool(NULL, arguments, "-level");
 
     // Open the input file, determine the camera

trunk/ppStats/src/ppStatsStandAlone.c

@@ -43 +43 @@
             if (!outFile) {
                 psLogMsg("ppStats", PS_LOG_ERROR, "Unable to open output file %s\n", outName);
-                // XXX this could be a system or config error, but not a data error
+                // XXX this could be a system or config error, but not a data error
                 status = PS_EXIT_CONFIG_ERROR;
                 goto die;
@@ -61 +61 @@
         status = PS_EXIT_DATA_ERROR;
         goto die;
+    }
+
+    if (data->fileLevel) {
+        const char *level = pmFPALevelToName(pmFPAPHULevel(config->format)); // Level for file
+        psMetadataAddStr(results, PS_LIST_HEAD, "FILE.LEVEL", 0, "File level", level);
     }
 
@@ -83 +88 @@
 die:
     if (status) {
-        psErrorStackPrint (stderr, "failure in %s", __func__);
+        psErrorStackPrint (stderr, "failure in %s", __func__);
     }
     psFree(data);