Changeset 10125

Timestamp:

02/02/11 08:03:34 (14 years ago)

Author:

ogrimm

Message:

DAQ page shows message service of drsdaq or FADctrl

File:

• fact/Evidence/Edd/Edd.cc (modified) (7 diffs)

fact/Evidence/Edd/Edd.cc

@@ -1452 +1452 @@
   Line->setMaximumWidth(100);
   Layout->addWidget(Line, 0, 1, 1, 1);      
-  Line = new EddLineDisplay("drsdaq/EventNumber");
+  Line = new EddLineDisplay(DRSBoard+"/EventNumber");
   Line->setMaximumWidth(100);
   Layout->addWidget(Line, 0, 2, 1, 1);      
@@ -1465 +1465 @@
   Layout->addWidget(Line, 0, 5, 1, 1);      
 
+  // Message service
+  Line = new EddLineDisplay(DRSBoard+"/Message");
+  Line->setMaximumWidth(200);
+  Layout->addWidget(Line, 1, 1, 1, 2);      
+
   // Event scope
   Scope = new EventScope;
@@ -1480 +1485 @@
   TabWidget->addTab(RunHeaderDisplay, "&Run Header");
   TabWidget->addTab(EventHeaderDisplay, "&Event Header");
-  Layout->addWidget(TabWidget, 1, 1, 5, 5);
+  Layout->addWidget(TabWidget, 2, 1, 6, 5);
 
   // Channel number 
@@ -1508 +1513 @@
   QFormLayout *FormLayout = new QFormLayout();
   FormLayout->setRowWrapPolicy(QFormLayout::WrapAllRows);
+  FormLayout->addRow("Board", Board);
+  FormLayout->addRow("Chip", Chip);
   FormLayout->addRow("Channel", Channel);
-  FormLayout->addRow("Chip", Chip);
-  FormLayout->addRow("Board", Board);
   FormLayout->addRow("Pixel ID", PixelID);
-  Layout->addLayout(FormLayout, 0, 0, 2, 1);
+  Layout->addLayout(FormLayout, 0, 0, 4, 1);
   
   // Add trace permanently
@@ -1518 +1523 @@
   Button->setToolTip("Keep trace in display");
   Button->setMaximumWidth(80);
-  Layout->addWidget(Button, 2, 0);
+  Layout->addWidget(Button, 4, 0);
   connect(Button, SIGNAL(clicked()), SLOT(KeepCurrent()));
 
@@ -1531 +1536 @@
   StartStopButton->setPalette(Palette);
   StartStopButton->setFont(QFont("Times", 10, QFont::Bold));
-  Layout->addWidget(StartStopButton, 4, 0);
+  Layout->addWidget(StartStopButton, 6, 0);
   connect(StartStopButton, SIGNAL(toggled(bool)), SLOT(StartStop(bool)));
 
@@ -1539 +1544 @@
   PixDisplay->setToolTip("Show event display window");
   PixDisplay->setMaximumWidth(80);
-  Layout->addWidget(PixDisplay, 5, 0);
+  Layout->addWidget(PixDisplay, 7, 0);
   connect(PixDisplay, SIGNAL(clicked()), SLOT(ShowPixelDisplay()));