HG_REPOSITORIES/LPP/INSTRUMENTATION/SOLO_LFR/LPPMON_PLUGINS_PAUL Commit - r76:c2ac69e28c43

spacecraft potential storage added to lfrsgse...

leroy -

r76:c2ac69e28c43 default

parent child

Context file:

r76:c2ac69e28c43

projects/gse_lesia/storehk.cpp created 644 +92 0

@@ -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	}

projects/gse_lesia/storehk.h created 644 +43 0

@@ -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

common/paulcommon/header/hkdisplay.h +8 -1

             public:
                 explicit HKDisplay(QWidget *parent = 0);
                 void displayPacket(TMPacketToRead *tmPacketToRead);
-            //    void displayPacketLESIA(TMPacketToRead *tmPacketToRead);
                 void setupLFRStatusWord();
                 void setupLFRSWVersion();
                 void setupLFR_FPGA_Version();
+                void setupVE1E2();
                 void setupTCStatistics();
                 void setupAnomalyStatistics();
                 void setupSpaceWireIFStatistics();
                 void update_lfr_status_word(Packet_TM_LFR_HK_t *housekeepingPacket);
                 void updateSWVersion(Packet_TM_LFR_HK_t *housekeepingPacket);
                 void update_FPGA_version(Packet_TM_LFR_HK_t *housekeepingPacket);
+                void update_v_e1_e2(Packet_TM_LFR_HK_t *housekeepingPacket);
                 void updateTCStatistics(Packet_TM_LFR_HK_t *housekeepingPacket);
                 void updateAnomalyStatistics(Packet_TM_LFR_HK_t *housekeepingPacket);
                 void updateSpaceWireIFStatistics(Packet_TM_LFR_HK_t *housekeepingPacket);
                 QGroupBox *groupbox_lfr_FPGA_Version;
                 QGroupBox *groupbox_tcStatistics;
                 QGroupBox *groupbox_anomalyStatistics;
+                QGroupBox *groupbox_v_e1_e2;
                 //***********************************
                 //***********************************
                 QGroupBox *groupbox_vhdlBlockStatus;
                 QVBoxLayout *box_lfrStatusWord;
                 QVBoxLayout *box_lfrSWVersion;
                 QVBoxLayout *box_lfr_FPGA_Version;
+                QVBoxLayout *box_v_e1_e2;
                 QVBoxLayout *box_tcStatistics;
                 QVBoxLayout *box_anomalyStatistics;
                 //***********************************
                 QLabel *sy_lfr_fpga_version_n1;
                 QLabel *sy_lfr_fpga_version_n2;
                 QLabel *sy_lfr_fpga_version_n3;
+                // hk_lfr_sc_
+                QLabel *hk_lfr_sc_v_f3;
+                QLabel *hk_lfr_sc_e1_f3;
+                QLabel *hk_lfr_sc_e2_f3;
                 //
                 QLabel *hk_lfr_update_info_tc_cnt;
                 QLabel *hk_lfr_update_time_tc_cnt;

common/paulcommon/src/hkdisplay.cpp +39 -23

                 setupLFRStatusWord();
                 setupLFRSWVersion();
                 setupLFR_FPGA_Version();
+                setupVE1E2();
                 setupTCStatistics();
                 setupAnomalyStatistics();
                 setupSpaceWireIFStatistics();
                 groupbox_lfrStatusWord->setFont(font);
                 groupbox_lfrSWVersion->setFont(font);
                 groupbox_lfr_FPGA_Version->setFont(font);
+                groupbox_v_e1_e2->setFont(font);
                 groupbox_tcStatistics->setFont(font);
                 groupbox_anomalyStatistics->setFont(font);
                 groupbox_spacewireIFStatisctics->setFont(font);
                 mainLayout->addWidget(groupbox_lfrStatusWord, 0,0,1,1);
                 mainLayout->addWidget(groupbox_lfrSWVersion, 0,1,1,1);
                 mainLayout->addWidget(groupbox_lfr_FPGA_Version, 0,2,1,1);
-                mainLayout->addWidget(groupbox_anomalyStatistics, 0,3,1,1);
+                mainLayout->addWidget(groupbox_v_e1_e2, 0,3,1,1);
                 mainLayout->addWidget(groupbox_tcStatistics, 1,0,1,1);
                 mainLayout->addWidget(groupbox_spacewireIFStatisctics, 1, 1, 1, 1);
                 mainLayout->addWidget(groupbox_errorCountersSpaceWire, 1, 2, 1, 1);
+                mainLayout->addWidget(groupbox_anomalyStatistics, 1,3,1,1);
                 mainLayout->setColumnStretch(4, 1);
                 mainLayout->setRowStretch(2, 1);
                 groupbox_lfr_FPGA_Version->setLayout(box_lfr_FPGA_Version);
             }
+            void HKDisplay::setupVE1E2()
+            {
+                groupbox_v_e1_e2 = new QGroupBox("V E1 E2 @ 16 Hz");
+                box_v_e1_e2 = new QVBoxLayout();
+                hk_lfr_sc_v_f3 = new QLabel("v_f3: -");
+                hk_lfr_sc_e1_f3 = new QLabel("e1_f3: -");
+                hk_lfr_sc_e2_f3 = new QLabel("e2_f3: -");
+                box_v_e1_e2->addWidget(hk_lfr_sc_v_f3);
+                box_v_e1_e2->addWidget(hk_lfr_sc_e1_f3);
+                box_v_e1_e2->addWidget(hk_lfr_sc_e2_f3);
+                box_v_e1_e2->insertStretch(3);
+                groupbox_v_e1_e2->setLayout(box_v_e1_e2);
+            }
             void HKDisplay::setupTCStatistics()
             {
                 groupbox_tcStatistics = new QGroupBox("TC Statistics");
                     update_lfr_status_word( housekeepingPacket );
                     updateSWVersion( housekeepingPacket );
                     update_FPGA_version( housekeepingPacket );
+                    update_v_e1_e2( housekeepingPacket );
                     updateTCStatistics( housekeepingPacket );
                     updateAnomalyStatistics( housekeepingPacket );
                     updateSpaceWireIFStatistics( housekeepingPacket );
                 }
             }
-            //void HKDisplay::displayPacketLESIA(TMPacketToRead *tmPacketToRead)
-            //{
-            //    Packet_TM_LFR_HK_t *housekeepingPacket;
-            //    if (tmPacketToRead->size != (HK_PACKET_SIZE - 4)) {
-            //        emit displayMessage("in displayPacket *** HK packet size is "
-            //                            + QString::number(tmPacketToRead->size)
-            //                            + " instead of "
-            //                            + QString::number(HK_PACKET_SIZE-4));
-            //    }
-            //    else {
-            //        housekeepingPacket = (Packet_TM_LFR_HK_t *) (tmPacketToRead->Value-4);
-            //        update_lfr_status_word( housekeepingPacket );
-            //        updateSWVersion( housekeepingPacket );
-            //        updateTCStatistics( housekeepingPacket );
-            //        updateAnomalyStatistics( housekeepingPacket );
-            //        updateSpaceWireIFStatistics( housekeepingPacket );
-            //        updateErrorCountersSpaceWire( housekeepingPacket );
-            //    }
-            //}
             void HKDisplay::update_lfr_status_word(Packet_TM_LFR_HK_t *housekeepingPacket)
             {
                 hk_lfr_mode->setText("hk_lfr_mode: "
                                      );
             }
+            void HKDisplay::update_v_e1_e2(Packet_TM_LFR_HK_t *housekeepingPacket)
+            {
+                hk_lfr_sc_v_f3->setText("v_f3: "
+                                        + QString::number(
+                                            housekeepingPacket->hk_lfr_sc_v_f3[0] * 256
+                                        + housekeepingPacket->hk_lfr_sc_v_f3[1] )
+                                     );
+                hk_lfr_sc_e1_f3->setText("e1_f3: "
+                                         + QString::number(
+                                             housekeepingPacket->hk_lfr_sc_e1_f3[0] * 256
+                                         + housekeepingPacket->hk_lfr_sc_e1_f3[1] )
+                                     );
+                hk_lfr_sc_e2_f3->setText("e2_f3: "
+                                         + QString::number(
+                                             housekeepingPacket->hk_lfr_sc_e2_f3[0] * 256
+                                         + housekeepingPacket->hk_lfr_sc_e2_f3[1] )
+                                     );
+            }
             void HKDisplay::updateTCStatistics(Packet_TM_LFR_HK_t *housekeepingPacket)
             {
                 // TC Statistics
                 hk_lfr_update_info_tc_cnt->setText("hk_lfr_update_info_tc_cnt: "
                                                    + QString::number(
                                                        housekeepingPacket->hk_lfr_update_info_tc_cnt[0] * 256
-                                                       + housekeepingPacket->hk_lfr_update_info_tc_cnt[1])
+                                                   + housekeepingPacket->hk_lfr_update_info_tc_cnt[1])
                                                    );
                 hk_lfr_update_time_tc_cnt->setText("hk_lfr_update_time_tc_cnt: "
                                                    + QString::number(

projects/Makefile +210 -21

@@ -3,7 +3,7
3	# Generated by qmake (3.0) (Qt 5.2.1)	3	# Generated by qmake (3.0) (Qt 5.2.1)
4	# Project: gse_lesia/gselesia.pro	4	# Project: gse_lesia/gselesia.pro
5	# Template: app	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	MAKEFILE = Makefile	9	MAKEFILE = Makefile
@@ -12,12 +12,12 MAKEFILE = Makefile
12		12
13	CC = gcc	13	CC = gcc
14	CXX = g++	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	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 -g -Wall -W -D_REENTRANT -fPIE $(DEFINES)	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 -g -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	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.	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	LINK = g++	19	LINK = g++
20	LFLAGS = -m64	20	LFLAGS = -m64 -Wl,-O1 -Wl,-z,relro
21	LIBS = $(SUBLIBS) -L/usr/X11R6/lib64 -llppmoncommon -lwfdisplay -lpaulcommon -lQt5PrintSupport -lQt5Widgets -lQt5Xml -lQt5Network -lQt5Gui -lQt5Core -lGL -lpthread	21	LIBS = $(SUBLIBS) -L/usr/X11R6/lib64 -llppmoncommon -lwfdisplay -lpaulcommon -lQt5PrintSupport -lQt5Widgets -lQt5Xml -lQt5Network -lQt5Gui -lQt5Core -lGL -lpthread
22	AR = ar cqs	22	AR = ar cqs
23	RANLIB =	23	RANLIB =
@@ -53,14 +53,16 SOURCES = gse_lesia/main.cpp \
53	gse_lesia/spectrapacket.cpp \	53	gse_lesia/spectrapacket.cpp \
54	gse_lesia/lfrxmlparser.cpp \	54	gse_lesia/lfrxmlparser.cpp \
55	gse_lesia/recordpage.cpp \	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	moc_mainwindowui.cpp \	58	moc_mainwindowui.cpp \
58	moc_lfrxmlhandler.cpp \	59	moc_lfrxmlhandler.cpp \
59	moc_lfrxmlwriter.cpp \	60	moc_lfrxmlwriter.cpp \
60	moc_spectrapacket.cpp \	61	moc_spectrapacket.cpp \
61	moc_lfrxmlparser.cpp \	62	moc_lfrxmlparser.cpp \
62	moc_recordpage.cpp \	63	moc_recordpage.cpp \
63	moc_wfpacket.cpp	64	moc_wfpacket.cpp \
		65	moc_storehk.cpp
64	OBJECTS = main.o \	66	OBJECTS = main.o \
65	mainwindow.o \	67	mainwindow.o \
66	mainwindowui.o \	68	mainwindowui.o \
@@ -70,6 +72,7 OBJECTS = main.o \
70	lfrxmlparser.o \	72	lfrxmlparser.o \
71	recordpage.o \	73	recordpage.o \
72	wfpacket.o \	74	wfpacket.o \
		75	storehk.o \
73	moc_mainwindow.o \	76	moc_mainwindow.o \
74	moc_mainwindowui.o \	77	moc_mainwindowui.o \
75	moc_lfrxmlhandler.o \	78	moc_lfrxmlhandler.o \
@@ -77,7 +80,8 OBJECTS = main.o \
77	moc_spectrapacket.o \	80	moc_spectrapacket.o \
78	moc_lfrxmlparser.o \	81	moc_lfrxmlparser.o \
79	moc_recordpage.o \	82	moc_recordpage.o \
80	moc_wfpacket.o	83	moc_wfpacket.o \
		84	moc_storehk.o
81	DIST = /usr/lib64/qt5/mkspecs/features/spec_pre.prf \	85	DIST = /usr/lib64/qt5/mkspecs/features/spec_pre.prf \
82	/usr/lib64/qt5/mkspecs/common/shell-unix.conf \	86	/usr/lib64/qt5/mkspecs/common/shell-unix.conf \
83	/usr/lib64/qt5/mkspecs/common/unix.conf \	87	/usr/lib64/qt5/mkspecs/common/unix.conf \
@@ -160,8 +164,6 DIST = /usr/lib64/qt5/mkspecs/f
160	/usr/lib64/qt5/mkspecs/features/default_pre.prf \	164	/usr/lib64/qt5/mkspecs/features/default_pre.prf \
161	/usr/lib64/qt5/mkspecs/features/resolve_config.prf \	165	/usr/lib64/qt5/mkspecs/features/resolve_config.prf \
162	/usr/lib64/qt5/mkspecs/features/default_post.prf \	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	/usr/lib64/qt5/mkspecs/features/unix/gdb_dwarf_index.prf \	167	/usr/lib64/qt5/mkspecs/features/unix/gdb_dwarf_index.prf \
166	/usr/lib64/qt5/mkspecs/features/warn_on.prf \	168	/usr/lib64/qt5/mkspecs/features/warn_on.prf \
167	/usr/lib64/qt5/mkspecs/features/qt.prf \	169	/usr/lib64/qt5/mkspecs/features/qt.prf \
@@ -207,7 +209,6 all: Makefile $(TARGET)
207		209
208	$(TARGET): $(OBJECTS)	210	$(TARGET): $(OBJECTS)
209	$(LINK) $(LFLAGS) -o $(TARGET) $(OBJECTS) $(OBJCOMP) $(LIBS)	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	Makefile: gse_lesia/gselesia.pro /usr/lib64/qt5/mkspecs/linux-g++-64/qmake.conf /usr/lib64/qt5/mkspecs/features/spec_pre.prf \	213	Makefile: gse_lesia/gselesia.pro /usr/lib64/qt5/mkspecs/linux-g++-64/qmake.conf /usr/lib64/qt5/mkspecs/features/spec_pre.prf \
213	/usr/lib64/qt5/mkspecs/common/shell-unix.conf \	214	/usr/lib64/qt5/mkspecs/common/shell-unix.conf \
@@ -291,8 +292,6 Makefile: gse_lesia/gselesia.pro /usr/li
291	/usr/lib64/qt5/mkspecs/features/default_pre.prf \	292	/usr/lib64/qt5/mkspecs/features/default_pre.prf \
292	/usr/lib64/qt5/mkspecs/features/resolve_config.prf \	293	/usr/lib64/qt5/mkspecs/features/resolve_config.prf \
293	/usr/lib64/qt5/mkspecs/features/default_post.prf \	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	/usr/lib64/qt5/mkspecs/features/unix/gdb_dwarf_index.prf \	295	/usr/lib64/qt5/mkspecs/features/unix/gdb_dwarf_index.prf \
297	/usr/lib64/qt5/mkspecs/features/warn_on.prf \	296	/usr/lib64/qt5/mkspecs/features/warn_on.prf \
298	/usr/lib64/qt5/mkspecs/features/qt.prf \	297	/usr/lib64/qt5/mkspecs/features/qt.prf \
@@ -312,7 +311,7 Makefile: gse_lesia/gselesia.pro /usr/li
312	/lib64/libQt5Network.prl \	311	/lib64/libQt5Network.prl \
313	/lib64/libQt5Gui.prl \	312	/lib64/libQt5Gui.prl \
314	/lib64/libQt5Core.prl	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	/usr/lib64/qt5/mkspecs/features/spec_pre.prf:	315	/usr/lib64/qt5/mkspecs/features/spec_pre.prf:
317	/usr/lib64/qt5/mkspecs/common/shell-unix.conf:	316	/usr/lib64/qt5/mkspecs/common/shell-unix.conf:
318	/usr/lib64/qt5/mkspecs/common/unix.conf:	317	/usr/lib64/qt5/mkspecs/common/unix.conf:
@@ -395,8 +394,6 Makefile: gse_lesia/gselesia.pro /usr/li
395	/usr/lib64/qt5/mkspecs/features/default_pre.prf:	394	/usr/lib64/qt5/mkspecs/features/default_pre.prf:
396	/usr/lib64/qt5/mkspecs/features/resolve_config.prf:	395	/usr/lib64/qt5/mkspecs/features/resolve_config.prf:
397	/usr/lib64/qt5/mkspecs/features/default_post.prf:	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	/usr/lib64/qt5/mkspecs/features/unix/gdb_dwarf_index.prf:	397	/usr/lib64/qt5/mkspecs/features/unix/gdb_dwarf_index.prf:
401	/usr/lib64/qt5/mkspecs/features/warn_on.prf:	398	/usr/lib64/qt5/mkspecs/features/warn_on.prf:
402	/usr/lib64/qt5/mkspecs/features/qt.prf:	399	/usr/lib64/qt5/mkspecs/features/qt.prf:
@@ -417,13 +414,13 gse_lesia/gselesia.pro:
417	/lib64/libQt5Gui.prl:	414	/lib64/libQt5Gui.prl:
418	/lib64/libQt5Core.prl:	415	/lib64/libQt5Core.prl:
419	qmake: FORCE	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	qmake_all: FORCE	419	qmake_all: FORCE
423		420
424	dist:	421	dist:
425	@test -d .tmp/lfrsgse1.0.0 \|\| mkdir -p .tmp/lfrsgse1.0.0	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	clean:compiler_clean	426	clean:compiler_clean
@@ -446,9 +443,9 check: first
446		443
447	compiler_rcc_make_all:	444	compiler_rcc_make_all:
448	compiler_rcc_clean:	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	compiler_moc_header_clean:	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	moc_mainwindow.cpp: /usr/include/qt5/QtNetwork/QTcpServer \	449	moc_mainwindow.cpp: /usr/include/qt5/QtNetwork/QTcpServer \
453	/usr/include/qt5/QtNetwork/qtcpserver.h \	450	/usr/include/qt5/QtNetwork/qtcpserver.h \
454	/usr/include/qt5/QtCore/qobject.h \	451	/usr/include/qt5/QtCore/qobject.h \
@@ -969,6 +966,9 moc_mainwindow.cpp: /usr/include/qt5/QtN
969	/usr/include/qt5/lppmon/paulcommon/hkdisplay.h \	966	/usr/include/qt5/lppmon/paulcommon/hkdisplay.h \
970	gse_lesia/recordpage.h \	967	gse_lesia/recordpage.h \
971	/usr/include/qt5/QtGui/QCloseEvent \	968	/usr/include/qt5/QtGui/QCloseEvent \
		969	gse_lesia/storehk.h \
		970	/usr/include/qt5/QtCore/QDate \
		971	/usr/include/qt5/QtCore/QTime \
972	gse_lesia/spectrapacket.h \	972	gse_lesia/spectrapacket.h \
973	/usr/include/qt5/lppmon/paulcommon/paulcommonparams.h \	973	/usr/include/qt5/lppmon/paulcommon/paulcommonparams.h \
974	gse_lesia/wfpacket.h \	974	gse_lesia/wfpacket.h \
@@ -1486,6 +1486,9 moc_mainwindowui.cpp: /usr/include/qt5/Q
1486	/usr/include/qt5/lppmon/paulcommon/hkdisplay.h \	1486	/usr/include/qt5/lppmon/paulcommon/hkdisplay.h \
1487	gse_lesia/recordpage.h \	1487	gse_lesia/recordpage.h \
1488	/usr/include/qt5/QtGui/QCloseEvent \	1488	/usr/include/qt5/QtGui/QCloseEvent \
		1489	gse_lesia/storehk.h \
		1490	/usr/include/qt5/QtCore/QDate \
		1491	/usr/include/qt5/QtCore/QTime \
1489	gse_lesia/mainwindowui.h	1492	gse_lesia/mainwindowui.h
1490	/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	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	gse_lesia/wfpacket.h	1988	gse_lesia/wfpacket.h
1986	/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	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	compiler_moc_source_make_all:	2078	compiler_moc_source_make_all:
1989	compiler_moc_source_clean:	2079	compiler_moc_source_clean:
1990	compiler_uic_make_all:	2080	compiler_uic_make_all:
@@ -2520,6 +2610,9 main.o: gse_lesia/main.cpp gse_lesia/mai
2520	/usr/include/qt5/lppmon/paulcommon/hkdisplay.h \	2610	/usr/include/qt5/lppmon/paulcommon/hkdisplay.h \
2521	gse_lesia/recordpage.h \	2611	gse_lesia/recordpage.h \
2522	/usr/include/qt5/QtGui/QCloseEvent \	2612	/usr/include/qt5/QtGui/QCloseEvent \
		2613	gse_lesia/storehk.h \
		2614	/usr/include/qt5/QtCore/QDate \
		2615	/usr/include/qt5/QtCore/QTime \
2523	gse_lesia/spectrapacket.h \	2616	gse_lesia/spectrapacket.h \
2524	/usr/include/qt5/lppmon/paulcommon/paulcommonparams.h \	2617	/usr/include/qt5/lppmon/paulcommon/paulcommonparams.h \
2525	gse_lesia/wfpacket.h \	2618	gse_lesia/wfpacket.h \
@@ -3051,6 +3144,9 mainwindow.o: gse_lesia/mainwindow.cpp g
3051	/usr/include/qt5/lppmon/paulcommon/hkdisplay.h \	3144	/usr/include/qt5/lppmon/paulcommon/hkdisplay.h \
3052	gse_lesia/recordpage.h \	3145	gse_lesia/recordpage.h \
3053	/usr/include/qt5/QtGui/QCloseEvent \	3146	/usr/include/qt5/QtGui/QCloseEvent \
		3147	gse_lesia/storehk.h \
		3148	/usr/include/qt5/QtCore/QDate \
		3149	/usr/include/qt5/QtCore/QTime \
3054	gse_lesia/spectrapacket.h \	3150	gse_lesia/spectrapacket.h \
3055	/usr/include/qt5/lppmon/paulcommon/paulcommonparams.h \	3151	/usr/include/qt5/lppmon/paulcommon/paulcommonparams.h \
3056	gse_lesia/wfpacket.h \	3152	gse_lesia/wfpacket.h \
@@ -3569,7 +3665,10 mainwindowui.o: gse_lesia/mainwindowui.c
3569	/usr/include/qt5/QtWidgets/QCheckBox \	3665	/usr/include/qt5/QtWidgets/QCheckBox \
3570	/usr/include/qt5/lppmon/paulcommon/hkdisplay.h \	3666	/usr/include/qt5/lppmon/paulcommon/hkdisplay.h \
3571	gse_lesia/recordpage.h \	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	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o mainwindowui.o gse_lesia/mainwindowui.cpp	3672	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o mainwindowui.o gse_lesia/mainwindowui.cpp
3574		3673
3575	lfrxmlhandler.o: gse_lesia/lfrxmlhandler.cpp gse_lesia/lfrxmlhandler.h \	3674	lfrxmlhandler.o: gse_lesia/lfrxmlhandler.cpp gse_lesia/lfrxmlhandler.h \
@@ -4107,6 +4206,93 wfpacket.o: gse_lesia/wfpacket.cpp gse_l
4107	../../DEV_PLE/header/ccsds_types.h	4206	../../DEV_PLE/header/ccsds_types.h
4108	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o wfpacket.o gse_lesia/wfpacket.cpp	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	moc_mainwindow.o: moc_mainwindow.cpp	4296	moc_mainwindow.o: moc_mainwindow.cpp
4111	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o moc_mainwindow.o moc_mainwindow.cpp	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	moc_wfpacket.o: moc_wfpacket.cpp	4317	moc_wfpacket.o: moc_wfpacket.cpp
4132	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o moc_wfpacket.o moc_wfpacket.cpp	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	####### Install	4323	####### Install
4135		4324
4136	install: FORCE	4325	install: FORCE

projects/gse_lesia/gselesia.pro +4 -2

                 spectrapacket.cpp \
                 lfrxmlparser.cpp \
                 recordpage.cpp \
-                wfpacket.cpp
+                wfpacket.cpp \
+                storehk.cpp
             HEADERS  += mainwindow.h \
                 mainwindowui.h \
                 spectrapacket.h \
                 lfrxmlparser.h \
                 recordpage.h \
-                wfpacket.h
+                wfpacket.h \
+                storehk.h

projects/gse_lesia/mainwindow.cpp +24 -2

                 deltaT = 1 / 16.;
-                if (pkt_nr == 1) // the acquisition time of the first packet of the snapshot is taken as starting time
+                if (pkt_nr == 1)
                 {
                     tmpCoarseTime = coarseTime;
                     tmpFineTime = fineTime;
                 deltaT = 1. / 4096.;
-                if (pkt_nr == 1) // the acquisition time of the first packet of the snapshot is taken as starting time
+                if (pkt_nr == 1)
                 {
                     coarseTime = ((packet->Value[22] & 0x7f) << 24)
                             + (packet->Value[23] << 16)
                 }
             }
+            void MainWindow::extract_v_e1_e2( TMPacketToRead *packet )
+            {
+                unsigned short param1;
+                unsigned short param2;
+                unsigned short param3;
+                unsigned int coarseTime;
+                unsigned int fineTime;
+                coarseTime = ((packet->Value[14] & 0x7f) << 24)
+                        + (packet->Value[15] << 16)
+                        + (packet->Value[16] << 8)
+                        + packet->Value[17];
+                fineTime = (packet->Value[18] << 8) + packet->Value[19];
+                param1 = (unsigned short) (packet->Value[100] << 8) + packet->Value[101];
+                param2 = (unsigned short) (packet->Value[102] << 8) + packet->Value[103];
+                param3 = (unsigned short) (packet->Value[104] << 8) + packet->Value[105];
+                this->UI->storeHK->buildDataAsQByteArray(param1, param2, param3, coarseTime, fineTime);
+            }
             void MainWindow::resetStatistics()
             {
                 totalOfBytes = 0;
                      & (typ == TM_TYPE_HK) & (sub == TM_SUBTYPE_HK) )
                 {
                     this->UI->hkDisplay->displayPacket(packet);
+                    extract_v_e1_e2( packet );
                 }
                 //**************************************************************

projects/gse_lesia/mainwindow.h +1 0

                 void buildWFAndDisplay_CWF_F2(TMPacketToRead *packet, WFPacket *wfPacket);
                 void build_ASM_AndDisplay_NORM_F0(TMPacketToRead *packet, SpectraPacket *spectraPacket);
                 void build_ASM_AndDisplay_NORM(TMPacketToRead *packet, SpectraPacket *spectraPacket, double deltaF, unsigned char indiceStart, ASMPage *asmPage);
+                void extract_v_e1_e2(TMPacketToRead *packet );
             protected:
                 void closeEvent(QCloseEvent *);

projects/gse_lesia/mainwindowui.cpp +7 0

                 asmPage_F0 = new ASMPage(0, NB_BINS_PER_ASM_F0, NB_BINS_PER_ASM_F0, 15000);
                 asmPage_F1 = new ASMPage(0, NB_BINS_PER_ASM_F1, NB_BINS_PER_ASM_F1, 15000);
                 asmPage_F2 = new ASMPage(0, NB_BINS_PER_ASM_F2, NB_BINS_PER_ASM_F2, 15000);
+                storeHK = new StoreHK();
                 wfPage_CWF_F1->pageTitle = "SBM1_CWF_F1";
                 wfPage_CWF_F2->pageTitle = "SBM2_CWF_F2";
                 asmPage_F0->pageTitle = "ASM_F0";
                 asmPage_F1->pageTitle = "ASM_F1";
                 asmPage_F2->pageTitle = "ASM_F2";
+                storeHK->hkName = "spacecraft_potential";
                 hkDisplay = new HKDisplay();
                 recordPage = new RecordPage;
                         this->asmPage_F2, SLOT(storeWfrm()));
                 connect(this->recordPage, SIGNAL(signal_defaultStorageDirectoryUpdated(QString)),
                         this->asmPage_F2, SLOT(setDefaultStorageDirectory(QString)));
+                // HK_SPACECRAFT_POTENTIAL
+                connect(this->recordPage, SIGNAL(signal_store_hk_spacecraft_potential()),
+                        this->storeHK, SLOT(storeData()));
+                connect(this->recordPage, SIGNAL(signal_defaultStorageDirectoryUpdated(QString)),
+                        this->storeHK, SLOT(setDefaultStorageDirectory(QString)));
                 emit this->recordPage->signal_defaultStorageDirectoryUpdated(this->recordPage->defaultStorageDirectory);
             }

projects/gse_lesia/mainwindowui.h +3 0

             #include "tmstatistics.h"
             #include "hkdisplay.h"
             #include "recordpage.h"
+            #include "storehk.h"
             class MainWindowUI : public QWidget
             {
                 HKDisplay* hkDisplay;
                 RecordPage* recordPage;
+                StoreHK *storeHK;
                 QWidget* widget_spectrogram;
                 ParameterDump* parameterDump;

projects/gse_lesia/recordpage.cpp +14 -2

                radiobutton_asm_f0 = new QRadioButton("asm_f0");
                radiobutton_asm_f1 = new QRadioButton("asm_f1");
                radiobutton_asm_f2 = new QRadioButton("asm_f2");
+               radiobutton_hk_spacecraft_potential = new QRadioButton("s/c potential");
                radiobutton_swf_f0->setAutoExclusive(false);
                radiobutton_swf_f1->setAutoExclusive(false);
                radiobutton_asm_f0->setAutoExclusive(false);
                radiobutton_asm_f1->setAutoExclusive(false);
                radiobutton_asm_f2->setAutoExclusive(false);
+               radiobutton_hk_spacecraft_potential->setAutoExclusive(false);
                label_currentDir = new QLabel("Current Dir: -");
                groupbox_waveforms = new QGroupBox("waveforms");
                groupbox_matrices = new QGroupBox("spectral matrices");
+               groupbox_hk = new QGroupBox("HK");
                groupbox_directory = new QGroupBox("directory");
                vboxlayout_waveforms = new QVBoxLayout();
                vboxlayout_matrices = new QVBoxLayout();
+               vboxlayout_hk = new QVBoxLayout();
                vboxlayout_directory = new QVBoxLayout();
                mainLayout = new QGridLayout();
                vboxlayout_waveforms->addWidget(radiobutton_cwf_f3);
                vboxlayout_waveforms->addStretch();
                vboxlayout_matrices->addWidget(radiobutton_asm_f0);
                vboxlayout_matrices->addWidget(radiobutton_asm_f1);
                vboxlayout_matrices->addWidget(radiobutton_asm_f2);
                vboxlayout_matrices->addStretch();
+               vboxlayout_hk->addWidget(radiobutton_hk_spacecraft_potential);
+               vboxlayout_hk->addStretch();
                vboxlayout_directory->addWidget(button_storeWfrm);
                vboxlayout_directory->addWidget(button_chooseDir);
                vboxlayout_directory->addWidget(label_currentDir);
                groupbox_waveforms->setLayout(vboxlayout_waveforms);
                groupbox_matrices->setLayout(vboxlayout_matrices);
+               groupbox_hk->setLayout(vboxlayout_hk);
                groupbox_directory->setLayout(vboxlayout_directory);
                mainLayout->addWidget(groupbox_directory, 0, 0, 1, 1);
                mainLayout->addWidget(groupbox_waveforms, 0, 1, 1, 1);
                mainLayout->addWidget(groupbox_matrices, 0, 2, 1, 1);
+               mainLayout->addWidget(groupbox_hk, 0, 3, 1, 1);
                mainLayout->setRowStretch(1, 1);
-               mainLayout->setColumnStretch(3, 1);
+               mainLayout->setColumnStretch(4, 1);
                this->setLayout(mainLayout);
                     if (radiobutton_asm_f0->isChecked()) emit signal_store_asm_f0();
                     if (radiobutton_asm_f1->isChecked()) emit signal_store_asm_f0();
                     if (radiobutton_asm_f2->isChecked()) emit signal_store_asm_f0();
+                    if (radiobutton_hk_spacecraft_potential->isChecked()) emit signal_store_hk_spacecraft_potential();
                     radiobutton_swf_f0->setEnabled(false);
                     radiobutton_swf_f1->setEnabled(false);
                     radiobutton_swf_f2->setEnabled(false);
                     radiobutton_asm_f0->setEnabled(false);
                     radiobutton_asm_f1->setEnabled(false);
                     radiobutton_asm_f2->setEnabled(false);
+                    radiobutton_hk_spacecraft_potential->setEnabled(false);
                 }
                 else
                 {
                     if (radiobutton_asm_f0->isChecked()) emit signal_store_asm_f0();
                     if (radiobutton_asm_f1->isChecked()) emit signal_store_asm_f1();
                     if (radiobutton_asm_f2->isChecked()) emit signal_store_asm_f2();
+                    if (radiobutton_hk_spacecraft_potential->isChecked()) emit signal_store_hk_spacecraft_potential();
                     radiobutton_swf_f0->setEnabled(true);
                     radiobutton_swf_f1->setEnabled(true);
                     radiobutton_swf_f2->setEnabled(true);
                     radiobutton_asm_f0->setEnabled(true);
                     radiobutton_asm_f1->setEnabled(true);
                     radiobutton_asm_f2->setEnabled(true);
+                    radiobutton_hk_spacecraft_potential->setEnabled(true);
                 }
             }

projects/gse_lesia/recordpage.h +4 0

                 QRadioButton *radiobutton_asm_f0;
                 QRadioButton *radiobutton_asm_f1;
                 QRadioButton *radiobutton_asm_f2;
+                QRadioButton *radiobutton_hk_spacecraft_potential;
                 QGroupBox *groupbox_waveforms;
                 QGroupBox *groupbox_matrices;
+                QGroupBox *groupbox_hk;
                 QGroupBox *groupbox_directory;
                 QVBoxLayout *vboxlayout_waveforms;
                 QVBoxLayout *vboxlayout_matrices;
+                QVBoxLayout *vboxlayout_hk;
                 QVBoxLayout *vboxlayout_directory;
                 QString defaultStorageDirectory;
                 void signal_store_asm_f0();
                 void signal_store_asm_f1();
                 void signal_store_asm_f2();
+                void signal_store_hk_spacecraft_potential();
                 void signal_defaultStorageDirectoryUpdated( QString nameOfTheDirectory );
             public slots:

projects/lfrsgse binary modified 0 0

NO CONTENT: modified file, binary diff hidden

projects/rmapplugin/Makefile +14 -64

             # Generated by qmake (3.0) (Qt 5.2.1)
             # Project:  rmapplugin.pro
             # Template: lib
-            # Command: /usr/bin/qmake-qt5 -o Makefile rmapplugin.pro
+            # Command: /bin/qmake-qt5 -spec linux-g++-64 -o Makefile rmapplugin.pro
             #############################################################################
             MAKEFILE      = Makefile
             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
             AR            = ar cqs
             RANLIB        =
-            QMAKE         = /usr/bin/qmake-qt5
+            QMAKE         = /bin/qmake-qt5
             TAR           = tar -cf
             COMPRESS      = gzip -9f
             COPY          = cp -f
             		/usr/lib64/qt5/mkspecs/common/g++-base.conf \
             		/usr/lib64/qt5/mkspecs/common/g++-unix.conf \
             		/usr/lib64/qt5/mkspecs/qconfig.pri \
-            		/usr/lib64/qt5/mkspecs/modules/qt_lib_bluetooth.pri \
-            		/usr/lib64/qt5/mkspecs/modules/qt_lib_bluetooth_private.pri \
             		/usr/lib64/qt5/mkspecs/modules/qt_lib_bootstrap_private.pri \
             		/usr/lib64/qt5/mkspecs/modules/qt_lib_clucene_private.pri \
             		/usr/lib64/qt5/mkspecs/modules/qt_lib_compositor.pri \
             		/usr/lib64/qt5/mkspecs/modules/qt_lib_multimediawidgets_private.pri \
             		/usr/lib64/qt5/mkspecs/modules/qt_lib_network.pri \
             		/usr/lib64/qt5/mkspecs/modules/qt_lib_network_private.pri \
-            		/usr/lib64/qt5/mkspecs/modules/qt_lib_nfc.pri \
-            		/usr/lib64/qt5/mkspecs/modules/qt_lib_nfc_private.pri \
             		/usr/lib64/qt5/mkspecs/modules/qt_lib_opengl.pri \
             		/usr/lib64/qt5/mkspecs/modules/qt_lib_opengl_private.pri \
             		/usr/lib64/qt5/mkspecs/modules/qt_lib_openglextensions.pri \
             		/usr/lib64/qt5/mkspecs/modules/qt_lib_openglextensions_private.pri \
             		/usr/lib64/qt5/mkspecs/modules/qt_lib_platformsupport_private.pri \
-            		/usr/lib64/qt5/mkspecs/modules/qt_lib_positioning.pri \
-            		/usr/lib64/qt5/mkspecs/modules/qt_lib_positioning_private.pri \
             		/usr/lib64/qt5/mkspecs/modules/qt_lib_printsupport.pri \
             		/usr/lib64/qt5/mkspecs/modules/qt_lib_printsupport_private.pri \
             		/usr/lib64/qt5/mkspecs/modules/qt_lib_qml.pri \
             		/usr/lib64/qt5/mkspecs/modules/qt_lib_script_private.pri \
             		/usr/lib64/qt5/mkspecs/modules/qt_lib_scripttools.pri \
             		/usr/lib64/qt5/mkspecs/modules/qt_lib_scripttools_private.pri \
-            		/usr/lib64/qt5/mkspecs/modules/qt_lib_sensors.pri \
-            		/usr/lib64/qt5/mkspecs/modules/qt_lib_sensors_private.pri \
-            		/usr/lib64/qt5/mkspecs/modules/qt_lib_serialport.pri \
-            		/usr/lib64/qt5/mkspecs/modules/qt_lib_serialport_private.pri \
             		/usr/lib64/qt5/mkspecs/modules/qt_lib_sql.pri \
             		/usr/lib64/qt5/mkspecs/modules/qt_lib_sql_private.pri \
             		/usr/lib64/qt5/mkspecs/modules/qt_lib_svg.pri \
             		/usr/lib64/qt5/mkspecs/common/g++-base.conf \
             		/usr/lib64/qt5/mkspecs/common/g++-unix.conf \
             		/usr/lib64/qt5/mkspecs/qconfig.pri \
-            		/usr/lib64/qt5/mkspecs/modules/qt_lib_bluetooth.pri \
-            		/usr/lib64/qt5/mkspecs/modules/qt_lib_bluetooth_private.pri \
             		/usr/lib64/qt5/mkspecs/modules/qt_lib_bootstrap_private.pri \
             		/usr/lib64/qt5/mkspecs/modules/qt_lib_clucene_private.pri \
             		/usr/lib64/qt5/mkspecs/modules/qt_lib_compositor.pri \
             		/usr/lib64/qt5/mkspecs/modules/qt_lib_multimediawidgets_private.pri \
             		/usr/lib64/qt5/mkspecs/modules/qt_lib_network.pri \
             		/usr/lib64/qt5/mkspecs/modules/qt_lib_network_private.pri \
-            		/usr/lib64/qt5/mkspecs/modules/qt_lib_nfc.pri \
-            		/usr/lib64/qt5/mkspecs/modules/qt_lib_nfc_private.pri \
             		/usr/lib64/qt5/mkspecs/modules/qt_lib_opengl.pri \
             		/usr/lib64/qt5/mkspecs/modules/qt_lib_opengl_private.pri \
             		/usr/lib64/qt5/mkspecs/modules/qt_lib_openglextensions.pri \
             		/usr/lib64/qt5/mkspecs/modules/qt_lib_openglextensions_private.pri \
             		/usr/lib64/qt5/mkspecs/modules/qt_lib_platformsupport_private.pri \
-            		/usr/lib64/qt5/mkspecs/modules/qt_lib_positioning.pri \
-            		/usr/lib64/qt5/mkspecs/modules/qt_lib_positioning_private.pri \
             		/usr/lib64/qt5/mkspecs/modules/qt_lib_printsupport.pri \
             		/usr/lib64/qt5/mkspecs/modules/qt_lib_printsupport_private.pri \
             		/usr/lib64/qt5/mkspecs/modules/qt_lib_qml.pri \
             		/usr/lib64/qt5/mkspecs/modules/qt_lib_script_private.pri \
             		/usr/lib64/qt5/mkspecs/modules/qt_lib_scripttools.pri \
             		/usr/lib64/qt5/mkspecs/modules/qt_lib_scripttools_private.pri \
-            		/usr/lib64/qt5/mkspecs/modules/qt_lib_sensors.pri \
-            		/usr/lib64/qt5/mkspecs/modules/qt_lib_sensors_private.pri \
-            		/usr/lib64/qt5/mkspecs/modules/qt_lib_serialport.pri \
-            		/usr/lib64/qt5/mkspecs/modules/qt_lib_serialport_private.pri \
             		/usr/lib64/qt5/mkspecs/modules/qt_lib_sql.pri \
             		/usr/lib64/qt5/mkspecs/modules/qt_lib_sql_private.pri \
             		/usr/lib64/qt5/mkspecs/modules/qt_lib_svg.pri \
             		/lib64/libQt5Xml.prl \
             		/lib64/libQt5Gui.prl \
             		/lib64/libQt5Core.prl
-            	$(QMAKE) -o Makefile rmapplugin.pro
+            	$(QMAKE) -spec linux-g++-64 -o Makefile rmapplugin.pro
             /usr/lib64/qt5/mkspecs/features/spec_pre.prf:
             /usr/lib64/qt5/mkspecs/common/shell-unix.conf:
             /usr/lib64/qt5/mkspecs/common/unix.conf:
             /usr/lib64/qt5/mkspecs/common/g++-base.conf:
             /usr/lib64/qt5/mkspecs/common/g++-unix.conf:
             /usr/lib64/qt5/mkspecs/qconfig.pri:
-            /usr/lib64/qt5/mkspecs/modules/qt_lib_bluetooth.pri:
-            /usr/lib64/qt5/mkspecs/modules/qt_lib_bluetooth_private.pri:
             /usr/lib64/qt5/mkspecs/modules/qt_lib_bootstrap_private.pri:
             /usr/lib64/qt5/mkspecs/modules/qt_lib_clucene_private.pri:
             /usr/lib64/qt5/mkspecs/modules/qt_lib_compositor.pri:
             /usr/lib64/qt5/mkspecs/modules/qt_lib_multimediawidgets_private.pri:
             /usr/lib64/qt5/mkspecs/modules/qt_lib_network.pri:
             /usr/lib64/qt5/mkspecs/modules/qt_lib_network_private.pri:
-            /usr/lib64/qt5/mkspecs/modules/qt_lib_nfc.pri:
-            /usr/lib64/qt5/mkspecs/modules/qt_lib_nfc_private.pri:
             /usr/lib64/qt5/mkspecs/modules/qt_lib_opengl.pri:
             /usr/lib64/qt5/mkspecs/modules/qt_lib_opengl_private.pri:
             /usr/lib64/qt5/mkspecs/modules/qt_lib_openglextensions.pri:
             /usr/lib64/qt5/mkspecs/modules/qt_lib_openglextensions_private.pri:
             /usr/lib64/qt5/mkspecs/modules/qt_lib_platformsupport_private.pri:
-            /usr/lib64/qt5/mkspecs/modules/qt_lib_positioning.pri:
-            /usr/lib64/qt5/mkspecs/modules/qt_lib_positioning_private.pri:
             /usr/lib64/qt5/mkspecs/modules/qt_lib_printsupport.pri:
             /usr/lib64/qt5/mkspecs/modules/qt_lib_printsupport_private.pri:
             /usr/lib64/qt5/mkspecs/modules/qt_lib_qml.pri:
             /usr/lib64/qt5/mkspecs/modules/qt_lib_script_private.pri:
             /usr/lib64/qt5/mkspecs/modules/qt_lib_scripttools.pri:
             /usr/lib64/qt5/mkspecs/modules/qt_lib_scripttools_private.pri:
-            /usr/lib64/qt5/mkspecs/modules/qt_lib_sensors.pri:
-            /usr/lib64/qt5/mkspecs/modules/qt_lib_sensors_private.pri:
-            /usr/lib64/qt5/mkspecs/modules/qt_lib_serialport.pri:
-            /usr/lib64/qt5/mkspecs/modules/qt_lib_serialport_private.pri:
             /usr/lib64/qt5/mkspecs/modules/qt_lib_sql.pri:
             /usr/lib64/qt5/mkspecs/modules/qt_lib_sql_private.pri:
             /usr/lib64/qt5/mkspecs/modules/qt_lib_svg.pri:
             /lib64/libQt5Gui.prl:
             /lib64/libQt5Core.prl:
             qmake: FORCE
-            	@$(QMAKE) -o Makefile rmapplugin.pro
+            	@$(QMAKE) -spec linux-g++-64 -o Makefile rmapplugin.pro
             qmake_all: FORCE
             		/usr/include/qt5/QtGui/qwindowdefs.h \
             		/usr/include/qt5/QtCore/qglobal.h \
             		/usr/include/qt5/QtCore/qconfig.h \
-            		/usr/include/qt5/QtCore/qconfig-32.h \
             		/usr/include/qt5/QtCore/qconfig-64.h \
             		/usr/include/qt5/QtCore/qfeatures.h \
             		/usr/include/qt5/QtCore/qsystemdetection.h \
             		/usr/include/qt5/QtGui/qwindowdefs.h \
             		/usr/include/qt5/QtCore/qglobal.h \
             		/usr/include/qt5/QtCore/qconfig.h \
-            		/usr/include/qt5/QtCore/qconfig-32.h \
             		/usr/include/qt5/QtCore/qconfig-64.h \
             		/usr/include/qt5/QtCore/qfeatures.h \
             		/usr/include/qt5/QtCore/qsystemdetection.h \
             		/usr/include/qt5/QtCore/qnamespace.h \
             		/usr/include/qt5/QtCore/qglobal.h \
             		/usr/include/qt5/QtCore/qconfig.h \
-            		/usr/include/qt5/QtCore/qconfig-32.h \
             		/usr/include/qt5/QtCore/qconfig-64.h \
             		/usr/include/qt5/QtCore/qfeatures.h \
             		/usr/include/qt5/QtCore/qsystemdetection.h \
             		/usr/include/qt5/QtGui/qwindowdefs.h \
             		/usr/include/qt5/QtCore/qglobal.h \
             		/usr/include/qt5/QtCore/qconfig.h \
-            		/usr/include/qt5/QtCore/qconfig-32.h \
             		/usr/include/qt5/QtCore/qconfig-64.h \
             		/usr/include/qt5/QtCore/qfeatures.h \
             		/usr/include/qt5/QtCore/qsystemdetection.h \
             		/usr/include/qt5/QtGui/qwindowdefs.h \
             		/usr/include/qt5/QtCore/qglobal.h \
             		/usr/include/qt5/QtCore/qconfig.h \
-            		/usr/include/qt5/QtCore/qconfig-32.h \
             		/usr/include/qt5/QtCore/qconfig-64.h \
             		/usr/include/qt5/QtCore/qfeatures.h \
             		/usr/include/qt5/QtCore/qsystemdetection.h \
             		/usr/include/qt5/QtGui/qwindowdefs.h \
             		/usr/include/qt5/QtCore/qglobal.h \
             		/usr/include/qt5/QtCore/qconfig.h \
-            		/usr/include/qt5/QtCore/qconfig-32.h \
             		/usr/include/qt5/QtCore/qconfig-64.h \
             		/usr/include/qt5/QtCore/qfeatures.h \
             		/usr/include/qt5/QtCore/qsystemdetection.h \
             		/usr/include/qt5/QtGui/qwindowdefs.h \
             		/usr/include/qt5/QtCore/qglobal.h \
             		/usr/include/qt5/QtCore/qconfig.h \
-            		/usr/include/qt5/QtCore/qconfig-32.h \
             		/usr/include/qt5/QtCore/qconfig-64.h \
             		/usr/include/qt5/QtCore/qfeatures.h \
             		/usr/include/qt5/QtCore/qsystemdetection.h \
             		/usr/include/qt5/QtGui/qwindowdefs.h \
             		/usr/include/qt5/QtCore/qglobal.h \
             		/usr/include/qt5/QtCore/qconfig.h \
-            		/usr/include/qt5/QtCore/qconfig-32.h \
             		/usr/include/qt5/QtCore/qconfig-64.h \
             		/usr/include/qt5/QtCore/qfeatures.h \
             		/usr/include/qt5/QtCore/qsystemdetection.h \
             		/usr/include/qt5/QtCore/qnamespace.h \
             		/usr/include/qt5/QtCore/qglobal.h \
             		/usr/include/qt5/QtCore/qconfig.h \
-            		/usr/include/qt5/QtCore/qconfig-32.h \
             		/usr/include/qt5/QtCore/qconfig-64.h \
             		/usr/include/qt5/QtCore/qfeatures.h \
             		/usr/include/qt5/QtCore/qsystemdetection.h \
             		/usr/include/qt5/QtGui/qwindowdefs.h \
             		/usr/include/qt5/QtCore/qglobal.h \
             		/usr/include/qt5/QtCore/qconfig.h \
-            		/usr/include/qt5/QtCore/qconfig-32.h \
             		/usr/include/qt5/QtCore/qconfig-64.h \
             		/usr/include/qt5/QtCore/qfeatures.h \
             		/usr/include/qt5/QtCore/qsystemdetection.h \
             		/usr/include/qt5/QtGui/qwindowdefs.h \
             		/usr/include/qt5/QtCore/qglobal.h \
             		/usr/include/qt5/QtCore/qconfig.h \
-            		/usr/include/qt5/QtCore/qconfig-32.h \
             		/usr/include/qt5/QtCore/qconfig-64.h \
             		/usr/include/qt5/QtCore/qfeatures.h \
             		/usr/include/qt5/QtCore/qsystemdetection.h \
             		/usr/include/qt5/QtGui/qwindowdefs.h \
             		/usr/include/qt5/QtCore/qglobal.h \
             		/usr/include/qt5/QtCore/qconfig.h \
-            		/usr/include/qt5/QtCore/qconfig-32.h \
             		/usr/include/qt5/QtCore/qconfig-64.h \
             		/usr/include/qt5/QtCore/qfeatures.h \
             		/usr/include/qt5/QtCore/qsystemdetection.h \
             		/usr/include/qt5/QtGui/qwindowdefs.h \
             		/usr/include/qt5/QtCore/qglobal.h \
             		/usr/include/qt5/QtCore/qconfig.h \
-            		/usr/include/qt5/QtCore/qconfig-32.h \
             		/usr/include/qt5/QtCore/qconfig-64.h \
             		/usr/include/qt5/QtCore/qfeatures.h \
             		/usr/include/qt5/QtCore/qsystemdetection.h \
             		/usr/include/qt5/QtCore/qnamespace.h \
             		/usr/include/qt5/QtCore/qglobal.h \
             		/usr/include/qt5/QtCore/qconfig.h \
-            		/usr/include/qt5/QtCore/qconfig-32.h \
             		/usr/include/qt5/QtCore/qconfig-64.h \
             		/usr/include/qt5/QtCore/qfeatures.h \
             		/usr/include/qt5/QtCore/qsystemdetection.h \
             		/usr/include/qt5/QtGui/qwindowdefs.h \
             		/usr/include/qt5/QtCore/qglobal.h \
             		/usr/include/qt5/QtCore/qconfig.h \
-            		/usr/include/qt5/QtCore/qconfig-32.h \
             		/usr/include/qt5/QtCore/qconfig-64.h \
             		/usr/include/qt5/QtCore/qfeatures.h \
             		/usr/include/qt5/QtCore/qsystemdetection.h \
             		/usr/include/qt5/QtGui/qwindowdefs.h \
             		/usr/include/qt5/QtCore/qglobal.h \
             		/usr/include/qt5/QtCore/qconfig.h \
-            		/usr/include/qt5/QtCore/qconfig-32.h \
             		/usr/include/qt5/QtCore/qconfig-64.h \
             		/usr/include/qt5/QtCore/qfeatures.h \
             		/usr/include/qt5/QtCore/qsystemdetection.h \
             		/usr/include/qt5/QtGui/qwindowdefs.h \
             		/usr/include/qt5/QtCore/qglobal.h \
             		/usr/include/qt5/QtCore/qconfig.h \
-            		/usr/include/qt5/QtCore/qconfig-32.h \
             		/usr/include/qt5/QtCore/qconfig-64.h \
             		/usr/include/qt5/QtCore/qfeatures.h \
             		/usr/include/qt5/QtCore/qsystemdetection.h \
             		/usr/include/qt5/QtGui/qwindowdefs.h \
             		/usr/include/qt5/QtCore/qglobal.h \
             		/usr/include/qt5/QtCore/qconfig.h \
-            		/usr/include/qt5/QtCore/qconfig-32.h \
             		/usr/include/qt5/QtCore/qconfig-64.h \
             		/usr/include/qt5/QtCore/qfeatures.h \
             		/usr/include/qt5/QtCore/qsystemdetection.h \
             		/usr/include/qt5/QtGui/qwindowdefs.h \
             		/usr/include/qt5/QtCore/qglobal.h \
             		/usr/include/qt5/QtCore/qconfig.h \
-            		/usr/include/qt5/QtCore/qconfig-32.h \
             		/usr/include/qt5/QtCore/qconfig-64.h \
             		/usr/include/qt5/QtCore/qfeatures.h \
             		/usr/include/qt5/QtCore/qsystemdetection.h \
             		/usr/include/qt5/lppmon/pluginsInterface/lppmonplugininterface_global.h \
             		/usr/include/qt5/QtCore/qglobal.h \
             		/usr/include/qt5/QtCore/qconfig.h \
-            		/usr/include/qt5/QtCore/qconfig-32.h \
             		/usr/include/qt5/QtCore/qconfig-64.h \
             		/usr/include/qt5/QtCore/qfeatures.h \
             		/usr/include/qt5/QtCore/qsystemdetection.h \
             ####### Install
             install_target: first FORCE
-            	@test -d $(INSTALL_ROOT)/home/admin/.lppmon/plugins || mkdir -p $(INSTALL_ROOT)/home/admin/.lppmon/plugins
+            	@test -d $(INSTALL_ROOT)/home/paul/.lppmon/plugins || mkdir -p $(INSTALL_ROOT)/home/paul/.lppmon/plugins
-            	-$(INSTALL_PROGRAM) "bin/$(TARGET)" "$(INSTALL_ROOT)/home/admin/.lppmon/plugins/$(TARGET)"
+            	-$(INSTALL_PROGRAM) "bin/$(TARGET)" "$(INSTALL_ROOT)/home/paul/.lppmon/plugins/$(TARGET)"
-            	-$(SYMLINK) "$(TARGET)" "$(INSTALL_ROOT)/home/admin/.lppmon/plugins/$(TARGET0)"
+            	-$(SYMLINK) "$(TARGET)" "$(INSTALL_ROOT)/home/paul/.lppmon/plugins/$(TARGET0)"
-            	-$(SYMLINK) "$(TARGET)" "$(INSTALL_ROOT)/home/admin/.lppmon/plugins/$(TARGET1)"
+            	-$(SYMLINK) "$(TARGET)" "$(INSTALL_ROOT)/home/paul/.lppmon/plugins/$(TARGET1)"
-            	-$(SYMLINK) "$(TARGET)" "$(INSTALL_ROOT)/home/admin/.lppmon/plugins/$(TARGET2)"
+            	-$(SYMLINK) "$(TARGET)" "$(INSTALL_ROOT)/home/paul/.lppmon/plugins/$(TARGET2)"
             uninstall_target: FORCE
-            	-$(DEL_FILE) "$(INSTALL_ROOT)/home/admin/.lppmon/plugins/$(TARGET)"
+            	-$(DEL_FILE) "$(INSTALL_ROOT)/home/paul/.lppmon/plugins/$(TARGET)"
-            	 -$(DEL_FILE) "$(INSTALL_ROOT)/home/admin/.lppmon/plugins/$(TARGET0)"
+            	 -$(DEL_FILE) "$(INSTALL_ROOT)/home/paul/.lppmon/plugins/$(TARGET0)"
-            	 -$(DEL_FILE) "$(INSTALL_ROOT)/home/admin/.lppmon/plugins/$(TARGET1)"
+            	 -$(DEL_FILE) "$(INSTALL_ROOT)/home/paul/.lppmon/plugins/$(TARGET1)"
-            	 -$(DEL_FILE) "$(INSTALL_ROOT)/home/admin/.lppmon/plugins/$(TARGET2)"
+            	 -$(DEL_FILE) "$(INSTALL_ROOT)/home/paul/.lppmon/plugins/$(TARGET2)"
-            	-$(DEL_DIR) $(INSTALL_ROOT)/home/admin/.lppmon/plugins/
+            	-$(DEL_DIR) $(INSTALL_ROOT)/home/paul/.lppmon/plugins/
             install:  install_target  FORCE

projects/rmapplugin/entermode.cpp +5 -5

                 radio_plus0 = new QRadioButton("+0");
                 radio_plus1 = new QRadioButton("+1");
                 radio_plus2 = new QRadioButton("+2");
-                radio_plus3 = new QRadioButton("+3");
+                radio_now = new QRadioButton("now");
                 radio_plus4 = new QRadioButton("+4");
-                radio_plus1->setChecked( true );
+                radio_now->setChecked( true );
                 button_enterModeStandby = new QPushButton(tr("STANDBY"));
                 button_enterModeNormal = new QPushButton(tr("NORMAL"));
                 mainLayout->addWidget(radio_plus0, 6, 1, 1, 1);
                 mainLayout->addWidget(radio_plus1, 6, 2, 1, 1);
                 mainLayout->addWidget(radio_plus2, 7, 0, 1, 1);
-                mainLayout->addWidget(radio_plus3, 7, 1, 1, 1);
+                mainLayout->addWidget(radio_now, 7, 1, 1, 1);
                 mainLayout->addWidget(radio_plus4, 7, 2, 1, 1);
                 mainLayout->setColumnStretch(1, 1);
                     timeToSend = lastTMTime + 1;
                 if (radio_plus2->isChecked())
                     timeToSend = lastTMTime + 2;
-                if (radio_plus3->isChecked())
+                if (radio_now->isChecked())
-                    timeToSend = lastTMTime + 3;
+                    timeToSend = 0;
                 if (radio_plus4->isChecked())
                     timeToSend = lastTMTime + 4;
             }

projects/rmapplugin/entermode.h +1 -1

                 QRadioButton *radio_plus0;
                 QRadioButton *radio_plus1;
                 QRadioButton *radio_plus2;
-                QRadioButton *radio_plus3;
+                QRadioButton *radio_now;
                 QRadioButton *radio_plus4;
             //    ArbitraryTime *arbitraryTime;

projects/rmapplugin/rmappluginpythonwrapper.cpp +2 -2

                 return result;
             }
-            void rmappluginPythonWrapper::WriteSPW(QList<int> dataList)
+            void rmappluginPythonWrapper::WriteSPW(QList<QVariant> dataList)
             {
                 char targetLogicalAddress;
                 char userApplication;
                 for(int i = 0; i<dataList.count(); i++) // get the data as unsigned char
                 {
-                    data[i] = (unsigned char)dataList.at(i);
+                    data[i] = (unsigned char) dataList.at(i).toUInt();
                 }
                 // read the first bytes of the data to get the targetLogicalAddress and the userApplication parameters
                 targetLogicalAddress = data[0];

projects/rmapplugin/rmappluginpythonwrapper.h +1 -1

             public slots:
                 QList<QVariant> ReadSPW(unsigned int size=0);
                 int fetchPacket() {return emit fetchPacketSig();}
-                void WriteSPW(QList<int> dataList);
+                void WriteSPW(QList<QVariant> dataList);
                 void WriteSPWDelay(QList<int> dataList, unsigned int delay=0);
                 void processPacketStoreLater(unsigned int delay);
                 void sendProcessPacketStoreNowSig(){emit processPacketStoreNowSig();}

General Comments 0

Write
Preview

You need to be logged in to leave comments. Login now

No TODOs yet

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages