Changeset 10984 for fact/tools/Edd

Timestamp:

06/10/11 15:02:24 (14 years ago)

Author:

ogrimm

Message:

Edd allows to set plot update rate

File:

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

fact/tools/Edd/Edd.cc

@@ -7 +7 @@
 EddLineDisplay changes its background colour in case it display
 a DIM status service
+
+Note: Currently no limit to number of points in plot, can result in out of memory condition.
 
 ============================================================ */
@@ -55 +57 @@
   AddTrace(0,0,0);
 
+  // Update interval
+  Timer->setInterval(100);
   SetActive(true);
 }
@@ -334 +338 @@
 
 //
-// Environment page
+// Environment page (For M0, server was called ARDUINO)
 //
 TP_Environment::TP_Environment() {
@@ -342 +346 @@
 
   // Status display
-  EddLineDisplay *Line = new EddLineDisplay("ARDUINO/Message");
-  Line->setMaximumWidth(200);
-  Layout->addWidget(Line, 0, 0, 1, 2);      
-
-  // Generate plot and data displays
+  EddLineDisplay *Line = new EddLineDisplay("FSCctrl/Message");
+  Line->setMaximumWidth(300);
+  Layout->addWidget(Line, 0, 0, 1, 4);      
+
+  Line = new EddLineDisplay("FSCctrl/Time");
+  Layout->addWidget(Line, 0, 5, 1, 2);      
+
+  // Temperatures
   EddPlot *Plot = new EddPlot();
-  for (int i=0; i<10; i++) {
-    Line = new EddLineDisplay("ARDUINO/Data", i);
-    Layout->addWidget(Line, i%5+1, i/5, 1, 1);
-    Plot->AddService("ARDUINO/Data", i);
-  }
-  Layout->addWidget(Plot, 0, 2, 9, 7);      
+  for (int i=0; i<64; i++) {
+    Line = new EddLineDisplay("FSCctrl/Temperature", i);
+    Line->setMaximumWidth(50);
+    Layout->addWidget(Line, i/8+1, i%8);
+    Plot->AddService("FSCctrl/Temperature", i);
+  }
+  Layout->addWidget(Plot, 0, 10, 22, 15);      
+
+  // Voltages and currents
+  for (int i=0; i<40; i++) {
+    Line = new EddLineDisplay("FSCctrl/Voltage", i);
+    Line->setMaximumWidth(50);
+    Layout->addWidget(Line, i/8+10, i%8);
+
+    Line = new EddLineDisplay("FSCctrl/Current", i);
+    Line->setMaximumWidth(50);
+    Layout->addWidget(Line, i/8+16, i%8);
+  }
 
   // Night sky monitor
   Line = new EddLineDisplay("SQM/Message");
-  Line->setMaximumWidth(200);
-  Layout->addWidget(Line, 6, 0, 1, 2);      
+  Line->setMaximumWidth(300);
+  Layout->addWidget(Line, 22, 0, 1, 4);      
 
   Line = new EddLineDisplay("SQM/NSB");
-  Layout->addWidget(Line, 7, 0, 1, 1);          
+  Layout->addWidget(Line, 22, 5, 1, 2);          
 }
 
@@ -872 +891 @@
   TabWidget->addTab(new TP_Bias, "Bias");
   TabWidget->addTab(new TP_Feedback, "Feedback");
-  TabWidget->addTab(new TP_Environment, "Environment");
+  TabWidget->addTab(new TP_Environment, "FSC/SQM");
   TabWidget->addTab(new TP_Evidence, "Evidence");