Changeset 12894 for fact/Evidence/Evidence.cc

Timestamp:

02/16/12 14:44:55 (13 years ago)

Author:

ogrimm

Message:

Updated Edd for history plotting of more complex arrays

File:

• fact/Evidence/Evidence.cc (modified) (1 diff)

fact/Evidence/Evidence.cc

@@ -421 +421 @@
   }
 
-  // Simplify format "?;1" to "?" 
-  if (strlen(Format)==3 && Format[2]=='1') Format[1] = '\0';
-  
-  // Structure: print hex representation 
-  if (strlen(Format) != 1) {
-        for (int i=0; i<Size; i++) {
-          Text << setw(2) << hex << *((char *) Data + i) << " ";
-        } 
-        return Text.str();
-  }
-
   // String if format "C" and terminated with \0
   if (strcmp(Format, "C") == 0 && Size > 0 && *((char *) Data+Size-1)=='\0') {
         return string((char *) Data);
   }
-
+  
+  // Check if format is made of identical component types
+  vector<string> Components = Tokenize(Format, ";");
+  
+  for (unsigned int i=0; i<Components.size(); i++) {
+        if (Components[i].empty()) return string();
+
+        // Print hex representation if format complex
+        if (Components[i][0] != Components[0][0]) {
+          for (int i=0; i<Size; i++) {
+                Text << setw(2) << hex << *((char *) Data + i) << " ";
+          } 
+          return Text.str();
+        }
+  }
+  
   // Number array
   int ElementSize;
+
   switch (toupper(*Format)) {
     case 'B':