Changeset 167 for Evidence

Timestamp:

02/09/10 10:46:42 (15 years ago)

Author:

ogrimm

Message:

Replaced __TIMESTAMP__ by __DATE__ and __TIME__

Location:

Evidence

Files:

• Edd/Edd.cc (modified) (2 diffs)
• Edd/Edd.h (modified) (1 diff)
• Evidence.cc (modified) (1 diff)

Evidence/Edd/Edd.cc

@@ -732 +732 @@
   //MainLayout->addWidget(Graph1, 2, 0, 1, 2);
 
+  // Feedback page
+  FeedbackWidget = new QWidget();
+  FeedbackLayout = new QGridLayout(FeedbackWidget);
+  Graph = new Edd_Plot();
+  for (int i=0; i<36; i++) {
+    Text = Text.sprintf("Feedback/Average/ID%.2d/%.2d",i/8, i%8);
+    Value = new Edd_Indicator(Text);
+
+    FeedbackLayout->addWidget(Value, i%9+1, 0+i/9, 1, 1);
+    //Graph->AddService(Text);
+
+    //Text = Text.sprintf("Bias/VOLT/ID00/01-%.3d",i);
+    //Value = new Edd_Indicator(Text);
+    //BiasLayout->addWidget(Value, i%9+1, 2+i/9, 1, 1);
+    //Graph->AddService(Text);
+  }
+
+  FeedbackLayout->addWidget(Graph, 0, 4, 12, 3);
+  Value = new Edd_Indicator("Feedback/Status");
+  Value->setMaximumWidth(200);
+  FeedbackLayout->addWidget(Value, 0, 0, 1, 3);      
+
   // Bias voltage page
   BiasWidget = new QWidget();
@@ -780 +802 @@
   TabWidget = new QTabWidget(Central);
   TabWidget->addTab(BiasWidget, "&Bias");
+  TabWidget->addTab(FeedbackWidget, "&Feedback");
   TabWidget->addTab(EnvironmentWidget, "&Environment");
   TabWidget->addTab(MainWidget, "Evidence");

Evidence/Edd/Edd.h

@@ -156 +156 @@
     QwtAnalogClock *Clock;
         
-    QWidget *Central, *MainWidget, *BiasWidget, *EnvironmentWidget;
-    QGridLayout *MainLayout, *BiasLayout, *EnvironmentLayout;
+    QWidget *Central, *MainWidget, *BiasWidget, *FeedbackWidget, *EnvironmentWidget;
+    QGridLayout *MainLayout, *BiasLayout, *FeedbackLayout, *EnvironmentLayout;
 
     QTabWidget *TabWidget;

Evidence/Evidence.cc

@@ -54 +54 @@
   string Rev(EVIDENCE_REVISION);
   Rev = Rev.substr(1, Rev.size()-3);
-  if (asprintf(&InitMsg, "Server started (%s, compiled %s)", Rev.c_str(),__TIMESTAMP__) == -1) InitMsg = NULL;
+  if (asprintf(&InitMsg, "Server started (%s, compiled %s %s)", Rev.c_str(),__DATE__, __TIME__) == -1) InitMsg = NULL;
   
   Status = new DimService((string(Name) + "/Status").c_str(), (char *) "C", InitMsg, strlen(InitMsg)+1);