##// END OF EJS Templates
HG_REPOSITORIES » LPP » INSTRUMENTATION » SOLO_LFR » LPPMON_PLUGINS_PAUL
RSS

Clone from http://pc-instru.lpp.polytechnique.fr:5000/LPPMON_GROUP/LPPMON_PLUGINS_PAUL

title of the dockwidgets removed
leroy -
r40:1049d68df926 default
parent child
Show More
Show file before | Show file after | Hide comments
@@ -1,6 +1,6
1 #############################################################################
1 #############################################################################
2 # Makefile for building: lfrsgse
2 # Makefile for building: lfrsgse
3 # Generated by qmake (2.01a) (Qt 4.8.4) on: Thu Jul 4 13:26:49 2013
3 # Generated by qmake (2.01a) (Qt 4.8.4) on: Thu Jul 4 14:35:25 2013
4 # Project: gselesia.pro
4 # Project: gselesia.pro
5 # Template: app
5 # Template: app
6 # Command: /usr/bin/qmake-qt4 -spec /usr/lib64/qt4/mkspecs/linux-g++ CONFIG+=debug CONFIG+=declarative_debug -o Makefile gselesia.pro
6 # Command: /usr/bin/qmake-qt4 -spec /usr/lib64/qt4/mkspecs/linux-g++ CONFIG+=debug CONFIG+=declarative_debug -o Makefile gselesia.pro
Show file before | Show file after | Hide comments
@@ -1,6 +1,6
1 <?xml version="1.0" encoding="UTF-8"?>
1 <?xml version="1.0" encoding="UTF-8"?>
2 <!DOCTYPE QtCreatorProject>
2 <!DOCTYPE QtCreatorProject>
3 <!-- Written by Qt Creator 2.4.1, 2013-07-04T13:53:51. -->
3 <!-- Written by Qt Creator 2.4.1, 2013-07-04T14:46:51. -->
4 <qtcreator>
4 <qtcreator>
5 <data>
5 <data>
6 <variable>ProjectExplorer.Project.ActiveTarget</variable>
6 <variable>ProjectExplorer.Project.ActiveTarget</variable>
Show file before | Show file after | Hide comments
1 NO CONTENT: modified file, binary diff hidden
NO CONTENT: modified file, binary diff hidden
Show file before | Show file after | Hide comments
@@ -86,10 +86,12 MainWindowUI::MainWindowUI(QWidget *pare
86 groupbox_TMToForeignGSETester->setLayout(layout_TMToForeignGSETester);
86 groupbox_TMToForeignGSETester->setLayout(layout_TMToForeignGSETester);
87
87
88 mainLayout->addWidget(groupbox_TMEcho, 0, 0, 1, 1);
88 mainLayout->addWidget(groupbox_TMEcho, 0, 0, 1, 1);
89 mainLayout->addWidget(groupbox_ports, 1, 0, 1, 1);
89 mainLayout->addWidget(button_clearConsole, 1, 0, 1, 1);
90 mainLayout->addWidget(groupbox_TMToForeignGSETester, 2, 0, 1, 1);
90 mainLayout->addWidget(console, 0, 1, 2, 1);
91 mainLayout->addWidget(console, 0, 1, 2, 2);
91 mainLayout->addWidget(groupbox_ports, 2, 0, 1, 1);
92 mainLayout->addWidget(button_clearConsole, 3, 1, 1, 2);
92 mainLayout->addWidget(groupbox_TMToForeignGSETester, 2, 1, 1, 1);
93 mainLayout->setColumnStretch(2, 1);
94 mainLayout->setRowStretch(3, 1);
93
95
94 spwTabWidget->addTab(spwTabWidgetPage0, tr("Connection"));
96 spwTabWidget->addTab(spwTabWidgetPage0, tr("Connection"));
95 spwTabWidget->addTab(spwTabWidgetPage1, tr("TM Statistics"));
97 spwTabWidget->addTab(spwTabWidgetPage1, tr("TM Statistics"));
Show file before | Show file after | Hide comments
@@ -1,6 +1,6
1 #############################################################################
1 #############################################################################
2 # Makefile for building: libwfdisplay.so.1.0.0
2 # Makefile for building: libwfdisplay.so.1.0.0
3 # Generated by qmake (2.01a) (Qt 4.8.4) on: Thu Jul 4 13:53:16 2013
3 # Generated by qmake (2.01a) (Qt 4.8.4) on: Thu Jul 4 14:33:47 2013
4 # Project: wfdisplay.pro
4 # Project: wfdisplay.pro
5 # Template: lib
5 # Template: lib
6 # Command: /bin/qmake-qt4 -o Makefile wfdisplay.pro
6 # Command: /bin/qmake-qt4 -o Makefile wfdisplay.pro
Show file before | Show file after | Hide comments
@@ -1,6 +1,6
1 <?xml version="1.0" encoding="UTF-8"?>
1 <?xml version="1.0" encoding="UTF-8"?>
2 <!DOCTYPE QtCreatorProject>
2 <!DOCTYPE QtCreatorProject>
3 <!-- Written by Qt Creator 2.4.1, 2013-07-04T13:53:51. -->
3 <!-- Written by Qt Creator 2.4.1, 2013-07-04T14:46:51. -->
4 <qtcreator>
4 <qtcreator>
5 <data>
5 <data>
6 <variable>ProjectExplorer.Project.ActiveTarget</variable>
6 <variable>ProjectExplorer.Project.ActiveTarget</variable>
Show file before | Show file after | Hide comments
@@ -32,6 +32,13 WFPage::WFPage(QWidget *parent) :
32 dockB2 = NULL;
32 dockB2 = NULL;
33 dockB3 = NULL;
33 dockB3 = NULL;
34
34
35 titleWidgetV = new QWidget();
36 titleWidgetE1 = new QWidget();
37 titleWidgetE2 = new QWidget();
38 titleWidgetB1 = new QWidget();
39 titleWidgetB2 = new QWidget();
40 titleWidgetB3 = new QWidget();
41
35 createToolBar();
42 createToolBar();
36 //
43 //
37 //this->setLayout(mainLayout);
44 //this->setLayout(mainLayout);
@@ -61,16 +68,6 void WFPage::displayOnPlot(short *data,
61 }
68 }
62 }
69 }
63
70
64 void WFPage::createDockWindows()
65 {
66 dockV = new QDockWidget(tr("V"), this);
67 dockE1 = new QDockWidget(tr("E1"), this);
68 dockE2 = new QDockWidget(tr("E2"), this);
69 dockB1 = new QDockWidget(tr("B1"), this);
70 dockB2 = new QDockWidget(tr("B2"), this);
71 dockB3 = new QDockWidget(tr("B3"), this);
72 }
73
74 void WFPage::createToolBar()
71 void WFPage::createToolBar()
75 {
72 {
76 radio_v = new QRadioButton(tr("v"));
73 radio_v = new QRadioButton(tr("v"));
@@ -121,6 +118,7 void WFPage::actionRadioV(bool state)
121 {
118 {
122 dockV = new QDockWidget("V", this);
119 dockV = new QDockWidget("V", this);
123 dockV->setWidget(wfPlot_v);
120 dockV->setWidget(wfPlot_v);
121 dockV->setTitleBarWidget(titleWidgetV);
124 }
122 }
125 }
123 }
126 else
124 else
@@ -138,9 +136,8 void WFPage::actionRadioE1(bool state)
138 {
136 {
139 dockE1 = new QDockWidget("E1", this);
137 dockE1 = new QDockWidget("E1", this);
140 dockE1->setWidget(wfPlot_e1);
138 dockE1->setWidget(wfPlot_e1);
139 dockE1->setTitleBarWidget(titleWidgetE1);
141 }
140 }
142 addDockWidget(Qt::TopDockWidgetArea, dockE1);
143 dockE1->show();
144 }
141 }
145 else
142 else
146 {
143 {
@@ -157,9 +154,8 void WFPage::actionRadioE2(bool state)
157 {
154 {
158 dockE2 = new QDockWidget("E2", this);
155 dockE2 = new QDockWidget("E2", this);
159 dockE2->setWidget(wfPlot_e2);
156 dockE2->setWidget(wfPlot_e2);
157 dockE2->setTitleBarWidget(titleWidgetE2);
160 }
158 }
161 addDockWidget(Qt::TopDockWidgetArea, dockE2);
162 dockE2->show();
163 }
159 }
164 else
160 else
165 {
161 {
@@ -176,6 +172,7 void WFPage::actionRadioB1(bool state)
176 {
172 {
177 dockB1 = new QDockWidget("B1", this);
173 dockB1 = new QDockWidget("B1", this);
178 dockB1->setWidget(wfPlot_b1);
174 dockB1->setWidget(wfPlot_b1);
175 dockB1->setTitleBarWidget(titleWidgetB1);
179 }
176 }
180 }
177 }
181 else
178 else
@@ -193,6 +190,7 void WFPage::actionRadioB2(bool state)
193 {
190 {
194 dockB2 = new QDockWidget("B2", this);
191 dockB2 = new QDockWidget("B2", this);
195 dockB2->setWidget(wfPlot_b2);
192 dockB2->setWidget(wfPlot_b2);
193 dockB2->setTitleBarWidget(titleWidgetB2);
196 }
194 }
197 }
195 }
198 else
196 else
@@ -210,6 +208,7 void WFPage::actionRadioB3(bool state)
210 {
208 {
211 dockB3 = new QDockWidget("B3", this);
209 dockB3 = new QDockWidget("B3", this);
212 dockB3->setWidget(wfPlot_b3);
210 dockB3->setWidget(wfPlot_b3);
211 dockB3->setTitleBarWidget(titleWidgetB3);
213 }
212 }
214 }
213 }
215 else
214 else
Show file before | Show file after | Hide comments
@@ -17,12 +17,18 class WFDISPLAYSHARED_EXPORT WFPage : pu
17 public:
17 public:
18 explicit WFPage(QWidget *parent = 0);
18 explicit WFPage(QWidget *parent = 0);
19
19
20 void createDockWindows();
21 void createToolBar();
20 void createToolBar();
22 void buildDockList();
21 void buildDockList();
23 void unTabify();
22 void unTabify();
24 void tabify();
23 void tabify();
25
24
25 QWidget *titleWidgetV;
26 QWidget *titleWidgetE1;
27 QWidget *titleWidgetE2;
28 QWidget *titleWidgetB1;
29 QWidget *titleWidgetB2;
30 QWidget *titleWidgetB3;
31
26 QList<QDockWidget*> dockList;
32 QList<QDockWidget*> dockList;
27
33
28 QDockWidget *dockV;
34 QDockWidget *dockV;
General Comments 0
You need to be logged in to leave comments. Login now