@@ -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-0 |
|
3 | <!-- Written by Qt Creator 2.4.1, 2013-07-04T13:25:30. --> | |
4 | <qtcreator> |
|
4 | <qtcreator> | |
5 | <data> |
|
5 | <data> | |
6 | <variable>ProjectExplorer.Project.ActiveTarget</variable> |
|
6 | <variable>ProjectExplorer.Project.ActiveTarget</variable> | |
@@ -63,7 +63,7 | |||||
63 | <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value> |
|
63 | <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value> | |
64 | <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">QtProjectManager.QMakeBuildStep</value> |
|
64 | <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">QtProjectManager.QMakeBuildStep</value> | |
65 | <value type="bool" key="QtProjectManager.QMakeBuildStep.LinkQmlDebuggingLibrary">false</value> |
|
65 | <value type="bool" key="QtProjectManager.QMakeBuildStep.LinkQmlDebuggingLibrary">false</value> | |
66 |
<value type="bool" key="QtProjectManager.QMakeBuildStep.LinkQmlDebuggingLibraryAuto"> |
|
66 | <value type="bool" key="QtProjectManager.QMakeBuildStep.LinkQmlDebuggingLibraryAuto">false</value> | |
67 | <value type="QString" key="QtProjectManager.QMakeBuildStep.QMakeArguments"></value> |
|
67 | <value type="QString" key="QtProjectManager.QMakeBuildStep.QMakeArguments"></value> | |
68 | <value type="bool" key="QtProjectManager.QMakeBuildStep.QMakeForced">false</value> |
|
68 | <value type="bool" key="QtProjectManager.QMakeBuildStep.QMakeForced">false</value> | |
69 | </valuemap> |
|
69 | </valuemap> | |
@@ -105,57 +105,7 | |||||
105 | <value type="int" key="Qt4ProjectManager.Qt4BuildConfiguration.QtVersionId">1</value> |
|
105 | <value type="int" key="Qt4ProjectManager.Qt4BuildConfiguration.QtVersionId">1</value> | |
106 | <value type="bool" key="Qt4ProjectManager.Qt4BuildConfiguration.UseShadowBuild">false</value> |
|
106 | <value type="bool" key="Qt4ProjectManager.Qt4BuildConfiguration.UseShadowBuild">false</value> | |
107 | </valuemap> |
|
107 | </valuemap> | |
108 |
<value |
|
108 | <value type="int" key="ProjectExplorer.Target.BuildConfigurationCount">1</value> | |
109 | <value type="QString" key="ProjectExplorer.BuildCOnfiguration.ToolChain">ProjectExplorer.ToolChain.Gcc:/usr/bin/g++.x86-linux-generic-elf-64bit./usr/bin/gdb</value> |
|
|||
110 | <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.0"> |
|
|||
111 | <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0"> |
|
|||
112 | <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">qmake</value> |
|
|||
113 | <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value> |
|
|||
114 | <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">QtProjectManager.QMakeBuildStep</value> |
|
|||
115 | <value type="bool" key="QtProjectManager.QMakeBuildStep.LinkQmlDebuggingLibrary">false</value> |
|
|||
116 | <value type="bool" key="QtProjectManager.QMakeBuildStep.LinkQmlDebuggingLibraryAuto">true</value> |
|
|||
117 | <value type="QString" key="QtProjectManager.QMakeBuildStep.QMakeArguments"></value> |
|
|||
118 | <value type="bool" key="QtProjectManager.QMakeBuildStep.QMakeForced">false</value> |
|
|||
119 | </valuemap> |
|
|||
120 | <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.1"> |
|
|||
121 | <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Make</value> |
|
|||
122 | <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value> |
|
|||
123 | <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.MakeStep</value> |
|
|||
124 | <value type="bool" key="Qt4ProjectManager.MakeStep.Clean">false</value> |
|
|||
125 | <value type="QString" key="Qt4ProjectManager.MakeStep.MakeArguments"></value> |
|
|||
126 | <value type="QString" key="Qt4ProjectManager.MakeStep.MakeCommand"></value> |
|
|||
127 | </valuemap> |
|
|||
128 | <value type="int" key="ProjectExplorer.BuildStepList.StepsCount">2</value> |
|
|||
129 | <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Build</value> |
|
|||
130 | <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value> |
|
|||
131 | <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Build</value> |
|
|||
132 | </valuemap> |
|
|||
133 | <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.1"> |
|
|||
134 | <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0"> |
|
|||
135 | <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Make</value> |
|
|||
136 | <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value> |
|
|||
137 | <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.MakeStep</value> |
|
|||
138 | <value type="bool" key="Qt4ProjectManager.MakeStep.Clean">true</value> |
|
|||
139 | <value type="QString" key="Qt4ProjectManager.MakeStep.MakeArguments">clean</value> |
|
|||
140 | <value type="QString" key="Qt4ProjectManager.MakeStep.MakeCommand"></value> |
|
|||
141 | </valuemap> |
|
|||
142 | <value type="int" key="ProjectExplorer.BuildStepList.StepsCount">1</value> |
|
|||
143 | <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Clean</value> |
|
|||
144 | <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value> |
|
|||
145 | <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Clean</value> |
|
|||
146 | </valuemap> |
|
|||
147 | <value type="int" key="ProjectExplorer.BuildConfiguration.BuildStepListCount">2</value> |
|
|||
148 | <value type="bool" key="ProjectExplorer.BuildConfiguration.ClearSystemEnvironment">false</value> |
|
|||
149 | <valuelist type="QVariantList" key="ProjectExplorer.BuildConfiguration.UserEnvironmentChanges"/> |
|
|||
150 | <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Qt 4.8.2 in PATH (System) Debug</value> |
|
|||
151 | <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value> |
|
|||
152 | <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.Qt4BuildConfiguration</value> |
|
|||
153 | <value type="int" key="Qt4ProjectManager.Qt4BuildConfiguration.BuildConfiguration">2</value> |
|
|||
154 | <value type="QString" key="Qt4ProjectManager.Qt4BuildConfiguration.BuildDirectory">/opt/LPPMON_PLUGINS_PAUL</value> |
|
|||
155 | <value type="int" key="Qt4ProjectManager.Qt4BuildConfiguration.QtVersionId">1</value> |
|
|||
156 | <value type="bool" key="Qt4ProjectManager.Qt4BuildConfiguration.UseShadowBuild">false</value> |
|
|||
157 | </valuemap> |
|
|||
158 | <value type="int" key="ProjectExplorer.Target.BuildConfigurationCount">2</value> |
|
|||
159 | <valuemap type="QVariantMap" key="ProjectExplorer.Target.DeployConfiguration.0"> |
|
109 | <valuemap type="QVariantMap" key="ProjectExplorer.Target.DeployConfiguration.0"> | |
160 | <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.0"> |
|
110 | <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.0"> | |
161 | <value type="int" key="ProjectExplorer.BuildStepList.StepsCount">0</value> |
|
111 | <value type="int" key="ProjectExplorer.BuildStepList.StepsCount">0</value> | |
@@ -232,89 +182,12 | |||||
232 | <value type="int">13</value> |
|
182 | <value type="int">13</value> | |
233 | <value type="int">14</value> |
|
183 | <value type="int">14</value> | |
234 | </valuelist> |
|
184 | </valuelist> | |
235 |
<value type="QString" key="ProjectExplorer. |
|
185 | <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">rmapplugin</value> | |
236 | <value type="int" key="ProjectExplorer.CustomExecutableRunConfiguration.BaseEnvironmentBase">2</value> |
|
|||
237 | <value type="QString" key="ProjectExplorer.CustomExecutableRunConfiguration.Executable">lppmon</value> |
|
|||
238 | <value type="bool" key="ProjectExplorer.CustomExecutableRunConfiguration.UseTerminal">false</value> |
|
|||
239 | <valuelist type="QVariantList" key="ProjectExplorer.CustomExecutableRunConfiguration.UserEnvironmentChanges"/> |
|
|||
240 | <value type="QString" key="ProjectExplorer.CustomExecutableRunConfiguration.WorkingDirectory">%{buildDir}</value> |
|
|||
241 | <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Run lppmon</value> |
|
|||
242 | <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value> |
|
|||
243 | <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.CustomExecutableRunConfiguration</value> |
|
|||
244 | <value type="uint" key="RunConfiguration.QmlDebugServerPort">3768</value> |
|
|||
245 | <value type="bool" key="RunConfiguration.UseCppDebugger">true</value> |
|
|||
246 | <value type="bool" key="RunConfiguration.UseQmlDebugger">false</value> |
|
|||
247 | <value type="bool" key="RunConfiguration.UseQmlDebuggerAuto">false</value> |
|
|||
248 | </valuemap> |
|
|||
249 | <valuemap type="QVariantMap" key="ProjectExplorer.Target.RunConfiguration.1"> |
|
|||
250 | <value type="bool" key="Analyzer.Project.UseGlobal">true</value> |
|
|||
251 | <value type="bool" key="Analyzer.Project.UseGlobal">true</value> |
|
|||
252 | <valuelist type="QVariantList" key="Analyzer.Valgrind.AddedSuppressionFiles"/> |
|
|||
253 | <valuelist type="QVariantList" key="Analyzer.Valgrind.AddedSuppressionFiles"/> |
|
|||
254 | <value type="bool" key="Analyzer.Valgrind.Callgrind.CollectBusEvents">false</value> |
|
|||
255 | <value type="bool" key="Analyzer.Valgrind.Callgrind.CollectBusEvents">false</value> |
|
|||
256 | <value type="bool" key="Analyzer.Valgrind.Callgrind.CollectSystime">false</value> |
|
|||
257 | <value type="bool" key="Analyzer.Valgrind.Callgrind.CollectSystime">false</value> |
|
|||
258 | <value type="bool" key="Analyzer.Valgrind.Callgrind.EnableBranchSim">false</value> |
|
|||
259 | <value type="bool" key="Analyzer.Valgrind.Callgrind.EnableBranchSim">false</value> |
|
|||
260 | <value type="bool" key="Analyzer.Valgrind.Callgrind.EnableCacheSim">false</value> |
|
|||
261 | <value type="bool" key="Analyzer.Valgrind.Callgrind.EnableCacheSim">false</value> |
|
|||
262 | <value type="bool" key="Analyzer.Valgrind.Callgrind.EnableEventToolTips">true</value> |
|
|||
263 | <value type="bool" key="Analyzer.Valgrind.Callgrind.EnableEventToolTips">true</value> |
|
|||
264 | <value type="double" key="Analyzer.Valgrind.Callgrind.MinimumCostRatio">0.01</value> |
|
|||
265 | <value type="double" key="Analyzer.Valgrind.Callgrind.MinimumCostRatio">0.01</value> |
|
|||
266 | <value type="double" key="Analyzer.Valgrind.Callgrind.VisualisationMinimumCostRatio">10</value> |
|
|||
267 | <value type="double" key="Analyzer.Valgrind.Callgrind.VisualisationMinimumCostRatio">10</value> |
|
|||
268 | <value type="bool" key="Analyzer.Valgrind.FilterExternalIssues">true</value> |
|
|||
269 | <value type="bool" key="Analyzer.Valgrind.FilterExternalIssues">true</value> |
|
|||
270 | <value type="int" key="Analyzer.Valgrind.NumCallers">25</value> |
|
|||
271 | <value type="int" key="Analyzer.Valgrind.NumCallers">25</value> |
|
|||
272 | <valuelist type="QVariantList" key="Analyzer.Valgrind.RemovedSuppressionFiles"/> |
|
|||
273 | <valuelist type="QVariantList" key="Analyzer.Valgrind.RemovedSuppressionFiles"/> |
|
|||
274 | <value type="bool" key="Analyzer.Valgrind.TrackOrigins">true</value> |
|
|||
275 | <value type="bool" key="Analyzer.Valgrind.TrackOrigins">true</value> |
|
|||
276 | <value type="QString" key="Analyzer.Valgrind.ValgrindExecutable">valgrind</value> |
|
|||
277 | <value type="QString" key="Analyzer.Valgrind.ValgrindExecutable">valgrind</value> |
|
|||
278 | <valuelist type="QVariantList" key="Analyzer.Valgrind.VisibleErrorKinds"> |
|
|||
279 | <value type="int">0</value> |
|
|||
280 | <value type="int">1</value> |
|
|||
281 | <value type="int">2</value> |
|
|||
282 | <value type="int">3</value> |
|
|||
283 | <value type="int">4</value> |
|
|||
284 | <value type="int">5</value> |
|
|||
285 | <value type="int">6</value> |
|
|||
286 | <value type="int">7</value> |
|
|||
287 | <value type="int">8</value> |
|
|||
288 | <value type="int">9</value> |
|
|||
289 | <value type="int">10</value> |
|
|||
290 | <value type="int">11</value> |
|
|||
291 | <value type="int">12</value> |
|
|||
292 | <value type="int">13</value> |
|
|||
293 | <value type="int">14</value> |
|
|||
294 | </valuelist> |
|
|||
295 | <valuelist type="QVariantList" key="Analyzer.Valgrind.VisibleErrorKinds"> |
|
|||
296 | <value type="int">0</value> |
|
|||
297 | <value type="int">1</value> |
|
|||
298 | <value type="int">2</value> |
|
|||
299 | <value type="int">3</value> |
|
|||
300 | <value type="int">4</value> |
|
|||
301 | <value type="int">5</value> |
|
|||
302 | <value type="int">6</value> |
|
|||
303 | <value type="int">7</value> |
|
|||
304 | <value type="int">8</value> |
|
|||
305 | <value type="int">9</value> |
|
|||
306 | <value type="int">10</value> |
|
|||
307 | <value type="int">11</value> |
|
|||
308 | <value type="int">12</value> |
|
|||
309 | <value type="int">13</value> |
|
|||
310 | <value type="int">14</value> |
|
|||
311 | </valuelist> |
|
|||
312 | <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">spwtimegenerator</value> |
|
|||
313 | <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value> |
|
186 | <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value> | |
314 | <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.Qt4RunConfiguration</value> |
|
187 | <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.Qt4RunConfiguration</value> | |
315 | <value type="int" key="Qt4ProjectManager.Qt4RunConfiguration.BaseEnvironmentBase">2</value> |
|
188 | <value type="int" key="Qt4ProjectManager.Qt4RunConfiguration.BaseEnvironmentBase">2</value> | |
316 | <value type="QString" key="Qt4ProjectManager.Qt4RunConfiguration.CommandLineArguments"></value> |
|
189 | <value type="QString" key="Qt4ProjectManager.Qt4RunConfiguration.CommandLineArguments"></value> | |
317 |
<value type="QString" key="Qt4ProjectManager.Qt4RunConfiguration.ProFile"> |
|
190 | <value type="QString" key="Qt4ProjectManager.Qt4RunConfiguration.ProFile">rmapplugin/rmapplugin.pro</value> | |
318 | <value type="bool" key="Qt4ProjectManager.Qt4RunConfiguration.UseDyldImageSuffix">false</value> |
|
191 | <value type="bool" key="Qt4ProjectManager.Qt4RunConfiguration.UseDyldImageSuffix">false</value> | |
319 | <value type="bool" key="Qt4ProjectManager.Qt4RunConfiguration.UseTerminal">false</value> |
|
192 | <value type="bool" key="Qt4ProjectManager.Qt4RunConfiguration.UseTerminal">false</value> | |
320 | <valuelist type="QVariantList" key="Qt4ProjectManager.Qt4RunConfiguration.UserEnvironmentChanges"/> |
|
193 | <valuelist type="QVariantList" key="Qt4ProjectManager.Qt4RunConfiguration.UserEnvironmentChanges"/> | |
@@ -324,7 +197,7 | |||||
324 | <value type="bool" key="RunConfiguration.UseQmlDebugger">false</value> |
|
197 | <value type="bool" key="RunConfiguration.UseQmlDebugger">false</value> | |
325 | <value type="bool" key="RunConfiguration.UseQmlDebuggerAuto">true</value> |
|
198 | <value type="bool" key="RunConfiguration.UseQmlDebuggerAuto">true</value> | |
326 | </valuemap> |
|
199 | </valuemap> | |
327 |
<value type="int" key="ProjectExplorer.Target.RunConfigurationCount"> |
|
200 | <value type="int" key="ProjectExplorer.Target.RunConfigurationCount">1</value> | |
328 | </valuemap> |
|
201 | </valuemap> | |
329 | </data> |
|
202 | </data> | |
330 | <data> |
|
203 | <data> | |
@@ -333,7 +206,7 | |||||
333 | </data> |
|
206 | </data> | |
334 | <data> |
|
207 | <data> | |
335 | <variable>ProjectExplorer.Project.Updater.EnvironmentId</variable> |
|
208 | <variable>ProjectExplorer.Project.Updater.EnvironmentId</variable> | |
336 |
<value type="QString">{ |
|
209 | <value type="QString">{2e58a81f-9962-4bba-ae6b-760177f0656c}</value> | |
337 | </data> |
|
210 | </data> | |
338 | <data> |
|
211 | <data> | |
339 | <variable>ProjectExplorer.Project.Updater.FileVersion</variable> |
|
212 | <variable>ProjectExplorer.Project.Updater.FileVersion</variable> |
@@ -3,6 +3,9 | |||||
3 | HKDisplay::HKDisplay(QWidget *parent) : |
|
3 | HKDisplay::HKDisplay(QWidget *parent) : | |
4 | QWidget(parent) |
|
4 | QWidget(parent) | |
5 | { |
|
5 | { | |
|
6 | QFont font; | |||
|
7 | font = QFont(this->fontInfo().family(), HK_INFORMATION_FONT_SIZE, QFont::Light); | |||
|
8 | ||||
6 | mainLayout = new QGridLayout(); |
|
9 | mainLayout = new QGridLayout(); | |
7 |
|
10 | |||
8 | setupLFRStatusWord(); |
|
11 | setupLFRStatusWord(); | |
@@ -12,13 +15,21 HKDisplay::HKDisplay(QWidget *parent) : | |||||
12 | setupSpaceWireIFStatistics(); |
|
15 | setupSpaceWireIFStatistics(); | |
13 | setupErrorCountersSpaceWire(); |
|
16 | setupErrorCountersSpaceWire(); | |
14 |
|
17 | |||
|
18 | groupbox_lfrStatusWord->setFont(font); | |||
|
19 | groupbox_lfrSWVersion->setFont(font); | |||
|
20 | groupbox_tcStatistics->setFont(font); | |||
|
21 | groupbox_anomalyStatistics->setFont(font); | |||
|
22 | groupbox_spacewireIFStatisctics->setFont(font); | |||
|
23 | groupbox_errorCountersSpaceWire->setFont(font); | |||
|
24 | ||||
15 | mainLayout->addWidget(groupbox_lfrStatusWord, 0,0,1,1); |
|
25 | mainLayout->addWidget(groupbox_lfrStatusWord, 0,0,1,1); | |
16 | mainLayout->addWidget(groupbox_lfrSWVersion, 0,1,1,1); |
|
26 | mainLayout->addWidget(groupbox_lfrSWVersion, 0,1,1,1); | |
|
27 | mainLayout->addWidget(groupbox_anomalyStatistics, 0,2,1,1); | |||
17 | mainLayout->addWidget(groupbox_tcStatistics, 1,0,1,1); |
|
28 | mainLayout->addWidget(groupbox_tcStatistics, 1,0,1,1); | |
18 |
mainLayout->addWidget(groupbox_ |
|
29 | mainLayout->addWidget(groupbox_spacewireIFStatisctics, 1, 1, 1, 1); | |
19 |
mainLayout->addWidget(groupbox_ |
|
30 | mainLayout->addWidget(groupbox_errorCountersSpaceWire, 1, 2, 1, 1); | |
20 | mainLayout->addWidget(groupbox_errorCountersSpaceWire, 1, 3, 1, 1); |
|
31 | mainLayout->setColumnStretch(3, 1); | |
21 |
mainLayout->set |
|
32 | mainLayout->setRowStretch(2, 1); | |
22 |
|
33 | |||
23 | this->setLayout(mainLayout); |
|
34 | this->setLayout(mainLayout); | |
24 | } |
|
35 | } |
@@ -10,6 +10,7 | |||||
10 | #include "ccsds_types.h" |
|
10 | #include "ccsds_types.h" | |
11 |
|
11 | |||
12 | #define HK_PACKET_SIZE 126 + 4 |
|
12 | #define HK_PACKET_SIZE 126 + 4 | |
|
13 | #define HK_INFORMATION_FONT_SIZE 9 | |||
13 |
|
14 | |||
14 | class HKDisplay : public QWidget |
|
15 | class HKDisplay : public QWidget | |
15 | { |
|
16 | { |
@@ -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 1 |
|
3 | # Generated by qmake (2.01a) (Qt 4.8.4) on: Thu Jul 4 13:26:49 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 |
@@ -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-04T1 |
|
3 | <!-- Written by Qt Creator 2.4.1, 2013-07-04T13:53:51. --> | |
4 | <qtcreator> |
|
4 | <qtcreator> | |
5 | <data> |
|
5 | <data> | |
6 | <variable>ProjectExplorer.Project.ActiveTarget</variable> |
|
6 | <variable>ProjectExplorer.Project.ActiveTarget</variable> | |
@@ -52,7 +52,7 | |||||
52 | <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Desktop</value> |
|
52 | <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Desktop</value> | |
53 | <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Desktop</value> |
|
53 | <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Desktop</value> | |
54 | <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.Target.DesktopTarget</value> |
|
54 | <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.Target.DesktopTarget</value> | |
55 |
<value type="int" key="ProjectExplorer.Target.ActiveBuildConfiguration"> |
|
55 | <value type="int" key="ProjectExplorer.Target.ActiveBuildConfiguration">0</value> | |
56 | <value type="int" key="ProjectExplorer.Target.ActiveDeployConfiguration">0</value> |
|
56 | <value type="int" key="ProjectExplorer.Target.ActiveDeployConfiguration">0</value> | |
57 | <value type="int" key="ProjectExplorer.Target.ActiveRunConfiguration">0</value> |
|
57 | <value type="int" key="ProjectExplorer.Target.ActiveRunConfiguration">0</value> | |
58 | <valuemap type="QVariantMap" key="ProjectExplorer.Target.BuildConfiguration.0"> |
|
58 | <valuemap type="QVariantMap" key="ProjectExplorer.Target.BuildConfiguration.0"> | |
@@ -62,7 +62,7 | |||||
62 | <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">qmake</value> |
|
62 | <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">qmake</value> | |
63 | <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value> |
|
63 | <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value> | |
64 | <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">QtProjectManager.QMakeBuildStep</value> |
|
64 | <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">QtProjectManager.QMakeBuildStep</value> | |
65 |
<value type="bool" key="QtProjectManager.QMakeBuildStep.LinkQmlDebuggingLibrary"> |
|
65 | <value type="bool" key="QtProjectManager.QMakeBuildStep.LinkQmlDebuggingLibrary">true</value> | |
66 | <value type="bool" key="QtProjectManager.QMakeBuildStep.LinkQmlDebuggingLibraryAuto">false</value> |
|
66 | <value type="bool" key="QtProjectManager.QMakeBuildStep.LinkQmlDebuggingLibraryAuto">false</value> | |
67 | <value type="QString" key="QtProjectManager.QMakeBuildStep.QMakeArguments"></value> |
|
67 | <value type="QString" key="QtProjectManager.QMakeBuildStep.QMakeArguments"></value> | |
68 | <value type="bool" key="QtProjectManager.QMakeBuildStep.QMakeForced">false</value> |
|
68 | <value type="bool" key="QtProjectManager.QMakeBuildStep.QMakeForced">false</value> | |
@@ -97,65 +97,15 | |||||
97 | <value type="int" key="ProjectExplorer.BuildConfiguration.BuildStepListCount">2</value> |
|
97 | <value type="int" key="ProjectExplorer.BuildConfiguration.BuildStepListCount">2</value> | |
98 | <value type="bool" key="ProjectExplorer.BuildConfiguration.ClearSystemEnvironment">false</value> |
|
98 | <value type="bool" key="ProjectExplorer.BuildConfiguration.ClearSystemEnvironment">false</value> | |
99 | <valuelist type="QVariantList" key="ProjectExplorer.BuildConfiguration.UserEnvironmentChanges"/> |
|
99 | <valuelist type="QVariantList" key="ProjectExplorer.BuildConfiguration.UserEnvironmentChanges"/> | |
100 |
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Qt 4.8. |
|
100 | <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Qt 4.8.2 in PATH (System) Debug</value> | |
101 | <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value> |
|
101 | <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value> | |
102 | <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.Qt4BuildConfiguration</value> |
|
102 | <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.Qt4BuildConfiguration</value> | |
103 |
<value type="int" key="Qt4ProjectManager.Qt4BuildConfiguration.BuildConfiguration"> |
|
103 | <value type="int" key="Qt4ProjectManager.Qt4BuildConfiguration.BuildConfiguration">2</value> | |
104 |
<value type="QString" key="Qt4ProjectManager.Qt4BuildConfiguration.BuildDirectory">/ |
|
104 | <value type="QString" key="Qt4ProjectManager.Qt4BuildConfiguration.BuildDirectory">/opt/LPPMON_PLUGINS_PAUL/gse_lesia</value> | |
105 | <value type="int" key="Qt4ProjectManager.Qt4BuildConfiguration.QtVersionId">1</value> |
|
105 | <value type="int" key="Qt4ProjectManager.Qt4BuildConfiguration.QtVersionId">1</value> | |
106 | <value type="bool" key="Qt4ProjectManager.Qt4BuildConfiguration.UseShadowBuild">false</value> |
|
106 | <value type="bool" key="Qt4ProjectManager.Qt4BuildConfiguration.UseShadowBuild">false</value> | |
107 | </valuemap> |
|
107 | </valuemap> | |
108 |
<value |
|
108 | <value type="int" key="ProjectExplorer.Target.BuildConfigurationCount">1</value> | |
109 | <value type="QString" key="ProjectExplorer.BuildCOnfiguration.ToolChain">ProjectExplorer.ToolChain.Gcc:/usr/bin/g++.x86-linux-generic-elf-64bit./usr/bin/gdb</value> |
|
|||
110 | <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.0"> |
|
|||
111 | <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0"> |
|
|||
112 | <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">qmake</value> |
|
|||
113 | <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value> |
|
|||
114 | <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">QtProjectManager.QMakeBuildStep</value> |
|
|||
115 | <value type="bool" key="QtProjectManager.QMakeBuildStep.LinkQmlDebuggingLibrary">false</value> |
|
|||
116 | <value type="bool" key="QtProjectManager.QMakeBuildStep.LinkQmlDebuggingLibraryAuto">true</value> |
|
|||
117 | <value type="QString" key="QtProjectManager.QMakeBuildStep.QMakeArguments"></value> |
|
|||
118 | <value type="bool" key="QtProjectManager.QMakeBuildStep.QMakeForced">false</value> |
|
|||
119 | </valuemap> |
|
|||
120 | <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.1"> |
|
|||
121 | <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Make</value> |
|
|||
122 | <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value> |
|
|||
123 | <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.MakeStep</value> |
|
|||
124 | <value type="bool" key="Qt4ProjectManager.MakeStep.Clean">false</value> |
|
|||
125 | <value type="QString" key="Qt4ProjectManager.MakeStep.MakeArguments"></value> |
|
|||
126 | <value type="QString" key="Qt4ProjectManager.MakeStep.MakeCommand"></value> |
|
|||
127 | </valuemap> |
|
|||
128 | <value type="int" key="ProjectExplorer.BuildStepList.StepsCount">2</value> |
|
|||
129 | <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Build</value> |
|
|||
130 | <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value> |
|
|||
131 | <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Build</value> |
|
|||
132 | </valuemap> |
|
|||
133 | <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.1"> |
|
|||
134 | <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0"> |
|
|||
135 | <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Make</value> |
|
|||
136 | <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value> |
|
|||
137 | <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.MakeStep</value> |
|
|||
138 | <value type="bool" key="Qt4ProjectManager.MakeStep.Clean">true</value> |
|
|||
139 | <value type="QString" key="Qt4ProjectManager.MakeStep.MakeArguments">clean</value> |
|
|||
140 | <value type="QString" key="Qt4ProjectManager.MakeStep.MakeCommand"></value> |
|
|||
141 | </valuemap> |
|
|||
142 | <value type="int" key="ProjectExplorer.BuildStepList.StepsCount">1</value> |
|
|||
143 | <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Clean</value> |
|
|||
144 | <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value> |
|
|||
145 | <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Clean</value> |
|
|||
146 | </valuemap> |
|
|||
147 | <value type="int" key="ProjectExplorer.BuildConfiguration.BuildStepListCount">2</value> |
|
|||
148 | <value type="bool" key="ProjectExplorer.BuildConfiguration.ClearSystemEnvironment">false</value> |
|
|||
149 | <valuelist type="QVariantList" key="ProjectExplorer.BuildConfiguration.UserEnvironmentChanges"/> |
|
|||
150 | <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Qt 4.8.3 in PATH (System) Debug</value> |
|
|||
151 | <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value> |
|
|||
152 | <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.Qt4BuildConfiguration</value> |
|
|||
153 | <value type="int" key="Qt4ProjectManager.Qt4BuildConfiguration.BuildConfiguration">2</value> |
|
|||
154 | <value type="QString" key="Qt4ProjectManager.Qt4BuildConfiguration.BuildDirectory">/home/admin/opt/LPPMON_PLUGINS_PLE/gselesia-build-desktop-Qt_4_8_3_in_PATH__System__Debug</value> |
|
|||
155 | <value type="int" key="Qt4ProjectManager.Qt4BuildConfiguration.QtVersionId">1</value> |
|
|||
156 | <value type="bool" key="Qt4ProjectManager.Qt4BuildConfiguration.UseShadowBuild">false</value> |
|
|||
157 | </valuemap> |
|
|||
158 | <value type="int" key="ProjectExplorer.Target.BuildConfigurationCount">2</value> |
|
|||
159 | <valuemap type="QVariantMap" key="ProjectExplorer.Target.DeployConfiguration.0"> |
|
109 | <valuemap type="QVariantMap" key="ProjectExplorer.Target.DeployConfiguration.0"> | |
160 | <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.0"> |
|
110 | <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.0"> | |
161 | <value type="int" key="ProjectExplorer.BuildStepList.StepsCount">0</value> |
|
111 | <value type="int" key="ProjectExplorer.BuildStepList.StepsCount">0</value> | |
@@ -256,7 +206,7 | |||||
256 | </data> |
|
206 | </data> | |
257 | <data> |
|
207 | <data> | |
258 | <variable>ProjectExplorer.Project.Updater.EnvironmentId</variable> |
|
208 | <variable>ProjectExplorer.Project.Updater.EnvironmentId</variable> | |
259 |
<value type="QString">{ |
|
209 | <value type="QString">{2e58a81f-9962-4bba-ae6b-760177f0656c}</value> | |
260 | </data> |
|
210 | </data> | |
261 | <data> |
|
211 | <data> | |
262 | <variable>ProjectExplorer.Project.Updater.FileVersion</variable> |
|
212 | <variable>ProjectExplorer.Project.Updater.FileVersion</variable> |
1 | NO CONTENT: modified file, binary diff hidden |
|
NO CONTENT: modified file, binary diff hidden |
@@ -3,7 +3,7 | |||||
3 | #include <QNetworkInterface> |
|
3 | #include <QNetworkInterface> | |
4 |
|
4 | |||
5 | MainWindow::MainWindow(QWidget *parent) |
|
5 | MainWindow::MainWindow(QWidget *parent) | |
6 |
: Q |
|
6 | : QMainWindow(parent) | |
7 | { |
|
7 | { | |
8 | parsingContinue = false; |
|
8 | parsingContinue = false; | |
9 | totalOfBytes = 0; |
|
9 | totalOfBytes = 0; | |
@@ -28,7 +28,8 MainWindow::MainWindow(QWidget *parent) | |||||
28 |
|
28 | |||
29 | initSocketStatesList(); |
|
29 | initSocketStatesList(); | |
30 |
|
30 | |||
31 | this->setLayout(UI->layout()); |
|
31 | this->setCentralWidget(this->UI); | |
|
32 | //this->setLayout(UI->layout()); | |||
32 |
|
33 | |||
33 | analyserSGSEServerTC = new QTcpServer(); |
|
34 | analyserSGSEServerTC = new QTcpServer(); | |
34 | analyserSGSEServerTM = new QTcpServer(); |
|
35 | analyserSGSEServerTM = new QTcpServer(); |
@@ -5,6 +5,7 | |||||
5 | #include <QTcpSocket> |
|
5 | #include <QTcpSocket> | |
6 | #include <QXmlSimpleReader> |
|
6 | #include <QXmlSimpleReader> | |
7 | #include <QSettings> |
|
7 | #include <QSettings> | |
|
8 | #include <QMainWindow> | |||
8 |
|
9 | |||
9 | #include <lfrxmlhandler.h> |
|
10 | #include <lfrxmlhandler.h> | |
10 | #include <lfrxmlwriter.h> |
|
11 | #include <lfrxmlwriter.h> | |
@@ -13,7 +14,7 | |||||
13 | #include "wfpacket.h" |
|
14 | #include "wfpacket.h" | |
14 | #include "lfrxmlparser.h" |
|
15 | #include "lfrxmlparser.h" | |
15 |
|
16 | |||
16 |
class MainWindow : public Q |
|
17 | class MainWindow : public QMainWindow | |
17 | { |
|
18 | { | |
18 | Q_OBJECT |
|
19 | Q_OBJECT | |
19 |
|
20 |
@@ -98,13 +98,13 MainWindowUI::MainWindowUI(QWidget *pare | |||||
98 | spwTabWidget->addTab((QWidget *) wfPageBurst, tr("WFRM BURST")); |
|
98 | spwTabWidget->addTab((QWidget *) wfPageBurst, tr("WFRM BURST")); | |
99 | spwTabWidget->addTab((QWidget *) wfPageSBM1, tr("WFRM SBM1")); |
|
99 | spwTabWidget->addTab((QWidget *) wfPageSBM1, tr("WFRM SBM1")); | |
100 | spwTabWidget->addTab((QWidget *) wfPageSBM2, tr("WFRM SBM2")); |
|
100 | spwTabWidget->addTab((QWidget *) wfPageSBM2, tr("WFRM SBM2")); | |
101 | spwTabWidget->addTab(spwTabWidgetPage4, tr("Spectrograms")); |
|
101 | //spwTabWidget->addTab(spwTabWidgetPage4, tr("Spectrograms")); | |
102 |
|
102 | |||
103 | spwTabWidgetPage0->setLayout(mainLayout); |
|
103 | spwTabWidgetPage0->setLayout(mainLayout); | |
104 | spwTabWidgetPage1->setLayout(tmStatistics->layout()); |
|
104 | spwTabWidgetPage1->setLayout(tmStatistics->layout()); | |
105 | spwTabWidgetPage2->setLayout(wfDisplay->layout()); |
|
105 | spwTabWidgetPage2->setLayout(wfDisplay->layout()); | |
106 | spwTabWidgetPage3->setLayout(hkDisplay->layout()); |
|
106 | spwTabWidgetPage3->setLayout(hkDisplay->layout()); | |
107 | spwTabWidgetPage4->setLayout(lfrSpectrogam->layout()); |
|
107 | //spwTabWidgetPage4->setLayout(lfrSpectrogam->layout()); | |
108 | //spwTabWidgetPage5->setLayout(wfPageBurst->layout()); |
|
108 | //spwTabWidgetPage5->setLayout(wfPageBurst->layout()); | |
109 | //spwTabWidgetPage6->setLayout(wfPageSBM1->layout()); |
|
109 | //spwTabWidgetPage6->setLayout(wfPageSBM1->layout()); | |
110 | //spwTabWidgetPage7->setLayout(wfPageSBM2->layout()); |
|
110 | //spwTabWidgetPage7->setLayout(wfPageSBM2->layout()); |
@@ -1,9 +1,9 | |||||
1 | ############################################################################# |
|
1 | ############################################################################# | |
2 | # Makefile for building: librmapplugin.so.1.0.0 |
|
2 | # Makefile for building: librmapplugin.so.1.0.0 | |
3 |
# Generated by qmake (2.01a) (Qt 4.8.4) on: |
|
3 | # Generated by qmake (2.01a) (Qt 4.8.4) on: Thu Jul 4 12:50:48 2013 | |
4 | # Project: rmapplugin.pro |
|
4 | # Project: rmapplugin.pro | |
5 | # Template: lib |
|
5 | # Template: lib | |
6 |
# Command: /usr/bin/qmake-qt4 - |
|
6 | # Command: /usr/bin/qmake-qt4 -o Makefile rmapplugin.pro | |
7 | ############################################################################# |
|
7 | ############################################################################# | |
8 |
|
8 | |||
9 | ####### Compiler, tools and options |
|
9 | ####### Compiler, tools and options | |
@@ -13,10 +13,10 CXX = g++ | |||||
13 | DEFINES = -DPLUGIN=rmapplugin -DPLUGINHEADER="\"rmapplugin.h\"" -Ddriver_Name="\"RMAPPlugin\"" -Ddriver_Author="\"Paul Leroy paul.leroy@lpp.polytechnique.fr\"" -Ddriver_Version="\"1.1.2\"" -Ddriver_Description="\"AHB bus controler, works with Gaisler's AHB plugn' play bus.\"" -Ddriver_can_be_root=1 -Ddriver_can_be_child=0 -Ddriver_VID=0 -Ddriver_PID=0 -DLPPMON_VERSION="\"0.0.1\"" -DUNIXTRANSLATIONPATH -DLPPMON_PLUGINS_INSTALL_PATH="QDir::homePath()+\"/.lppmon/plugins\"" -DLPPMON_CONFIG_PATH="QDir::homePath()+\"/.lppmon/config\"" -DLPPMON_TRANSLATION_PATH="\"/etc/lppmon/translations\"" -DLPPMONPLUGIN_LIBRARY -DQT_NO_DEBUG -DQT_XML_LIB -DQT_GUI_LIB -DQT_NETWORK_LIB -DQT_CORE_LIB -DQT_SHARED |
|
13 | DEFINES = -DPLUGIN=rmapplugin -DPLUGINHEADER="\"rmapplugin.h\"" -Ddriver_Name="\"RMAPPlugin\"" -Ddriver_Author="\"Paul Leroy paul.leroy@lpp.polytechnique.fr\"" -Ddriver_Version="\"1.1.2\"" -Ddriver_Description="\"AHB bus controler, works with Gaisler's AHB plugn' play bus.\"" -Ddriver_can_be_root=1 -Ddriver_can_be_child=0 -Ddriver_VID=0 -Ddriver_PID=0 -DLPPMON_VERSION="\"0.0.1\"" -DUNIXTRANSLATIONPATH -DLPPMON_PLUGINS_INSTALL_PATH="QDir::homePath()+\"/.lppmon/plugins\"" -DLPPMON_CONFIG_PATH="QDir::homePath()+\"/.lppmon/config\"" -DLPPMON_TRANSLATION_PATH="\"/etc/lppmon/translations\"" -DLPPMONPLUGIN_LIBRARY -DQT_NO_DEBUG -DQT_XML_LIB -DQT_GUI_LIB -DQT_NETWORK_LIB -DQT_CORE_LIB -DQT_SHARED | |
14 | CFLAGS = -pipe -O2 -g -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 -fstack-protector --param=ssp-buffer-size=4 -m64 -mtune=generic -O2 -Wall -W -D_REENTRANT -fPIC $(DEFINES) |
|
14 | CFLAGS = -pipe -O2 -g -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 -fstack-protector --param=ssp-buffer-size=4 -m64 -mtune=generic -O2 -Wall -W -D_REENTRANT -fPIC $(DEFINES) | |
15 | CXXFLAGS = -pipe -O2 -g -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 -fstack-protector --param=ssp-buffer-size=4 -m64 -mtune=generic -O2 -I/usr/include/python2.7 -I/usr/include/python2.7 -Wall -W -D_REENTRANT -fPIC $(DEFINES) |
|
15 | CXXFLAGS = -pipe -O2 -g -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 -fstack-protector --param=ssp-buffer-size=4 -m64 -mtune=generic -O2 -I/usr/include/python2.7 -I/usr/include/python2.7 -Wall -W -D_REENTRANT -fPIC $(DEFINES) | |
16 | INCPATH = -I/usr/lib64/qt4/mkspecs/linux-g++ -I. -I/usr/include/QtCore -I/usr/include/QtNetwork -I/usr/include/QtGui -I/usr/include/QtXml -I/usr/include -I. -I../common_PLE -I../spw_usb_driver_v2.63/inc -I/usr/include/lppmon/common -I/usr/include/lppmon -I/usr/include/lppmon/pluginsInterface -I/usr/include/PythonQt -Imoc |
|
16 | INCPATH = -I/usr/lib64/qt4/mkspecs/linux-g++ -I. -I/usr/include/QtCore -I/usr/include/QtNetwork -I/usr/include/QtGui -I/usr/include/QtXml -I/usr/include -I. -I../common_PLE -I../spw_usb_driver_v2.63/inc -I/usr/include/lppmon/common -I/usr/include/lppmon/wfdisplay -I/usr/include/lppmon/common -I/usr/include/lppmon -I/usr/include/lppmon/pluginsInterface -I/usr/include/PythonQt -Imoc | |
17 | LINK = g++ |
|
17 | LINK = g++ | |
18 | LFLAGS = -Wl,-O1 -Wl,-z,relro -shared -Wl,-soname,librmapplugin.so.1 |
|
18 | LFLAGS = -Wl,-O1 -Wl,-z,relro -shared -Wl,-soname,librmapplugin.so.1 | |
19 | LIBS = $(SUBLIBS) -L/usr/lib64 ../spw_usb_driver_v2.63/lib/x86_64/libSpaceWireUSBAPI.so ../spw_usb_driver_v2.63/lib/x86_64/libConfigLibraryUSB.so -ldl -lutil -lm -lpython2.7 -lPythonQt_QtAll -lPythonQt -lQtXml -lQtGui -lQtNetwork -lQtCore -lpthread |
|
19 | LIBS = $(SUBLIBS) -L/usr/lib64 ../spw_usb_driver_v2.63/lib/x86_64/libSpaceWireUSBAPI.so ../spw_usb_driver_v2.63/lib/x86_64/libConfigLibraryUSB.so -llppmoncommon -lwfdisplay -lqwt5-qt4 -ldl -lutil -lm -lpython2.7 -lPythonQt_QtAll -lPythonQt -lQtXml -lQtGui -lQtNetwork -lQtCore -lpthread | |
20 | AR = ar cqs |
|
20 | AR = ar cqs | |
21 | RANLIB = |
|
21 | RANLIB = | |
22 | QMAKE = /usr/bin/qmake-qt4 |
|
22 | QMAKE = /usr/bin/qmake-qt4 | |
@@ -54,10 +54,7 SOURCES = rmapplugin.cpp \ | |||||
54 | gresb.cpp \ |
|
54 | gresb.cpp \ | |
55 | tcpackettosend.cpp \ |
|
55 | tcpackettosend.cpp \ | |
56 | tmpackettoread.cpp \ |
|
56 | tmpackettoread.cpp \ | |
57 | wfdisplay.cpp \ |
|
|||
58 | tmstatistics.cpp \ |
|
57 | tmstatistics.cpp \ | |
59 | wfplot.cpp \ |
|
|||
60 | wfpage.cpp \ |
|
|||
61 | wfpacket.cpp \ |
|
58 | wfpacket.cpp \ | |
62 | tmechobridge.cpp \ |
|
59 | tmechobridge.cpp \ | |
63 | /usr/include/lppmon/pluginsInterface/lppmonplugininterface.cpp moc/moc_rmappluginui.cpp \ |
|
60 | /usr/include/lppmon/pluginsInterface/lppmonplugininterface.cpp moc/moc_rmappluginui.cpp \ | |
@@ -69,10 +66,7 SOURCES = rmapplugin.cpp \ | |||||
69 | moc/moc_gresb.cpp \ |
|
66 | moc/moc_gresb.cpp \ | |
70 | moc/moc_tcpackettosend.cpp \ |
|
67 | moc/moc_tcpackettosend.cpp \ | |
71 | moc/moc_tmpackettoread.cpp \ |
|
68 | moc/moc_tmpackettoread.cpp \ | |
72 | moc/moc_wfdisplay.cpp \ |
|
|||
73 | moc/moc_tmstatistics.cpp \ |
|
69 | moc/moc_tmstatistics.cpp \ | |
74 | moc/moc_wfplot.cpp \ |
|
|||
75 | moc/moc_wfpage.cpp \ |
|
|||
76 | moc/moc_wfpacket.cpp \ |
|
70 | moc/moc_wfpacket.cpp \ | |
77 | moc/moc_tmechobridge.cpp \ |
|
71 | moc/moc_tmechobridge.cpp \ | |
78 | moc/moc_genericPySysdriver.cpp \ |
|
72 | moc/moc_genericPySysdriver.cpp \ | |
@@ -88,10 +82,7 OBJECTS = obj/rmapplugin.o \ | |||||
88 | obj/gresb.o \ |
|
82 | obj/gresb.o \ | |
89 | obj/tcpackettosend.o \ |
|
83 | obj/tcpackettosend.o \ | |
90 | obj/tmpackettoread.o \ |
|
84 | obj/tmpackettoread.o \ | |
91 | obj/wfdisplay.o \ |
|
|||
92 | obj/tmstatistics.o \ |
|
85 | obj/tmstatistics.o \ | |
93 | obj/wfplot.o \ |
|
|||
94 | obj/wfpage.o \ |
|
|||
95 | obj/wfpacket.o \ |
|
86 | obj/wfpacket.o \ | |
96 | obj/tmechobridge.o \ |
|
87 | obj/tmechobridge.o \ | |
97 | obj/lppmonplugininterface.o \ |
|
88 | obj/lppmonplugininterface.o \ | |
@@ -104,10 +95,7 OBJECTS = obj/rmapplugin.o \ | |||||
104 | obj/moc_gresb.o \ |
|
95 | obj/moc_gresb.o \ | |
105 | obj/moc_tcpackettosend.o \ |
|
96 | obj/moc_tcpackettosend.o \ | |
106 | obj/moc_tmpackettoread.o \ |
|
97 | obj/moc_tmpackettoread.o \ | |
107 | obj/moc_wfdisplay.o \ |
|
|||
108 | obj/moc_tmstatistics.o \ |
|
98 | obj/moc_tmstatistics.o \ | |
109 | obj/moc_wfplot.o \ |
|
|||
110 | obj/moc_wfpage.o \ |
|
|||
111 | obj/moc_wfpacket.o \ |
|
99 | obj/moc_wfpacket.o \ | |
112 | obj/moc_tmechobridge.o \ |
|
100 | obj/moc_tmechobridge.o \ | |
113 | obj/moc_genericPySysdriver.o \ |
|
101 | obj/moc_genericPySysdriver.o \ | |
@@ -223,7 +211,7 Makefile: rmapplugin.pro /usr/lib64/qt4 | |||||
223 | /usr/lib64/libQtCore.prl \ |
|
211 | /usr/lib64/libQtCore.prl \ | |
224 | /usr/lib64/libQtGui.prl \ |
|
212 | /usr/lib64/libQtGui.prl \ | |
225 | /usr/lib64/libQtNetwork.prl |
|
213 | /usr/lib64/libQtNetwork.prl | |
226 |
$(QMAKE) |
|
214 | $(QMAKE) -o Makefile rmapplugin.pro | |
227 | /usr/lib64/qt4/mkspecs/common/unix.conf: |
|
215 | /usr/lib64/qt4/mkspecs/common/unix.conf: | |
228 | /usr/lib64/qt4/mkspecs/common/linux.conf: |
|
216 | /usr/lib64/qt4/mkspecs/common/linux.conf: | |
229 | /usr/lib64/qt4/mkspecs/common/gcc-base.conf: |
|
217 | /usr/lib64/qt4/mkspecs/common/gcc-base.conf: | |
@@ -255,11 +243,11 Makefile: rmapplugin.pro /usr/lib64/qt4 | |||||
255 | /usr/lib64/libQtGui.prl: |
|
243 | /usr/lib64/libQtGui.prl: | |
256 | /usr/lib64/libQtNetwork.prl: |
|
244 | /usr/lib64/libQtNetwork.prl: | |
257 | qmake: FORCE |
|
245 | qmake: FORCE | |
258 |
@$(QMAKE) |
|
246 | @$(QMAKE) -o Makefile rmapplugin.pro | |
259 |
|
247 | |||
260 | dist: |
|
248 | dist: | |
261 | @$(CHK_DIR_EXISTS) obj/rmapplugin1.0.0 || $(MKDIR) obj/rmapplugin1.0.0 |
|
249 | @$(CHK_DIR_EXISTS) obj/rmapplugin1.0.0 || $(MKDIR) obj/rmapplugin1.0.0 | |
262 |
$(COPY_FILE) --parents $(SOURCES) $(DIST) obj/rmapplugin1.0.0/ && $(COPY_FILE) --parents rmappluginui.h rmapplugin.h rmapoperations.h ccsds.h ../common_PLE/qipdialogbox.h ../common_PLE/gresbstatusenquiry.h rmappluginpythonwrapper.h stardundee.h ../spw_usb_driver_v2.61/inc/spw_usb_api.h ../spw_usb_driver_v2.61/inc/spw_config_library.h gresb.h tcpackettosend.h tmpackettoread.h |
|
250 | $(COPY_FILE) --parents $(SOURCES) $(DIST) obj/rmapplugin1.0.0/ && $(COPY_FILE) --parents rmappluginui.h rmapplugin.h rmapoperations.h ccsds.h ../common_PLE/qipdialogbox.h ../common_PLE/gresbstatusenquiry.h rmappluginpythonwrapper.h stardundee.h ../spw_usb_driver_v2.61/inc/spw_usb_api.h ../spw_usb_driver_v2.61/inc/spw_config_library.h gresb.h tcpackettosend.h tmpackettoread.h tmstatistics.h wfpacket.h params.h tmechobridge.h /usr/include/lppmon/genericPySysdriver.h /usr/include/lppmon/lppmonplugin.h obj/rmapplugin1.0.0/ && $(COPY_FILE) --parents rmapplugin.cpp rmappluginui.cpp rmapoperations.cpp ccsds.cpp ../common_PLE/qipdialogbox.cpp ../common_PLE/gresbstatusenquiry.cpp rmappluginpythonwrapper.cpp stardundee.cpp gresb.cpp tcpackettosend.cpp tmpackettoread.cpp tmstatistics.cpp wfpacket.cpp tmechobridge.cpp /usr/include/lppmon/pluginsInterface/lppmonplugininterface.cpp obj/rmapplugin1.0.0/ && (cd `dirname obj/rmapplugin1.0.0` && $(TAR) rmapplugin1.0.0.tar rmapplugin1.0.0 && $(COMPRESS) rmapplugin1.0.0.tar) && $(MOVE) `dirname obj/rmapplugin1.0.0`/rmapplugin1.0.0.tar.gz . && $(DEL_FILE) -r obj/rmapplugin1.0.0 | |
263 |
|
251 | |||
264 |
|
252 | |||
265 | clean:compiler_clean |
|
253 | clean:compiler_clean | |
@@ -281,18 +269,15 mocclean: compiler_moc_header_clean comp | |||||
281 |
|
269 | |||
282 | mocables: compiler_moc_header_make_all compiler_moc_source_make_all |
|
270 | mocables: compiler_moc_header_make_all compiler_moc_source_make_all | |
283 |
|
271 | |||
284 |
compiler_moc_header_make_all: moc/moc_rmappluginui.cpp moc/moc_rmapplugin.cpp moc/moc_qipdialogbox.cpp moc/moc_gresbstatusenquiry.cpp moc/moc_rmappluginpythonwrapper.cpp moc/moc_stardundee.cpp moc/moc_gresb.cpp moc/moc_tcpackettosend.cpp moc/moc_tmpackettoread.cpp moc/ |
|
272 | compiler_moc_header_make_all: moc/moc_rmappluginui.cpp moc/moc_rmapplugin.cpp moc/moc_qipdialogbox.cpp moc/moc_gresbstatusenquiry.cpp moc/moc_rmappluginpythonwrapper.cpp moc/moc_stardundee.cpp moc/moc_gresb.cpp moc/moc_tcpackettosend.cpp moc/moc_tmpackettoread.cpp moc/moc_tmstatistics.cpp moc/moc_wfpacket.cpp moc/moc_tmechobridge.cpp moc/moc_genericPySysdriver.cpp moc/moc_lppmonplugin.cpp | |
285 | compiler_moc_header_clean: |
|
273 | compiler_moc_header_clean: | |
286 |
-$(DEL_FILE) moc/moc_rmappluginui.cpp moc/moc_rmapplugin.cpp moc/moc_qipdialogbox.cpp moc/moc_gresbstatusenquiry.cpp moc/moc_rmappluginpythonwrapper.cpp moc/moc_stardundee.cpp moc/moc_gresb.cpp moc/moc_tcpackettosend.cpp moc/moc_tmpackettoread.cpp |
|
274 | -$(DEL_FILE) moc/moc_rmappluginui.cpp moc/moc_rmapplugin.cpp moc/moc_qipdialogbox.cpp moc/moc_gresbstatusenquiry.cpp moc/moc_rmappluginpythonwrapper.cpp moc/moc_stardundee.cpp moc/moc_gresb.cpp moc/moc_tcpackettosend.cpp moc/moc_tmpackettoread.cpp moc/moc_tmstatistics.cpp moc/moc_wfpacket.cpp moc/moc_tmechobridge.cpp moc/moc_genericPySysdriver.cpp moc/moc_lppmonplugin.cpp | |
287 | moc/moc_rmappluginui.cpp: rmapoperations.h \ |
|
275 | moc/moc_rmappluginui.cpp: rmapoperations.h \ | |
288 | params.h \ |
|
276 | params.h \ | |
289 | stardundee.h \ |
|
277 | stardundee.h \ | |
290 | ccsds.h \ |
|
278 | ccsds.h \ | |
291 | tmpackettoread.h \ |
|
279 | tmpackettoread.h \ | |
292 | gresb.h \ |
|
280 | gresb.h \ | |
293 | wfdisplay.h \ |
|
|||
294 | wfplot.h \ |
|
|||
295 | wfpage.h \ |
|
|||
296 | tmstatistics.h \ |
|
281 | tmstatistics.h \ | |
297 | tmechobridge.h \ |
|
282 | tmechobridge.h \ | |
298 | rmappluginui.h |
|
283 | rmappluginui.h | |
@@ -305,9 +290,6 moc/moc_rmapplugin.cpp: rmappluginui.h \ | |||||
305 | ccsds.h \ |
|
290 | ccsds.h \ | |
306 | tmpackettoread.h \ |
|
291 | tmpackettoread.h \ | |
307 | gresb.h \ |
|
292 | gresb.h \ | |
308 | wfdisplay.h \ |
|
|||
309 | wfplot.h \ |
|
|||
310 | wfpage.h \ |
|
|||
311 | tmstatistics.h \ |
|
293 | tmstatistics.h \ | |
312 | tmechobridge.h \ |
|
294 | tmechobridge.h \ | |
313 | wfpacket.h \ |
|
295 | wfpacket.h \ | |
@@ -348,24 +330,9 moc/moc_tcpackettosend.cpp: tcpackettose | |||||
348 | moc/moc_tmpackettoread.cpp: tmpackettoread.h |
|
330 | moc/moc_tmpackettoread.cpp: tmpackettoread.h | |
349 | /usr/lib64/qt4/bin/moc $(DEFINES) $(INCPATH) tmpackettoread.h -o moc/moc_tmpackettoread.cpp |
|
331 | /usr/lib64/qt4/bin/moc $(DEFINES) $(INCPATH) tmpackettoread.h -o moc/moc_tmpackettoread.cpp | |
350 |
|
332 | |||
351 | moc/moc_wfdisplay.cpp: wfplot.h \ |
|
|||
352 | params.h \ |
|
|||
353 | wfpage.h \ |
|
|||
354 | wfdisplay.h |
|
|||
355 | /usr/lib64/qt4/bin/moc $(DEFINES) $(INCPATH) wfdisplay.h -o moc/moc_wfdisplay.cpp |
|
|||
356 |
|
||||
357 | moc/moc_tmstatistics.cpp: tmstatistics.h |
|
333 | moc/moc_tmstatistics.cpp: tmstatistics.h | |
358 | /usr/lib64/qt4/bin/moc $(DEFINES) $(INCPATH) tmstatistics.h -o moc/moc_tmstatistics.cpp |
|
334 | /usr/lib64/qt4/bin/moc $(DEFINES) $(INCPATH) tmstatistics.h -o moc/moc_tmstatistics.cpp | |
359 |
|
335 | |||
360 | moc/moc_wfplot.cpp: params.h \ |
|
|||
361 | wfplot.h |
|
|||
362 | /usr/lib64/qt4/bin/moc $(DEFINES) $(INCPATH) wfplot.h -o moc/moc_wfplot.cpp |
|
|||
363 |
|
||||
364 | moc/moc_wfpage.cpp: wfplot.h \ |
|
|||
365 | params.h \ |
|
|||
366 | wfpage.h |
|
|||
367 | /usr/lib64/qt4/bin/moc $(DEFINES) $(INCPATH) wfpage.h -o moc/moc_wfpage.cpp |
|
|||
368 |
|
||||
369 | moc/moc_wfpacket.cpp: params.h \ |
|
336 | moc/moc_wfpacket.cpp: params.h \ | |
370 | wfpacket.h |
|
337 | wfpacket.h | |
371 | /usr/lib64/qt4/bin/moc $(DEFINES) $(INCPATH) wfpacket.h -o moc/moc_wfpacket.cpp |
|
338 | /usr/lib64/qt4/bin/moc $(DEFINES) $(INCPATH) wfpacket.h -o moc/moc_wfpacket.cpp | |
@@ -407,9 +374,6 obj/rmapplugin.o: rmapplugin.cpp rmapplu | |||||
407 | ccsds.h \ |
|
374 | ccsds.h \ | |
408 | tmpackettoread.h \ |
|
375 | tmpackettoread.h \ | |
409 | gresb.h \ |
|
376 | gresb.h \ | |
410 | wfdisplay.h \ |
|
|||
411 | wfplot.h \ |
|
|||
412 | wfpage.h \ |
|
|||
413 | tmstatistics.h \ |
|
377 | tmstatistics.h \ | |
414 | tmechobridge.h \ |
|
378 | tmechobridge.h \ | |
415 | wfpacket.h \ |
|
379 | wfpacket.h \ | |
@@ -425,9 +389,6 obj/rmappluginui.o: rmappluginui.cpp rma | |||||
425 | ccsds.h \ |
|
389 | ccsds.h \ | |
426 | tmpackettoread.h \ |
|
390 | tmpackettoread.h \ | |
427 | gresb.h \ |
|
391 | gresb.h \ | |
428 | wfdisplay.h \ |
|
|||
429 | wfplot.h \ |
|
|||
430 | wfpage.h \ |
|
|||
431 | tmstatistics.h \ |
|
392 | tmstatistics.h \ | |
432 | tmechobridge.h \ |
|
393 | tmechobridge.h \ | |
433 | wfpacket.h |
|
394 | wfpacket.h | |
@@ -474,24 +435,9 obj/tcpackettosend.o: tcpackettosend.cpp | |||||
474 | obj/tmpackettoread.o: tmpackettoread.cpp tmpackettoread.h |
|
435 | obj/tmpackettoread.o: tmpackettoread.cpp tmpackettoread.h | |
475 | $(CXX) -c $(CXXFLAGS) $(INCPATH) -o obj/tmpackettoread.o tmpackettoread.cpp |
|
436 | $(CXX) -c $(CXXFLAGS) $(INCPATH) -o obj/tmpackettoread.o tmpackettoread.cpp | |
476 |
|
437 | |||
477 | obj/wfdisplay.o: wfdisplay.cpp wfdisplay.h \ |
|
|||
478 | wfplot.h \ |
|
|||
479 | params.h \ |
|
|||
480 | wfpage.h |
|
|||
481 | $(CXX) -c $(CXXFLAGS) $(INCPATH) -o obj/wfdisplay.o wfdisplay.cpp |
|
|||
482 |
|
||||
483 | obj/tmstatistics.o: tmstatistics.cpp tmstatistics.h |
|
438 | obj/tmstatistics.o: tmstatistics.cpp tmstatistics.h | |
484 | $(CXX) -c $(CXXFLAGS) $(INCPATH) -o obj/tmstatistics.o tmstatistics.cpp |
|
439 | $(CXX) -c $(CXXFLAGS) $(INCPATH) -o obj/tmstatistics.o tmstatistics.cpp | |
485 |
|
440 | |||
486 | obj/wfplot.o: wfplot.cpp wfplot.h \ |
|
|||
487 | params.h |
|
|||
488 | $(CXX) -c $(CXXFLAGS) $(INCPATH) -o obj/wfplot.o wfplot.cpp |
|
|||
489 |
|
||||
490 | obj/wfpage.o: wfpage.cpp wfpage.h \ |
|
|||
491 | wfplot.h \ |
|
|||
492 | params.h |
|
|||
493 | $(CXX) -c $(CXXFLAGS) $(INCPATH) -o obj/wfpage.o wfpage.cpp |
|
|||
494 |
|
||||
495 | obj/wfpacket.o: wfpacket.cpp wfpacket.h \ |
|
441 | obj/wfpacket.o: wfpacket.cpp wfpacket.h \ | |
496 | params.h |
|
442 | params.h | |
497 | $(CXX) -c $(CXXFLAGS) $(INCPATH) -o obj/wfpacket.o wfpacket.cpp |
|
443 | $(CXX) -c $(CXXFLAGS) $(INCPATH) -o obj/wfpacket.o wfpacket.cpp | |
@@ -531,18 +477,9 obj/moc_tcpackettosend.o: moc/moc_tcpack | |||||
531 | obj/moc_tmpackettoread.o: moc/moc_tmpackettoread.cpp |
|
477 | obj/moc_tmpackettoread.o: moc/moc_tmpackettoread.cpp | |
532 | $(CXX) -c $(CXXFLAGS) $(INCPATH) -o obj/moc_tmpackettoread.o moc/moc_tmpackettoread.cpp |
|
478 | $(CXX) -c $(CXXFLAGS) $(INCPATH) -o obj/moc_tmpackettoread.o moc/moc_tmpackettoread.cpp | |
533 |
|
479 | |||
534 | obj/moc_wfdisplay.o: moc/moc_wfdisplay.cpp |
|
|||
535 | $(CXX) -c $(CXXFLAGS) $(INCPATH) -o obj/moc_wfdisplay.o moc/moc_wfdisplay.cpp |
|
|||
536 |
|
||||
537 | obj/moc_tmstatistics.o: moc/moc_tmstatistics.cpp |
|
480 | obj/moc_tmstatistics.o: moc/moc_tmstatistics.cpp | |
538 | $(CXX) -c $(CXXFLAGS) $(INCPATH) -o obj/moc_tmstatistics.o moc/moc_tmstatistics.cpp |
|
481 | $(CXX) -c $(CXXFLAGS) $(INCPATH) -o obj/moc_tmstatistics.o moc/moc_tmstatistics.cpp | |
539 |
|
482 | |||
540 | obj/moc_wfplot.o: moc/moc_wfplot.cpp |
|
|||
541 | $(CXX) -c $(CXXFLAGS) $(INCPATH) -o obj/moc_wfplot.o moc/moc_wfplot.cpp |
|
|||
542 |
|
||||
543 | obj/moc_wfpage.o: moc/moc_wfpage.cpp |
|
|||
544 | $(CXX) -c $(CXXFLAGS) $(INCPATH) -o obj/moc_wfpage.o moc/moc_wfpage.cpp |
|
|||
545 |
|
||||
546 | obj/moc_wfpacket.o: moc/moc_wfpacket.cpp |
|
483 | obj/moc_wfpacket.o: moc/moc_wfpacket.cpp | |
547 | $(CXX) -c $(CXXFLAGS) $(INCPATH) -o obj/moc_wfpacket.o moc/moc_wfpacket.cpp |
|
484 | $(CXX) -c $(CXXFLAGS) $(INCPATH) -o obj/moc_wfpacket.o moc/moc_wfpacket.cpp | |
548 |
|
485 | |||
@@ -558,18 +495,18 obj/moc_lppmonplugin.o: moc/moc_lppmonpl | |||||
558 | ####### Install |
|
495 | ####### Install | |
559 |
|
496 | |||
560 | install_target: first FORCE |
|
497 | install_target: first FORCE | |
561 |
@$(CHK_DIR_EXISTS) $(INSTALL_ROOT)/home/ |
|
498 | @$(CHK_DIR_EXISTS) $(INSTALL_ROOT)/home/paul/.lppmon/plugins/ || $(MKDIR) $(INSTALL_ROOT)/home/paul/.lppmon/plugins/ | |
562 |
-$(INSTALL_PROGRAM) "bin/$(TARGET)" "$(INSTALL_ROOT)/home/ |
|
499 | -$(INSTALL_PROGRAM) "bin/$(TARGET)" "$(INSTALL_ROOT)/home/paul/.lppmon/plugins/$(TARGET)" | |
563 |
-$(SYMLINK) "$(TARGET)" "$(INSTALL_ROOT)/home/ |
|
500 | -$(SYMLINK) "$(TARGET)" "$(INSTALL_ROOT)/home/paul/.lppmon/plugins/$(TARGET0)" | |
564 |
-$(SYMLINK) "$(TARGET)" "$(INSTALL_ROOT)/home/ |
|
501 | -$(SYMLINK) "$(TARGET)" "$(INSTALL_ROOT)/home/paul/.lppmon/plugins/$(TARGET1)" | |
565 |
-$(SYMLINK) "$(TARGET)" "$(INSTALL_ROOT)/home/ |
|
502 | -$(SYMLINK) "$(TARGET)" "$(INSTALL_ROOT)/home/paul/.lppmon/plugins/$(TARGET2)" | |
566 |
|
503 | |||
567 | uninstall_target: FORCE |
|
504 | uninstall_target: FORCE | |
568 |
-$(DEL_FILE) "$(INSTALL_ROOT)/home/ |
|
505 | -$(DEL_FILE) "$(INSTALL_ROOT)/home/paul/.lppmon/plugins/$(TARGET)" | |
569 |
-$(DEL_FILE) "$(INSTALL_ROOT)/home/ |
|
506 | -$(DEL_FILE) "$(INSTALL_ROOT)/home/paul/.lppmon/plugins/$(TARGET0)" | |
570 |
-$(DEL_FILE) "$(INSTALL_ROOT)/home/ |
|
507 | -$(DEL_FILE) "$(INSTALL_ROOT)/home/paul/.lppmon/plugins/$(TARGET1)" | |
571 |
-$(DEL_FILE) "$(INSTALL_ROOT)/home/ |
|
508 | -$(DEL_FILE) "$(INSTALL_ROOT)/home/paul/.lppmon/plugins/$(TARGET2)" | |
572 |
-$(DEL_DIR) $(INSTALL_ROOT)/home/ |
|
509 | -$(DEL_DIR) $(INSTALL_ROOT)/home/paul/.lppmon/plugins/ | |
573 |
|
510 | |||
574 |
|
511 | |||
575 | install: install_target FORCE |
|
512 | install: install_target FORCE |
@@ -27,7 +27,12 LIBS += ../spw_usb_driver_v2.63/lib/x86_ | |||||
27 | INCLUDEPATH += \ |
|
27 | INCLUDEPATH += \ | |
28 | $${PWD} \ |
|
28 | $${PWD} \ | |
29 | ../common_PLE \ |
|
29 | ../common_PLE \ | |
30 | ../spw_usb_driver_v2.63/inc |
|
30 | ../spw_usb_driver_v2.63/inc \ | |
|
31 | $${QT_INSTALL_HEADER} \ | |||
|
32 | $$[QT_INSTALL_HEADERS]/lppmon/common \ | |||
|
33 | $$[QT_INSTALL_HEADERS]/lppmon/wfdisplay | |||
|
34 | ||||
|
35 | LIBS += -llppmoncommon -lwfdisplay -lqwt5-qt4 | |||
31 |
|
36 | |||
32 |
|
37 | |||
33 | HEADERS += \ |
|
38 | HEADERS += \ | |
@@ -44,10 +49,7 HEADERS += \ | |||||
44 | gresb.h \ |
|
49 | gresb.h \ | |
45 | tcpackettosend.h \ |
|
50 | tcpackettosend.h \ | |
46 | tmpackettoread.h \ |
|
51 | tmpackettoread.h \ | |
47 | wfdisplay.h \ |
|
|||
48 | tmstatistics.h \ |
|
52 | tmstatistics.h \ | |
49 | wfplot.h \ |
|
|||
50 | wfpage.h \ |
|
|||
51 | wfpacket.h \ |
|
53 | wfpacket.h \ | |
52 | params.h \ |
|
54 | params.h \ | |
53 | tmechobridge.h |
|
55 | tmechobridge.h | |
@@ -65,10 +67,7 SOURCES += \ | |||||
65 | gresb.cpp \ |
|
67 | gresb.cpp \ | |
66 | tcpackettosend.cpp \ |
|
68 | tcpackettosend.cpp \ | |
67 | tmpackettoread.cpp \ |
|
69 | tmpackettoread.cpp \ | |
68 | wfdisplay.cpp \ |
|
|||
69 | tmstatistics.cpp \ |
|
70 | tmstatistics.cpp \ | |
70 | wfplot.cpp \ |
|
|||
71 | wfpage.cpp \ |
|
|||
72 | wfpacket.cpp \ |
|
71 | wfpacket.cpp \ | |
73 | tmechobridge.cpp |
|
72 | tmechobridge.cpp | |
74 |
|
73 |
@@ -36,15 +36,17 | |||||
36 | #include <QDialog> |
|
36 | #include <QDialog> | |
37 | #include <QCloseEvent> |
|
37 | #include <QCloseEvent> | |
38 | #include <QTabWidget> |
|
38 | #include <QTabWidget> | |
39 | #include "qipdialogbox.h" |
|
39 | #include <QTextEdit> | |
|
40 | #include <QRadioButton> | |||
|
41 | #include <QGroupBox> | |||
|
42 | ||||
40 | #include <rmapoperations.h> |
|
43 | #include <rmapoperations.h> | |
41 | #include <gresbstatusenquiry.h> |
|
44 | #include <gresbstatusenquiry.h> | |
42 | #include <QTextEdit> |
|
|||
43 | #include <stardundee.h> |
|
45 | #include <stardundee.h> | |
44 | #include <gresb.h> |
|
46 | #include <gresb.h> | |
45 | #include <QRadioButton> |
|
47 | #include <wfdisplay.h> | |
46 | #include <QGroupBox> |
|
48 | ||
47 |
#include " |
|
49 | #include "qipdialogbox.h" | |
48 | #include "tmstatistics.h" |
|
50 | #include "tmstatistics.h" | |
49 | #include "tmechobridge.h" |
|
51 | #include "tmechobridge.h" | |
50 |
|
52 |
@@ -1,9 +1,9 | |||||
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 1 |
|
3 | # Generated by qmake (2.01a) (Qt 4.8.4) on: Thu Jul 4 13:53:16 2013 | |
4 | # Project: wfdisplay.pro |
|
4 | # Project: wfdisplay.pro | |
5 | # Template: lib |
|
5 | # Template: lib | |
6 |
# Command: / |
|
6 | # Command: /bin/qmake-qt4 -o Makefile wfdisplay.pro | |
7 | ############################################################################# |
|
7 | ############################################################################# | |
8 |
|
8 | |||
9 | ####### Compiler, tools and options |
|
9 | ####### Compiler, tools and options | |
@@ -19,7 +19,7 LFLAGS = -Wl,-O1 -Wl,-z,relro -sh | |||||
19 | LIBS = $(SUBLIBS) -L/usr/lib64 -llppmoncommon -lQtGui -lQtCore -lpthread |
|
19 | LIBS = $(SUBLIBS) -L/usr/lib64 -llppmoncommon -lQtGui -lQtCore -lpthread | |
20 | AR = ar cqs |
|
20 | AR = ar cqs | |
21 | RANLIB = |
|
21 | RANLIB = | |
22 |
QMAKE = |
|
22 | QMAKE = /bin/qmake-qt4 | |
23 | TAR = tar -cf |
|
23 | TAR = tar -cf | |
24 | COMPRESS = gzip -9f |
|
24 | COMPRESS = gzip -9f | |
25 | COPY = cp -f |
|
25 | COPY = cp -f | |
@@ -275,11 +275,11 moc_wfpage.o: moc_wfpage.cpp | |||||
275 |
|
275 | |||
276 | install_header: first FORCE |
|
276 | install_header: first FORCE | |
277 | @$(CHK_DIR_EXISTS) $(INSTALL_ROOT)/usr/include/lppmon/wfdisplay/ || $(MKDIR) $(INSTALL_ROOT)/usr/include/lppmon/wfdisplay/ |
|
277 | @$(CHK_DIR_EXISTS) $(INSTALL_ROOT)/usr/include/lppmon/wfdisplay/ || $(MKDIR) $(INSTALL_ROOT)/usr/include/lppmon/wfdisplay/ | |
278 |
-$(INSTALL_FILE) |
|
278 | -$(INSTALL_FILE) /opt/LPPMON_PLUGINS_PAUL/wfdisplay/wfdisplay/wfdisplay.h $(INSTALL_ROOT)/usr/include/lppmon/wfdisplay/ | |
279 |
-$(INSTALL_FILE) |
|
279 | -$(INSTALL_FILE) /opt/LPPMON_PLUGINS_PAUL/wfdisplay/wfdisplay/wfdisplay_global.h $(INSTALL_ROOT)/usr/include/lppmon/wfdisplay/ | |
280 |
-$(INSTALL_FILE) |
|
280 | -$(INSTALL_FILE) /opt/LPPMON_PLUGINS_PAUL/wfdisplay/wfdisplay/wfpage.h $(INSTALL_ROOT)/usr/include/lppmon/wfdisplay/ | |
281 |
-$(INSTALL_FILE) |
|
281 | -$(INSTALL_FILE) /opt/LPPMON_PLUGINS_PAUL/wfdisplay/wfdisplay/wfplot.h $(INSTALL_ROOT)/usr/include/lppmon/wfdisplay/ | |
282 |
-$(INSTALL_FILE) |
|
282 | -$(INSTALL_FILE) /opt/LPPMON_PLUGINS_PAUL/wfdisplay/wfdisplay/wfdisplay_params.h $(INSTALL_ROOT)/usr/include/lppmon/wfdisplay/ | |
283 |
|
283 | |||
284 |
|
284 | |||
285 | uninstall_header: FORCE |
|
285 | uninstall_header: FORCE |
@@ -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-04T1 |
|
3 | <!-- Written by Qt Creator 2.4.1, 2013-07-04T13:53:51. --> | |
4 | <qtcreator> |
|
4 | <qtcreator> | |
5 | <data> |
|
5 | <data> | |
6 | <variable>ProjectExplorer.Project.ActiveTarget</variable> |
|
6 | <variable>ProjectExplorer.Project.ActiveTarget</variable> | |
@@ -63,7 +63,7 | |||||
63 | <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value> |
|
63 | <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value> | |
64 | <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">QtProjectManager.QMakeBuildStep</value> |
|
64 | <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">QtProjectManager.QMakeBuildStep</value> | |
65 | <value type="bool" key="QtProjectManager.QMakeBuildStep.LinkQmlDebuggingLibrary">false</value> |
|
65 | <value type="bool" key="QtProjectManager.QMakeBuildStep.LinkQmlDebuggingLibrary">false</value> | |
66 |
<value type="bool" key="QtProjectManager.QMakeBuildStep.LinkQmlDebuggingLibraryAuto"> |
|
66 | <value type="bool" key="QtProjectManager.QMakeBuildStep.LinkQmlDebuggingLibraryAuto">false</value> | |
67 | <value type="QString" key="QtProjectManager.QMakeBuildStep.QMakeArguments"></value> |
|
67 | <value type="QString" key="QtProjectManager.QMakeBuildStep.QMakeArguments"></value> | |
68 | <value type="bool" key="QtProjectManager.QMakeBuildStep.QMakeForced">false</value> |
|
68 | <value type="bool" key="QtProjectManager.QMakeBuildStep.QMakeForced">false</value> | |
69 | </valuemap> |
|
69 | </valuemap> | |
@@ -97,65 +97,15 | |||||
97 | <value type="int" key="ProjectExplorer.BuildConfiguration.BuildStepListCount">2</value> |
|
97 | <value type="int" key="ProjectExplorer.BuildConfiguration.BuildStepListCount">2</value> | |
98 | <value type="bool" key="ProjectExplorer.BuildConfiguration.ClearSystemEnvironment">false</value> |
|
98 | <value type="bool" key="ProjectExplorer.BuildConfiguration.ClearSystemEnvironment">false</value> | |
99 | <valuelist type="QVariantList" key="ProjectExplorer.BuildConfiguration.UserEnvironmentChanges"/> |
|
99 | <valuelist type="QVariantList" key="ProjectExplorer.BuildConfiguration.UserEnvironmentChanges"/> | |
100 |
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Qt 4.8. |
|
100 | <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Qt 4.8.2 in PATH (System) Release</value> | |
101 | <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value> |
|
101 | <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value> | |
102 | <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.Qt4BuildConfiguration</value> |
|
102 | <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.Qt4BuildConfiguration</value> | |
103 |
<value type="int" key="Qt4ProjectManager.Qt4BuildConfiguration.BuildConfiguration"> |
|
103 | <value type="int" key="Qt4ProjectManager.Qt4BuildConfiguration.BuildConfiguration">0</value> | |
104 |
<value type="QString" key="Qt4ProjectManager.Qt4BuildConfiguration.BuildDirectory">/ |
|
104 | <value type="QString" key="Qt4ProjectManager.Qt4BuildConfiguration.BuildDirectory">/opt/LPPMON_PLUGINS_PAUL/wfdisplay/wfdisplay</value> | |
105 | <value type="int" key="Qt4ProjectManager.Qt4BuildConfiguration.QtVersionId">1</value> |
|
105 | <value type="int" key="Qt4ProjectManager.Qt4BuildConfiguration.QtVersionId">1</value> | |
106 | <value type="bool" key="Qt4ProjectManager.Qt4BuildConfiguration.UseShadowBuild">false</value> |
|
106 | <value type="bool" key="Qt4ProjectManager.Qt4BuildConfiguration.UseShadowBuild">false</value> | |
107 | </valuemap> |
|
107 | </valuemap> | |
108 |
<value |
|
108 | <value type="int" key="ProjectExplorer.Target.BuildConfigurationCount">1</value> | |
109 | <value type="QString" key="ProjectExplorer.BuildCOnfiguration.ToolChain">ProjectExplorer.ToolChain.Gcc:/usr/bin/g++.x86-linux-generic-elf-64bit./usr/bin/gdb</value> |
|
|||
110 | <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.0"> |
|
|||
111 | <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0"> |
|
|||
112 | <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">qmake</value> |
|
|||
113 | <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value> |
|
|||
114 | <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">QtProjectManager.QMakeBuildStep</value> |
|
|||
115 | <value type="bool" key="QtProjectManager.QMakeBuildStep.LinkQmlDebuggingLibrary">false</value> |
|
|||
116 | <value type="bool" key="QtProjectManager.QMakeBuildStep.LinkQmlDebuggingLibraryAuto">true</value> |
|
|||
117 | <value type="QString" key="QtProjectManager.QMakeBuildStep.QMakeArguments"></value> |
|
|||
118 | <value type="bool" key="QtProjectManager.QMakeBuildStep.QMakeForced">false</value> |
|
|||
119 | </valuemap> |
|
|||
120 | <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.1"> |
|
|||
121 | <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Make</value> |
|
|||
122 | <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value> |
|
|||
123 | <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.MakeStep</value> |
|
|||
124 | <value type="bool" key="Qt4ProjectManager.MakeStep.Clean">false</value> |
|
|||
125 | <value type="QString" key="Qt4ProjectManager.MakeStep.MakeArguments"></value> |
|
|||
126 | <value type="QString" key="Qt4ProjectManager.MakeStep.MakeCommand"></value> |
|
|||
127 | </valuemap> |
|
|||
128 | <value type="int" key="ProjectExplorer.BuildStepList.StepsCount">2</value> |
|
|||
129 | <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Build</value> |
|
|||
130 | <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value> |
|
|||
131 | <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Build</value> |
|
|||
132 | </valuemap> |
|
|||
133 | <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.1"> |
|
|||
134 | <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0"> |
|
|||
135 | <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Make</value> |
|
|||
136 | <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value> |
|
|||
137 | <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.MakeStep</value> |
|
|||
138 | <value type="bool" key="Qt4ProjectManager.MakeStep.Clean">true</value> |
|
|||
139 | <value type="QString" key="Qt4ProjectManager.MakeStep.MakeArguments">clean</value> |
|
|||
140 | <value type="QString" key="Qt4ProjectManager.MakeStep.MakeCommand"></value> |
|
|||
141 | </valuemap> |
|
|||
142 | <value type="int" key="ProjectExplorer.BuildStepList.StepsCount">1</value> |
|
|||
143 | <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Clean</value> |
|
|||
144 | <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value> |
|
|||
145 | <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Clean</value> |
|
|||
146 | </valuemap> |
|
|||
147 | <value type="int" key="ProjectExplorer.BuildConfiguration.BuildStepListCount">2</value> |
|
|||
148 | <value type="bool" key="ProjectExplorer.BuildConfiguration.ClearSystemEnvironment">false</value> |
|
|||
149 | <valuelist type="QVariantList" key="ProjectExplorer.BuildConfiguration.UserEnvironmentChanges"/> |
|
|||
150 | <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Qt 4.8.3 in PATH (System) Release</value> |
|
|||
151 | <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value> |
|
|||
152 | <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.Qt4BuildConfiguration</value> |
|
|||
153 | <value type="int" key="Qt4ProjectManager.Qt4BuildConfiguration.BuildConfiguration">0</value> |
|
|||
154 | <value type="QString" key="Qt4ProjectManager.Qt4BuildConfiguration.BuildDirectory">/home/admin/opt/LPPMON_PLUGINS_PLE/wfdisplay/wfdisplay-build-desktop-Qt_4_8_3_in_PATH__System__Release</value> |
|
|||
155 | <value type="int" key="Qt4ProjectManager.Qt4BuildConfiguration.QtVersionId">1</value> |
|
|||
156 | <value type="bool" key="Qt4ProjectManager.Qt4BuildConfiguration.UseShadowBuild">false</value> |
|
|||
157 | </valuemap> |
|
|||
158 | <value type="int" key="ProjectExplorer.Target.BuildConfigurationCount">2</value> |
|
|||
159 | <valuemap type="QVariantMap" key="ProjectExplorer.Target.DeployConfiguration.0"> |
|
109 | <valuemap type="QVariantMap" key="ProjectExplorer.Target.DeployConfiguration.0"> | |
160 | <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.0"> |
|
110 | <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.0"> | |
161 | <value type="int" key="ProjectExplorer.BuildStepList.StepsCount">0</value> |
|
111 | <value type="int" key="ProjectExplorer.BuildStepList.StepsCount">0</value> | |
@@ -232,16 +182,15 | |||||
232 | <value type="int">13</value> |
|
182 | <value type="int">13</value> | |
233 | <value type="int">14</value> |
|
183 | <value type="int">14</value> | |
234 | </valuelist> |
|
184 | </valuelist> | |
235 |
<value type="QString" key="ProjectExplorer. |
|
185 | <value type="QString" key="ProjectExplorer.CustomExecutableRunConfiguration.Arguments"></value> | |
|
186 | <value type="int" key="ProjectExplorer.CustomExecutableRunConfiguration.BaseEnvironmentBase">2</value> | |||
|
187 | <value type="QString" key="ProjectExplorer.CustomExecutableRunConfiguration.Executable"></value> | |||
|
188 | <value type="bool" key="ProjectExplorer.CustomExecutableRunConfiguration.UseTerminal">false</value> | |||
|
189 | <valuelist type="QVariantList" key="ProjectExplorer.CustomExecutableRunConfiguration.UserEnvironmentChanges"/> | |||
|
190 | <value type="QString" key="ProjectExplorer.CustomExecutableRunConfiguration.WorkingDirectory">%{buildDir}</value> | |||
|
191 | <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Custom Executable</value> | |||
236 | <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value> |
|
192 | <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value> | |
237 |
<value type="QString" key="ProjectExplorer.ProjectConfiguration.Id"> |
|
193 | <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.CustomExecutableRunConfiguration</value> | |
238 | <value type="int" key="Qt4ProjectManager.Qt4RunConfiguration.BaseEnvironmentBase">2</value> |
|
|||
239 | <value type="QString" key="Qt4ProjectManager.Qt4RunConfiguration.CommandLineArguments"></value> |
|
|||
240 | <value type="QString" key="Qt4ProjectManager.Qt4RunConfiguration.ProFile">wfdisplay.pro</value> |
|
|||
241 | <value type="bool" key="Qt4ProjectManager.Qt4RunConfiguration.UseDyldImageSuffix">false</value> |
|
|||
242 | <value type="bool" key="Qt4ProjectManager.Qt4RunConfiguration.UseTerminal">false</value> |
|
|||
243 | <valuelist type="QVariantList" key="Qt4ProjectManager.Qt4RunConfiguration.UserEnvironmentChanges"/> |
|
|||
244 | <value type="QString" key="Qt4ProjectManager.Qt4RunConfiguration.UserWorkingDirectory"></value> |
|
|||
245 | <value type="uint" key="RunConfiguration.QmlDebugServerPort">3768</value> |
|
194 | <value type="uint" key="RunConfiguration.QmlDebugServerPort">3768</value> | |
246 | <value type="bool" key="RunConfiguration.UseCppDebugger">true</value> |
|
195 | <value type="bool" key="RunConfiguration.UseCppDebugger">true</value> | |
247 | <value type="bool" key="RunConfiguration.UseQmlDebugger">false</value> |
|
196 | <value type="bool" key="RunConfiguration.UseQmlDebugger">false</value> | |
@@ -256,7 +205,7 | |||||
256 | </data> |
|
205 | </data> | |
257 | <data> |
|
206 | <data> | |
258 | <variable>ProjectExplorer.Project.Updater.EnvironmentId</variable> |
|
207 | <variable>ProjectExplorer.Project.Updater.EnvironmentId</variable> | |
259 |
<value type="QString">{ |
|
208 | <value type="QString">{2e58a81f-9962-4bba-ae6b-760177f0656c}</value> | |
260 | </data> |
|
209 | </data> | |
261 | <data> |
|
210 | <data> | |
262 | <variable>ProjectExplorer.Project.Updater.FileVersion</variable> |
|
211 | <variable>ProjectExplorer.Project.Updater.FileVersion</variable> |
@@ -260,19 +260,18 void WFPage::organizeDocks() | |||||
260 | if (radio_tabify->isChecked()) |
|
260 | if (radio_tabify->isChecked()) | |
261 | { |
|
261 | { | |
262 | tabify(); |
|
262 | tabify(); | |
263 | this->resize(1.2*this->minimumSizeHint()); |
|
|||
264 | } |
|
263 | } | |
265 | else |
|
264 | else | |
266 | { |
|
265 | { | |
267 | unTabify(); |
|
266 | unTabify(); | |
268 | wfPlot_v->resize(wfPlot_v->minimumSizeHint()); |
|
|||
269 | wfPlot_e1->resize(wfPlot_e1->minimumSizeHint()); |
|
|||
270 | wfPlot_e2->resize(wfPlot_e2->minimumSizeHint()); |
|
|||
271 | wfPlot_b1->resize(wfPlot_b1->minimumSizeHint()); |
|
|||
272 | wfPlot_b2->resize(wfPlot_b2->minimumSizeHint()); |
|
|||
273 | wfPlot_b3->resize(wfPlot_b3->minimumSizeHint()); |
|
|||
274 | this->resize(this->minimumSizeHint()); |
|
|||
275 | } |
|
267 | } | |
|
268 | wfPlot_v->resize(wfPlot_v->minimumSizeHint()); | |||
|
269 | wfPlot_e1->resize(wfPlot_e1->minimumSizeHint()); | |||
|
270 | wfPlot_e2->resize(wfPlot_e2->minimumSizeHint()); | |||
|
271 | wfPlot_b1->resize(wfPlot_b1->minimumSizeHint()); | |||
|
272 | wfPlot_b2->resize(wfPlot_b2->minimumSizeHint()); | |||
|
273 | wfPlot_b3->resize(wfPlot_b3->minimumSizeHint()); | |||
|
274 | this->resize(this->minimumSizeHint()); | |||
276 | } |
|
275 | } | |
277 |
|
276 | |||
278 | void WFPage::unTabify() |
|
277 | void WFPage::unTabify() |
General Comments 0
You need to be logged in to leave comments.
Login now