HG_REPOSITORIES/LPP/INSTRUMENTATION/SOLO_LFR/LPPMON_PLUGINS_PAUL Commit - r55:4ea52012da18

Function added to the plugin to store packets in CSV format.

leroy -

r55:4ea52012da18 default

parent child

Context file:

r55:4ea52012da18

PAULs_LPPMON_PLUGINS.pro.user +1 -1

             <?xml version="1.0" encoding="UTF-8"?>
             <!DOCTYPE QtCreatorProject>
-            <!-- Written by QtCreator 2.8.1, 2013-11-07T12:53:04. -->
+            <!-- Written by QtCreator 2.8.1, 2013-11-14T14:43:39. -->
             <qtcreator>
              <data>
               <variable>ProjectExplorer.Project.ActiveTarget</variable>

gse_lesia/Makefile +6 -11

             #############################################################################
             # Makefile for building: lfrsgse
-            # Generated by qmake (2.01a) (Qt 4.8.5) on: Thu Oct 10 08:44:30 2013
+            # Generated by qmake (2.01a) (Qt 4.8.5) on: Tue Nov 12 11:16:36 2013
             # Project:  gselesia.pro
             # Template: app
-            # Command: /usr/bin/qmake-qt4 -spec /usr/lib64/qt4/mkspecs/linux-g++ -o Makefile gselesia.pro
+            # Command: /usr/bin/qmake-qt4 -o Makefile gselesia.pro
             #############################################################################
             ####### Compiler, tools and options
             		/usr/lib64/libQtCore.prl \
             		/usr/lib64/libQtGui.prl \
             		/usr/lib64/libQtNetwork.prl
-            	$(QMAKE) -spec /usr/lib64/qt4/mkspecs/linux-g++ -o Makefile gselesia.pro
+            	$(QMAKE) -o Makefile gselesia.pro
             /usr/lib64/qt4/mkspecs/common/unix.conf:
             /usr/lib64/qt4/mkspecs/common/linux.conf:
             /usr/lib64/qt4/mkspecs/common/gcc-base.conf:
             /usr/lib64/libQtGui.prl:
             /usr/lib64/libQtNetwork.prl:
             qmake:  FORCE
-            	@$(QMAKE) -spec /usr/lib64/qt4/mkspecs/linux-g++ -o Makefile gselesia.pro
+            	@$(QMAKE) -o Makefile gselesia.pro
             dist:
             	@$(CHK_DIR_EXISTS) .tmp/lfrsgse1.0.0 || $(MKDIR) .tmp/lfrsgse1.0.0
             moc_mainwindow.cpp: lfrxmlhandler.h \
             		lfrxmlwriter.h \
             		mainwindowui.h \
-            		lfrspectrogram.h \
             		lfrxmlparser.h \
             		mainwindow.h
             	/usr/lib64/qt4/bin/moc $(DEFINES) $(INCPATH) mainwindow.h -o moc_mainwindow.cpp
-            moc_mainwindowui.cpp: lfrspectrogram.h \
+            moc_mainwindowui.cpp: mainwindowui.h
-            		mainwindowui.h
             	/usr/lib64/qt4/bin/moc $(DEFINES) $(INCPATH) mainwindowui.h -o moc_mainwindowui.cpp
             moc_lfrxmlhandler.cpp: lfrxmlhandler.h
             		lfrxmlhandler.h \
             		lfrxmlwriter.h \
             		mainwindowui.h \
-            		lfrspectrogram.h \
             		lfrxmlparser.h
             	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o main.o main.cpp
             		lfrxmlhandler.h \
             		lfrxmlwriter.h \
             		mainwindowui.h \
-            		lfrspectrogram.h \
             		lfrxmlparser.h
             	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o mainwindow.o mainwindow.cpp
-            mainwindowui.o: mainwindowui.cpp mainwindowui.h \
+            mainwindowui.o: mainwindowui.cpp mainwindowui.h
-            		lfrspectrogram.h
             	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o mainwindowui.o mainwindowui.cpp
             lfrxmlhandler.o: lfrxmlhandler.cpp lfrxmlhandler.h

gse_lesia/gselesia.pro.user +1 -1

             <?xml version="1.0" encoding="UTF-8"?>
             <!DOCTYPE QtCreatorProject>
-            <!-- Written by QtCreator 2.8.1, 2013-11-07T14:48:17. -->
+            <!-- Written by QtCreator 2.8.1, 2013-11-12T11:12:03. -->
             <qtcreator>
              <data>
               <variable>ProjectExplorer.Project.ActiveTarget</variable>

gse_lesia/lfrsgse binary modified 0 0

NO CONTENT: modified file, binary diff hidden

rmapplugin/entermode.cpp +5 -5

                 packet.ccsdsSecHeaderFlag_pusVersion_ack = 0x19;
                 packet.serviceType = TC_TYPE_DEFAULT;
                 packet.serviceSubType = TC_SUBTYPE_ENTER_MODE;
-                packet.sourceID = SID_TC_DEFAULT;
+                packet.sourceID = SID_TC_GROUND;
                 packet.spare = 0x00;
                 packet.mode = mode;
                 packet.enterModeTime[0] = 0x00;
                 packet.ccsdsSecHeaderFlag_pusVersion_ack = 0x19;
                 packet.serviceType = TC_TYPE_DEFAULT;
                 packet.serviceSubType = TC_SUBTYPE_RESET;
-                packet.sourceID = SID_TC_DEFAULT;
+                packet.sourceID = SID_TC_GROUND;
                 parameterDump->GetCRCAsTwoBytes((unsigned char*) &packet, crcAsTwoBytes,
                                                PACKET_LENGTH_TC_LFR_RESET + CCSDS_TC_TM_PACKET_OFFSET - 2);
                 packet.ccsdsSecHeaderFlag_pusVersion_ack = 0x19;
                 packet.serviceType = TC_TYPE_DEFAULT;
                 packet.serviceSubType = TC_SUBTYPE_UPDATE_INFO;
-                packet.sourceID = SID_TC_DEFAULT;
+                packet.sourceID = SID_TC_GROUND;
                 packet.set1 = 0x00;
                 packet.set2 = 0x00;
                 packet.ccsdsSecHeaderFlag_pusVersion_ack = 0x19;
                 packet.serviceType = TC_TYPE_DEFAULT;
                 packet.serviceSubType = TC_SUBTYPE_ENABLE_CALIBRATION;
-                packet.sourceID = SID_TC_DEFAULT;
+                packet.sourceID = SID_TC_GROUND;
                 parameterDump->GetCRCAsTwoBytes((unsigned char*) &packet, crcAsTwoBytes,
                                                PACKET_LENGTH_TC_LFR_ENABLE_CALIBRATION + CCSDS_TC_TM_PACKET_OFFSET - 2);
                 packet.ccsdsSecHeaderFlag_pusVersion_ack = 0x19;
                 packet.serviceType = TC_TYPE_DEFAULT;
                 packet.serviceSubType = TC_SUBTYPE_DISABLE_CALIBRATION;
-                packet.sourceID = SID_TC_DEFAULT;
+                packet.sourceID = SID_TC_GROUND;
                 parameterDump->GetCRCAsTwoBytes((unsigned char*) &packet, crcAsTwoBytes,
                                                PACKET_LENGTH_TC_LFR_DISABLE_CALIBRATION + CCSDS_TC_TM_PACKET_OFFSET - 2);

rmapplugin/tmstatistics.cpp +76 -12

                 button_chooseDir = new QPushButton("choose dir");
                 //QCheckBox
-                checkbox_record = new QCheckBox("Record packets");
                 checkbox_packetLog = new QCheckBox("Log packets");
+                checkbox_packetRecording = new QCheckBox("Store packets (RAW)");
+                checkbox_CSVPacketRecording = new QCheckBox("Store Packets (CSV)");
                 label_currentDir = new QLabel("Current Dir: -");
                 //**********
                 readSettings();
                 logFile = new QFile();
                 packetLogFile = new QFile();
+                csvPacketRecordFile = new QFile();
                 logFileEn = false;
                 packetLogFileEn = false;
+                csvPacketRecordFileEn = false;
                 initConstants();
                 connect(this->button_reset_stat, SIGNAL(clicked()), this, SLOT(resetStatistics()));
                 connect(this->button_chooseDir, SIGNAL(clicked()), this, SLOT(chooseDir()));
-                connect(this->checkbox_record, SIGNAL(stateChanged(int)), this, SLOT(storePackets(int)));
+                connect(this->checkbox_packetLog, SIGNAL(stateChanged(int)),
-                connect(this->checkbox_packetLog, SIGNAL(stateChanged(int)), this, SLOT(logPackets(int)));
+                        this, SLOT(logPackets(int)));
+                connect(this->checkbox_packetRecording, SIGNAL(stateChanged(int)),
+                        this, SLOT(storePackets(int)));
+                connect(this->checkbox_CSVPacketRecording, SIGNAL(stateChanged(int)),
+                        this, SLOT(storeCSVPackets(int)));
             }
             void TMStatistics::initConstants()
                 layout_last->addWidget(label_UNKNOWN, 3, 0, 1, 1);
                 layout_last->addWidget(label_UNKNOWN_nb, 3, 1, 1, 1);
-                layout_record->addWidget(checkbox_record);
                 layout_record->addWidget(checkbox_packetLog);
+                layout_record->addWidget(checkbox_packetRecording);
+                layout_record->addWidget(checkbox_CSVPacketRecording);
                 layout_record->addWidget(button_chooseDir);
                 layout_record->addWidget(label_currentDir);
                 layout_record->insertStretch(4, 1);
                                                 unsigned char typ, unsigned char sub)
             {
                 unsigned int sid = 0;
-                QByteArray packetAsAnArray;
                 QString packetName;
                 QTime currentTime;
                 QDate currentDate;
+                unsigned int i;
                 if ((pid == TM_PACKET_PID_DEFAULT) & (cat == TM_PACKET_CAT_TC_EXE)
                         & (typ == TM_TYPE_TC_EXE) & (sub == TM_SUBTYPE_EXE_NOK))
                 if (logFileEn == true)
                 {
-            //        packetAsAnArray = QByteArray::fromRawData((char *) &packet->Value[4], (packet->size-4));
                     logFile->write((char *) &packet->Value[4], (packet->size-4));
-            //        *(this->logFileStrm)
-            //                << packetAsAnArray;
                 }
+                currentTime = QTime::currentTime();
+                currentDate = QDate::currentDate();
                 if (packetLogFileEn == true)
                 {
-                    currentTime = QTime::currentTime();
-                    currentDate = QDate::currentDate();
                     packetName = getPacketName( typ, sub, sid);
                     *(this->packetLogFileStrm)
                             << endl;
                 }
+                if (csvPacketRecordFileEn == true)
+                {
+                    *(this->packetLogFileStrm)
+                            << QString::number(currentDate.year()) + " "
+                            << QString::number(currentDate.month()) + " "
+                            << QString::number(currentDate.day()) + " "
+                            << QTime::currentTime().toString() + ":"
+                            << QString::number(currentTime.msec());
+                    for (i=0; i< packet->size; i++)
+                    {
+                        *(this->packetLogFileStrm)
+                                << ", " + QString::number( packet->Value[i] );
+                    }
+                    *(this->packetLogFileStrm)
+                            << endl;
+                }
                 return sid;
             }
                 if(this->logFile->isOpen()) this->logFile->close();
                 this->logFile->setFileName( prefix + "packet_record.data");
-                if(this->logFile->open(QIODevice::WriteOnly)) this->logFileStrm = new QTextStream(this->logFile);
+                if(this->logFile->open(QIODevice::WriteOnly))
+                    this->logFileStrm = new QTextStream(this->logFile);
             }
             void TMStatistics::buildPacketLogFileName()
                 if(this->packetLogFile->isOpen()) this->packetLogFile->close();
                 this->packetLogFile->setFileName( prefix + "packet_log.data");
-                if(this->packetLogFile->open(QIODevice::WriteOnly)) this->packetLogFileStrm = new QTextStream(this->packetLogFile);
+                if(this->packetLogFile->open(QIODevice::WriteOnly))
+                    this->packetLogFileStrm = new QTextStream(this->packetLogFile);
+            }
+            void TMStatistics::buildCSVPacketRecordFileName()
+            {
+                QTime time;
+                QDate date;
+                QString dateTime;
+                QString prefix;
+                date = QDate::currentDate();
+                time = QTime::currentTime();
+                dateTime = QString::number( date.year()  ) + "_"
+                        + QString::number( date.month()  ) + "_"
+                        + QString::number( date.day()    ) + "-"
+                        + QString::number( time.hour()   ) + "_"
+                        + QString::number( time.minute() ) + "_"
+                        + QString::number( time.second() );
+                prefix = defaultStorageDirectory + "/" + dateTime + "_" ;
+                if(this->csvPacketRecordFile->isOpen()) this->csvPacketRecordFile->close();
+                this->csvPacketRecordFile->setFileName( prefix + "packet_record.csv");
+                if(this->csvPacketRecordFile->open(QIODevice::WriteOnly))
+                    this->csvPacketRecordFileStrm = new QTextStream(this->csvPacketRecordFile);
             }
             void TMStatistics::storePackets( int state )
                 }
             }
+            void TMStatistics::storeCSVPackets( int state )
+            {
+                if (state == Qt::Checked)
+                {
+                    buildCSVPacketRecordFileName();
+                    csvPacketRecordFileEn = true;
+                }
+                else
+                {
+                    if(this->csvPacketRecordFile->isOpen()) this->csvPacketRecordFile->close();
+                    csvPacketRecordFileEn = false;
+                }
+            }
             void TMStatistics::logPackets( int state )
             {
                 if (state == Qt::Checked)

rmapplugin/tmstatistics.h +7 -1

                 QPushButton *button_chooseDir;
                 //QCheckBox
-                QCheckBox *checkbox_record;
+                QCheckBox *checkbox_packetRecording;
                 QCheckBox *checkbox_packetLog;
+                QCheckBox *checkbox_CSVPacketRecording;
                 QFile *logFile;
                 QFile *packetLogFile;
+                QFile *csvPacketRecordFile;
                 QTextStream *logFileStrm;
                 QTextStream *packetLogFileStrm;
+                QTextStream *csvPacketRecordFileStrm;
                 bool logFileEn;
                 bool packetLogFileEn;
+                bool csvPacketRecordFileEn;
                 QString defaultStorageDirectory;
                 // QGroupBox
                               unsigned int sid, unsigned int length,
                               unsigned int coarse_t, unsigned int fine_t);
                 void storePackets(int state);
+                void storeCSVPackets( int state );
                 void logPackets(int state);
                 void buildFileName();
                 void buildPacketLogFileName();
+                void buildCSVPacketRecordFileName();
                 void readSettings();
                 void writeSettings();
                 void chooseDir();

wfdisplay/wfdisplay/Makefile +10 -4

             #############################################################################
             # Makefile for building: libwfdisplay.so.1.0.0
-            # Generated by qmake (2.01a) (Qt 4.8.4) on: Wed Jul 24 10:11:16 2013
+            # Generated by qmake (2.01a) (Qt 4.8.5) on: Tue Nov 12 11:17:03 2013
             # Project:  wfdisplay.pro
             # Template: lib
-            # Command: /usr/bin/qmake-qt4 -spec /usr/lib64/qt4/mkspecs/linux-g++ -o Makefile wfdisplay.pro
+            # Command: /usr/bin/qmake-qt4 -o Makefile wfdisplay.pro
             #############################################################################
             ####### Compiler, tools and options
             		/usr/lib64/qt4/mkspecs/features/default_pre.prf \
             		/usr/lib64/qt4/mkspecs/features/release.prf \
             		/usr/lib64/qt4/mkspecs/features/default_post.prf \
+            		/usr/lib64/qt4/mkspecs/features/shared.prf \
+            		/usr/lib64/qt4/mkspecs/features/dll.prf \
             		/usr/lib64/qt4/mkspecs/features/unix/gdb_dwarf_index.prf \
             		/usr/lib64/qt4/mkspecs/features/warn_on.prf \
             		/usr/lib64/qt4/mkspecs/features/qt.prf \
             		/usr/lib64/qt4/mkspecs/features/default_pre.prf \
             		/usr/lib64/qt4/mkspecs/features/release.prf \
             		/usr/lib64/qt4/mkspecs/features/default_post.prf \
+            		/usr/lib64/qt4/mkspecs/features/shared.prf \
+            		/usr/lib64/qt4/mkspecs/features/dll.prf \
             		/usr/lib64/qt4/mkspecs/features/unix/gdb_dwarf_index.prf \
             		/usr/lib64/qt4/mkspecs/features/warn_on.prf \
             		/usr/lib64/qt4/mkspecs/features/qt.prf \
             		/usr/lib64/qt4/mkspecs/features/include_source_dir.prf \
             		/usr/lib64/libQtGui.prl \
             		/usr/lib64/libQtCore.prl
-            	$(QMAKE) -spec /usr/lib64/qt4/mkspecs/linux-g++ -o Makefile wfdisplay.pro
+            	$(QMAKE) -o Makefile wfdisplay.pro
             /usr/lib64/qt4/mkspecs/common/unix.conf:
             /usr/lib64/qt4/mkspecs/common/linux.conf:
             /usr/lib64/qt4/mkspecs/common/gcc-base.conf:
             /usr/lib64/qt4/mkspecs/features/default_pre.prf:
             /usr/lib64/qt4/mkspecs/features/release.prf:
             /usr/lib64/qt4/mkspecs/features/default_post.prf:
+            /usr/lib64/qt4/mkspecs/features/shared.prf:
+            /usr/lib64/qt4/mkspecs/features/dll.prf:
             /usr/lib64/qt4/mkspecs/features/unix/gdb_dwarf_index.prf:
             /usr/lib64/qt4/mkspecs/features/warn_on.prf:
             /usr/lib64/qt4/mkspecs/features/qt.prf:
             /usr/lib64/libQtGui.prl:
             /usr/lib64/libQtCore.prl:
             qmake:  FORCE
-            	@$(QMAKE) -spec /usr/lib64/qt4/mkspecs/linux-g++ -o Makefile wfdisplay.pro
+            	@$(QMAKE) -o Makefile wfdisplay.pro
             dist:
             	@$(CHK_DIR_EXISTS) .tmp/wfdisplay1.0.0 || $(MKDIR) .tmp/wfdisplay1.0.0

wfdisplay/wfdisplay/wfdisplay.pro.user +1 -1

             <?xml version="1.0" encoding="UTF-8"?>
             <!DOCTYPE QtCreatorProject>
-            <!-- Written by QtCreator 2.8.0, 2013-10-08T12:38:17. -->
+            <!-- Written by QtCreator 2.8.1, 2013-11-12T11:16:00. -->
             <qtcreator>
              <data>
               <variable>ProjectExplorer.Project.ActiveTarget</variable>

wfdisplay/wfdisplay/wfpage.cpp +13 -5

@@ -536,14 +536,22 void WFPage::storeWfrm()
536		536
537	void WFPage::buildFileName()	537	void WFPage::buildFileName()
538	{	538	{
539	QString date;	539	QTime time;
540	Q~~String~~ time;	540	QDate date;
		541	QString dateTime;
541	QString prefix;	542	QString prefix;
542		543
543	date = QDate::currentDate().~~toString~~();	544	date = QDate::currentDate();
544	time = QTime::currentTime().~~toString~~();	545	time = QTime::currentTime();
545		546
546	prefix = defaultStorageDirectory + "/" + date + "_" + time + "_" + pageTitle ;	547	dateTime = QString::number( date.year() ) + "_"
		548	+ QString::number( date.month() ) + "_"
		549	+ QString::number( date.day() ) + "-"
		550	+ QString::number( time.hour() ) + "_"
		551	+ QString::number( time.minute() ) + "_"
		552	+ QString::number( time.second() );
		553
		554	prefix = defaultStorageDirectory + "/" + dateTime + "_" + pageTitle ;
547		555
548	if(this->logFile->isOpen()) this->logFile->close();	556	if(this->logFile->isOpen()) this->logFile->close();
549	this->logFile->setFileName( prefix + ".data");	557	this->logFile->setFileName( prefix + ".data");

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