Changeset 12941

Timestamp:

02/24/12 23:05:19 (13 years ago)

Author:

ogrimm

Message:

Less digits deplayed in widgets

Location:

fact

Files:

• Evidence/GUI.cc (modified) (1 diff)
• tools/Edd_LP/Edd.cc (modified) (3 diffs)

fact/Evidence/GUI.cc

@@ -132 +132 @@
         setText(Text.section(' ', 1));
   }
-  else if (!ShowAsTime) setText(Text);
+  else if (!ShowAsTime) {
+    bool OK;
+        double Num = Text.toDouble(&OK);
+        
+        if (OK) setText(QString::number(Num, 'g', 4));
+        else setText(Text);
+  }
   else setText(QDateTime::fromTime_t(Text.toInt()).toString());
 

fact/tools/Edd_LP/Edd.cc

@@ -335 +335 @@
   // Status display
   EddLineDisplay *Line = new EddLineDisplay("FSC_CONTROL/MESSAGE");
-  Line->setMaximumWidth(300);
-  Layout->addWidget(Line, 0, 0, 1, 4);      
-
-  Line = new EddLineDisplay("FSCctrl/Time");
-  Layout->addWidget(Line, 0, 5, 1, 2);      
-
-  // Temperatures
+  Line->setMaximumWidth(800);
+  Layout->addWidget(Line, 0, 0, 1, 10);      
+
+   // Temperatures
   EddPlot *Plot = new EddPlot();
-  for (int i=1; i<59; i++) {
-    Line = new EddLineDisplay("FSC_CONTROL/TEMPERATURE", i);
+  Plot->setMinimumWidth(400);
+
+  for (int i=0; i<58; i++) {
+    Line = new EddLineDisplay("FSC_CONTROL/TEMPERATURE", i+1);
     Line->setMaximumWidth(50);
-    Layout->addWidget(Line, i/8+1, i%8);
-    Plot->AddService("FSC_CONTROL/TEMPERATURE", i);
-  }
-  Layout->addWidget(Plot, 0, 10, 22, 15);      
+    Layout->addWidget(Line, i/10+1, i%10);
+    Plot->AddService("FSC_CONTROL/TEMPERATURE", i+1);
+  }
+  Layout->addWidget(Plot, 0, 10, 20, 10);
+
+  // Humidities
+  for (int i=0; i<4; i++) {
+    Line = new EddLineDisplay("FSC_CONTROL/HUMIDITY", i+1);
+    Line->setMaximumWidth(50);
+    Layout->addWidget(Line, i/10+7, i%10);
+  }
 
   // Voltages and currents
-  for (int i=0; i<40; i++) {
-    Line = new EddLineDisplay("FSC_CONTROL/VOLTAGE", i);
-    Line->setMaximumWidth(50);
-    Layout->addWidget(Line, i/8+10, i%8);
-
-    Line = new EddLineDisplay("FSC_CONTROL/CURRENT", i);
-    Line->setMaximumWidth(50);
-    Layout->addWidget(Line, i/8+16, i%8);
+  for (int i=0; i<30; i++) {
+    Line = new EddLineDisplay("FSC_CONTROL/VOLTAGE", i+1);
+    Line->setMaximumWidth(60);
+    Layout->addWidget(Line, i/10+8, i%10);
+
+    Line = new EddLineDisplay("FSC_CONTROL/CURRENT", i+1);
+    Line->setMaximumWidth(60);
+    Layout->addWidget(Line, i/10+11, i%10);
   }
 
@@ -654 +660 @@
   New->setMaximumWidth(80);
   New->setToolTip("Show event display window");
+  New->Window()->resize(550,550);
+  
   Layout->addWidget(New, 7, 0);      
   
@@ -857 +865 @@
   TabWidget->addTab(new TP_Bias, "Bias");
   printf("...bias\n");
-  //TabWidget->addTab(new TP_Feedback, "Feedback");
-  //printf("...feedback\n");
+  TabWidget->addTab(new TP_Feedback, "Feedback");
+  printf("...feedback\n");
   TabWidget->addTab(new TP_Environment, "FSC/SQM");
   printf("...FSC\n");