##// END OF EJS Templates
Sync
leroy -
r65:34aad6053543 default
parent child
Show More
@@ -1,6 +1,6
1 1 <?xml version="1.0" encoding="UTF-8"?>
2 2 <!DOCTYPE QtCreatorProject>
3 <!-- Written by QtCreator 3.0.1, 2014-04-07T08:08:54. -->
3 <!-- Written by QtCreator 3.0.1, 2014-04-10T12:51:45. -->
4 4 <qtcreator>
5 5 <data>
6 6 <variable>ProjectExplorer.Project.ActiveTarget</variable>
1 NO CONTENT: modified file, binary diff hidden
@@ -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: /usr/bin/qmake-qt5 -o Makefile rmapplugin.pro
6 # Command: /bin/qmake-qt5 -spec linux-g++-64 -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 -lparameterdump -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 = /usr/bin/qmake-qt5
24 QMAKE = /bin/qmake-qt5
25 25 TAR = tar -cf
26 26 COMPRESS = gzip -9f
27 27 COPY = cp -f
@@ -371,7 +371,7 Makefile: rmapplugin.pro /usr/lib64/qt5/
371 371 /lib64/libQt5Xml.prl \
372 372 /lib64/libQt5Gui.prl \
373 373 /lib64/libQt5Core.prl
374 $(QMAKE) -o Makefile rmapplugin.pro
374 $(QMAKE) -spec linux-g++-64 -o Makefile rmapplugin.pro
375 375 /usr/lib64/qt5/mkspecs/features/spec_pre.prf:
376 376 /usr/lib64/qt5/mkspecs/common/shell-unix.conf:
377 377 /usr/lib64/qt5/mkspecs/common/unix.conf:
@@ -477,7 +477,7 rmapplugin.pro:
477 477 /lib64/libQt5Gui.prl:
478 478 /lib64/libQt5Core.prl:
479 479 qmake: FORCE
480 @$(QMAKE) -o Makefile rmapplugin.pro
480 @$(QMAKE) -spec linux-g++-64 -o Makefile rmapplugin.pro
481 481
482 482 qmake_all: FORCE
483 483
@@ -429,13 +429,21 void TMStatistics::resetStatistics()
429 429 label_NORM_SWF_F2_nb->setText("-");
430 430 label_NORM_CWF_F3_nb->setText("-");
431 431 label_NORM_CWF_LONG_F3_nb->setText("-");
432 label_NORM_BP1_F0_nb->setText("-");
433 label_NORM_BP2_F0_nb->setText("-");
432 434 label_NORM_ASM_F0_nb->setText("-");
433 435 //
434 436 label_BURST_CWF_F2_nb->setText("-");
437 label_BURST_BP1_F0_nb->setText("-");
438 label_BURST_BP2_F0_nb->setText("-");
435 439 //
436 440 label_SBM1_CWF_F1_nb->setText("-");
441 label_SBM1_BP1_F0_nb->setText("-");
442 label_SBM1_BP2_F0_nb->setText("-");
437 443 //
438 444 label_SBM2_CWF_F2_nb->setText("-");
445 label_SBM2_BP1_F0_nb->setText("-");
446 label_SBM2_BP2_F0_nb->setText("-");
439 447 //
440 448 label_PID_is->setText("-");
441 449 label_CAT_is->setText("-");
@@ -615,6 +623,16 void TMStatistics::updateStatistics(unsi
615 623 NORM_BP2_F2_nb = NORM_BP2_F2_nb + 1;
616 624 label_NORM_BP2_F2_nb->setText(QString::number(NORM_BP2_F2_nb));
617 625 }
626 else if (sid == SID_BURST_BP1_F0)
627 {
628 BURST_BP1_F0_nb = BURST_BP1_F0_nb + 1;
629 label_BURST_BP1_F0_nb->setText(QString::number(BURST_BP1_F0_nb));
630 }
631 else if (sid == SID_BURST_BP2_F0)
632 {
633 BURST_BP2_F0_nb = BURST_BP2_F0_nb + 1;
634 label_BURST_BP2_F0_nb->setText(QString::number(BURST_BP2_F0_nb));
635 }
618 636 else if (sid == SID_SBM1_CWF_F1)
619 637 {
620 638 SBM1_CWF_F1_nb = SBM1_CWF_F1_nb + 1;
@@ -635,6 +653,16 void TMStatistics::updateStatistics(unsi
635 653 SBM1_BP2_F0_nb = SBM1_BP2_F0_nb + 1;
636 654 label_SBM1_BP2_F0_nb->setText(QString::number(SBM1_BP2_F0_nb));
637 655 }
656 else if (sid == SID_SBM2_BP1_F0)
657 {
658 SBM2_BP1_F0_nb = SBM2_BP1_F0_nb + 1;
659 label_SBM2_BP1_F0_nb->setText(QString::number(SBM2_BP1_F0_nb));
660 }
661 else if (sid == SID_SBM2_BP2_F0)
662 {
663 SBM2_BP2_F0_nb = SBM2_BP2_F0_nb + 1;
664 label_SBM2_BP2_F0_nb->setText(QString::number(SBM2_BP2_F0_nb));
665 }
638 666 else
639 667 {
640 668 incrementUnknown();
General Comments 0
You need to be logged in to leave comments. Login now