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

spacecraft potential storage added to lfrsgse...
leroy -
r76:c2ac69e28c43 default
parent child
Show More
Show file before | Show file after | Hide comments
@@ -0,0 +1,92
1 #include "storehk.h"
2
3 StoreHK::StoreHK(QObject *parent) :
4 QObject(parent)
5 {
6 logFile = new QFile();
7 }
8
9 void StoreHK::buildDataAsQByteArray( short param1, short param2, short param3, unsigned int coarseTime, unsigned int fineTime )
10 {
11 double sampleTime;
12 QByteArray sampleTimeQByteArray;
13
14 initDataBuffer();
15 sampleTime = 0;
16
17 if (storageEnabled == true)
18 {
19 sampleTime = (double) (coarseTime)
20 + ((double) (fineTime)) * 1. / 65536.;
21 sampleTimeQByteArray.setNum( sampleTime, 'f', 10 );
22
23 dataBuffer.append( sampleTimeQByteArray + ' '
24 + QByteArray::number(param1) + ' '
25 + QByteArray::number(param2) + ' '
26 + QByteArray::number(param3) );
27 storeDataBuffer();
28 }
29 }
30
31 void StoreHK::buildFileName()
32 {
33 QTime time;
34 QDate date;
35 QString dateTime;
36 QString prefix;
37
38 date = QDate::currentDate();
39 time = QTime::currentTime();
40
41 dateTime = QString::number( date.year() ) + "_"
42 + QString::number( date.month() ) + "_"
43 + QString::number( date.day() ) + "-"
44 + QString::number( time.hour() ) + "_"
45 + QString::number( time.minute() ) + "_"
46 + QString::number( time.second() );
47
48 prefix = defaultStorageDirectory + "/" + dateTime + "_" + hkName ;
49
50 if(this->logFile->isOpen()) this->logFile->close();
51 this->logFile->setFileName( prefix + ".data");
52 if(this->logFile->open(QIODevice::WriteOnly)) this->logFileStrm = new QTextStream(this->logFile);
53
54 *(this->logFileStrm) << "time value1 value2 value3" << endl;
55
56 storageEnabled = true;
57 }
58
59 void StoreHK::storeDataBuffer()
60 {
61 *(this->logFileStrm) << dataBuffer << endl;
62 if (storageEnabled == false){
63 this->logFileStrm->flush();
64 this->logFile->waitForBytesWritten(3000);
65 this->logFile->close();
66 }
67 }
68
69 void StoreHK::storeData()
70 {
71 if (logFileEn == false)
72 {
73 buildFileName();
74 logFileEn = true;
75 }
76 else
77 {
78 // disable storage
79 storageEnabled = false;
80 logFileEn = false;
81 }
82 }
83
84 void StoreHK::initDataBuffer()
85 {
86 dataBuffer.clear();
87 }
88
89 void StoreHK::setDefaultStorageDirectory(QString nameOfTheDirectory)
90 {
91 defaultStorageDirectory = nameOfTheDirectory;
92 }
Show file before | Show file after | Hide comments
@@ -0,0 +1,43
1 #ifndef STOREHK_H
2 #define STOREHK_H
3
4 #include <QObject>
5 #include <QFile>
6 #include <QTextStream>
7 #include <QDate>
8 #include <QTime>
9
10 class StoreHK : public QObject
11 {
12 Q_OBJECT
13 public:
14 explicit StoreHK(QObject *parent = 0);
15
16 void buildDataAsQByteArray(short param1, short param2, short param3, unsigned int coarseTime, unsigned int fineTime );
17 void buildFileName();
18 void storeDataBuffer();
19 void initDataBuffer();
20
21 QString defaultStorageDirectory;
22
23 QFile *logFile;
24
25 QString hkName;
26
27 QTextStream *logFileStrm;
28
29 bool logFileEn;
30 bool storageEnabled;
31
32 unsigned int localBufferSize;
33 QByteArray dataBuffer;
34
35 signals:
36
37 public slots:
38 void storeData();
39 void setDefaultStorageDirectory(QString nameOfTheDirectory);
40
41 };
42
43 #endif // StoreHK_H
Show file before | Show file after | Hide comments
@@ -18,11 +18,11 class HKDisplay : public QWidget
18 18 public:
19 19 explicit HKDisplay(QWidget *parent = 0);
20 20 void displayPacket(TMPacketToRead *tmPacketToRead);
21 // void displayPacketLESIA(TMPacketToRead *tmPacketToRead);
22 21
23 22 void setupLFRStatusWord();
24 23 void setupLFRSWVersion();
25 24 void setupLFR_FPGA_Version();
25 void setupVE1E2();
26 26 void setupTCStatistics();
27 27 void setupAnomalyStatistics();
28 28 void setupSpaceWireIFStatistics();
@@ -31,6 +31,7 public:
31 31 void update_lfr_status_word(Packet_TM_LFR_HK_t *housekeepingPacket);
32 32 void updateSWVersion(Packet_TM_LFR_HK_t *housekeepingPacket);
33 33 void update_FPGA_version(Packet_TM_LFR_HK_t *housekeepingPacket);
34 void update_v_e1_e2(Packet_TM_LFR_HK_t *housekeepingPacket);
34 35 void updateTCStatistics(Packet_TM_LFR_HK_t *housekeepingPacket);
35 36 void updateAnomalyStatistics(Packet_TM_LFR_HK_t *housekeepingPacket);
36 37 void updateSpaceWireIFStatistics(Packet_TM_LFR_HK_t *housekeepingPacket);
@@ -47,6 +48,7 private:
47 48 QGroupBox *groupbox_lfr_FPGA_Version;
48 49 QGroupBox *groupbox_tcStatistics;
49 50 QGroupBox *groupbox_anomalyStatistics;
51 QGroupBox *groupbox_v_e1_e2;
50 52 //***********************************
51 53 //***********************************
52 54 QGroupBox *groupbox_vhdlBlockStatus;
@@ -60,6 +62,7 private:
60 62 QVBoxLayout *box_lfrStatusWord;
61 63 QVBoxLayout *box_lfrSWVersion;
62 64 QVBoxLayout *box_lfr_FPGA_Version;
65 QVBoxLayout *box_v_e1_e2;
63 66 QVBoxLayout *box_tcStatistics;
64 67 QVBoxLayout *box_anomalyStatistics;
65 68 //***********************************
@@ -87,6 +90,10 private:
87 90 QLabel *sy_lfr_fpga_version_n1;
88 91 QLabel *sy_lfr_fpga_version_n2;
89 92 QLabel *sy_lfr_fpga_version_n3;
93 // hk_lfr_sc_
94 QLabel *hk_lfr_sc_v_f3;
95 QLabel *hk_lfr_sc_e1_f3;
96 QLabel *hk_lfr_sc_e2_f3;
90 97 //
91 98 QLabel *hk_lfr_update_info_tc_cnt;
92 99 QLabel *hk_lfr_update_time_tc_cnt;
Show file before | Show file after | Hide comments
@@ -11,6 +11,7 HKDisplay::HKDisplay(QWidget *parent) :
11 11 setupLFRStatusWord();
12 12 setupLFRSWVersion();
13 13 setupLFR_FPGA_Version();
14 setupVE1E2();
14 15 setupTCStatistics();
15 16 setupAnomalyStatistics();
16 17 setupSpaceWireIFStatistics();
@@ -19,6 +20,7 HKDisplay::HKDisplay(QWidget *parent) :
19 20 groupbox_lfrStatusWord->setFont(font);
20 21 groupbox_lfrSWVersion->setFont(font);
21 22 groupbox_lfr_FPGA_Version->setFont(font);
23 groupbox_v_e1_e2->setFont(font);
22 24 groupbox_tcStatistics->setFont(font);
23 25 groupbox_anomalyStatistics->setFont(font);
24 26 groupbox_spacewireIFStatisctics->setFont(font);
@@ -27,10 +29,11 HKDisplay::HKDisplay(QWidget *parent) :
27 29 mainLayout->addWidget(groupbox_lfrStatusWord, 0,0,1,1);
28 30 mainLayout->addWidget(groupbox_lfrSWVersion, 0,1,1,1);
29 31 mainLayout->addWidget(groupbox_lfr_FPGA_Version, 0,2,1,1);
30 mainLayout->addWidget(groupbox_anomalyStatistics, 0,3,1,1);
32 mainLayout->addWidget(groupbox_v_e1_e2, 0,3,1,1);
31 33 mainLayout->addWidget(groupbox_tcStatistics, 1,0,1,1);
32 34 mainLayout->addWidget(groupbox_spacewireIFStatisctics, 1, 1, 1, 1);
33 35 mainLayout->addWidget(groupbox_errorCountersSpaceWire, 1, 2, 1, 1);
36 mainLayout->addWidget(groupbox_anomalyStatistics, 1,3,1,1);
34 37 mainLayout->setColumnStretch(4, 1);
35 38 mainLayout->setRowStretch(2, 1);
36 39
@@ -89,6 +92,20 void HKDisplay::setupLFR_FPGA_Version()
89 92 groupbox_lfr_FPGA_Version->setLayout(box_lfr_FPGA_Version);
90 93 }
91 94
95 void HKDisplay::setupVE1E2()
96 {
97 groupbox_v_e1_e2 = new QGroupBox("V E1 E2 @ 16 Hz");
98 box_v_e1_e2 = new QVBoxLayout();
99 hk_lfr_sc_v_f3 = new QLabel("v_f3: -");
100 hk_lfr_sc_e1_f3 = new QLabel("e1_f3: -");
101 hk_lfr_sc_e2_f3 = new QLabel("e2_f3: -");
102 box_v_e1_e2->addWidget(hk_lfr_sc_v_f3);
103 box_v_e1_e2->addWidget(hk_lfr_sc_e1_f3);
104 box_v_e1_e2->addWidget(hk_lfr_sc_e2_f3);
105 box_v_e1_e2->insertStretch(3);
106 groupbox_v_e1_e2->setLayout(box_v_e1_e2);
107 }
108
92 109 void HKDisplay::setupTCStatistics()
93 110 {
94 111 groupbox_tcStatistics = new QGroupBox("TC Statistics");
@@ -207,6 +224,7 void HKDisplay::displayPacket(TMPacketTo
207 224 update_lfr_status_word( housekeepingPacket );
208 225 updateSWVersion( housekeepingPacket );
209 226 update_FPGA_version( housekeepingPacket );
227 update_v_e1_e2( housekeepingPacket );
210 228 updateTCStatistics( housekeepingPacket );
211 229 updateAnomalyStatistics( housekeepingPacket );
212 230 updateSpaceWireIFStatistics( housekeepingPacket );
@@ -214,27 +232,6 void HKDisplay::displayPacket(TMPacketTo
214 232 }
215 233 }
216 234
217 //void HKDisplay::displayPacketLESIA(TMPacketToRead *tmPacketToRead)
218 //{
219 // Packet_TM_LFR_HK_t *housekeepingPacket;
220 // if (tmPacketToRead->size != (HK_PACKET_SIZE - 4)) {
221 // emit displayMessage("in displayPacket *** HK packet size is "
222 // + QString::number(tmPacketToRead->size)
223 // + " instead of "
224 // + QString::number(HK_PACKET_SIZE-4));
225 // }
226 // else {
227 // housekeepingPacket = (Packet_TM_LFR_HK_t *) (tmPacketToRead->Value-4);
228
229 // update_lfr_status_word( housekeepingPacket );
230 // updateSWVersion( housekeepingPacket );
231 // updateTCStatistics( housekeepingPacket );
232 // updateAnomalyStatistics( housekeepingPacket );
233 // updateSpaceWireIFStatistics( housekeepingPacket );
234 // updateErrorCountersSpaceWire( housekeepingPacket );
235 // }
236 //}
237
238 235 void HKDisplay::update_lfr_status_word(Packet_TM_LFR_HK_t *housekeepingPacket)
239 236 {
240 237 hk_lfr_mode->setText("hk_lfr_mode: "
@@ -296,13 +293,32 void HKDisplay::update_FPGA_version(Pack
296 293 );
297 294 }
298 295
296 void HKDisplay::update_v_e1_e2(Packet_TM_LFR_HK_t *housekeepingPacket)
297 {
298 hk_lfr_sc_v_f3->setText("v_f3: "
299 + QString::number(
300 housekeepingPacket->hk_lfr_sc_v_f3[0] * 256
301 + housekeepingPacket->hk_lfr_sc_v_f3[1] )
302 );
303 hk_lfr_sc_e1_f3->setText("e1_f3: "
304 + QString::number(
305 housekeepingPacket->hk_lfr_sc_e1_f3[0] * 256
306 + housekeepingPacket->hk_lfr_sc_e1_f3[1] )
307 );
308 hk_lfr_sc_e2_f3->setText("e2_f3: "
309 + QString::number(
310 housekeepingPacket->hk_lfr_sc_e2_f3[0] * 256
311 + housekeepingPacket->hk_lfr_sc_e2_f3[1] )
312 );
313 }
314
299 315 void HKDisplay::updateTCStatistics(Packet_TM_LFR_HK_t *housekeepingPacket)
300 316 {
301 317 // TC Statistics
302 318 hk_lfr_update_info_tc_cnt->setText("hk_lfr_update_info_tc_cnt: "
303 319 + QString::number(
304 320 housekeepingPacket->hk_lfr_update_info_tc_cnt[0] * 256
305 + housekeepingPacket->hk_lfr_update_info_tc_cnt[1])
321 + housekeepingPacket->hk_lfr_update_info_tc_cnt[1])
306 322 );
307 323 hk_lfr_update_time_tc_cnt->setText("hk_lfr_update_time_tc_cnt: "
308 324 + QString::number(
Show file before | Show file after | Hide comments
@@ -3,7 +3,7
3 3 # Generated by qmake (3.0) (Qt 5.2.1)
4 4 # Project: gse_lesia/gselesia.pro
5 5 # Template: app
6 # Command: /bin/qmake-qt5 -spec linux-g++-64 CONFIG+=debug CONFIG+=declarative_debug CONFIG+=qml_debug -o Makefile gse_lesia/gselesia.pro
6 # Command: /bin/qmake-qt5 -spec linux-g++-64 -o Makefile gse_lesia/gselesia.pro
7 7 #############################################################################
8 8
9 9 MAKEFILE = Makefile
@@ -12,12 +12,12 MAKEFILE = Makefile
12 12
13 13 CC = gcc
14 14 CXX = g++
15 DEFINES = -DQT_QML_DEBUG -DQT_DECLARATIVE_DEBUG -DQT_PRINTSUPPORT_LIB -DQT_WIDGETS_LIB -DQT_XML_LIB -DQT_NETWORK_LIB -DQT_GUI_LIB -DQT_CORE_LIB
16 CFLAGS = -m64 -pipe -g -Wall -W -D_REENTRANT -fPIE $(DEFINES)
17 CXXFLAGS = -m64 -pipe -g -Wall -W -D_REENTRANT -fPIE $(DEFINES)
15 DEFINES = -DQT_NO_DEBUG -DQT_PRINTSUPPORT_LIB -DQT_WIDGETS_LIB -DQT_XML_LIB -DQT_NETWORK_LIB -DQT_GUI_LIB -DQT_CORE_LIB
16 CFLAGS = -m64 -pipe -O2 -g -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 -fstack-protector-strong --param=ssp-buffer-size=4 -grecord-gcc-switches -m64 -mtune=generic -O2 -Wall -W -D_REENTRANT -fPIE $(DEFINES)
17 CXXFLAGS = -m64 -pipe -O2 -g -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 -fstack-protector-strong --param=ssp-buffer-size=4 -grecord-gcc-switches -m64 -mtune=generic -O2 -Wall -W -D_REENTRANT -fPIE $(DEFINES)
18 18 INCPATH = -I/usr/lib64/qt5/mkspecs/linux-g++-64 -Igse_lesia -Igse_lesia -I../../DEV_PLE/header -I/usr/include/qt5/lppmon/common -I/usr/include/qt5/lppmon/wfdisplay -I/usr/include/qt5/lppmon/paulcommon -I/usr/include/qt5 -I/usr/include/qt5/QtPrintSupport -I/usr/include/qt5/QtWidgets -I/usr/include/qt5/QtXml -I/usr/include/qt5/QtNetwork -I/usr/include/qt5/QtGui -I/usr/include/qt5/QtCore -I. -I.
19 19 LINK = g++
20 LFLAGS = -m64
20 LFLAGS = -m64 -Wl,-O1 -Wl,-z,relro
21 21 LIBS = $(SUBLIBS) -L/usr/X11R6/lib64 -llppmoncommon -lwfdisplay -lpaulcommon -lQt5PrintSupport -lQt5Widgets -lQt5Xml -lQt5Network -lQt5Gui -lQt5Core -lGL -lpthread
22 22 AR = ar cqs
23 23 RANLIB =
@@ -53,14 +53,16 SOURCES = gse_lesia/main.cpp \
53 53 gse_lesia/spectrapacket.cpp \
54 54 gse_lesia/lfrxmlparser.cpp \
55 55 gse_lesia/recordpage.cpp \
56 gse_lesia/wfpacket.cpp moc_mainwindow.cpp \
56 gse_lesia/wfpacket.cpp \
57 gse_lesia/storehk.cpp moc_mainwindow.cpp \
57 58 moc_mainwindowui.cpp \
58 59 moc_lfrxmlhandler.cpp \
59 60 moc_lfrxmlwriter.cpp \
60 61 moc_spectrapacket.cpp \
61 62 moc_lfrxmlparser.cpp \
62 63 moc_recordpage.cpp \
63 moc_wfpacket.cpp
64 moc_wfpacket.cpp \
65 moc_storehk.cpp
64 66 OBJECTS = main.o \
65 67 mainwindow.o \
66 68 mainwindowui.o \
@@ -70,6 +72,7 OBJECTS = main.o \
70 72 lfrxmlparser.o \
71 73 recordpage.o \
72 74 wfpacket.o \
75 storehk.o \
73 76 moc_mainwindow.o \
74 77 moc_mainwindowui.o \
75 78 moc_lfrxmlhandler.o \
@@ -77,7 +80,8 OBJECTS = main.o \
77 80 moc_spectrapacket.o \
78 81 moc_lfrxmlparser.o \
79 82 moc_recordpage.o \
80 moc_wfpacket.o
83 moc_wfpacket.o \
84 moc_storehk.o
81 85 DIST = /usr/lib64/qt5/mkspecs/features/spec_pre.prf \
82 86 /usr/lib64/qt5/mkspecs/common/shell-unix.conf \
83 87 /usr/lib64/qt5/mkspecs/common/unix.conf \
@@ -160,8 +164,6 DIST = /usr/lib64/qt5/mkspecs/f
160 164 /usr/lib64/qt5/mkspecs/features/default_pre.prf \
161 165 /usr/lib64/qt5/mkspecs/features/resolve_config.prf \
162 166 /usr/lib64/qt5/mkspecs/features/default_post.prf \
163 /usr/lib64/qt5/mkspecs/features/qml_debug.prf \
164 /usr/lib64/qt5/mkspecs/features/declarative_debug.prf \
165 167 /usr/lib64/qt5/mkspecs/features/unix/gdb_dwarf_index.prf \
166 168 /usr/lib64/qt5/mkspecs/features/warn_on.prf \
167 169 /usr/lib64/qt5/mkspecs/features/qt.prf \
@@ -207,7 +209,6 all: Makefile $(TARGET)
207 209
208 210 $(TARGET): $(OBJECTS)
209 211 $(LINK) $(LFLAGS) -o $(TARGET) $(OBJECTS) $(OBJCOMP) $(LIBS)
210 { test -n "$(DESTDIR)" && DESTDIR="$(DESTDIR)" || DESTDIR=.; } && test $$(gdb --version | sed -e 's,[^0-9][^0-9]*\([0-9]\)\.\([0-9]\).*,\1\2,;q') -gt 72 && gdb --nx --batch --quiet -ex 'set confirm off' -ex "save gdb-index $$DESTDIR" -ex quit '$(TARGET)' && test -f $(TARGET).gdb-index && objcopy --add-section '.gdb_index=$(TARGET).gdb-index' --set-section-flags '.gdb_index=readonly' '$(TARGET)' '$(TARGET)' && rm -f $(TARGET).gdb-index || true
211 212
212 213 Makefile: gse_lesia/gselesia.pro /usr/lib64/qt5/mkspecs/linux-g++-64/qmake.conf /usr/lib64/qt5/mkspecs/features/spec_pre.prf \
213 214 /usr/lib64/qt5/mkspecs/common/shell-unix.conf \
@@ -291,8 +292,6 Makefile: gse_lesia/gselesia.pro /usr/li
291 292 /usr/lib64/qt5/mkspecs/features/default_pre.prf \
292 293 /usr/lib64/qt5/mkspecs/features/resolve_config.prf \
293 294 /usr/lib64/qt5/mkspecs/features/default_post.prf \
294 /usr/lib64/qt5/mkspecs/features/qml_debug.prf \
295 /usr/lib64/qt5/mkspecs/features/declarative_debug.prf \
296 295 /usr/lib64/qt5/mkspecs/features/unix/gdb_dwarf_index.prf \
297 296 /usr/lib64/qt5/mkspecs/features/warn_on.prf \
298 297 /usr/lib64/qt5/mkspecs/features/qt.prf \
@@ -312,7 +311,7 Makefile: gse_lesia/gselesia.pro /usr/li
312 311 /lib64/libQt5Network.prl \
313 312 /lib64/libQt5Gui.prl \
314 313 /lib64/libQt5Core.prl
315 $(QMAKE) -spec linux-g++-64 CONFIG+=debug CONFIG+=declarative_debug CONFIG+=qml_debug -o Makefile gse_lesia/gselesia.pro
314 $(QMAKE) -spec linux-g++-64 -o Makefile gse_lesia/gselesia.pro
316 315 /usr/lib64/qt5/mkspecs/features/spec_pre.prf:
317 316 /usr/lib64/qt5/mkspecs/common/shell-unix.conf:
318 317 /usr/lib64/qt5/mkspecs/common/unix.conf:
@@ -395,8 +394,6 Makefile: gse_lesia/gselesia.pro /usr/li
395 394 /usr/lib64/qt5/mkspecs/features/default_pre.prf:
396 395 /usr/lib64/qt5/mkspecs/features/resolve_config.prf:
397 396 /usr/lib64/qt5/mkspecs/features/default_post.prf:
398 /usr/lib64/qt5/mkspecs/features/qml_debug.prf:
399 /usr/lib64/qt5/mkspecs/features/declarative_debug.prf:
400 397 /usr/lib64/qt5/mkspecs/features/unix/gdb_dwarf_index.prf:
401 398 /usr/lib64/qt5/mkspecs/features/warn_on.prf:
402 399 /usr/lib64/qt5/mkspecs/features/qt.prf:
@@ -417,13 +414,13 gse_lesia/gselesia.pro:
417 414 /lib64/libQt5Gui.prl:
418 415 /lib64/libQt5Core.prl:
419 416 qmake: FORCE
420 @$(QMAKE) -spec linux-g++-64 CONFIG+=debug CONFIG+=declarative_debug CONFIG+=qml_debug -o Makefile gse_lesia/gselesia.pro
417 @$(QMAKE) -spec linux-g++-64 -o Makefile gse_lesia/gselesia.pro
421 418
422 419 qmake_all: FORCE
423 420
424 421 dist:
425 422 @test -d .tmp/lfrsgse1.0.0 || mkdir -p .tmp/lfrsgse1.0.0
426 $(COPY_FILE) --parents $(SOURCES) $(DIST) .tmp/lfrsgse1.0.0/ && $(COPY_FILE) --parents gse_lesia/mainwindow.h gse_lesia/mainwindowui.h gse_lesia/lfrxmlhandler.h gse_lesia/lfrxmlwriter.h gse_lesia/spectrapacket.h gse_lesia/lfrxmlparser.h gse_lesia/recordpage.h gse_lesia/wfpacket.h .tmp/lfrsgse1.0.0/ && $(COPY_FILE) --parents gse_lesia/main.cpp gse_lesia/mainwindow.cpp gse_lesia/mainwindowui.cpp gse_lesia/lfrxmlhandler.cpp gse_lesia/lfrxmlwriter.cpp gse_lesia/spectrapacket.cpp gse_lesia/lfrxmlparser.cpp gse_lesia/recordpage.cpp gse_lesia/wfpacket.cpp .tmp/lfrsgse1.0.0/ && (cd `dirname .tmp/lfrsgse1.0.0` && $(TAR) lfrsgse1.0.0.tar lfrsgse1.0.0 && $(COMPRESS) lfrsgse1.0.0.tar) && $(MOVE) `dirname .tmp/lfrsgse1.0.0`/lfrsgse1.0.0.tar.gz . && $(DEL_FILE) -r .tmp/lfrsgse1.0.0
423 $(COPY_FILE) --parents $(SOURCES) $(DIST) .tmp/lfrsgse1.0.0/ && $(COPY_FILE) --parents gse_lesia/mainwindow.h gse_lesia/mainwindowui.h gse_lesia/lfrxmlhandler.h gse_lesia/lfrxmlwriter.h gse_lesia/spectrapacket.h gse_lesia/lfrxmlparser.h gse_lesia/recordpage.h gse_lesia/wfpacket.h gse_lesia/storehk.h .tmp/lfrsgse1.0.0/ && $(COPY_FILE) --parents gse_lesia/main.cpp gse_lesia/mainwindow.cpp gse_lesia/mainwindowui.cpp gse_lesia/lfrxmlhandler.cpp gse_lesia/lfrxmlwriter.cpp gse_lesia/spectrapacket.cpp gse_lesia/lfrxmlparser.cpp gse_lesia/recordpage.cpp gse_lesia/wfpacket.cpp gse_lesia/storehk.cpp .tmp/lfrsgse1.0.0/ && (cd `dirname .tmp/lfrsgse1.0.0` && $(TAR) lfrsgse1.0.0.tar lfrsgse1.0.0 && $(COMPRESS) lfrsgse1.0.0.tar) && $(MOVE) `dirname .tmp/lfrsgse1.0.0`/lfrsgse1.0.0.tar.gz . && $(DEL_FILE) -r .tmp/lfrsgse1.0.0
427 424
428 425
429 426 clean:compiler_clean
@@ -446,9 +443,9 check: first
446 443
447 444 compiler_rcc_make_all:
448 445 compiler_rcc_clean:
449 compiler_moc_header_make_all: moc_mainwindow.cpp moc_mainwindowui.cpp moc_lfrxmlhandler.cpp moc_lfrxmlwriter.cpp moc_spectrapacket.cpp moc_lfrxmlparser.cpp moc_recordpage.cpp moc_wfpacket.cpp
446 compiler_moc_header_make_all: moc_mainwindow.cpp moc_mainwindowui.cpp moc_lfrxmlhandler.cpp moc_lfrxmlwriter.cpp moc_spectrapacket.cpp moc_lfrxmlparser.cpp moc_recordpage.cpp moc_wfpacket.cpp moc_storehk.cpp
450 447 compiler_moc_header_clean:
451 -$(DEL_FILE) moc_mainwindow.cpp moc_mainwindowui.cpp moc_lfrxmlhandler.cpp moc_lfrxmlwriter.cpp moc_spectrapacket.cpp moc_lfrxmlparser.cpp moc_recordpage.cpp moc_wfpacket.cpp
448 -$(DEL_FILE) moc_mainwindow.cpp moc_mainwindowui.cpp moc_lfrxmlhandler.cpp moc_lfrxmlwriter.cpp moc_spectrapacket.cpp moc_lfrxmlparser.cpp moc_recordpage.cpp moc_wfpacket.cpp moc_storehk.cpp
452 449 moc_mainwindow.cpp: /usr/include/qt5/QtNetwork/QTcpServer \
453 450 /usr/include/qt5/QtNetwork/qtcpserver.h \
454 451 /usr/include/qt5/QtCore/qobject.h \
@@ -969,6 +966,9 moc_mainwindow.cpp: /usr/include/qt5/QtN
969 966 /usr/include/qt5/lppmon/paulcommon/hkdisplay.h \
970 967 gse_lesia/recordpage.h \
971 968 /usr/include/qt5/QtGui/QCloseEvent \
969 gse_lesia/storehk.h \
970 /usr/include/qt5/QtCore/QDate \
971 /usr/include/qt5/QtCore/QTime \
972 972 gse_lesia/spectrapacket.h \
973 973 /usr/include/qt5/lppmon/paulcommon/paulcommonparams.h \
974 974 gse_lesia/wfpacket.h \
@@ -1486,6 +1486,9 moc_mainwindowui.cpp: /usr/include/qt5/Q
1486 1486 /usr/include/qt5/lppmon/paulcommon/hkdisplay.h \
1487 1487 gse_lesia/recordpage.h \
1488 1488 /usr/include/qt5/QtGui/QCloseEvent \
1489 gse_lesia/storehk.h \
1490 /usr/include/qt5/QtCore/QDate \
1491 /usr/include/qt5/QtCore/QTime \
1489 1492 gse_lesia/mainwindowui.h
1490 1493 /usr/lib64/qt5/bin/moc $(DEFINES) $(INCPATH) -I/usr/lib/gcc/include/c++/4.8.2 -I/usr/lib/gcc/include/c++/4.8.2/x86_64-redhat-linux -I/usr/lib/gcc/include/c++/4.8.2/backward -I/usr/lib/gcc/x86_64-redhat-linux/4.8.2/include -I/usr/local/include -I/usr/include gse_lesia/mainwindowui.h -o moc_mainwindowui.cpp
1491 1494
@@ -1985,6 +1988,93 moc_wfpacket.cpp: /usr/include/qt5/QtCor
1985 1988 gse_lesia/wfpacket.h
1986 1989 /usr/lib64/qt5/bin/moc $(DEFINES) $(INCPATH) -I/usr/lib/gcc/include/c++/4.8.2 -I/usr/lib/gcc/include/c++/4.8.2/x86_64-redhat-linux -I/usr/lib/gcc/include/c++/4.8.2/backward -I/usr/lib/gcc/x86_64-redhat-linux/4.8.2/include -I/usr/local/include -I/usr/include gse_lesia/wfpacket.h -o moc_wfpacket.cpp
1987 1990
1991 moc_storehk.cpp: /usr/include/qt5/QtCore/QObject \
1992 /usr/include/qt5/QtCore/qobject.h \
1993 /usr/include/qt5/QtCore/qobjectdefs.h \
1994 /usr/include/qt5/QtCore/qnamespace.h \
1995 /usr/include/qt5/QtCore/qglobal.h \
1996 /usr/include/qt5/QtCore/qconfig.h \
1997 /usr/include/qt5/QtCore/qconfig-64.h \
1998 /usr/include/qt5/QtCore/qfeatures.h \
1999 /usr/include/qt5/QtCore/qsystemdetection.h \
2000 /usr/include/qt5/QtCore/qprocessordetection.h \
2001 /usr/include/qt5/QtCore/qcompilerdetection.h \
2002 /usr/include/qt5/QtCore/qglobalstatic.h \
2003 /usr/include/qt5/QtCore/qatomic.h \
2004 /usr/include/qt5/QtCore/qbasicatomic.h \
2005 /usr/include/qt5/QtCore/qatomic_bootstrap.h \
2006 /usr/include/qt5/QtCore/qgenericatomic.h \
2007 /usr/include/qt5/QtCore/qatomic_msvc.h \
2008 /usr/include/qt5/QtCore/qatomic_integrity.h \
2009 /usr/include/qt5/QtCore/qoldbasicatomic.h \
2010 /usr/include/qt5/QtCore/qatomic_vxworks.h \
2011 /usr/include/qt5/QtCore/qatomic_power.h \
2012 /usr/include/qt5/QtCore/qatomic_alpha.h \
2013 /usr/include/qt5/QtCore/qatomic_armv7.h \
2014 /usr/include/qt5/QtCore/qatomic_armv6.h \
2015 /usr/include/qt5/QtCore/qatomic_armv5.h \
2016 /usr/include/qt5/QtCore/qatomic_bfin.h \
2017 /usr/include/qt5/QtCore/qatomic_ia64.h \
2018 /usr/include/qt5/QtCore/qatomic_mips.h \
2019 /usr/include/qt5/QtCore/qatomic_s390.h \
2020 /usr/include/qt5/QtCore/qatomic_sh4a.h \
2021 /usr/include/qt5/QtCore/qatomic_sparc.h \
2022 /usr/include/qt5/QtCore/qatomic_x86.h \
2023 /usr/include/qt5/QtCore/qatomic_cxx11.h \
2024 /usr/include/qt5/QtCore/qatomic_gcc.h \
2025 /usr/include/qt5/QtCore/qatomic_unix.h \
2026 /usr/include/qt5/QtCore/qmutex.h \
2027 /usr/include/qt5/QtCore/qlogging.h \
2028 /usr/include/qt5/QtCore/qflags.h \
2029 /usr/include/qt5/QtCore/qtypeinfo.h \
2030 /usr/include/qt5/QtCore/qtypetraits.h \
2031 /usr/include/qt5/QtCore/qsysinfo.h \
2032 /usr/include/qt5/QtCore/qobjectdefs_impl.h \
2033 /usr/include/qt5/QtCore/qstring.h \
2034 /usr/include/qt5/QtCore/qchar.h \
2035 /usr/include/qt5/QtCore/qbytearray.h \
2036 /usr/include/qt5/QtCore/qrefcount.h \
2037 /usr/include/qt5/QtCore/qarraydata.h \
2038 /usr/include/qt5/QtCore/qstringbuilder.h \
2039 /usr/include/qt5/QtCore/qlist.h \
2040 /usr/include/qt5/QtCore/qalgorithms.h \
2041 /usr/include/qt5/QtCore/qiterator.h \
2042 /usr/include/qt5/QtCore/qcoreevent.h \
2043 /usr/include/qt5/QtCore/qscopedpointer.h \
2044 /usr/include/qt5/QtCore/qmetatype.h \
2045 /usr/include/qt5/QtCore/qvarlengtharray.h \
2046 /usr/include/qt5/QtCore/qcontainerfwd.h \
2047 /usr/include/qt5/QtCore/qisenum.h \
2048 /usr/include/qt5/QtCore/qobject_impl.h \
2049 /usr/include/qt5/QtCore/QFile \
2050 /usr/include/qt5/QtCore/qfile.h \
2051 /usr/include/qt5/QtCore/qfiledevice.h \
2052 /usr/include/qt5/QtCore/qiodevice.h \
2053 /usr/include/qt5/QtCore/QTextStream \
2054 /usr/include/qt5/QtCore/qtextstream.h \
2055 /usr/include/qt5/QtCore/qlocale.h \
2056 /usr/include/qt5/QtCore/qvariant.h \
2057 /usr/include/qt5/QtCore/qmap.h \
2058 /usr/include/qt5/QtCore/qpair.h \
2059 /usr/include/qt5/QtCore/qdebug.h \
2060 /usr/include/qt5/QtCore/qhash.h \
2061 /usr/include/qt5/QtCore/qvector.h \
2062 /usr/include/qt5/QtCore/qpoint.h \
2063 /usr/include/qt5/QtCore/qset.h \
2064 /usr/include/qt5/QtCore/qcontiguouscache.h \
2065 /usr/include/qt5/QtCore/qstringlist.h \
2066 /usr/include/qt5/QtCore/qdatastream.h \
2067 /usr/include/qt5/QtCore/qregexp.h \
2068 /usr/include/qt5/QtCore/qstringmatcher.h \
2069 /usr/include/qt5/QtCore/qshareddata.h \
2070 /usr/include/qt5/QtCore/QDate \
2071 /usr/include/qt5/QtCore/qdatetime.h \
2072 /usr/include/qt5/QtCore/qsharedpointer.h \
2073 /usr/include/qt5/QtCore/qsharedpointer_impl.h \
2074 /usr/include/qt5/QtCore/QTime \
2075 gse_lesia/storehk.h
2076 /usr/lib64/qt5/bin/moc $(DEFINES) $(INCPATH) -I/usr/lib/gcc/include/c++/4.8.2 -I/usr/lib/gcc/include/c++/4.8.2/x86_64-redhat-linux -I/usr/lib/gcc/include/c++/4.8.2/backward -I/usr/lib/gcc/x86_64-redhat-linux/4.8.2/include -I/usr/local/include -I/usr/include gse_lesia/storehk.h -o moc_storehk.cpp
2077
1988 2078 compiler_moc_source_make_all:
1989 2079 compiler_moc_source_clean:
1990 2080 compiler_uic_make_all:
@@ -2520,6 +2610,9 main.o: gse_lesia/main.cpp gse_lesia/mai
2520 2610 /usr/include/qt5/lppmon/paulcommon/hkdisplay.h \
2521 2611 gse_lesia/recordpage.h \
2522 2612 /usr/include/qt5/QtGui/QCloseEvent \
2613 gse_lesia/storehk.h \
2614 /usr/include/qt5/QtCore/QDate \
2615 /usr/include/qt5/QtCore/QTime \
2523 2616 gse_lesia/spectrapacket.h \
2524 2617 /usr/include/qt5/lppmon/paulcommon/paulcommonparams.h \
2525 2618 gse_lesia/wfpacket.h \
@@ -3051,6 +3144,9 mainwindow.o: gse_lesia/mainwindow.cpp g
3051 3144 /usr/include/qt5/lppmon/paulcommon/hkdisplay.h \
3052 3145 gse_lesia/recordpage.h \
3053 3146 /usr/include/qt5/QtGui/QCloseEvent \
3147 gse_lesia/storehk.h \
3148 /usr/include/qt5/QtCore/QDate \
3149 /usr/include/qt5/QtCore/QTime \
3054 3150 gse_lesia/spectrapacket.h \
3055 3151 /usr/include/qt5/lppmon/paulcommon/paulcommonparams.h \
3056 3152 gse_lesia/wfpacket.h \
@@ -3569,7 +3665,10 mainwindowui.o: gse_lesia/mainwindowui.c
3569 3665 /usr/include/qt5/QtWidgets/QCheckBox \
3570 3666 /usr/include/qt5/lppmon/paulcommon/hkdisplay.h \
3571 3667 gse_lesia/recordpage.h \
3572 /usr/include/qt5/QtGui/QCloseEvent
3668 /usr/include/qt5/QtGui/QCloseEvent \
3669 gse_lesia/storehk.h \
3670 /usr/include/qt5/QtCore/QDate \
3671 /usr/include/qt5/QtCore/QTime
3573 3672 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o mainwindowui.o gse_lesia/mainwindowui.cpp
3574 3673
3575 3674 lfrxmlhandler.o: gse_lesia/lfrxmlhandler.cpp gse_lesia/lfrxmlhandler.h \
@@ -4107,6 +4206,93 wfpacket.o: gse_lesia/wfpacket.cpp gse_l
4107 4206 ../../DEV_PLE/header/ccsds_types.h
4108 4207 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o wfpacket.o gse_lesia/wfpacket.cpp
4109 4208
4209 storehk.o: gse_lesia/storehk.cpp gse_lesia/storehk.h \
4210 /usr/include/qt5/QtCore/QObject \
4211 /usr/include/qt5/QtCore/qobject.h \
4212 /usr/include/qt5/QtCore/qobjectdefs.h \
4213 /usr/include/qt5/QtCore/qnamespace.h \
4214 /usr/include/qt5/QtCore/qglobal.h \
4215 /usr/include/qt5/QtCore/qconfig.h \
4216 /usr/include/qt5/QtCore/qconfig-64.h \
4217 /usr/include/qt5/QtCore/qfeatures.h \
4218 /usr/include/qt5/QtCore/qsystemdetection.h \
4219 /usr/include/qt5/QtCore/qprocessordetection.h \
4220 /usr/include/qt5/QtCore/qcompilerdetection.h \
4221 /usr/include/qt5/QtCore/qglobalstatic.h \
4222 /usr/include/qt5/QtCore/qatomic.h \
4223 /usr/include/qt5/QtCore/qbasicatomic.h \
4224 /usr/include/qt5/QtCore/qatomic_bootstrap.h \
4225 /usr/include/qt5/QtCore/qgenericatomic.h \
4226 /usr/include/qt5/QtCore/qatomic_msvc.h \
4227 /usr/include/qt5/QtCore/qatomic_integrity.h \
4228 /usr/include/qt5/QtCore/qoldbasicatomic.h \
4229 /usr/include/qt5/QtCore/qatomic_vxworks.h \
4230 /usr/include/qt5/QtCore/qatomic_power.h \
4231 /usr/include/qt5/QtCore/qatomic_alpha.h \
4232 /usr/include/qt5/QtCore/qatomic_armv7.h \
4233 /usr/include/qt5/QtCore/qatomic_armv6.h \
4234 /usr/include/qt5/QtCore/qatomic_armv5.h \
4235 /usr/include/qt5/QtCore/qatomic_bfin.h \
4236 /usr/include/qt5/QtCore/qatomic_ia64.h \
4237 /usr/include/qt5/QtCore/qatomic_mips.h \
4238 /usr/include/qt5/QtCore/qatomic_s390.h \
4239 /usr/include/qt5/QtCore/qatomic_sh4a.h \
4240 /usr/include/qt5/QtCore/qatomic_sparc.h \
4241 /usr/include/qt5/QtCore/qatomic_x86.h \
4242 /usr/include/qt5/QtCore/qatomic_cxx11.h \
4243 /usr/include/qt5/QtCore/qatomic_gcc.h \
4244 /usr/include/qt5/QtCore/qatomic_unix.h \
4245 /usr/include/qt5/QtCore/qmutex.h \
4246 /usr/include/qt5/QtCore/qlogging.h \
4247 /usr/include/qt5/QtCore/qflags.h \
4248 /usr/include/qt5/QtCore/qtypeinfo.h \
4249 /usr/include/qt5/QtCore/qtypetraits.h \
4250 /usr/include/qt5/QtCore/qsysinfo.h \
4251 /usr/include/qt5/QtCore/qobjectdefs_impl.h \
4252 /usr/include/qt5/QtCore/qstring.h \
4253 /usr/include/qt5/QtCore/qchar.h \
4254 /usr/include/qt5/QtCore/qbytearray.h \
4255 /usr/include/qt5/QtCore/qrefcount.h \
4256 /usr/include/qt5/QtCore/qarraydata.h \
4257 /usr/include/qt5/QtCore/qstringbuilder.h \
4258 /usr/include/qt5/QtCore/qlist.h \
4259 /usr/include/qt5/QtCore/qalgorithms.h \
4260 /usr/include/qt5/QtCore/qiterator.h \
4261 /usr/include/qt5/QtCore/qcoreevent.h \
4262 /usr/include/qt5/QtCore/qscopedpointer.h \
4263 /usr/include/qt5/QtCore/qmetatype.h \
4264 /usr/include/qt5/QtCore/qvarlengtharray.h \
4265 /usr/include/qt5/QtCore/qcontainerfwd.h \
4266 /usr/include/qt5/QtCore/qisenum.h \
4267 /usr/include/qt5/QtCore/qobject_impl.h \
4268 /usr/include/qt5/QtCore/QFile \
4269 /usr/include/qt5/QtCore/qfile.h \
4270 /usr/include/qt5/QtCore/qfiledevice.h \
4271 /usr/include/qt5/QtCore/qiodevice.h \
4272 /usr/include/qt5/QtCore/QTextStream \
4273 /usr/include/qt5/QtCore/qtextstream.h \
4274 /usr/include/qt5/QtCore/qlocale.h \
4275 /usr/include/qt5/QtCore/qvariant.h \
4276 /usr/include/qt5/QtCore/qmap.h \
4277 /usr/include/qt5/QtCore/qpair.h \
4278 /usr/include/qt5/QtCore/qdebug.h \
4279 /usr/include/qt5/QtCore/qhash.h \
4280 /usr/include/qt5/QtCore/qvector.h \
4281 /usr/include/qt5/QtCore/qpoint.h \
4282 /usr/include/qt5/QtCore/qset.h \
4283 /usr/include/qt5/QtCore/qcontiguouscache.h \
4284 /usr/include/qt5/QtCore/qstringlist.h \
4285 /usr/include/qt5/QtCore/qdatastream.h \
4286 /usr/include/qt5/QtCore/qregexp.h \
4287 /usr/include/qt5/QtCore/qstringmatcher.h \
4288 /usr/include/qt5/QtCore/qshareddata.h \
4289 /usr/include/qt5/QtCore/QDate \
4290 /usr/include/qt5/QtCore/qdatetime.h \
4291 /usr/include/qt5/QtCore/qsharedpointer.h \
4292 /usr/include/qt5/QtCore/qsharedpointer_impl.h \
4293 /usr/include/qt5/QtCore/QTime
4294 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o storehk.o gse_lesia/storehk.cpp
4295
4110 4296 moc_mainwindow.o: moc_mainwindow.cpp
4111 4297 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o moc_mainwindow.o moc_mainwindow.cpp
4112 4298
@@ -4131,6 +4317,9 moc_recordpage.o: moc_recordpage.cpp
4131 4317 moc_wfpacket.o: moc_wfpacket.cpp
4132 4318 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o moc_wfpacket.o moc_wfpacket.cpp
4133 4319
4320 moc_storehk.o: moc_storehk.cpp
4321 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o moc_storehk.o moc_storehk.cpp
4322
4134 4323 ####### Install
4135 4324
4136 4325 install: FORCE
Show file before | Show file after | Hide comments
@@ -36,7 +36,8 SOURCES += main.cpp\
36 36 spectrapacket.cpp \
37 37 lfrxmlparser.cpp \
38 38 recordpage.cpp \
39 wfpacket.cpp
39 wfpacket.cpp \
40 storehk.cpp
40 41
41 42 HEADERS += mainwindow.h \
42 43 mainwindowui.h \
@@ -45,7 +46,8 HEADERS += mainwindow.h \
45 46 spectrapacket.h \
46 47 lfrxmlparser.h \
47 48 recordpage.h \
48 wfpacket.h
49 wfpacket.h \
50 storehk.h
49 51
50 52
51 53
Show file before | Show file after | Hide comments
@@ -399,7 +399,7 void MainWindow::buildWFAndDisplay_CWF_F
399 399
400 400 deltaT = 1 / 16.;
401 401
402 if (pkt_nr == 1) // the acquisition time of the first packet of the snapshot is taken as starting time
402 if (pkt_nr == 1)
403 403 {
404 404 tmpCoarseTime = coarseTime;
405 405 tmpFineTime = fineTime;
@@ -452,7 +452,7 void MainWindow::buildWFAndDisplay_CWF_F
452 452
453 453 deltaT = 1. / 4096.;
454 454
455 if (pkt_nr == 1) // the acquisition time of the first packet of the snapshot is taken as starting time
455 if (pkt_nr == 1)
456 456 {
457 457 coarseTime = ((packet->Value[22] & 0x7f) << 24)
458 458 + (packet->Value[23] << 16)
@@ -583,6 +583,27 void MainWindow::build_ASM_AndDisplay_NO
583 583 }
584 584 }
585 585
586 void MainWindow::extract_v_e1_e2( TMPacketToRead *packet )
587 {
588 unsigned short param1;
589 unsigned short param2;
590 unsigned short param3;
591 unsigned int coarseTime;
592 unsigned int fineTime;
593
594 coarseTime = ((packet->Value[14] & 0x7f) << 24)
595 + (packet->Value[15] << 16)
596 + (packet->Value[16] << 8)
597 + packet->Value[17];
598 fineTime = (packet->Value[18] << 8) + packet->Value[19];
599
600 param1 = (unsigned short) (packet->Value[100] << 8) + packet->Value[101];
601 param2 = (unsigned short) (packet->Value[102] << 8) + packet->Value[103];
602 param3 = (unsigned short) (packet->Value[104] << 8) + packet->Value[105];
603
604 this->UI->storeHK->buildDataAsQByteArray(param1, param2, param3, coarseTime, fineTime);
605 }
606
586 607 void MainWindow::resetStatistics()
587 608 {
588 609 totalOfBytes = 0;
@@ -651,6 +672,7 void MainWindow::preProcessPacket(TMPack
651 672 & (typ == TM_TYPE_HK) & (sub == TM_SUBTYPE_HK) )
652 673 {
653 674 this->UI->hkDisplay->displayPacket(packet);
675 extract_v_e1_e2( packet );
654 676 }
655 677
656 678 //**************************************************************
Show file before | Show file after | Hide comments
@@ -45,6 +45,7 public:
45 45 void buildWFAndDisplay_CWF_F2(TMPacketToRead *packet, WFPacket *wfPacket);
46 46 void build_ASM_AndDisplay_NORM_F0(TMPacketToRead *packet, SpectraPacket *spectraPacket);
47 47 void build_ASM_AndDisplay_NORM(TMPacketToRead *packet, SpectraPacket *spectraPacket, double deltaF, unsigned char indiceStart, ASMPage *asmPage);
48 void extract_v_e1_e2(TMPacketToRead *packet );
48 49
49 50 protected:
50 51 void closeEvent(QCloseEvent *);
Show file before | Show file after | Hide comments
@@ -29,6 +29,7 MainWindowUI::MainWindowUI(QWidget *pare
29 29 asmPage_F0 = new ASMPage(0, NB_BINS_PER_ASM_F0, NB_BINS_PER_ASM_F0, 15000);
30 30 asmPage_F1 = new ASMPage(0, NB_BINS_PER_ASM_F1, NB_BINS_PER_ASM_F1, 15000);
31 31 asmPage_F2 = new ASMPage(0, NB_BINS_PER_ASM_F2, NB_BINS_PER_ASM_F2, 15000);
32 storeHK = new StoreHK();
32 33
33 34 wfPage_CWF_F1->pageTitle = "SBM1_CWF_F1";
34 35 wfPage_CWF_F2->pageTitle = "SBM2_CWF_F2";
@@ -36,6 +37,7 MainWindowUI::MainWindowUI(QWidget *pare
36 37 asmPage_F0->pageTitle = "ASM_F0";
37 38 asmPage_F1->pageTitle = "ASM_F1";
38 39 asmPage_F2->pageTitle = "ASM_F2";
40 storeHK->hkName = "spacecraft_potential";
39 41 hkDisplay = new HKDisplay();
40 42 recordPage = new RecordPage;
41 43
@@ -170,6 +172,11 MainWindowUI::MainWindowUI(QWidget *pare
170 172 this->asmPage_F2, SLOT(storeWfrm()));
171 173 connect(this->recordPage, SIGNAL(signal_defaultStorageDirectoryUpdated(QString)),
172 174 this->asmPage_F2, SLOT(setDefaultStorageDirectory(QString)));
175 // HK_SPACECRAFT_POTENTIAL
176 connect(this->recordPage, SIGNAL(signal_store_hk_spacecraft_potential()),
177 this->storeHK, SLOT(storeData()));
178 connect(this->recordPage, SIGNAL(signal_defaultStorageDirectoryUpdated(QString)),
179 this->storeHK, SLOT(setDefaultStorageDirectory(QString)));
173 180
174 181 emit this->recordPage->signal_defaultStorageDirectoryUpdated(this->recordPage->defaultStorageDirectory);
175 182 }
Show file before | Show file after | Hide comments
@@ -20,6 +20,7
20 20 #include "tmstatistics.h"
21 21 #include "hkdisplay.h"
22 22 #include "recordpage.h"
23 #include "storehk.h"
23 24
24 25 class MainWindowUI : public QWidget
25 26 {
@@ -51,6 +52,8 public:
51 52 HKDisplay* hkDisplay;
52 53 RecordPage* recordPage;
53 54
55 StoreHK *storeHK;
56
54 57 QWidget* widget_spectrogram;
55 58
56 59 ParameterDump* parameterDump;
Show file before | Show file after | Hide comments
@@ -14,6 +14,7 RecordPage::RecordPage(QWidget *parent)
14 14 radiobutton_asm_f0 = new QRadioButton("asm_f0");
15 15 radiobutton_asm_f1 = new QRadioButton("asm_f1");
16 16 radiobutton_asm_f2 = new QRadioButton("asm_f2");
17 radiobutton_hk_spacecraft_potential = new QRadioButton("s/c potential");
17 18
18 19 radiobutton_swf_f0->setAutoExclusive(false);
19 20 radiobutton_swf_f1->setAutoExclusive(false);
@@ -24,6 +25,7 RecordPage::RecordPage(QWidget *parent)
24 25 radiobutton_asm_f0->setAutoExclusive(false);
25 26 radiobutton_asm_f1->setAutoExclusive(false);
26 27 radiobutton_asm_f2->setAutoExclusive(false);
28 radiobutton_hk_spacecraft_potential->setAutoExclusive(false);
27 29
28 30 label_currentDir = new QLabel("Current Dir: -");
29 31
@@ -32,10 +34,12 RecordPage::RecordPage(QWidget *parent)
32 34
33 35 groupbox_waveforms = new QGroupBox("waveforms");
34 36 groupbox_matrices = new QGroupBox("spectral matrices");
37 groupbox_hk = new QGroupBox("HK");
35 38 groupbox_directory = new QGroupBox("directory");
36 39
37 40 vboxlayout_waveforms = new QVBoxLayout();
38 41 vboxlayout_matrices = new QVBoxLayout();
42 vboxlayout_hk = new QVBoxLayout();
39 43 vboxlayout_directory = new QVBoxLayout();
40 44
41 45 mainLayout = new QGridLayout();
@@ -50,12 +54,14 RecordPage::RecordPage(QWidget *parent)
50 54 vboxlayout_waveforms->addWidget(radiobutton_cwf_f3);
51 55 vboxlayout_waveforms->addStretch();
52 56
53
54 57 vboxlayout_matrices->addWidget(radiobutton_asm_f0);
55 58 vboxlayout_matrices->addWidget(radiobutton_asm_f1);
56 59 vboxlayout_matrices->addWidget(radiobutton_asm_f2);
57 60 vboxlayout_matrices->addStretch();
58 61
62 vboxlayout_hk->addWidget(radiobutton_hk_spacecraft_potential);
63 vboxlayout_hk->addStretch();
64
59 65 vboxlayout_directory->addWidget(button_storeWfrm);
60 66 vboxlayout_directory->addWidget(button_chooseDir);
61 67 vboxlayout_directory->addWidget(label_currentDir);
@@ -63,13 +69,15 RecordPage::RecordPage(QWidget *parent)
63 69
64 70 groupbox_waveforms->setLayout(vboxlayout_waveforms);
65 71 groupbox_matrices->setLayout(vboxlayout_matrices);
72 groupbox_hk->setLayout(vboxlayout_hk);
66 73 groupbox_directory->setLayout(vboxlayout_directory);
67 74
68 75 mainLayout->addWidget(groupbox_directory, 0, 0, 1, 1);
69 76 mainLayout->addWidget(groupbox_waveforms, 0, 1, 1, 1);
70 77 mainLayout->addWidget(groupbox_matrices, 0, 2, 1, 1);
78 mainLayout->addWidget(groupbox_hk, 0, 3, 1, 1);
71 79 mainLayout->setRowStretch(1, 1);
72 mainLayout->setColumnStretch(3, 1);
80 mainLayout->setColumnStretch(4, 1);
73 81
74 82 this->setLayout(mainLayout);
75 83
@@ -115,6 +123,7 void RecordPage::storeWfrm()
115 123 if (radiobutton_asm_f0->isChecked()) emit signal_store_asm_f0();
116 124 if (radiobutton_asm_f1->isChecked()) emit signal_store_asm_f0();
117 125 if (radiobutton_asm_f2->isChecked()) emit signal_store_asm_f0();
126 if (radiobutton_hk_spacecraft_potential->isChecked()) emit signal_store_hk_spacecraft_potential();
118 127 radiobutton_swf_f0->setEnabled(false);
119 128 radiobutton_swf_f1->setEnabled(false);
120 129 radiobutton_swf_f2->setEnabled(false);
@@ -124,6 +133,7 void RecordPage::storeWfrm()
124 133 radiobutton_asm_f0->setEnabled(false);
125 134 radiobutton_asm_f1->setEnabled(false);
126 135 radiobutton_asm_f2->setEnabled(false);
136 radiobutton_hk_spacecraft_potential->setEnabled(false);
127 137 }
128 138 else
129 139 {
@@ -139,6 +149,7 void RecordPage::storeWfrm()
139 149 if (radiobutton_asm_f0->isChecked()) emit signal_store_asm_f0();
140 150 if (radiobutton_asm_f1->isChecked()) emit signal_store_asm_f1();
141 151 if (radiobutton_asm_f2->isChecked()) emit signal_store_asm_f2();
152 if (radiobutton_hk_spacecraft_potential->isChecked()) emit signal_store_hk_spacecraft_potential();
142 153 radiobutton_swf_f0->setEnabled(true);
143 154 radiobutton_swf_f1->setEnabled(true);
144 155 radiobutton_swf_f2->setEnabled(true);
@@ -148,6 +159,7 void RecordPage::storeWfrm()
148 159 radiobutton_asm_f0->setEnabled(true);
149 160 radiobutton_asm_f1->setEnabled(true);
150 161 radiobutton_asm_f2->setEnabled(true);
162 radiobutton_hk_spacecraft_potential->setEnabled(true);
151 163 }
152 164 }
153 165
Show file before | Show file after | Hide comments
@@ -35,13 +35,16 public:
35 35 QRadioButton *radiobutton_asm_f0;
36 36 QRadioButton *radiobutton_asm_f1;
37 37 QRadioButton *radiobutton_asm_f2;
38 QRadioButton *radiobutton_hk_spacecraft_potential;
38 39
39 40 QGroupBox *groupbox_waveforms;
40 41 QGroupBox *groupbox_matrices;
42 QGroupBox *groupbox_hk;
41 43 QGroupBox *groupbox_directory;
42 44
43 45 QVBoxLayout *vboxlayout_waveforms;
44 46 QVBoxLayout *vboxlayout_matrices;
47 QVBoxLayout *vboxlayout_hk;
45 48 QVBoxLayout *vboxlayout_directory;
46 49
47 50 QString defaultStorageDirectory;
@@ -61,6 +64,7 signals:
61 64 void signal_store_asm_f0();
62 65 void signal_store_asm_f1();
63 66 void signal_store_asm_f2();
67 void signal_store_hk_spacecraft_potential();
64 68 void signal_defaultStorageDirectoryUpdated( QString nameOfTheDirectory );
65 69
66 70 public slots:
Show file before | Show file after | Hide comments
1 NO CONTENT: modified file, binary diff hidden
Show file before | Show file after | Hide comments
@@ -3,7 +3,7
3 3 # Generated by qmake (3.0) (Qt 5.2.1)
4 4 # Project: rmapplugin.pro
5 5 # Template: lib
6 # Command: /usr/bin/qmake-qt5 -o Makefile rmapplugin.pro
6 # Command: /bin/qmake-qt5 -spec linux-g++-64 -o Makefile rmapplugin.pro
7 7 #############################################################################
8 8
9 9 MAKEFILE = Makefile
@@ -21,7 +21,7 LFLAGS = -m64 -Wl,-O1 -Wl,-z,relr
21 21 LIBS = $(SUBLIBS) -L/usr/X11R6/lib64 /home/spacewire/usb/spw_usb_driver_v2.68/lib/x86_64/libSpaceWireUSBAPI.so /home/spacewire/usb/spw_usb_driver_v2.68/lib/x86_64/libConfigLibraryUSB.so -lwfdisplay -lpaulcommon -llppmonengine -llppmoncommon -ldl -lutil -lm -lpython2.7 -lPythonQt_QtAll -lPythonQt -lQt5PrintSupport -lQt5Svg -lQt5Widgets -lQt5Network -lQt5Xml -lQt5Gui -lQt5Core -lGL -lpthread
22 22 AR = ar cqs
23 23 RANLIB =
24 QMAKE = /usr/bin/qmake-qt5
24 QMAKE = /bin/qmake-qt5
25 25 TAR = tar -cf
26 26 COMPRESS = gzip -9f
27 27 COPY = cp -f
@@ -95,8 +95,6 DIST = /usr/lib64/qt5/mkspecs/f
95 95 /usr/lib64/qt5/mkspecs/common/g++-base.conf \
96 96 /usr/lib64/qt5/mkspecs/common/g++-unix.conf \
97 97 /usr/lib64/qt5/mkspecs/qconfig.pri \
98 /usr/lib64/qt5/mkspecs/modules/qt_lib_bluetooth.pri \
99 /usr/lib64/qt5/mkspecs/modules/qt_lib_bluetooth_private.pri \
100 98 /usr/lib64/qt5/mkspecs/modules/qt_lib_bootstrap_private.pri \
101 99 /usr/lib64/qt5/mkspecs/modules/qt_lib_clucene_private.pri \
102 100 /usr/lib64/qt5/mkspecs/modules/qt_lib_compositor.pri \
@@ -122,15 +120,11 DIST = /usr/lib64/qt5/mkspecs/f
122 120 /usr/lib64/qt5/mkspecs/modules/qt_lib_multimediawidgets_private.pri \
123 121 /usr/lib64/qt5/mkspecs/modules/qt_lib_network.pri \
124 122 /usr/lib64/qt5/mkspecs/modules/qt_lib_network_private.pri \
125 /usr/lib64/qt5/mkspecs/modules/qt_lib_nfc.pri \
126 /usr/lib64/qt5/mkspecs/modules/qt_lib_nfc_private.pri \
127 123 /usr/lib64/qt5/mkspecs/modules/qt_lib_opengl.pri \
128 124 /usr/lib64/qt5/mkspecs/modules/qt_lib_opengl_private.pri \
129 125 /usr/lib64/qt5/mkspecs/modules/qt_lib_openglextensions.pri \
130 126 /usr/lib64/qt5/mkspecs/modules/qt_lib_openglextensions_private.pri \
131 127 /usr/lib64/qt5/mkspecs/modules/qt_lib_platformsupport_private.pri \
132 /usr/lib64/qt5/mkspecs/modules/qt_lib_positioning.pri \
133 /usr/lib64/qt5/mkspecs/modules/qt_lib_positioning_private.pri \
134 128 /usr/lib64/qt5/mkspecs/modules/qt_lib_printsupport.pri \
135 129 /usr/lib64/qt5/mkspecs/modules/qt_lib_printsupport_private.pri \
136 130 /usr/lib64/qt5/mkspecs/modules/qt_lib_qml.pri \
@@ -146,10 +140,6 DIST = /usr/lib64/qt5/mkspecs/f
146 140 /usr/lib64/qt5/mkspecs/modules/qt_lib_script_private.pri \
147 141 /usr/lib64/qt5/mkspecs/modules/qt_lib_scripttools.pri \
148 142 /usr/lib64/qt5/mkspecs/modules/qt_lib_scripttools_private.pri \
149 /usr/lib64/qt5/mkspecs/modules/qt_lib_sensors.pri \
150 /usr/lib64/qt5/mkspecs/modules/qt_lib_sensors_private.pri \
151 /usr/lib64/qt5/mkspecs/modules/qt_lib_serialport.pri \
152 /usr/lib64/qt5/mkspecs/modules/qt_lib_serialport_private.pri \
153 143 /usr/lib64/qt5/mkspecs/modules/qt_lib_sql.pri \
154 144 /usr/lib64/qt5/mkspecs/modules/qt_lib_sql_private.pri \
155 145 /usr/lib64/qt5/mkspecs/modules/qt_lib_svg.pri \
@@ -262,8 +252,6 Makefile: rmapplugin.pro /usr/lib64/qt5/
262 252 /usr/lib64/qt5/mkspecs/common/g++-base.conf \
263 253 /usr/lib64/qt5/mkspecs/common/g++-unix.conf \
264 254 /usr/lib64/qt5/mkspecs/qconfig.pri \
265 /usr/lib64/qt5/mkspecs/modules/qt_lib_bluetooth.pri \
266 /usr/lib64/qt5/mkspecs/modules/qt_lib_bluetooth_private.pri \
267 255 /usr/lib64/qt5/mkspecs/modules/qt_lib_bootstrap_private.pri \
268 256 /usr/lib64/qt5/mkspecs/modules/qt_lib_clucene_private.pri \
269 257 /usr/lib64/qt5/mkspecs/modules/qt_lib_compositor.pri \
@@ -289,15 +277,11 Makefile: rmapplugin.pro /usr/lib64/qt5/
289 277 /usr/lib64/qt5/mkspecs/modules/qt_lib_multimediawidgets_private.pri \
290 278 /usr/lib64/qt5/mkspecs/modules/qt_lib_network.pri \
291 279 /usr/lib64/qt5/mkspecs/modules/qt_lib_network_private.pri \
292 /usr/lib64/qt5/mkspecs/modules/qt_lib_nfc.pri \
293 /usr/lib64/qt5/mkspecs/modules/qt_lib_nfc_private.pri \
294 280 /usr/lib64/qt5/mkspecs/modules/qt_lib_opengl.pri \
295 281 /usr/lib64/qt5/mkspecs/modules/qt_lib_opengl_private.pri \
296 282 /usr/lib64/qt5/mkspecs/modules/qt_lib_openglextensions.pri \
297 283 /usr/lib64/qt5/mkspecs/modules/qt_lib_openglextensions_private.pri \
298 284 /usr/lib64/qt5/mkspecs/modules/qt_lib_platformsupport_private.pri \
299 /usr/lib64/qt5/mkspecs/modules/qt_lib_positioning.pri \
300 /usr/lib64/qt5/mkspecs/modules/qt_lib_positioning_private.pri \
301 285 /usr/lib64/qt5/mkspecs/modules/qt_lib_printsupport.pri \
302 286 /usr/lib64/qt5/mkspecs/modules/qt_lib_printsupport_private.pri \
303 287 /usr/lib64/qt5/mkspecs/modules/qt_lib_qml.pri \
@@ -313,10 +297,6 Makefile: rmapplugin.pro /usr/lib64/qt5/
313 297 /usr/lib64/qt5/mkspecs/modules/qt_lib_script_private.pri \
314 298 /usr/lib64/qt5/mkspecs/modules/qt_lib_scripttools.pri \
315 299 /usr/lib64/qt5/mkspecs/modules/qt_lib_scripttools_private.pri \
316 /usr/lib64/qt5/mkspecs/modules/qt_lib_sensors.pri \
317 /usr/lib64/qt5/mkspecs/modules/qt_lib_sensors_private.pri \
318 /usr/lib64/qt5/mkspecs/modules/qt_lib_serialport.pri \
319 /usr/lib64/qt5/mkspecs/modules/qt_lib_serialport_private.pri \
320 300 /usr/lib64/qt5/mkspecs/modules/qt_lib_sql.pri \
321 301 /usr/lib64/qt5/mkspecs/modules/qt_lib_sql_private.pri \
322 302 /usr/lib64/qt5/mkspecs/modules/qt_lib_svg.pri \
@@ -367,7 +347,7 Makefile: rmapplugin.pro /usr/lib64/qt5/
367 347 /lib64/libQt5Xml.prl \
368 348 /lib64/libQt5Gui.prl \
369 349 /lib64/libQt5Core.prl
370 $(QMAKE) -o Makefile rmapplugin.pro
350 $(QMAKE) -spec linux-g++-64 -o Makefile rmapplugin.pro
371 351 /usr/lib64/qt5/mkspecs/features/spec_pre.prf:
372 352 /usr/lib64/qt5/mkspecs/common/shell-unix.conf:
373 353 /usr/lib64/qt5/mkspecs/common/unix.conf:
@@ -377,8 +357,6 Makefile: rmapplugin.pro /usr/lib64/qt5/
377 357 /usr/lib64/qt5/mkspecs/common/g++-base.conf:
378 358 /usr/lib64/qt5/mkspecs/common/g++-unix.conf:
379 359 /usr/lib64/qt5/mkspecs/qconfig.pri:
380 /usr/lib64/qt5/mkspecs/modules/qt_lib_bluetooth.pri:
381 /usr/lib64/qt5/mkspecs/modules/qt_lib_bluetooth_private.pri:
382 360 /usr/lib64/qt5/mkspecs/modules/qt_lib_bootstrap_private.pri:
383 361 /usr/lib64/qt5/mkspecs/modules/qt_lib_clucene_private.pri:
384 362 /usr/lib64/qt5/mkspecs/modules/qt_lib_compositor.pri:
@@ -404,15 +382,11 Makefile: rmapplugin.pro /usr/lib64/qt5/
404 382 /usr/lib64/qt5/mkspecs/modules/qt_lib_multimediawidgets_private.pri:
405 383 /usr/lib64/qt5/mkspecs/modules/qt_lib_network.pri:
406 384 /usr/lib64/qt5/mkspecs/modules/qt_lib_network_private.pri:
407 /usr/lib64/qt5/mkspecs/modules/qt_lib_nfc.pri:
408 /usr/lib64/qt5/mkspecs/modules/qt_lib_nfc_private.pri:
409 385 /usr/lib64/qt5/mkspecs/modules/qt_lib_opengl.pri:
410 386 /usr/lib64/qt5/mkspecs/modules/qt_lib_opengl_private.pri:
411 387 /usr/lib64/qt5/mkspecs/modules/qt_lib_openglextensions.pri:
412 388 /usr/lib64/qt5/mkspecs/modules/qt_lib_openglextensions_private.pri:
413 389 /usr/lib64/qt5/mkspecs/modules/qt_lib_platformsupport_private.pri:
414 /usr/lib64/qt5/mkspecs/modules/qt_lib_positioning.pri:
415 /usr/lib64/qt5/mkspecs/modules/qt_lib_positioning_private.pri:
416 390 /usr/lib64/qt5/mkspecs/modules/qt_lib_printsupport.pri:
417 391 /usr/lib64/qt5/mkspecs/modules/qt_lib_printsupport_private.pri:
418 392 /usr/lib64/qt5/mkspecs/modules/qt_lib_qml.pri:
@@ -428,10 +402,6 Makefile: rmapplugin.pro /usr/lib64/qt5/
428 402 /usr/lib64/qt5/mkspecs/modules/qt_lib_script_private.pri:
429 403 /usr/lib64/qt5/mkspecs/modules/qt_lib_scripttools.pri:
430 404 /usr/lib64/qt5/mkspecs/modules/qt_lib_scripttools_private.pri:
431 /usr/lib64/qt5/mkspecs/modules/qt_lib_sensors.pri:
432 /usr/lib64/qt5/mkspecs/modules/qt_lib_sensors_private.pri:
433 /usr/lib64/qt5/mkspecs/modules/qt_lib_serialport.pri:
434 /usr/lib64/qt5/mkspecs/modules/qt_lib_serialport_private.pri:
435 405 /usr/lib64/qt5/mkspecs/modules/qt_lib_sql.pri:
436 406 /usr/lib64/qt5/mkspecs/modules/qt_lib_sql_private.pri:
437 407 /usr/lib64/qt5/mkspecs/modules/qt_lib_svg.pri:
@@ -483,7 +453,7 rmapplugin.pro:
483 453 /lib64/libQt5Gui.prl:
484 454 /lib64/libQt5Core.prl:
485 455 qmake: FORCE
486 @$(QMAKE) -o Makefile rmapplugin.pro
456 @$(QMAKE) -spec linux-g++-64 -o Makefile rmapplugin.pro
487 457
488 458 qmake_all: FORCE
489 459
@@ -521,7 +491,6 moc/moc_rmappluginui.cpp: /usr/include/q
521 491 /usr/include/qt5/QtGui/qwindowdefs.h \
522 492 /usr/include/qt5/QtCore/qglobal.h \
523 493 /usr/include/qt5/QtCore/qconfig.h \
524 /usr/include/qt5/QtCore/qconfig-32.h \
525 494 /usr/include/qt5/QtCore/qconfig-64.h \
526 495 /usr/include/qt5/QtCore/qfeatures.h \
527 496 /usr/include/qt5/QtCore/qsystemdetection.h \
@@ -1062,7 +1031,6 moc/moc_rmapplugin.cpp: rmappluginui.h \
1062 1031 /usr/include/qt5/QtGui/qwindowdefs.h \
1063 1032 /usr/include/qt5/QtCore/qglobal.h \
1064 1033 /usr/include/qt5/QtCore/qconfig.h \
1065 /usr/include/qt5/QtCore/qconfig-32.h \
1066 1034 /usr/include/qt5/QtCore/qconfig-64.h \
1067 1035 /usr/include/qt5/QtCore/qfeatures.h \
1068 1036 /usr/include/qt5/QtCore/qsystemdetection.h \
@@ -1610,7 +1578,6 moc/moc_rmappluginpythonwrapper.cpp: /us
1610 1578 /usr/include/qt5/QtCore/qnamespace.h \
1611 1579 /usr/include/qt5/QtCore/qglobal.h \
1612 1580 /usr/include/qt5/QtCore/qconfig.h \
1613 /usr/include/qt5/QtCore/qconfig-32.h \
1614 1581 /usr/include/qt5/QtCore/qconfig-64.h \
1615 1582 /usr/include/qt5/QtCore/qfeatures.h \
1616 1583 /usr/include/qt5/QtCore/qsystemdetection.h \
@@ -1745,7 +1712,6 moc/moc_stardundee.cpp: /usr/include/qt5
1745 1712 /usr/include/qt5/QtGui/qwindowdefs.h \
1746 1713 /usr/include/qt5/QtCore/qglobal.h \
1747 1714 /usr/include/qt5/QtCore/qconfig.h \
1748 /usr/include/qt5/QtCore/qconfig-32.h \
1749 1715 /usr/include/qt5/QtCore/qconfig-64.h \
1750 1716 /usr/include/qt5/QtCore/qfeatures.h \
1751 1717 /usr/include/qt5/QtCore/qsystemdetection.h \
@@ -1908,7 +1874,6 moc/moc_gresb.cpp: /usr/include/qt5/QtWi
1908 1874 /usr/include/qt5/QtGui/qwindowdefs.h \
1909 1875 /usr/include/qt5/QtCore/qglobal.h \
1910 1876 /usr/include/qt5/QtCore/qconfig.h \
1911 /usr/include/qt5/QtCore/qconfig-32.h \
1912 1877 /usr/include/qt5/QtCore/qconfig-64.h \
1913 1878 /usr/include/qt5/QtCore/qfeatures.h \
1914 1879 /usr/include/qt5/QtCore/qsystemdetection.h \
@@ -2073,7 +2038,6 moc/moc_tmechobridge.cpp: /usr/include/q
2073 2038 /usr/include/qt5/QtGui/qwindowdefs.h \
2074 2039 /usr/include/qt5/QtCore/qglobal.h \
2075 2040 /usr/include/qt5/QtCore/qconfig.h \
2076 /usr/include/qt5/QtCore/qconfig-32.h \
2077 2041 /usr/include/qt5/QtCore/qconfig-64.h \
2078 2042 /usr/include/qt5/QtCore/qfeatures.h \
2079 2043 /usr/include/qt5/QtCore/qsystemdetection.h \
@@ -2225,7 +2189,6 moc/moc_entermode.cpp: /usr/include/qt5/
2225 2189 /usr/include/qt5/QtGui/qwindowdefs.h \
2226 2190 /usr/include/qt5/QtCore/qglobal.h \
2227 2191 /usr/include/qt5/QtCore/qconfig.h \
2228 /usr/include/qt5/QtCore/qconfig-32.h \
2229 2192 /usr/include/qt5/QtCore/qconfig-64.h \
2230 2193 /usr/include/qt5/QtCore/qfeatures.h \
2231 2194 /usr/include/qt5/QtCore/qsystemdetection.h \
@@ -2360,7 +2323,6 moc/moc_lfractions.cpp: /usr/include/qt5
2360 2323 /usr/include/qt5/QtGui/qwindowdefs.h \
2361 2324 /usr/include/qt5/QtCore/qglobal.h \
2362 2325 /usr/include/qt5/QtCore/qconfig.h \
2363 /usr/include/qt5/QtCore/qconfig-32.h \
2364 2326 /usr/include/qt5/QtCore/qconfig-64.h \
2365 2327 /usr/include/qt5/QtCore/qfeatures.h \
2366 2328 /usr/include/qt5/QtCore/qsystemdetection.h \
@@ -2506,7 +2468,6 moc/moc_genericPySysdriver.cpp: /usr/inc
2506 2468 /usr/include/qt5/QtCore/qnamespace.h \
2507 2469 /usr/include/qt5/QtCore/qglobal.h \
2508 2470 /usr/include/qt5/QtCore/qconfig.h \
2509 /usr/include/qt5/QtCore/qconfig-32.h \
2510 2471 /usr/include/qt5/QtCore/qconfig-64.h \
2511 2472 /usr/include/qt5/QtCore/qfeatures.h \
2512 2473 /usr/include/qt5/QtCore/qsystemdetection.h \
@@ -2590,7 +2551,6 moc/moc_lppmonplugin.cpp: /usr/include/q
2590 2551 /usr/include/qt5/QtGui/qwindowdefs.h \
2591 2552 /usr/include/qt5/QtCore/qglobal.h \
2592 2553 /usr/include/qt5/QtCore/qconfig.h \
2593 /usr/include/qt5/QtCore/qconfig-32.h \
2594 2554 /usr/include/qt5/QtCore/qconfig-64.h \
2595 2555 /usr/include/qt5/QtCore/qfeatures.h \
2596 2556 /usr/include/qt5/QtCore/qsystemdetection.h \
@@ -2738,7 +2698,6 obj/rmapplugin.o: rmapplugin.cpp rmapplu
2738 2698 /usr/include/qt5/QtGui/qwindowdefs.h \
2739 2699 /usr/include/qt5/QtCore/qglobal.h \
2740 2700 /usr/include/qt5/QtCore/qconfig.h \
2741 /usr/include/qt5/QtCore/qconfig-32.h \
2742 2701 /usr/include/qt5/QtCore/qconfig-64.h \
2743 2702 /usr/include/qt5/QtCore/qfeatures.h \
2744 2703 /usr/include/qt5/QtCore/qsystemdetection.h \
@@ -3308,7 +3267,6 obj/rmappluginui.o: rmappluginui.cpp rma
3308 3267 /usr/include/qt5/QtGui/qwindowdefs.h \
3309 3268 /usr/include/qt5/QtCore/qglobal.h \
3310 3269 /usr/include/qt5/QtCore/qconfig.h \
3311 /usr/include/qt5/QtCore/qconfig-32.h \
3312 3270 /usr/include/qt5/QtCore/qconfig-64.h \
3313 3271 /usr/include/qt5/QtCore/qfeatures.h \
3314 3272 /usr/include/qt5/QtCore/qsystemdetection.h \
@@ -3858,7 +3816,6 obj/rmapoperations.o: rmapoperations.cpp
3858 3816 /usr/include/qt5/QtGui/qwindowdefs.h \
3859 3817 /usr/include/qt5/QtCore/qglobal.h \
3860 3818 /usr/include/qt5/QtCore/qconfig.h \
3861 /usr/include/qt5/QtCore/qconfig-32.h \
3862 3819 /usr/include/qt5/QtCore/qconfig-64.h \
3863 3820 /usr/include/qt5/QtCore/qfeatures.h \
3864 3821 /usr/include/qt5/QtCore/qsystemdetection.h \
@@ -3981,7 +3938,6 obj/rmappluginpythonwrapper.o: rmapplugi
3981 3938 /usr/include/qt5/QtCore/qnamespace.h \
3982 3939 /usr/include/qt5/QtCore/qglobal.h \
3983 3940 /usr/include/qt5/QtCore/qconfig.h \
3984 /usr/include/qt5/QtCore/qconfig-32.h \
3985 3941 /usr/include/qt5/QtCore/qconfig-64.h \
3986 3942 /usr/include/qt5/QtCore/qfeatures.h \
3987 3943 /usr/include/qt5/QtCore/qsystemdetection.h \
@@ -4123,7 +4079,6 obj/stardundee.o: stardundee.cpp stardun
4123 4079 /usr/include/qt5/QtGui/qwindowdefs.h \
4124 4080 /usr/include/qt5/QtCore/qglobal.h \
4125 4081 /usr/include/qt5/QtCore/qconfig.h \
4126 /usr/include/qt5/QtCore/qconfig-32.h \
4127 4082 /usr/include/qt5/QtCore/qconfig-64.h \
4128 4083 /usr/include/qt5/QtCore/qfeatures.h \
4129 4084 /usr/include/qt5/QtCore/qsystemdetection.h \
@@ -4624,7 +4579,6 obj/gresb.o: gresb.cpp gresb.h \
4624 4579 /usr/include/qt5/QtGui/qwindowdefs.h \
4625 4580 /usr/include/qt5/QtCore/qglobal.h \
4626 4581 /usr/include/qt5/QtCore/qconfig.h \
4627 /usr/include/qt5/QtCore/qconfig-32.h \
4628 4582 /usr/include/qt5/QtCore/qconfig-64.h \
4629 4583 /usr/include/qt5/QtCore/qfeatures.h \
4630 4584 /usr/include/qt5/QtCore/qsystemdetection.h \
@@ -5123,7 +5077,6 obj/tmechobridge.o: tmechobridge.cpp tme
5123 5077 /usr/include/qt5/QtGui/qwindowdefs.h \
5124 5078 /usr/include/qt5/QtCore/qglobal.h \
5125 5079 /usr/include/qt5/QtCore/qconfig.h \
5126 /usr/include/qt5/QtCore/qconfig-32.h \
5127 5080 /usr/include/qt5/QtCore/qconfig-64.h \
5128 5081 /usr/include/qt5/QtCore/qfeatures.h \
5129 5082 /usr/include/qt5/QtCore/qsystemdetection.h \
@@ -5275,7 +5228,6 obj/entermode.o: entermode.cpp entermode
5275 5228 /usr/include/qt5/QtGui/qwindowdefs.h \
5276 5229 /usr/include/qt5/QtCore/qglobal.h \
5277 5230 /usr/include/qt5/QtCore/qconfig.h \
5278 /usr/include/qt5/QtCore/qconfig-32.h \
5279 5231 /usr/include/qt5/QtCore/qconfig-64.h \
5280 5232 /usr/include/qt5/QtCore/qfeatures.h \
5281 5233 /usr/include/qt5/QtCore/qsystemdetection.h \
@@ -5410,7 +5362,6 obj/lfractions.o: lfractions.cpp lfracti
5410 5362 /usr/include/qt5/QtGui/qwindowdefs.h \
5411 5363 /usr/include/qt5/QtCore/qglobal.h \
5412 5364 /usr/include/qt5/QtCore/qconfig.h \
5413 /usr/include/qt5/QtCore/qconfig-32.h \
5414 5365 /usr/include/qt5/QtCore/qconfig-64.h \
5415 5366 /usr/include/qt5/QtCore/qfeatures.h \
5416 5367 /usr/include/qt5/QtCore/qsystemdetection.h \
@@ -5553,7 +5504,6 obj/lppmonplugininterface.o: /usr/includ
5553 5504 /usr/include/qt5/lppmon/pluginsInterface/lppmonplugininterface_global.h \
5554 5505 /usr/include/qt5/QtCore/qglobal.h \
5555 5506 /usr/include/qt5/QtCore/qconfig.h \
5556 /usr/include/qt5/QtCore/qconfig-32.h \
5557 5507 /usr/include/qt5/QtCore/qconfig-64.h \
5558 5508 /usr/include/qt5/QtCore/qfeatures.h \
5559 5509 /usr/include/qt5/QtCore/qsystemdetection.h \
@@ -5633,18 +5583,18 obj/moc_lppmonplugin.o: moc/moc_lppmonpl
5633 5583 ####### Install
5634 5584
5635 5585 install_target: first FORCE
5636 @test -d $(INSTALL_ROOT)/home/admin/.lppmon/plugins || mkdir -p $(INSTALL_ROOT)/home/admin/.lppmon/plugins
5637 -$(INSTALL_PROGRAM) "bin/$(TARGET)" "$(INSTALL_ROOT)/home/admin/.lppmon/plugins/$(TARGET)"
5638 -$(SYMLINK) "$(TARGET)" "$(INSTALL_ROOT)/home/admin/.lppmon/plugins/$(TARGET0)"
5639 -$(SYMLINK) "$(TARGET)" "$(INSTALL_ROOT)/home/admin/.lppmon/plugins/$(TARGET1)"
5640 -$(SYMLINK) "$(TARGET)" "$(INSTALL_ROOT)/home/admin/.lppmon/plugins/$(TARGET2)"
5586 @test -d $(INSTALL_ROOT)/home/paul/.lppmon/plugins || mkdir -p $(INSTALL_ROOT)/home/paul/.lppmon/plugins
5587 -$(INSTALL_PROGRAM) "bin/$(TARGET)" "$(INSTALL_ROOT)/home/paul/.lppmon/plugins/$(TARGET)"
5588 -$(SYMLINK) "$(TARGET)" "$(INSTALL_ROOT)/home/paul/.lppmon/plugins/$(TARGET0)"
5589 -$(SYMLINK) "$(TARGET)" "$(INSTALL_ROOT)/home/paul/.lppmon/plugins/$(TARGET1)"
5590 -$(SYMLINK) "$(TARGET)" "$(INSTALL_ROOT)/home/paul/.lppmon/plugins/$(TARGET2)"
5641 5591
5642 5592 uninstall_target: FORCE
5643 -$(DEL_FILE) "$(INSTALL_ROOT)/home/admin/.lppmon/plugins/$(TARGET)"
5644 -$(DEL_FILE) "$(INSTALL_ROOT)/home/admin/.lppmon/plugins/$(TARGET0)"
5645 -$(DEL_FILE) "$(INSTALL_ROOT)/home/admin/.lppmon/plugins/$(TARGET1)"
5646 -$(DEL_FILE) "$(INSTALL_ROOT)/home/admin/.lppmon/plugins/$(TARGET2)"
5647 -$(DEL_DIR) $(INSTALL_ROOT)/home/admin/.lppmon/plugins/
5593 -$(DEL_FILE) "$(INSTALL_ROOT)/home/paul/.lppmon/plugins/$(TARGET)"
5594 -$(DEL_FILE) "$(INSTALL_ROOT)/home/paul/.lppmon/plugins/$(TARGET0)"
5595 -$(DEL_FILE) "$(INSTALL_ROOT)/home/paul/.lppmon/plugins/$(TARGET1)"
5596 -$(DEL_FILE) "$(INSTALL_ROOT)/home/paul/.lppmon/plugins/$(TARGET2)"
5597 -$(DEL_DIR) $(INSTALL_ROOT)/home/paul/.lppmon/plugins/
5648 5598
5649 5599
5650 5600 install: install_target FORCE
Show file before | Show file after | Hide comments
@@ -11,10 +11,10 EnterMode::EnterMode(QWidget *parent) :
11 11 radio_plus0 = new QRadioButton("+0");
12 12 radio_plus1 = new QRadioButton("+1");
13 13 radio_plus2 = new QRadioButton("+2");
14 radio_plus3 = new QRadioButton("+3");
14 radio_now = new QRadioButton("now");
15 15 radio_plus4 = new QRadioButton("+4");
16 16
17 radio_plus1->setChecked( true );
17 radio_now->setChecked( true );
18 18
19 19 button_enterModeStandby = new QPushButton(tr("STANDBY"));
20 20 button_enterModeNormal = new QPushButton(tr("NORMAL"));
@@ -60,7 +60,7 EnterMode::EnterMode(QWidget *parent) :
60 60 mainLayout->addWidget(radio_plus0, 6, 1, 1, 1);
61 61 mainLayout->addWidget(radio_plus1, 6, 2, 1, 1);
62 62 mainLayout->addWidget(radio_plus2, 7, 0, 1, 1);
63 mainLayout->addWidget(radio_plus3, 7, 1, 1, 1);
63 mainLayout->addWidget(radio_now, 7, 1, 1, 1);
64 64 mainLayout->addWidget(radio_plus4, 7, 2, 1, 1);
65 65
66 66 mainLayout->setColumnStretch(1, 1);
@@ -304,8 +304,8 void EnterMode::setTimeToSend( )
304 304 timeToSend = lastTMTime + 1;
305 305 if (radio_plus2->isChecked())
306 306 timeToSend = lastTMTime + 2;
307 if (radio_plus3->isChecked())
308 timeToSend = lastTMTime + 3;
307 if (radio_now->isChecked())
308 timeToSend = 0;
309 309 if (radio_plus4->isChecked())
310 310 timeToSend = lastTMTime + 4;
311 311 }
Show file before | Show file after | Hide comments
@@ -53,7 +53,7 public:
53 53 QRadioButton *radio_plus0;
54 54 QRadioButton *radio_plus1;
55 55 QRadioButton *radio_plus2;
56 QRadioButton *radio_plus3;
56 QRadioButton *radio_now;
57 57 QRadioButton *radio_plus4;
58 58
59 59 // ArbitraryTime *arbitraryTime;
Show file before | Show file after | Hide comments
@@ -29,7 +29,7 QList<QVariant> rmappluginPythonWrapper:
29 29 return result;
30 30 }
31 31
32 void rmappluginPythonWrapper::WriteSPW(QList<int> dataList)
32 void rmappluginPythonWrapper::WriteSPW(QList<QVariant> dataList)
33 33 {
34 34 char targetLogicalAddress;
35 35 char userApplication;
@@ -40,7 +40,7 void rmappluginPythonWrapper::WriteSPW(Q
40 40
41 41 for(int i = 0; i<dataList.count(); i++) // get the data as unsigned char
42 42 {
43 data[i] = (unsigned char)dataList.at(i);
43 data[i] = (unsigned char) dataList.at(i).toUInt();
44 44 }
45 45 // read the first bytes of the data to get the targetLogicalAddress and the userApplication parameters
46 46 targetLogicalAddress = data[0];
Show file before | Show file after | Hide comments
@@ -48,7 +48,7 signals:
48 48 public slots:
49 49 QList<QVariant> ReadSPW(unsigned int size=0);
50 50 int fetchPacket() {return emit fetchPacketSig();}
51 void WriteSPW(QList<int> dataList);
51 void WriteSPW(QList<QVariant> dataList);
52 52 void WriteSPWDelay(QList<int> dataList, unsigned int delay=0);
53 53 void processPacketStoreLater(unsigned int delay);
54 54 void sendProcessPacketStoreNowSig(){emit processPacketStoreNowSig();}
General Comments 0
You need to be logged in to leave comments. Login now