Changeset 11413 for fact

Timestamp:

07/15/11 07:44:31 (13 years ago)

Author:

ogrimm

Message:

Fixed bug when changing displayed event scope channel too fast

File:

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

fact/tools/Edd/Edd.cc

@@ -130 +130 @@
   // Open temporary raw data file
   OpenRawFile(File.fileName());
-
 
   // Process all pending events, then allow data again
@@ -191 +190 @@
   
   // Display first event
-  NewEventNum(DAQPage->Channel->value());
+  NewEventNum(DAQPage->Event->value());
 }
 
@@ -387 +386 @@
   setAttribute(Qt::WA_DeleteOnClose);
   EddLineDisplay *Line;
-  
-  EddPlot *Plot = new EddPlot();
-  Plot->setMinimumWidth(400);
-  for (int i=0; i<18; i++) {
-    Line = new EddLineDisplay("Bias/VOLT/ID00", i+64);
-    Layout->addWidget(Line, i%9+1, 0+i/9, 1, 1);
-    Plot->AddService("Bias/VOLT/ID00", i+64);
-
-    Line = new EddLineDisplay("Bias/VOLT/ID00", i+96);
-    Layout->addWidget(Line, i%9+1, 2+i/9, 1, 1);
-    Plot->AddService("Bias/VOLT/ID00",i+96);
-  }
-
-  Layout->addWidget(Plot, 0, 4, 12, 3);
+
   Line = new EddLineDisplay("Bias/Message");
   Line->setMaximumWidth(200);
-  Layout->addWidget(Line, 0, 0, 1, 3);      
+  Layout->addWidget(Line, 0, 0, 1, 8);      
 
   EddCommand *Command = new EddCommand("Bias/Command");
-  Layout->addWidget(Command, 10, 0, 1, 4);    
-
-  EddText *Text = new EddText("Bias/ConsoleOut", true);
-  Text->setFixedWidth(400);
-  Layout->addWidget(Text, 11, 0, 4, 4);
+  Layout->addWidget(Command, 0, 9, 1, 7);    
+
+  //EddText *Text = new EddText("Bias/ConsoleOut", true);
+  //Text->setFixedWidth(400);
+  //Layout->addWidget(Text, 1, 0, 3, 8);
+  
+  EddPlot *Plot = new EddPlot();
+  //Plot->setMinimumWidth(400);
+  for (int i=0; i<320; i++) {
+    Line = new EddLineDisplay("Bias/VOLT/ID00", i);
+        Line->setMaximumWidth(25);
+    Layout->addWidget(Line, 6+i/16, i%16);
+    //Plot->AddService("Bias/VOLT/ID00", i+64);
+
+    //Line = new EddLineDisplay("Bias/VOLT/ID00", i+96);
+    //Layout->addWidget(Line, i%9+1, 2+i/9, 1, 1);
+    //Plot->AddService("Bias/VOLT/ID00",i+96);
+  }
+
+  //Layout->addWidget(Plot, 0, 4, 12, 3);
 
   // Current page
   EddWindow *Button = new EddWindow("Currents", "Edd - Edd - Bias currents");
-  Layout->addWidget(Button, 13, 4, 1, 1);      
+  Layout->addWidget(Button, 0, 16);      
 
   Plot = new EddPlot();