HG_REPOSITORIES/LPP/INSTRUMENTATION/SOLO_LFR/LPPMON_PLUGINS_PAUL Commit - r25:361dd727106d

rmapplugin updated, waveform plots removed (exported in gse_lesia)...

leroy -

r25:361dd727106d default

parent child

Context file:

r25:361dd727106d

PAULs_LPPMON_PLUGINS.pro.user +1 -1

             <?xml version="1.0" encoding="UTF-8"?>
             <!DOCTYPE QtCreatorProject>
-            <!-- Written by Qt Creator 2.4.1, 2013-06-14T11:39:28. -->
+            <!-- Written by Qt Creator 2.4.1, 2013-06-18T15:14:51. -->
             <qtcreator>
              <data>
               <variable>ProjectExplorer.Project.ActiveTarget</variable>

gse_lesia/Makefile +28 -10

             #############################################################################
             # Makefile for building: gselesia
-            # Generated by qmake (2.01a) (Qt 4.8.4) on: Mon Jun 17 13:07:45 2013
+            # Generated by qmake (2.01a) (Qt 4.8.4) on: Tue Jun 18 10:19:47 2013
             # Project:  gselesia.pro
             # Template: app
             # Command: /usr/bin/qmake-qt4 -spec /usr/lib64/qt4/mkspecs/linux-g++ -o Makefile gselesia.pro
             INCPATH       = -I/usr/lib64/qt4/mkspecs/linux-g++ -I. -I/usr/include/QtCore -I/usr/include/QtNetwork -I/usr/include/QtGui -I/usr/include/QtXml -I/usr/include -I. -I../common_PLE -I../rmapplugin -I../../DEV_PLE/header -I/usr/include/lppmon/common -I/usr/include/lppmon/wfdisplay -I.
             LINK          = g++
             LFLAGS        = -Wl,-O1 -Wl,-z,relro
-            LIBS          = $(SUBLIBS)  -L/usr/lib64 -llppmoncommon -lwfdisplay -lQtXml -lQtGui -lQtNetwork -lQtCore -lpthread
+            LIBS          = $(SUBLIBS)  -L/usr/lib64 -llppmoncommon -lwfdisplay -lqwt5-qt4 -lQtXml -lQtGui -lQtNetwork -lQtCore -lpthread
             AR            = ar cqs
             RANLIB        =
             QMAKE         = /usr/bin/qmake-qt4
             		../rmapplugin/tmpackettoread.cpp \
             		../rmapplugin/wfpacket.cpp \
             		../common_PLE/hkdisplay.cpp \
-            		lfrxmlparser.cpp moc_mainwindow.cpp \
+            		lfrxmlparser.cpp \
+            		lfrspectrogram.cpp moc_mainwindow.cpp \
             		moc_mainwindowui.cpp \
             		moc_qipdialogbox.cpp \
             		moc_lfrxmlhandler.cpp \
             		moc_tmpackettoread.cpp \
             		moc_wfpacket.cpp \
             		moc_hkdisplay.cpp \
-            		moc_lfrxmlparser.cpp
+            		moc_lfrxmlparser.cpp \
+            		moc_lfrspectrogram.cpp
             OBJECTS       = main.o \
             		mainwindow.o \
             		mainwindowui.o \
             		wfpacket.o \
             		hkdisplay.o \
             		lfrxmlparser.o \
+            		lfrspectrogram.o \
             		moc_mainwindow.o \
             		moc_mainwindowui.o \
             		moc_qipdialogbox.o \
             		moc_tmpackettoread.o \
             		moc_wfpacket.o \
             		moc_hkdisplay.o \
-            		moc_lfrxmlparser.o
+            		moc_lfrxmlparser.o \
+            		moc_lfrspectrogram.o
             DIST          = /usr/lib64/qt4/mkspecs/common/unix.conf \
             		/usr/lib64/qt4/mkspecs/common/linux.conf \
             		/usr/lib64/qt4/mkspecs/common/gcc-base.conf \
             dist:
             	@$(CHK_DIR_EXISTS) .tmp/gselesia1.0.0 || $(MKDIR) .tmp/gselesia1.0.0
-            	$(COPY_FILE) --parents $(SOURCES) $(DIST) .tmp/gselesia1.0.0/ && $(COPY_FILE) --parents mainwindow.h mainwindowui.h ../common_PLE/qipdialogbox.h lfrxmlhandler.h lfrxmlwriter.h ../rmapplugin/tmstatistics.h ../rmapplugin/tmpackettoread.h ../rmapplugin/wfpacket.h ../common_PLE/hkdisplay.h ../rmapplugin/params.h ../../DEV_PLE/header/ccsds_types.h lfrxmlparser.h .tmp/gselesia1.0.0/ && $(COPY_FILE) --parents main.cpp mainwindow.cpp mainwindowui.cpp ../common_PLE/qipdialogbox.cpp lfrxmlhandler.cpp lfrxmlwriter.cpp ../rmapplugin/tmstatistics.cpp ../rmapplugin/tmpackettoread.cpp ../rmapplugin/wfpacket.cpp ../common_PLE/hkdisplay.cpp lfrxmlparser.cpp .tmp/gselesia1.0.0/ && (cd `dirname .tmp/gselesia1.0.0` && $(TAR) gselesia1.0.0.tar gselesia1.0.0 && $(COMPRESS) gselesia1.0.0.tar) && $(MOVE) `dirname .tmp/gselesia1.0.0`/gselesia1.0.0.tar.gz . && $(DEL_FILE) -r .tmp/gselesia1.0.0
+            	$(COPY_FILE) --parents $(SOURCES) $(DIST) .tmp/gselesia1.0.0/ && $(COPY_FILE) --parents mainwindow.h mainwindowui.h ../common_PLE/qipdialogbox.h lfrxmlhandler.h lfrxmlwriter.h ../rmapplugin/tmstatistics.h ../rmapplugin/tmpackettoread.h ../rmapplugin/wfpacket.h ../common_PLE/hkdisplay.h ../rmapplugin/params.h ../../DEV_PLE/header/ccsds_types.h lfrxmlparser.h lfrspectrogram.h .tmp/gselesia1.0.0/ && $(COPY_FILE) --parents main.cpp mainwindow.cpp mainwindowui.cpp ../common_PLE/qipdialogbox.cpp lfrxmlhandler.cpp lfrxmlwriter.cpp ../rmapplugin/tmstatistics.cpp ../rmapplugin/tmpackettoread.cpp ../rmapplugin/wfpacket.cpp ../common_PLE/hkdisplay.cpp lfrxmlparser.cpp lfrspectrogram.cpp .tmp/gselesia1.0.0/ && (cd `dirname .tmp/gselesia1.0.0` && $(TAR) gselesia1.0.0.tar gselesia1.0.0 && $(COMPRESS) gselesia1.0.0.tar) && $(MOVE) `dirname .tmp/gselesia1.0.0`/gselesia1.0.0.tar.gz . && $(DEL_FILE) -r .tmp/gselesia1.0.0
             clean:compiler_clean
             mocables: compiler_moc_header_make_all compiler_moc_source_make_all
-            compiler_moc_header_make_all: moc_mainwindow.cpp moc_mainwindowui.cpp moc_qipdialogbox.cpp moc_lfrxmlhandler.cpp moc_lfrxmlwriter.cpp moc_tmstatistics.cpp moc_tmpackettoread.cpp moc_wfpacket.cpp moc_hkdisplay.cpp moc_lfrxmlparser.cpp
+            compiler_moc_header_make_all: moc_mainwindow.cpp moc_mainwindowui.cpp moc_qipdialogbox.cpp moc_lfrxmlhandler.cpp moc_lfrxmlwriter.cpp moc_tmstatistics.cpp moc_tmpackettoread.cpp moc_wfpacket.cpp moc_hkdisplay.cpp moc_lfrxmlparser.cpp moc_lfrspectrogram.cpp
             compiler_moc_header_clean:
-            	-$(DEL_FILE) moc_mainwindow.cpp moc_mainwindowui.cpp moc_qipdialogbox.cpp moc_lfrxmlhandler.cpp moc_lfrxmlwriter.cpp moc_tmstatistics.cpp moc_tmpackettoread.cpp moc_wfpacket.cpp moc_hkdisplay.cpp moc_lfrxmlparser.cpp
+            	-$(DEL_FILE) moc_mainwindow.cpp moc_mainwindowui.cpp moc_qipdialogbox.cpp moc_lfrxmlhandler.cpp moc_lfrxmlwriter.cpp moc_tmstatistics.cpp moc_tmpackettoread.cpp moc_wfpacket.cpp moc_hkdisplay.cpp moc_lfrxmlparser.cpp moc_lfrspectrogram.cpp
             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: mainwindowui.h
+            moc_mainwindowui.cpp: lfrspectrogram.h \
+            		mainwindowui.h
             	/usr/lib64/qt4/bin/moc $(DEFINES) $(INCPATH) mainwindowui.h -o moc_mainwindowui.cpp
             moc_qipdialogbox.cpp: ../common_PLE/qipdialogbox.h
             moc_lfrxmlparser.cpp: lfrxmlparser.h
             	/usr/lib64/qt4/bin/moc $(DEFINES) $(INCPATH) lfrxmlparser.h -o moc_lfrxmlparser.cpp
+            moc_lfrspectrogram.cpp: lfrspectrogram.h
+            	/usr/lib64/qt4/bin/moc $(DEFINES) $(INCPATH) lfrspectrogram.h -o moc_lfrspectrogram.cpp
             compiler_rcc_make_all:
             compiler_rcc_clean:
             compiler_image_collection_make_all: qmake_image_collection.cpp
             		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
             qipdialogbox.o: ../common_PLE/qipdialogbox.cpp ../common_PLE/qipdialogbox.h
             lfrxmlparser.o: lfrxmlparser.cpp lfrxmlparser.h
             	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o lfrxmlparser.o lfrxmlparser.cpp
+            lfrspectrogram.o: lfrspectrogram.cpp lfrspectrogram.h
+            	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o lfrspectrogram.o lfrspectrogram.cpp
             moc_mainwindow.o: moc_mainwindow.cpp
             	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o moc_mainwindow.o moc_mainwindow.cpp
             moc_lfrxmlparser.o: moc_lfrxmlparser.cpp
             	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o moc_lfrxmlparser.o moc_lfrxmlparser.cpp
+            moc_lfrspectrogram.o: moc_lfrspectrogram.cpp
+            	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o moc_lfrspectrogram.o moc_lfrspectrogram.cpp
             ####### Install
             install:   FORCE

gse_lesia/gselesia binary modified 0 0

NO CONTENT: modified file, binary diff hidden

gse_lesia/gselesia.pro +5 -3

                     $$[QT_INSTALL_HEADERS]/lppmon/common \
                     $$[QT_INSTALL_HEADERS]/lppmon/wfdisplay
-            LIBS += -llppmoncommon -lwfdisplay
+            LIBS += -llppmoncommon -lwfdisplay -lqwt5-qt4
             SOURCES += main.cpp\
                     mainwindow.cpp \
                 ../rmapplugin/tmpackettoread.cpp \
                 ../rmapplugin/wfpacket.cpp \
                 ../common_PLE/hkdisplay.cpp \
-                lfrxmlparser.cpp
+                lfrxmlparser.cpp \
+                lfrspectrogram.cpp
             HEADERS  += mainwindow.h \
                 mainwindowui.h \
                 ../common_PLE/hkdisplay.h \
                 ../rmapplugin/params.h \
                 ../../DEV_PLE/header/ccsds_types.h \
-                lfrxmlparser.h
+                lfrxmlparser.h \
+                lfrspectrogram.h

gse_lesia/gselesia.pro.user +1 -1

             <?xml version="1.0" encoding="UTF-8"?>
             <!DOCTYPE QtCreatorProject>
-            <!-- Written by Qt Creator 2.4.1, 2013-06-17T15:56:30. -->
+            <!-- Written by Qt Creator 2.4.1, 2013-06-18T10:58:40. -->
             <qtcreator>
              <data>
               <variable>ProjectExplorer.Project.ActiveTarget</variable>

gse_lesia/mainwindow.h +1 0

             #include <QTcpServer>
             #include <QTcpSocket>
             #include <QXmlSimpleReader>
             #include <lfrxmlhandler.h>
             #include <lfrxmlwriter.h>
             #include <mainwindowui.h>

gse_lesia/mainwindowui.cpp +3 0

                 wfDisplay = new WFDisplay;
                 hkDisplay = new HKDisplay;
+                lfrSpectrogam = new LFRSpectrogram();
                 spinbox_TMServerPort = new QSpinBox();
                 spinbox_TCServerPort = new QSpinBox();
                 spwTabWidget->addTab(spwTabWidgetPage1, tr("TM Statistics"));
                 spwTabWidget->addTab(spwTabWidgetPage3, tr("HK"));
                 spwTabWidget->addTab(spwTabWidgetPage2, tr("Waveforms"));
+                spwTabWidget->addTab(spwTabWidgetPage4, tr("Spectrograms"));
                 spwTabWidgetPage0->setLayout(mainLayout);
                 spwTabWidgetPage1->setLayout(tmStatistics->layout());
                 spwTabWidgetPage2->setLayout(wfDisplay->layout());
                 spwTabWidgetPage3->setLayout(hkDisplay->layout());
+                spwTabWidgetPage4->setLayout(lfrSpectrogam->layout());
                 layout_overallLayout->addWidget(spwTabWidget);

gse_lesia/mainwindowui.h +5 0

             #include <QSpinBox>
             #include <QTextEdit>
             #include <QTabWidget>
             #include "tmstatistics.h"
             #include "wfdisplay.h"
             #include "hkdisplay.h"
+            #include "lfrspectrogram.h"
             class MainWindowUI : public QWidget
             {
                 WFDisplay* wfDisplay;
                 HKDisplay* hkDisplay;
+                LFRSpectrogram* lfrSpectrogam;
+                QWidget* widget_spectrogram;
                 QPushButton *button_openServerTCTM;
                 QPushButton *button_testServerTCTM;

rmapplugin/rmapplugin.cpp +2 -2

                 //****************************************
                 // if the packet is a waveform, display it
-                if ( (typ == 21) & (sub == 3) )
+                /*if ( (typ == 21) & (sub == 3) )
                 {
                     sid = packet->Value[20];    // SID
                     switch (sid){
                             buildWFAndDisplay(packet, &wfPacketNormal[3], 3);
                             break;
                     }
+                }*/
             }
             void rmapplugin::nbPacketHasChanged(int nb)

rmapplugin/rmappluginui.cpp +1 -1

                 spwTabWidget->addTab(spwTabWidgetPage2, tr("status"));
                 spwTabWidget->addTab(spwTabWidgetPage3, tr("console"));
                 spwTabWidget->addTab(spwTabWidgetPage4, tr("TM statistics"));
-                spwTabWidget->addTab(spwTabWidgetPage5, tr("waveforms"));
+                //spwTabWidget->addTab(spwTabWidgetPage5, tr("waveforms"));
                 spwTabWidget->addTab(spwTabWidgetPage6, tr("TM Echo Bridge"));
                 spwTabWidgetPage0->setLayout(selectionLayout);

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