Changeset 12894 for fact/tools

Timestamp:

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

Author:

ogrimm

Message:

Updated Edd for history plotting of more complex arrays

File:

• fact/tools/Edd/Edd.cc (modified) (4 diffs)

fact/tools/Edd/Edd.cc

@@ -921 +921 @@
   QTimer *Timer = new QTimer(this);
   connect(Timer, SIGNAL(timeout()), this, SLOT(CheckAlarm()));
-  Timer->start(5000);
+  if (QString(DimServer::getDnsNode()).contains("ethz.ch")) Timer->start(5000);
 }  
     
@@ -940 +940 @@
 void GUI::MenuNewHistory() {
 
-  QStringList List;
+  QStringList List, Index;
   char *Name, *Format;
   int Type;
@@ -954 +954 @@
   // Open dialog and open history window
   QString Result = QInputDialog::getItem(this, "Edd Request",
-    "Enter or choose DIM service name (add index separated by colon)", List, 0, true, &OK);
+    "Enter or choose DIM service name (add index or index range a-b separated by colon)", List, 0, true, &OK);
 
   // Check if cancelled or empty data
@@ -960 +960 @@
   if (!OK || List.isEmpty()) return;
 
-  if (List.size() == 1) OpenHistory(List[0].toAscii().data(), 0);
-  else OpenHistory(List[0].toAscii().data(), atoi(List[1].toAscii().data()));
+  // Check if index was given
+  if (List.size() == 1) {
+        OpenHistory(List[0].toAscii().data(), 0);
+        return;
+  }
+
+  // Single index or index range?
+  Index = List[1].trimmed().split("-", QString::SkipEmptyParts);
+  if (Index.isEmpty()) {
+        QMessageBox::warning(NULL, "Edd Message", QString("Incorrect index range given") ,QMessageBox::Ok);
+        return;
+  }
+
+  if (Index.size() == 1) OpenHistory(List[0].toAscii().data(), atoi(Index[0].toAscii().data()));
+  else OpenHistory(List[0].toAscii().data(), atoi(Index[0].toAscii().data()), atoi(Index[1].toAscii().data()));
 }