##// 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

rmapplugin updated, waveform plots removed (exported in gse_lesia)...
leroy -
r25:361dd727106d default
parent child
Show More
Show file before | Show file after | Hide comments
@@ -1,6 +1,6
1 1 <?xml version="1.0" encoding="UTF-8"?>
2 2 <!DOCTYPE QtCreatorProject>
3 <!-- Written by Qt Creator 2.4.1, 2013-06-14T11:39:28. -->
3 <!-- Written by Qt Creator 2.4.1, 2013-06-18T15:14:51. -->
4 4 <qtcreator>
5 5 <data>
6 6 <variable>ProjectExplorer.Project.ActiveTarget</variable>
Show file before | Show file after | Hide comments
@@ -1,6 +1,6
1 1 #############################################################################
2 2 # Makefile for building: gselesia
3 # Generated by qmake (2.01a) (Qt 4.8.4) on: Mon Jun 17 13:07:45 2013
3 # Generated by qmake (2.01a) (Qt 4.8.4) on: Tue Jun 18 10:19:47 2013
4 4 # Project: gselesia.pro
5 5 # Template: app
6 6 # Command: /usr/bin/qmake-qt4 -spec /usr/lib64/qt4/mkspecs/linux-g++ -o Makefile gselesia.pro
@@ -16,7 +16,7 CXXFLAGS = -pipe -O2 -g -pipe -Wall
16 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../rmapplugin -I../../DEV_PLE/header -I/usr/include/lppmon/common -I/usr/include/lppmon/wfdisplay -I.
17 17 LINK = g++
18 18 LFLAGS = -Wl,-O1 -Wl,-z,relro
19 LIBS = $(SUBLIBS) -L/usr/lib64 -llppmoncommon -lwfdisplay -lQtXml -lQtGui -lQtNetwork -lQtCore -lpthread
19 LIBS = $(SUBLIBS) -L/usr/lib64 -llppmoncommon -lwfdisplay -lqwt5-qt4 -lQtXml -lQtGui -lQtNetwork -lQtCore -lpthread
20 20 AR = ar cqs
21 21 RANLIB =
22 22 QMAKE = /usr/bin/qmake-qt4
@@ -53,7 +53,8 SOURCES = main.cpp \
53 53 ../rmapplugin/tmpackettoread.cpp \
54 54 ../rmapplugin/wfpacket.cpp \
55 55 ../common_PLE/hkdisplay.cpp \
56 lfrxmlparser.cpp moc_mainwindow.cpp \
56 lfrxmlparser.cpp \
57 lfrspectrogram.cpp moc_mainwindow.cpp \
57 58 moc_mainwindowui.cpp \
58 59 moc_qipdialogbox.cpp \
59 60 moc_lfrxmlhandler.cpp \
@@ -62,7 +63,8 SOURCES = main.cpp \
62 63 moc_tmpackettoread.cpp \
63 64 moc_wfpacket.cpp \
64 65 moc_hkdisplay.cpp \
65 moc_lfrxmlparser.cpp
66 moc_lfrxmlparser.cpp \
67 moc_lfrspectrogram.cpp
66 68 OBJECTS = main.o \
67 69 mainwindow.o \
68 70 mainwindowui.o \
@@ -74,6 +76,7 OBJECTS = main.o \
74 76 wfpacket.o \
75 77 hkdisplay.o \
76 78 lfrxmlparser.o \
79 lfrspectrogram.o \
77 80 moc_mainwindow.o \
78 81 moc_mainwindowui.o \
79 82 moc_qipdialogbox.o \
@@ -83,7 +86,8 OBJECTS = main.o \
83 86 moc_tmpackettoread.o \
84 87 moc_wfpacket.o \
85 88 moc_hkdisplay.o \
86 moc_lfrxmlparser.o
89 moc_lfrxmlparser.o \
90 moc_lfrspectrogram.o
87 91 DIST = /usr/lib64/qt4/mkspecs/common/unix.conf \
88 92 /usr/lib64/qt4/mkspecs/common/linux.conf \
89 93 /usr/lib64/qt4/mkspecs/common/gcc-base.conf \
@@ -202,7 +206,7 qmake: FORCE
202 206
203 207 dist:
204 208 @$(CHK_DIR_EXISTS) .tmp/gselesia1.0.0 || $(MKDIR) .tmp/gselesia1.0.0
205 $(COPY_FILE) --parents $(SOURCES) $(DIST) .tmp/gselesia1.0.0/ && $(COPY_FILE) --parents mainwindow.h mainwindowui.h ../common_PLE/qipdialogbox.h lfrxmlhandler.h lfrxmlwriter.h ../rmapplugin/tmstatistics.h ../rmapplugin/tmpackettoread.h ../rmapplugin/wfpacket.h ../common_PLE/hkdisplay.h ../rmapplugin/params.h ../../DEV_PLE/header/ccsds_types.h lfrxmlparser.h .tmp/gselesia1.0.0/ && $(COPY_FILE) --parents main.cpp mainwindow.cpp mainwindowui.cpp ../common_PLE/qipdialogbox.cpp lfrxmlhandler.cpp lfrxmlwriter.cpp ../rmapplugin/tmstatistics.cpp ../rmapplugin/tmpackettoread.cpp ../rmapplugin/wfpacket.cpp ../common_PLE/hkdisplay.cpp lfrxmlparser.cpp .tmp/gselesia1.0.0/ && (cd `dirname .tmp/gselesia1.0.0` && $(TAR) gselesia1.0.0.tar gselesia1.0.0 && $(COMPRESS) gselesia1.0.0.tar) && $(MOVE) `dirname .tmp/gselesia1.0.0`/gselesia1.0.0.tar.gz . && $(DEL_FILE) -r .tmp/gselesia1.0.0
209 $(COPY_FILE) --parents $(SOURCES) $(DIST) .tmp/gselesia1.0.0/ && $(COPY_FILE) --parents mainwindow.h mainwindowui.h ../common_PLE/qipdialogbox.h lfrxmlhandler.h lfrxmlwriter.h ../rmapplugin/tmstatistics.h ../rmapplugin/tmpackettoread.h ../rmapplugin/wfpacket.h ../common_PLE/hkdisplay.h ../rmapplugin/params.h ../../DEV_PLE/header/ccsds_types.h lfrxmlparser.h lfrspectrogram.h .tmp/gselesia1.0.0/ && $(COPY_FILE) --parents main.cpp mainwindow.cpp mainwindowui.cpp ../common_PLE/qipdialogbox.cpp lfrxmlhandler.cpp lfrxmlwriter.cpp ../rmapplugin/tmstatistics.cpp ../rmapplugin/tmpackettoread.cpp ../rmapplugin/wfpacket.cpp ../common_PLE/hkdisplay.cpp lfrxmlparser.cpp lfrspectrogram.cpp .tmp/gselesia1.0.0/ && (cd `dirname .tmp/gselesia1.0.0` && $(TAR) gselesia1.0.0.tar gselesia1.0.0 && $(COMPRESS) gselesia1.0.0.tar) && $(MOVE) `dirname .tmp/gselesia1.0.0`/gselesia1.0.0.tar.gz . && $(DEL_FILE) -r .tmp/gselesia1.0.0
206 210
207 211
208 212 clean:compiler_clean
@@ -223,17 +227,19 mocclean: compiler_moc_header_clean comp
223 227
224 228 mocables: compiler_moc_header_make_all compiler_moc_source_make_all
225 229
226 compiler_moc_header_make_all: moc_mainwindow.cpp moc_mainwindowui.cpp moc_qipdialogbox.cpp moc_lfrxmlhandler.cpp moc_lfrxmlwriter.cpp moc_tmstatistics.cpp moc_tmpackettoread.cpp moc_wfpacket.cpp moc_hkdisplay.cpp moc_lfrxmlparser.cpp
230 compiler_moc_header_make_all: moc_mainwindow.cpp moc_mainwindowui.cpp moc_qipdialogbox.cpp moc_lfrxmlhandler.cpp moc_lfrxmlwriter.cpp moc_tmstatistics.cpp moc_tmpackettoread.cpp moc_wfpacket.cpp moc_hkdisplay.cpp moc_lfrxmlparser.cpp moc_lfrspectrogram.cpp
227 231 compiler_moc_header_clean:
228 -$(DEL_FILE) moc_mainwindow.cpp moc_mainwindowui.cpp moc_qipdialogbox.cpp moc_lfrxmlhandler.cpp moc_lfrxmlwriter.cpp moc_tmstatistics.cpp moc_tmpackettoread.cpp moc_wfpacket.cpp moc_hkdisplay.cpp moc_lfrxmlparser.cpp
232 -$(DEL_FILE) moc_mainwindow.cpp moc_mainwindowui.cpp moc_qipdialogbox.cpp moc_lfrxmlhandler.cpp moc_lfrxmlwriter.cpp moc_tmstatistics.cpp moc_tmpackettoread.cpp moc_wfpacket.cpp moc_hkdisplay.cpp moc_lfrxmlparser.cpp moc_lfrspectrogram.cpp
229 233 moc_mainwindow.cpp: lfrxmlhandler.h \
230 234 lfrxmlwriter.h \
231 235 mainwindowui.h \
236 lfrspectrogram.h \
232 237 lfrxmlparser.h \
233 238 mainwindow.h
234 239 /usr/lib64/qt4/bin/moc $(DEFINES) $(INCPATH) mainwindow.h -o moc_mainwindow.cpp
235 240
236 moc_mainwindowui.cpp: mainwindowui.h
241 moc_mainwindowui.cpp: lfrspectrogram.h \
242 mainwindowui.h
237 243 /usr/lib64/qt4/bin/moc $(DEFINES) $(INCPATH) mainwindowui.h -o moc_mainwindowui.cpp
238 244
239 245 moc_qipdialogbox.cpp: ../common_PLE/qipdialogbox.h
@@ -260,6 +266,9 moc_hkdisplay.cpp: ../common_PLE/hkdispl
260 266 moc_lfrxmlparser.cpp: lfrxmlparser.h
261 267 /usr/lib64/qt4/bin/moc $(DEFINES) $(INCPATH) lfrxmlparser.h -o moc_lfrxmlparser.cpp
262 268
269 moc_lfrspectrogram.cpp: lfrspectrogram.h
270 /usr/lib64/qt4/bin/moc $(DEFINES) $(INCPATH) lfrspectrogram.h -o moc_lfrspectrogram.cpp
271
263 272 compiler_rcc_make_all:
264 273 compiler_rcc_clean:
265 274 compiler_image_collection_make_all: qmake_image_collection.cpp
@@ -283,6 +292,7 main.o: main.cpp mainwindow.h \
283 292 lfrxmlhandler.h \
284 293 lfrxmlwriter.h \
285 294 mainwindowui.h \
295 lfrspectrogram.h \
286 296 lfrxmlparser.h
287 297 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o main.o main.cpp
288 298
@@ -290,10 +300,12 mainwindow.o: mainwindow.cpp mainwindow.
290 300 lfrxmlhandler.h \
291 301 lfrxmlwriter.h \
292 302 mainwindowui.h \
303 lfrspectrogram.h \
293 304 lfrxmlparser.h
294 305 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o mainwindow.o mainwindow.cpp
295 306
296 mainwindowui.o: mainwindowui.cpp mainwindowui.h
307 mainwindowui.o: mainwindowui.cpp mainwindowui.h \
308 lfrspectrogram.h
297 309 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o mainwindowui.o mainwindowui.cpp
298 310
299 311 qipdialogbox.o: ../common_PLE/qipdialogbox.cpp ../common_PLE/qipdialogbox.h
@@ -320,6 +332,9 hkdisplay.o: ../common_PLE/hkdisplay.cpp
320 332 lfrxmlparser.o: lfrxmlparser.cpp lfrxmlparser.h
321 333 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o lfrxmlparser.o lfrxmlparser.cpp
322 334
335 lfrspectrogram.o: lfrspectrogram.cpp lfrspectrogram.h
336 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o lfrspectrogram.o lfrspectrogram.cpp
337
323 338 moc_mainwindow.o: moc_mainwindow.cpp
324 339 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o moc_mainwindow.o moc_mainwindow.cpp
325 340
@@ -350,6 +365,9 moc_hkdisplay.o: moc_hkdisplay.cpp
350 365 moc_lfrxmlparser.o: moc_lfrxmlparser.cpp
351 366 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o moc_lfrxmlparser.o moc_lfrxmlparser.cpp
352 367
368 moc_lfrspectrogram.o: moc_lfrspectrogram.cpp
369 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o moc_lfrspectrogram.o moc_lfrspectrogram.cpp
370
353 371 ####### Install
354 372
355 373 install: FORCE
Show file before | Show file after | Hide comments
1 NO CONTENT: modified file, binary diff hidden
Show file before | Show file after | Hide comments
@@ -19,7 +19,7 INCLUDEPATH += \
19 19 $$[QT_INSTALL_HEADERS]/lppmon/common \
20 20 $$[QT_INSTALL_HEADERS]/lppmon/wfdisplay
21 21
22 LIBS += -llppmoncommon -lwfdisplay
22 LIBS += -llppmoncommon -lwfdisplay -lqwt5-qt4
23 23
24 24 SOURCES += main.cpp\
25 25 mainwindow.cpp \
@@ -31,7 +31,8 SOURCES += main.cpp\
31 31 ../rmapplugin/tmpackettoread.cpp \
32 32 ../rmapplugin/wfpacket.cpp \
33 33 ../common_PLE/hkdisplay.cpp \
34 lfrxmlparser.cpp
34 lfrxmlparser.cpp \
35 lfrspectrogram.cpp
35 36
36 37 HEADERS += mainwindow.h \
37 38 mainwindowui.h \
@@ -44,7 +45,8 HEADERS += mainwindow.h \
44 45 ../common_PLE/hkdisplay.h \
45 46 ../rmapplugin/params.h \
46 47 ../../DEV_PLE/header/ccsds_types.h \
47 lfrxmlparser.h
48 lfrxmlparser.h \
49 lfrspectrogram.h
48 50
49 51
50 52
Show file before | Show file after | Hide comments
@@ -1,6 +1,6
1 1 <?xml version="1.0" encoding="UTF-8"?>
2 2 <!DOCTYPE QtCreatorProject>
3 <!-- Written by Qt Creator 2.4.1, 2013-06-17T15:56:30. -->
3 <!-- Written by Qt Creator 2.4.1, 2013-06-18T10:58:40. -->
4 4 <qtcreator>
5 5 <data>
6 6 <variable>ProjectExplorer.Project.ActiveTarget</variable>
Show file before | Show file after | Hide comments
@@ -5,6 +5,7
5 5 #include <QTcpServer>
6 6 #include <QTcpSocket>
7 7 #include <QXmlSimpleReader>
8
8 9 #include <lfrxmlhandler.h>
9 10 #include <lfrxmlwriter.h>
10 11 #include <mainwindowui.h>
Show file before | Show file after | Hide comments
@@ -26,6 +26,7 MainWindowUI::MainWindowUI(QWidget *pare
26 26
27 27 wfDisplay = new WFDisplay;
28 28 hkDisplay = new HKDisplay;
29 lfrSpectrogam = new LFRSpectrogram();
29 30
30 31 spinbox_TMServerPort = new QSpinBox();
31 32 spinbox_TCServerPort = new QSpinBox();
@@ -89,11 +90,13 MainWindowUI::MainWindowUI(QWidget *pare
89 90 spwTabWidget->addTab(spwTabWidgetPage1, tr("TM Statistics"));
90 91 spwTabWidget->addTab(spwTabWidgetPage3, tr("HK"));
91 92 spwTabWidget->addTab(spwTabWidgetPage2, tr("Waveforms"));
93 spwTabWidget->addTab(spwTabWidgetPage4, tr("Spectrograms"));
92 94
93 95 spwTabWidgetPage0->setLayout(mainLayout);
94 96 spwTabWidgetPage1->setLayout(tmStatistics->layout());
95 97 spwTabWidgetPage2->setLayout(wfDisplay->layout());
96 98 spwTabWidgetPage3->setLayout(hkDisplay->layout());
99 spwTabWidgetPage4->setLayout(lfrSpectrogam->layout());
97 100
98 101 layout_overallLayout->addWidget(spwTabWidget);
99 102
Show file before | Show file after | Hide comments
@@ -11,9 +11,11
11 11 #include <QSpinBox>
12 12 #include <QTextEdit>
13 13 #include <QTabWidget>
14
14 15 #include "tmstatistics.h"
15 16 #include "wfdisplay.h"
16 17 #include "hkdisplay.h"
18 #include "lfrspectrogram.h"
17 19
18 20 class MainWindowUI : public QWidget
19 21 {
@@ -39,6 +41,9 public:
39 41
40 42 WFDisplay* wfDisplay;
41 43 HKDisplay* hkDisplay;
44 LFRSpectrogram* lfrSpectrogam;
45
46 QWidget* widget_spectrogram;
42 47
43 48 QPushButton *button_openServerTCTM;
44 49 QPushButton *button_testServerTCTM;
Show file before | Show file after | Hide comments
@@ -288,7 +288,7 void rmapplugin::preProcessPacket(TMPack
288 288
289 289 //****************************************
290 290 // if the packet is a waveform, display it
291 if ( (typ == 21) & (sub == 3) )
291 /*if ( (typ == 21) & (sub == 3) )
292 292 {
293 293 sid = packet->Value[20]; // SID
294 294 switch (sid){
@@ -305,7 +305,7 void rmapplugin::preProcessPacket(TMPack
305 305 buildWFAndDisplay(packet, &wfPacketNormal[3], 3);
306 306 break;
307 307 }
308 }
308 }*/
309 309 }
310 310
311 311 void rmapplugin::nbPacketHasChanged(int nb)
Show file before | Show file after | Hide comments
@@ -147,7 +147,7 rmapPluginUI::rmapPluginUI(QWidget *pare
147 147 spwTabWidget->addTab(spwTabWidgetPage2, tr("status"));
148 148 spwTabWidget->addTab(spwTabWidgetPage3, tr("console"));
149 149 spwTabWidget->addTab(spwTabWidgetPage4, tr("TM statistics"));
150 spwTabWidget->addTab(spwTabWidgetPage5, tr("waveforms"));
150 //spwTabWidget->addTab(spwTabWidgetPage5, tr("waveforms"));
151 151 spwTabWidget->addTab(spwTabWidgetPage6, tr("TM Echo Bridge"));
152 152
153 153 spwTabWidgetPage0->setLayout(selectionLayout);
General Comments 0
You need to be logged in to leave comments. Login now