Changeset 221 for Evidence/Edd

Timestamp:

06/07/10 15:00:41 (15 years ago)

Author:

ogrimm

Message:

Added Bridge server, History service separated from DColl

Location:

Evidence

Files:

• . (modified) (1 prop)
• Edd/Edd.cc (modified) (10 diffs)
• Edd/Edd.h (modified) (1 diff)

Evidence

@@ -2 +2 @@
 Config
 DColl
+Bridge
+History

@@ -2 +2 @@
 Config
 DColl
+Bridge
+History

Evidence/Edd/Edd.cc

@@ -73 +73 @@
   ShowAsTime = false;
   setFrame(false);
+  setAttribute(Qt::WA_DeleteOnClose);
   
   // Connect to DIM handler
@@ -1145 +1146 @@
 
   QGridLayout *Layout = new QGridLayout(this);
+  setAttribute(Qt::WA_DeleteOnClose);
 
   // Status display
@@ -1171 +1173 @@
 
   QGridLayout *Layout = new QGridLayout(this);
+  setAttribute(Qt::WA_DeleteOnClose);
   EddLineDisplay *Line;
   
@@ -1203 +1206 @@
 TP_Feedback::TP_Feedback() {
 
+  setAttribute(Qt::WA_DeleteOnClose);
   QGridLayout *Layout = new QGridLayout(this);
   EddLineDisplay *Line;
@@ -1237 +1241 @@
 void TP_Feedback::FeedbackDetails() {
 
+  setAttribute(Qt::WA_DeleteOnClose);
   EddLineDisplay *Line;
   QWidget *Widget = new QWidget();
@@ -1257 +1262 @@
 TP_DAQ::TP_DAQ() {
 
+  setAttribute(Qt::WA_DeleteOnClose);
   QGridLayout *Layout = new QGridLayout(this);
 
@@ -1403 +1409 @@
 TP_Evidence::TP_Evidence() {
 
+  setAttribute(Qt::WA_DeleteOnClose);
   QGridLayout *Layout = new QGridLayout(this);
   EddLineDisplay *Line;
@@ -1473 +1480 @@
   setCentralWidget(Central);
   setStatusBar(new QStatusBar(this));
-  setGeometry(100, 100, 800, 650);
   setWindowTitle("Edd - Evidence Data Display");
 
   // Arrangement in tabs
   TabWidget = new QTabWidget(Central);
+  TabWidget->setTabsClosable(true);
+  connect(TabWidget, SIGNAL(tabCloseRequested(int)), SLOT(DetachTab(int)));
   TabWidget->addTab(new TP_DAQ, "Event scope");
-  TabWidget->addTab(new TP_Bias, "&Bias");
-  TabWidget->addTab(new TP_Feedback, "&Feedback");
-  TabWidget->addTab(new TP_Environment, "&Environment");
+  TabWidget->addTab(new TP_Bias, "Bias");
+  TabWidget->addTab(new TP_Feedback, "Feedback");
+  TabWidget->addTab(new TP_Environment, "Environment");
   TabWidget->addTab(new TP_Evidence, "Evidence");
 
@@ -1494 +1502 @@
 
   // Show main window
+  resize(TabWidget->sizeHint()*1.1);
   show();
 }  
@@ -1540 +1549 @@
 }
 
+// Open tab as separate window
+void GUI::DetachTab(int Tab) {
+
+  QWidget *W = NULL;
+  QMainWindow *M = new QMainWindow;
+
+  M->setCentralWidget(new QWidget(M));
+  M->setStatusBar(new QStatusBar(M));
+
+  switch(Tab) {
+        case 0: W = new TP_DAQ; break;
+        case 1: W = new TP_Bias; break;
+        case 2: W = new TP_Feedback; break;
+        case 3: W = new TP_Environment; break;
+        case 4: W = new TP_Evidence; break;
+        default: break;
+  }
+
+  if (W == NULL) {
+    delete M->centralWidget();
+        delete M;
+        return;
+  }
+
+  W->setParent(M);
+  M->resize(size());
+  M->setWindowTitle("Edd - " + TabWidget->tabText(Tab));
+  M->show();
+}
+
 // Quit application when clicking close button on window
 void GUI::closeEvent(QCloseEvent *) {

Evidence/Edd/Edd.h

@@ -374 +374 @@
     void MenuAbout();
     void MenuNewHistory();
+        void DetachTab(int);
 };
 

@@ -2 +2 @@
 Config
 DColl
+Bridge
+History