##// END OF EJS Templates
HG_REPOSITORIES » LPP » INSTRUMENTATION » SOLO_LFR » LPPMON_PLUGINS_PAUL
RSS

Clone from http://pc-instru.lpp.polytechnique.fr:5000/LPPMON_GROUP/LPPMON_PLUGINS_PAUL

Minor update in project gse_lesia
leroy -
r72:27e89cd58c8b default
parent child
Show More
Show file before | Show file after | Hide comments
@@ -969,14 +969,14 moc_mainwindow.cpp: /usr/include/qt5/QtN
969 /usr/include/qt5/lppmon/paulcommon/hkdisplay.h \
969 /usr/include/qt5/lppmon/paulcommon/hkdisplay.h \
970 gse_lesia/recordpage.h \
970 gse_lesia/recordpage.h \
971 /usr/include/qt5/QtGui/QCloseEvent \
971 /usr/include/qt5/QtGui/QCloseEvent \
972 gse_lesia/spectrapacket.h \
973 /usr/include/qt5/lppmon/paulcommon/paulcommonparams.h \
972 gse_lesia/wfpacket.h \
974 gse_lesia/wfpacket.h \
973 ../../DEV_PLE/header/fsw_params.h \
975 ../../DEV_PLE/header/fsw_params.h \
974 ../../DEV_PLE/header/grlib_regs.h \
976 ../../DEV_PLE/header/grlib_regs.h \
975 ../../DEV_PLE/header/fsw_params_nb_bytes.h \
977 ../../DEV_PLE/header/fsw_params_nb_bytes.h \
976 ../../DEV_PLE/header/tm_byte_positions.h \
978 ../../DEV_PLE/header/tm_byte_positions.h \
977 gse_lesia/lfrxmlparser.h \
979 gse_lesia/lfrxmlparser.h \
978 gse_lesia/spectrapacket.h \
979 /usr/include/qt5/lppmon/paulcommon/params.h \
980 gse_lesia/mainwindow.h
980 gse_lesia/mainwindow.h
981 /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/mainwindow.h -o moc_mainwindow.cpp
981 /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/mainwindow.h -o moc_mainwindow.cpp
982
982
@@ -1715,7 +1715,7 moc_spectrapacket.cpp: /usr/include/qt5/
1715 /usr/include/qt5/QtCore/qcontainerfwd.h \
1715 /usr/include/qt5/QtCore/qcontainerfwd.h \
1716 /usr/include/qt5/QtCore/qisenum.h \
1716 /usr/include/qt5/QtCore/qisenum.h \
1717 /usr/include/qt5/QtCore/qobject_impl.h \
1717 /usr/include/qt5/QtCore/qobject_impl.h \
1718 /usr/include/qt5/lppmon/paulcommon/params.h \
1718 /usr/include/qt5/lppmon/paulcommon/paulcommonparams.h \
1719 gse_lesia/spectrapacket.h
1719 gse_lesia/spectrapacket.h
1720 /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/spectrapacket.h -o moc_spectrapacket.cpp
1720 /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/spectrapacket.h -o moc_spectrapacket.cpp
1721
1721
@@ -2520,14 +2520,14 main.o: gse_lesia/main.cpp gse_lesia/mai
2520 /usr/include/qt5/lppmon/paulcommon/hkdisplay.h \
2520 /usr/include/qt5/lppmon/paulcommon/hkdisplay.h \
2521 gse_lesia/recordpage.h \
2521 gse_lesia/recordpage.h \
2522 /usr/include/qt5/QtGui/QCloseEvent \
2522 /usr/include/qt5/QtGui/QCloseEvent \
2523 gse_lesia/spectrapacket.h \
2524 /usr/include/qt5/lppmon/paulcommon/paulcommonparams.h \
2523 gse_lesia/wfpacket.h \
2525 gse_lesia/wfpacket.h \
2524 ../../DEV_PLE/header/fsw_params.h \
2526 ../../DEV_PLE/header/fsw_params.h \
2525 ../../DEV_PLE/header/grlib_regs.h \
2527 ../../DEV_PLE/header/grlib_regs.h \
2526 ../../DEV_PLE/header/fsw_params_nb_bytes.h \
2528 ../../DEV_PLE/header/fsw_params_nb_bytes.h \
2527 ../../DEV_PLE/header/tm_byte_positions.h \
2529 ../../DEV_PLE/header/tm_byte_positions.h \
2528 gse_lesia/lfrxmlparser.h \
2530 gse_lesia/lfrxmlparser.h
2529 gse_lesia/spectrapacket.h \
2530 /usr/include/qt5/lppmon/paulcommon/params.h
2531 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o main.o gse_lesia/main.cpp
2531 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o main.o gse_lesia/main.cpp
2532
2532
2533 mainwindow.o: gse_lesia/mainwindow.cpp gse_lesia/mainwindow.h \
2533 mainwindow.o: gse_lesia/mainwindow.cpp gse_lesia/mainwindow.h \
@@ -3051,14 +3051,14 mainwindow.o: gse_lesia/mainwindow.cpp g
3051 /usr/include/qt5/lppmon/paulcommon/hkdisplay.h \
3051 /usr/include/qt5/lppmon/paulcommon/hkdisplay.h \
3052 gse_lesia/recordpage.h \
3052 gse_lesia/recordpage.h \
3053 /usr/include/qt5/QtGui/QCloseEvent \
3053 /usr/include/qt5/QtGui/QCloseEvent \
3054 gse_lesia/spectrapacket.h \
3055 /usr/include/qt5/lppmon/paulcommon/paulcommonparams.h \
3054 gse_lesia/wfpacket.h \
3056 gse_lesia/wfpacket.h \
3055 ../../DEV_PLE/header/fsw_params.h \
3057 ../../DEV_PLE/header/fsw_params.h \
3056 ../../DEV_PLE/header/grlib_regs.h \
3058 ../../DEV_PLE/header/grlib_regs.h \
3057 ../../DEV_PLE/header/fsw_params_nb_bytes.h \
3059 ../../DEV_PLE/header/fsw_params_nb_bytes.h \
3058 ../../DEV_PLE/header/tm_byte_positions.h \
3060 ../../DEV_PLE/header/tm_byte_positions.h \
3059 gse_lesia/lfrxmlparser.h \
3061 gse_lesia/lfrxmlparser.h \
3060 gse_lesia/spectrapacket.h \
3061 /usr/include/qt5/lppmon/paulcommon/params.h \
3062 /usr/include/qt5/QtNetwork/QNetworkInterface \
3062 /usr/include/qt5/QtNetwork/QNetworkInterface \
3063 /usr/include/qt5/QtNetwork/qnetworkinterface.h
3063 /usr/include/qt5/QtNetwork/qnetworkinterface.h
3064 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o mainwindow.o gse_lesia/mainwindow.cpp
3064 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o mainwindow.o gse_lesia/mainwindow.cpp
@@ -3838,7 +3838,7 spectrapacket.o: gse_lesia/spectrapacket
3838 /usr/include/qt5/QtCore/qcontainerfwd.h \
3838 /usr/include/qt5/QtCore/qcontainerfwd.h \
3839 /usr/include/qt5/QtCore/qisenum.h \
3839 /usr/include/qt5/QtCore/qisenum.h \
3840 /usr/include/qt5/QtCore/qobject_impl.h \
3840 /usr/include/qt5/QtCore/qobject_impl.h \
3841 /usr/include/qt5/lppmon/paulcommon/params.h
3841 /usr/include/qt5/lppmon/paulcommon/paulcommonparams.h
3842 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o spectrapacket.o gse_lesia/spectrapacket.cpp
3842 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o spectrapacket.o gse_lesia/spectrapacket.cpp
3843
3843
3844 lfrxmlparser.o: gse_lesia/lfrxmlparser.cpp gse_lesia/lfrxmlparser.h \
3844 lfrxmlparser.o: gse_lesia/lfrxmlparser.cpp gse_lesia/lfrxmlparser.h \
Show file before | Show file after | Hide comments
@@ -10,10 +10,11
10 #include <lfrxmlhandler.h>
10 #include <lfrxmlhandler.h>
11 #include <lfrxmlwriter.h>
11 #include <lfrxmlwriter.h>
12 #include <mainwindowui.h>
12 #include <mainwindowui.h>
13 #include <spectrapacket.h>
14
13 #include "tmpackettoread.h"
15 #include "tmpackettoread.h"
14 #include "wfpacket.h"
16 #include "wfpacket.h"
15 #include "lfrxmlparser.h"
17 #include "lfrxmlparser.h"
16 #include <spectrapacket.h>
17
18
18 class MainWindow : public QMainWindow
19 class MainWindow : public QMainWindow
19 {
20 {
Show file before | Show file after | Hide comments
@@ -2,7 +2,7
2 #define SPECTRAPACKET_H
2 #define SPECTRAPACKET_H
3
3
4 #include <QObject>
4 #include <QObject>
5 #include <params.h>
5 #include <paulcommonparams.h>
6
6
7 class SpectraPacket : public QObject
7 class SpectraPacket : public QObject
8 {
8 {
Show file before | Show file after | Hide comments
1 NO CONTENT: modified file, binary diff hidden
NO CONTENT: modified file, binary diff hidden
General Comments 0
You need to be logged in to leave comments. Login now