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

Sync
leroy -
r71:ac87a731be3a default
parent child
Show More
Show file before | Show file after | Hide comments
@@ -12,13 +12,13 MAKEFILE = Makefile
12 12
13 13 CC = gcc
14 14 CXX = g++
15 DEFINES = -DWFDISPLAY_LIBRARY -DQT_NO_DEBUG -DQT_PRINTSUPPORT_LIB -DQT_SVG_LIB -DQT_WIDGETS_LIB -DQT_NETWORK_LIB -DQT_XML_LIB -DQT_GUI_LIB -DQT_CORE_LIB
15 DEFINES = -DQT_NO_DEBUG -DQT_PRINTSUPPORT_LIB -DQT_SVG_LIB -DQT_WIDGETS_LIB -DQT_NETWORK_LIB -DQT_XML_LIB -DQT_GUI_LIB -DQT_CORE_LIB
16 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 -fPIC $(DEFINES)
17 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 -fPIC $(DEFINES)
18 INCPATH = -I/usr/lib64/qt5/mkspecs/linux-g++-64 -I. -I. -I/usr/include/qt5/lppmon/common -I/usr/include/qt5 -I/usr/include/qt5/QtPrintSupport -I/usr/include/qt5/QtSvg -I/usr/include/qt5/QtWidgets -I/usr/include/qt5/QtNetwork -I/usr/include/qt5/QtXml -I/usr/include/qt5/QtGui -I/usr/include/qt5/QtCore -I.
18 INCPATH = -I/usr/lib64/qt5/mkspecs/linux-g++-64 -I. -I. -I/usr/include/qt5/lppmon/common -I/usr/include/qt5 -I/usr/include/qt5/QtPrintSupport -I/usr/include/qt5/QtSvg -I/usr/include/qt5/QtWidgets -I/usr/include/qt5/QtNetwork -I/usr/include/qt5/QtXml -I/usr/include/qt5/QtGui -I/usr/include/qt5/QtCore -Imoc
19 19 LINK = g++
20 LFLAGS = -m64 -Wl,-O1 -Wl,-z,relro -shared -Wl,-soname,libwfdisplay.so.1
21 LIBS = $(SUBLIBS) -L/usr/X11R6/lib64 -llppmoncommon -lQt5PrintSupport -lQt5Svg -lQt5Widgets -lQt5Network -lQt5Xml -lQt5Gui -lQt5Core -lGL -lpthread
20 LFLAGS = -m64 -Wl,-O1 -Wl,-z,relro --enable-auto-import -shared -Wl,-soname,libwfdisplay.so.1
21 LIBS = $(SUBLIBS) -L/usr/X11R6/lib64 -lelf -llppmoncommon -lQt5PrintSupport -lQt5Svg -lQt5Widgets -lQt5Network -lQt5Xml -lQt5Gui -lQt5Core -lGL -lpthread
22 22 AR = ar cqs
23 23 RANLIB =
24 24 QMAKE = /usr/bin/qmake-qt5
@@ -41,7 +41,7 MKDIR = mkdir -p
41 41
42 42 ####### Output directory
43 43
44 OBJECTS_DIR = ./
44 OBJECTS_DIR = obj/
45 45
46 46 ####### Files
47 47
@@ -49,21 +49,21 SOURCES = wfdisplay.cpp \
49 49 wfplot.cpp \
50 50 wfpage.cpp \
51 51 pagespectra.cpp \
52 asmpage.cpp moc_wfdisplay.cpp \
53 moc_wfplot.cpp \
54 moc_wfpage.cpp \
55 moc_pagespectra.cpp \
56 moc_asmpage.cpp
57 OBJECTS = wfdisplay.o \
58 wfplot.o \
59 wfpage.o \
60 pagespectra.o \
61 asmpage.o \
62 moc_wfdisplay.o \
63 moc_wfplot.o \
64 moc_wfpage.o \
65 moc_pagespectra.o \
66 moc_asmpage.o
52 asmpage.cpp moc/moc_wfdisplay.cpp \
53 moc/moc_wfplot.cpp \
54 moc/moc_wfpage.cpp \
55 moc/moc_pagespectra.cpp \
56 moc/moc_asmpage.cpp
57 OBJECTS = obj/wfdisplay.o \
58 obj/wfplot.o \
59 obj/wfpage.o \
60 obj/pagespectra.o \
61 obj/asmpage.o \
62 obj/moc_wfdisplay.o \
63 obj/moc_wfplot.o \
64 obj/moc_wfpage.o \
65 obj/moc_pagespectra.o \
66 obj/moc_asmpage.o
67 67 DIST = /usr/lib64/qt5/mkspecs/features/spec_pre.prf \
68 68 /usr/lib64/qt5/mkspecs/common/shell-unix.conf \
69 69 /usr/lib64/qt5/mkspecs/common/unix.conf \
@@ -420,8 +420,8 qmake: FORCE
420 420 qmake_all: FORCE
421 421
422 422 dist:
423 @test -d .tmp/wfdisplay1.0.0 || mkdir -p .tmp/wfdisplay1.0.0
424 $(COPY_FILE) --parents $(SOURCES) $(DIST) .tmp/wfdisplay1.0.0/ && $(COPY_FILE) --parents wfdisplay.h wfplot.h wfpage.h wfdisplay_params.h pagespectra.h asmpage.h .tmp/wfdisplay1.0.0/ && $(COPY_FILE) --parents wfdisplay.cpp wfplot.cpp wfpage.cpp pagespectra.cpp asmpage.cpp .tmp/wfdisplay1.0.0/ && (cd `dirname .tmp/wfdisplay1.0.0` && $(TAR) wfdisplay1.0.0.tar wfdisplay1.0.0 && $(COMPRESS) wfdisplay1.0.0.tar) && $(MOVE) `dirname .tmp/wfdisplay1.0.0`/wfdisplay1.0.0.tar.gz . && $(DEL_FILE) -r .tmp/wfdisplay1.0.0
423 @test -d obj/wfdisplay1.0.0 || mkdir -p obj/wfdisplay1.0.0
424 $(COPY_FILE) --parents $(SOURCES) $(DIST) obj/wfdisplay1.0.0/ && $(COPY_FILE) --parents wfdisplay.h wfplot.h wfpage.h wfdisplay_params.h pagespectra.h asmpage.h obj/wfdisplay1.0.0/ && $(COPY_FILE) --parents wfdisplay.cpp wfplot.cpp wfpage.cpp pagespectra.cpp asmpage.cpp obj/wfdisplay1.0.0/ && (cd `dirname obj/wfdisplay1.0.0` && $(TAR) wfdisplay1.0.0.tar wfdisplay1.0.0 && $(COMPRESS) wfdisplay1.0.0.tar) && $(MOVE) `dirname obj/wfdisplay1.0.0`/wfdisplay1.0.0.tar.gz . && $(DEL_FILE) -r obj/wfdisplay1.0.0
425 425
426 426
427 427 clean:compiler_clean
@@ -445,10 +445,10 check: first
445 445
446 446 compiler_rcc_make_all:
447 447 compiler_rcc_clean:
448 compiler_moc_header_make_all: moc_wfdisplay.cpp moc_wfplot.cpp moc_wfpage.cpp moc_pagespectra.cpp moc_asmpage.cpp
448 compiler_moc_header_make_all: moc/moc_wfdisplay.cpp moc/moc_wfplot.cpp moc/moc_wfpage.cpp moc/moc_pagespectra.cpp moc/moc_asmpage.cpp
449 449 compiler_moc_header_clean:
450 -$(DEL_FILE) moc_wfdisplay.cpp moc_wfplot.cpp moc_wfpage.cpp moc_pagespectra.cpp moc_asmpage.cpp
451 moc_wfdisplay.cpp: /usr/include/qt5/QtWidgets/QWidget \
450 -$(DEL_FILE) moc/moc_wfdisplay.cpp moc/moc_wfplot.cpp moc/moc_wfpage.cpp moc/moc_pagespectra.cpp moc/moc_asmpage.cpp
451 moc/moc_wfdisplay.cpp: /usr/include/qt5/QtWidgets/QWidget \
452 452 /usr/include/qt5/QtWidgets/qwidget.h \
453 453 /usr/include/qt5/QtGui/qwindowdefs.h \
454 454 /usr/include/qt5/QtCore/qglobal.h \
@@ -934,9 +934,9 moc_wfdisplay.cpp: /usr/include/qt5/QtWi
934 934 /usr/include/qt5/QtPrintSupport/qtprintsupportversion.h \
935 935 wfdisplay_params.h \
936 936 wfdisplay.h
937 /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 wfdisplay.h -o moc_wfdisplay.cpp
937 /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 wfdisplay.h -o moc/moc_wfdisplay.cpp
938 938
939 moc_wfplot.cpp: /usr/include/qt5/QtWidgets/QWidget \
939 moc/moc_wfplot.cpp: /usr/include/qt5/QtWidgets/QWidget \
940 940 /usr/include/qt5/QtWidgets/qwidget.h \
941 941 /usr/include/qt5/QtGui/qwindowdefs.h \
942 942 /usr/include/qt5/QtCore/qglobal.h \
@@ -1408,9 +1408,9 moc_wfplot.cpp: /usr/include/qt5/QtWidge
1408 1408 /usr/include/qt5/QtPrintSupport/qprintpreviewwidget.h \
1409 1409 /usr/include/qt5/QtPrintSupport/qtprintsupportversion.h \
1410 1410 wfplot.h
1411 /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 wfplot.h -o moc_wfplot.cpp
1411 /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 wfplot.h -o moc/moc_wfplot.cpp
1412 1412
1413 moc_wfpage.cpp: /usr/include/qt5/QtWidgets/QMainWindow \
1413 moc/moc_wfpage.cpp: /usr/include/qt5/QtWidgets/QMainWindow \
1414 1414 /usr/include/qt5/QtWidgets/qmainwindow.h \
1415 1415 /usr/include/qt5/QtWidgets/qwidget.h \
1416 1416 /usr/include/qt5/QtGui/qwindowdefs.h \
@@ -1894,9 +1894,9 moc_wfpage.cpp: /usr/include/qt5/QtWidge
1894 1894 /usr/include/qt5/QtPrintSupport/qtprintsupportversion.h \
1895 1895 wfdisplay_params.h \
1896 1896 wfpage.h
1897 /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 wfpage.h -o moc_wfpage.cpp
1897 /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 wfpage.h -o moc/moc_wfpage.cpp
1898 1898
1899 moc_pagespectra.cpp: /usr/include/qt5/QtWidgets/QMainWindow \
1899 moc/moc_pagespectra.cpp: /usr/include/qt5/QtWidgets/QMainWindow \
1900 1900 /usr/include/qt5/QtWidgets/qmainwindow.h \
1901 1901 /usr/include/qt5/QtWidgets/qwidget.h \
1902 1902 /usr/include/qt5/QtGui/qwindowdefs.h \
@@ -2380,9 +2380,9 moc_pagespectra.cpp: /usr/include/qt5/Qt
2380 2380 /usr/include/qt5/QtPrintSupport/qtprintsupportversion.h \
2381 2381 wfdisplay_params.h \
2382 2382 pagespectra.h
2383 /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 pagespectra.h -o moc_pagespectra.cpp
2383 /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 pagespectra.h -o moc/moc_pagespectra.cpp
2384 2384
2385 moc_asmpage.cpp: /usr/include/qt5/QtWidgets/QMainWindow \
2385 moc/moc_asmpage.cpp: /usr/include/qt5/QtWidgets/QMainWindow \
2386 2386 /usr/include/qt5/QtWidgets/qmainwindow.h \
2387 2387 /usr/include/qt5/QtWidgets/qwidget.h \
2388 2388 /usr/include/qt5/QtGui/qwindowdefs.h \
@@ -2861,7 +2861,7 moc_asmpage.cpp: /usr/include/qt5/QtWidg
2861 2861 /usr/include/qt5/QtPrintSupport/qprintpreviewwidget.h \
2862 2862 /usr/include/qt5/QtPrintSupport/qtprintsupportversion.h \
2863 2863 asmpage.h
2864 /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 asmpage.h -o moc_asmpage.cpp
2864 /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 asmpage.h -o moc/moc_asmpage.cpp
2865 2865
2866 2866 compiler_moc_source_make_all:
2867 2867 compiler_moc_source_clean:
@@ -2877,7 +2877,7 compiler_clean: compiler_moc_header_clea
2877 2877
2878 2878 ####### Compile
2879 2879
2880 wfdisplay.o: wfdisplay.cpp wfdisplay.h \
2880 obj/wfdisplay.o: wfdisplay.cpp wfdisplay.h \
2881 2881 /usr/include/qt5/QtWidgets/QWidget \
2882 2882 /usr/include/qt5/QtWidgets/qwidget.h \
2883 2883 /usr/include/qt5/QtGui/qwindowdefs.h \
@@ -3363,9 +3363,9 wfdisplay.o: wfdisplay.cpp wfdisplay.h \
3363 3363 /usr/include/qt5/QtPrintSupport/qprintpreviewwidget.h \
3364 3364 /usr/include/qt5/QtPrintSupport/qtprintsupportversion.h \
3365 3365 wfdisplay_params.h
3366 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o wfdisplay.o wfdisplay.cpp
3366 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o obj/wfdisplay.o wfdisplay.cpp
3367 3367
3368 wfplot.o: wfplot.cpp wfplot.h \
3368 obj/wfplot.o: wfplot.cpp wfplot.h \
3369 3369 /usr/include/qt5/QtWidgets/QWidget \
3370 3370 /usr/include/qt5/QtWidgets/qwidget.h \
3371 3371 /usr/include/qt5/QtGui/qwindowdefs.h \
@@ -3839,9 +3839,9 wfplot.o: wfplot.cpp wfplot.h \
3839 3839 /usr/include/qt5/QtPrintSupport/qtprintsupportversion.h \
3840 3840 /usr/include/qt5/QtGui/QFontInfo \
3841 3841 wfdisplay_params.h
3842 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o wfplot.o wfplot.cpp
3842 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o obj/wfplot.o wfplot.cpp
3843 3843
3844 wfpage.o: wfpage.cpp wfpage.h \
3844 obj/wfpage.o: wfpage.cpp wfpage.h \
3845 3845 /usr/include/qt5/QtWidgets/QMainWindow \
3846 3846 /usr/include/qt5/QtWidgets/qmainwindow.h \
3847 3847 /usr/include/qt5/QtWidgets/qwidget.h \
@@ -4325,9 +4325,9 wfpage.o: wfpage.cpp wfpage.h \
4325 4325 /usr/include/qt5/QtPrintSupport/qprintpreviewwidget.h \
4326 4326 /usr/include/qt5/QtPrintSupport/qtprintsupportversion.h \
4327 4327 wfdisplay_params.h
4328 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o wfpage.o wfpage.cpp
4328 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o obj/wfpage.o wfpage.cpp
4329 4329
4330 pagespectra.o: pagespectra.cpp pagespectra.h \
4330 obj/pagespectra.o: pagespectra.cpp pagespectra.h \
4331 4331 /usr/include/qt5/QtWidgets/QMainWindow \
4332 4332 /usr/include/qt5/QtWidgets/qmainwindow.h \
4333 4333 /usr/include/qt5/QtWidgets/qwidget.h \
@@ -4811,9 +4811,9 pagespectra.o: pagespectra.cpp pagespect
4811 4811 /usr/include/qt5/QtPrintSupport/qprintpreviewwidget.h \
4812 4812 /usr/include/qt5/QtPrintSupport/qtprintsupportversion.h \
4813 4813 wfdisplay_params.h
4814 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o pagespectra.o pagespectra.cpp
4814 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o obj/pagespectra.o pagespectra.cpp
4815 4815
4816 asmpage.o: asmpage.cpp asmpage.h \
4816 obj/asmpage.o: asmpage.cpp asmpage.h \
4817 4817 /usr/include/qt5/QtWidgets/QMainWindow \
4818 4818 /usr/include/qt5/QtWidgets/qmainwindow.h \
4819 4819 /usr/include/qt5/QtWidgets/qwidget.h \
@@ -5292,22 +5292,22 asmpage.o: asmpage.cpp asmpage.h \
5292 5292 /usr/include/qt5/QtCore/QPair \
5293 5293 /usr/include/qt5/QtPrintSupport/qprintpreviewwidget.h \
5294 5294 /usr/include/qt5/QtPrintSupport/qtprintsupportversion.h
5295 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o asmpage.o asmpage.cpp
5295 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o obj/asmpage.o asmpage.cpp
5296 5296
5297 moc_wfdisplay.o: moc_wfdisplay.cpp
5298 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o moc_wfdisplay.o moc_wfdisplay.cpp
5297 obj/moc_wfdisplay.o: moc/moc_wfdisplay.cpp
5298 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o obj/moc_wfdisplay.o moc/moc_wfdisplay.cpp
5299 5299
5300 moc_wfplot.o: moc_wfplot.cpp
5301 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o moc_wfplot.o moc_wfplot.cpp
5300 obj/moc_wfplot.o: moc/moc_wfplot.cpp
5301 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o obj/moc_wfplot.o moc/moc_wfplot.cpp
5302 5302
5303 moc_wfpage.o: moc_wfpage.cpp
5304 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o moc_wfpage.o moc_wfpage.cpp
5303 obj/moc_wfpage.o: moc/moc_wfpage.cpp
5304 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o obj/moc_wfpage.o moc/moc_wfpage.cpp
5305 5305
5306 moc_pagespectra.o: moc_pagespectra.cpp
5307 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o moc_pagespectra.o moc_pagespectra.cpp
5306 obj/moc_pagespectra.o: moc/moc_pagespectra.cpp
5307 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o obj/moc_pagespectra.o moc/moc_pagespectra.cpp
5308 5308
5309 moc_asmpage.o: moc_asmpage.cpp
5310 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o moc_asmpage.o moc_asmpage.cpp
5309 obj/moc_asmpage.o: moc/moc_asmpage.cpp
5310 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o obj/moc_asmpage.o moc/moc_asmpage.cpp
5311 5311
5312 5312 ####### Install
5313 5313
Show file before | Show file after | Hide comments
@@ -1,18 +1,12
1 1 #ifndef ASMPAGE_H
2 2 #define ASMPAGE_H
3 3
4 #include <QtWidgets/QMainWindow>
4 #include <QMainWindow>
5 5 #include <QFile>
6 6 #include <QTextStream>
7 #include <QtWidgets/QLabel>
8 #include <QtWidgets/QRadioButton>
9 #include <QtWidgets/QPushButton>
10 //#include <QMainWindow>
11 //#include <QFile>
12 //#include <QTextStream>
13 //#include <QLabel>
14 //#include <QRadioButton>
15 //#include <QPushButton>
7 #include <QLabel>
8 #include <QRadioButton>
9 #include <QPushButton>
16 10
17 11 #include "wfplot.h"
18 12
Show file before | Show file after | Hide comments
@@ -1,19 +1,19
1 1 #ifndef PAGESPECTRA_H
2 2 #define PAGESPECTRA_H
3 3
4 #include <QtWidgets/QMainWindow>
5 #include <QtWidgets/QRadioButton>
6 #include <QtWidgets/QPushButton>
7 #include <QtWidgets/QDockWidget>
8 #include <QtWidgets/QToolBar>
9 #include <QtWidgets/QLabel>
4 #include <QMainWindow>
5 #include <QRadioButton>
6 #include <QPushButton>
7 #include <QDockWidget>
8 #include <QToolBar>
9 #include <QLabel>
10 10 #include <QFile>
11 11 #include <QTextStream>
12 12 #include <QFileDialog>
13 13 #include <QSettings>
14 14
15 #include <wfplot.h>
16 #include <wfdisplay_params.h>
15 #include "wfplot.h"
16 #include "wfdisplay_params.h"
17 17
18 18 class PageSpectra : public QMainWindow
19 19 {
Show file before | Show file after | Hide comments
@@ -1,11 +1,12
1 1 #ifndef WFDISPLAY_H
2 2 #define WFDISPLAY_H
3 3
4 #include <QtWidgets/QWidget>
5 #include <QtWidgets/QGridLayout>
6 #include <QtWidgets/QVBoxLayout>
7 #include <QtWidgets/QTabWidget>
8 #include <wfpage.h>
4 #include <QWidget>
5 #include <QGridLayout>
6 #include <QVBoxLayout>
7 #include <QTabWidget>
8
9 #include "wfpage.h"
9 10
10 11 class WFDisplay : public QWidget
11 12 {
Show file before | Show file after | Hide comments
@@ -4,42 +4,33
4 4 #
5 5 #-------------------------------------------------
6 6
7 TARGET = wfdisplay
8 TEMPLATE = lib
9 QT += core xml svg network
10
7 QT += core gui xml svg network
11 8 contains(QT_MAJOR_VERSION, 5) {
12
13 message( "Qt major version is" )
14 message( $$QT_MAJOR_VERSION )
15
16 9 QT += widgets
17
18 10 QT += printsupport
19
20 11 }
21 INCLUDEPATH += \
22 $${PWD} \
23 $$[QT_INSTALL_HEADERS]/lppmon/common
12 CONFIG(debug, debug|release) {
13 DEBUG_EXT = _d
14 } else {
15 DEBUG_EXT =
16 }
24 17
25 LIBS += -llppmoncommon
18 MOC_DIR = moc
19 RCC_DIR = resources
20 OBJECTS_DIR = obj
26 21
27 DEFINES += WFDISPLAY_LIBRARY
22 TEMPLATE = lib
23 TARGET = wfdisplay$${DEBUG_EXT}
28 24
29 SOURCES += wfdisplay.cpp \
30 wfplot.cpp \
31 wfpage.cpp \
32 pagespectra.cpp \
33 asmpage.cpp
25 unix:LIBS += -lelf
34 26
27 QMAKE_LFLAGS_RELEASE += --enable-auto-import
28 QMAKE_LFLAGS_DEBUG += --enable-auto-import
35 29
36 HEADERS += wfdisplay.h\
37 wfplot.h \
38 wfpage.h \
39 wfdisplay_params.h \
40 pagespectra.h \
41 asmpage.h
42
30 target.path = $$[QT_INSTALL_LIBS]
31 isEmpty(target.path) {
32 target.path = $(QTDIR)/lib
33 }
43 34
44 35 header.path = $$[QT_INSTALL_HEADERS]/lppmon/wfdisplay
45 36 header.files = \
@@ -51,9 +42,24 header.files = \
51 42 pagespectra.h \
52 43 asmpage.h
53 44
54 target.path = $$[QT_INSTALL_LIBS]
55 isEmpty(target.path) {
56 target.path = $(QTDIR)/lib
57 }
45 INSTALLS += header target
46
47 INCLUDEPATH += \
48 $${PWD} \
49 $$[QT_INSTALL_HEADERS]/lppmon/common
58 50
59 INSTALLS += header target
51 HEADERS += wfdisplay.h\
52 wfplot.h \
53 wfpage.h \
54 wfdisplay_params.h \
55 pagespectra.h \
56 asmpage.h
57
58 SOURCES += wfdisplay.cpp \
59 wfplot.cpp \
60 wfpage.cpp \
61 pagespectra.cpp \
62 asmpage.cpp
63
64 LIBS += -llppmoncommon
65
Show file before | Show file after | Hide comments
@@ -1,19 +1,19
1 1 #ifndef WFPAGE_H
2 2 #define WFPAGE_H
3 3
4 #include <QtWidgets/QMainWindow>
5 #include <QtWidgets/QRadioButton>
6 #include <QtWidgets/QPushButton>
7 #include <QtWidgets/QDockWidget>
8 #include <QtWidgets/QToolBar>
9 #include <QtWidgets/QLabel>
4 #include <QMainWindow>
5 #include <QRadioButton>
6 #include <QPushButton>
7 #include <QDockWidget>
8 #include <QToolBar>
9 #include <QLabel>
10 10 #include <QFile>
11 11 #include <QTextStream>
12 12 #include <QFileDialog>
13 13 #include <QSettings>
14 14
15 #include <wfplot.h>
16 #include <wfdisplay_params.h>
15 #include "wfplot.h"
16 #include "wfdisplay_params.h"
17 17
18 18 class WFPage : public QMainWindow
19 19 {
Show file before | Show file after | Hide comments
@@ -1,8 +1,8
1 1 #ifndef WFPLOT_H
2 2 #define WFPLOT_H
3 3
4 #include <QtWidgets/QWidget>
5 #include <QtWidgets/QVBoxLayout>
4 #include <QWidget>
5 #include <QVBoxLayout>
6 6 #include <lppmonplot.h>
7 7
8 8 class WFPlot : public QWidget
Show file before | Show file after | Hide comments
@@ -3,7 +3,7
3 3 # Generated by qmake (3.0) (Qt 5.2.1)
4 4 # Project: rmapplugin.pro
5 5 # Template: lib
6 # Command: /bin/qmake-qt5 -spec linux-g++-64 -o Makefile rmapplugin.pro
6 # Command: /usr/bin/qmake-qt5 -o Makefile rmapplugin.pro
7 7 #############################################################################
8 8
9 9 MAKEFILE = Makefile
@@ -21,7 +21,7 LFLAGS = -m64 -Wl,-O1 -Wl,-z,relr
21 21 LIBS = $(SUBLIBS) -L/usr/X11R6/lib64 /home/spacewire/usb/spw_usb_driver_v2.68/lib/x86_64/libSpaceWireUSBAPI.so /home/spacewire/usb/spw_usb_driver_v2.68/lib/x86_64/libConfigLibraryUSB.so -lwfdisplay -lpaulcommon -llppmonengine -llppmoncommon -ldl -lutil -lm -lpython2.7 -lPythonQt_QtAll -lPythonQt -lQt5PrintSupport -lQt5Svg -lQt5Widgets -lQt5Network -lQt5Xml -lQt5Gui -lQt5Core -lGL -lpthread
22 22 AR = ar cqs
23 23 RANLIB =
24 QMAKE = /bin/qmake-qt5
24 QMAKE = /usr/bin/qmake-qt5
25 25 TAR = tar -cf
26 26 COMPRESS = gzip -9f
27 27 COPY = cp -f
@@ -347,7 +347,7 Makefile: rmapplugin.pro /usr/lib64/qt5/
347 347 /lib64/libQt5Xml.prl \
348 348 /lib64/libQt5Gui.prl \
349 349 /lib64/libQt5Core.prl
350 $(QMAKE) -spec linux-g++-64 -o Makefile rmapplugin.pro
350 $(QMAKE) -o Makefile rmapplugin.pro
351 351 /usr/lib64/qt5/mkspecs/features/spec_pre.prf:
352 352 /usr/lib64/qt5/mkspecs/common/shell-unix.conf:
353 353 /usr/lib64/qt5/mkspecs/common/unix.conf:
@@ -453,7 +453,7 rmapplugin.pro:
453 453 /lib64/libQt5Gui.prl:
454 454 /lib64/libQt5Core.prl:
455 455 qmake: FORCE
456 @$(QMAKE) -spec linux-g++-64 -o Makefile rmapplugin.pro
456 @$(QMAKE) -o Makefile rmapplugin.pro
457 457
458 458 qmake_all: FORCE
459 459
Show file before | Show file after | Hide comments
1 NO CONTENT: file was removed
Show file before | Show file after | Hide comments
1 NO CONTENT: file was removed
This diff has been collapsed as it changes many lines, (3125 lines changed) Show them Hide them
General Comments 0
You need to be logged in to leave comments. Login now