Changeset 17898 for trunk/psModules

Timestamp:

Jun 3, 2008, 3:58:43 PM (18 years ago)

Author:

Paul Price

Message:

Need to truncate ourselves, otherwise can get "22:07:60.00", rather than "22:07:59.99"

File:

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

trunk/psModules/src/concepts/pmConceptsStandard.c

@@ -49 +49 @@
 // TELTEMPS : parse a list of the form 'X1 X2 X3 X4 X5 ...' : for now use median
 psMetadataItem *p_pmConceptParse_TELTEMPS(const psMetadataItem *concept,
-                                          const psMetadataItem *pattern,
-                                          pmConceptSource source,
-                                          const psMetadata *cameraFormat,
-                                          const pmFPA *fpa,
-                                          const pmChip *chip,
-                                          const pmCell *cell)
+                                          const psMetadataItem *pattern,
+                                          pmConceptSource source,
+                                          const psMetadata *cameraFormat,
+                                          const pmFPA *fpa,
+                                          const pmChip *chip,
+                                          const pmCell *cell)
 {
     assert(concept);
@@ -68 +68 @@
         break;
       case PS_DATA_STRING: {
-          // parse the list of values into an array of substrings
-          psArray *strValues = psStringSplitArray (concept->data.V, " ,;", false);
-          assert (strValues);
-
-          // convert the substrings into a vector
-          psVector *fltValues = psVectorAlloc (strValues->n, PS_DATA_F32);
-          for (int i = 0; i < strValues->n; i++) {
-              fltValues->data.F32[i] = atof(strValues->data[i]);
-          }
-
-          // take the (for now) MEDIAN of the data
-          psStats *stats = psStatsAlloc (PS_STAT_SAMPLE_MEDIAN);
-
-          if (!psVectorStats (stats, fltValues, NULL, NULL, 0)) {
-              psAbort ("how can this stats function fail?");
-          }
-    
-          value = stats->sampleMedian;
-          psFree (stats);
-          psFree (fltValues);
-          psFree (strValues);
-          break;
+          // parse the list of values into an array of substrings
+          psArray *strValues = psStringSplitArray (concept->data.V, " ,;", false);
+          assert (strValues);
+
+          // convert the substrings into a vector
+          psVector *fltValues = psVectorAlloc (strValues->n, PS_DATA_F32);
+          for (int i = 0; i < strValues->n; i++) {
+              fltValues->data.F32[i] = atof(strValues->data[i]);
+          }
+
+          // take the (for now) MEDIAN of the data
+          psStats *stats = psStatsAlloc (PS_STAT_SAMPLE_MEDIAN);
+
+          if (!psVectorStats (stats, fltValues, NULL, NULL, 0)) {
+              psAbort ("how can this stats function fail?");
+          }
+
+          value = stats->sampleMedian;
+          psFree (stats);
+          psFree (fltValues);
+          psFree (strValues);
+          break;
       }
 
@@ -334 +334 @@
     coords -= medium / 60.0;
     small = 3600.0 * coords;
+    small = (float)((int)(small * 100.0)) / 100.0;
     if (negative) {
         big *= -1;
@@ -526 +527 @@
     psString sys = concept->data.V;     // The time system string
     if (concept->type != PS_DATA_STRING || strlen(sys) <= 0) {
-        // XXX is this too low verbosity?
-        psLogMsg ("psModules.concepts", PS_LOG_DETAIL, "Can't interpret %s --- assuming UTC.\n", pattern->name);
+        // XXX is this too low verbosity?
+        psLogMsg ("psModules.concepts", PS_LOG_DETAIL, "Can't interpret %s --- assuming UTC.\n", pattern->name);
     } else if (strcasecmp(sys, "TAI") == 0) {
         timeSys = PS_TIME_TAI;
@@ -537 +538 @@
         timeSys = PS_TIME_TT;
     } else {
-        // XXX is this too low verbosity?
-        psLogMsg ("psModules.concepts", PS_LOG_DETAIL, "Can't interpret %s --- assuming UTC.\n", pattern->name);
+        // XXX is this too low verbosity?
+        psLogMsg ("psModules.concepts", PS_LOG_DETAIL, "Can't interpret %s --- assuming UTC.\n", pattern->name);
     }