Changeset 14187

Timestamp:

06/19/12 08:44:57 (13 years ago)

Author:

ogrimm

Message:

Simplified history plot selection for numeric arrays

Location:

fact

Files:

• Evidence/GUI.cc (modified) (1 diff)
• Evidence/readme.txt (modified) (1 diff)
• tools/Edd/Edd.cc (modified) (1 diff)

fact/Evidence/GUI.cc

@@ -43 +43 @@
   QGridLayout *Layout = new QGridLayout(M->centralWidget());
   
+  // If service ends with 'C' make text display, otherwise numeric plot
   if (Format.endsWith('C', Qt::CaseInsensitive)) Layout->addWidget(new EddText(Service), 0, 0);
-  else  {
+  else {
     EddPlot *W = new EddPlot(Service, FromIndex);
+        
+        // If service is array and no index given, try to find out how many indices exist and add all
+        if (FromIndex == -1 && Format.size() == 1) {
+          DimCurrentInfo X(Service, NULL, 0);
+          
+          FromIndex = 0;
+          ToIndex = EvidenceServer::Tokenize(EvidenceServer::ToString(Format.toAscii().data(), X.getData(), X.getSize()), " ").size() - 1;
+        }
+        
+        // Add all requested indices
         for (int i=FromIndex+1; i<=ToIndex; i++) W->AddService(Service,i);
  

fact/Evidence/readme.txt

@@ -66 +66 @@
                         services subscribed to.
 13/6/2012       Removed calling Message() before abort() in signal handler, as Message() might get stuck
+19/6/2012   Giving no indices in OpenHistory() will try to open plot for all members of an array

fact/tools/Edd/Edd.cc

@@ -950 +950 @@
   // Open dialog and open history window
   QString Result = QInputDialog::getItem(this, "Edd Request",
-    "Enter or choose DIM service name (add index or index range a-b separated by colon)", List, 0, true, &OK);
+    "Enter or choose DIM service name\n\nAdd index or index range a-b separated by colon\nWithout index, all array members will be plotted (for numeric data)", List, 0, true, &OK);
 
   // Check if cancelled or empty data