HG_REPOSITORIES/LPP/INSTRUMENTATION/SOLO_LFR/LPPMON_PLUGINS_PAUL Commit - r65:34aad6053543

Sync

leroy -

r65:34aad6053543 default

parent child

Context file:

r65:34aad6053543

gse_lesia/gselesia.pro.user +1 -1

             <?xml version="1.0" encoding="UTF-8"?>
             <!DOCTYPE QtCreatorProject>
-            <!-- Written by QtCreator 3.0.1, 2014-04-07T08:08:54. -->
+            <!-- Written by QtCreator 3.0.1, 2014-04-10T12:51:45. -->
             <qtcreator>
              <data>
               <variable>ProjectExplorer.Project.ActiveTarget</variable>

gse_lesia/lfrsgse binary modified 0 0

NO CONTENT: modified file, binary diff hidden

rmapplugin/Makefile +4 -4

             # Generated by qmake (3.0) (Qt 5.2.1)
             # Project:  rmapplugin.pro
             # Template: lib
-            # Command: /usr/bin/qmake-qt5 -o Makefile rmapplugin.pro
+            # Command: /bin/qmake-qt5 -spec linux-g++-64 -o Makefile rmapplugin.pro
             #############################################################################
             MAKEFILE      = Makefile
             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
             AR            = ar cqs
             RANLIB        =
-            QMAKE         = /usr/bin/qmake-qt5
+            QMAKE         = /bin/qmake-qt5
             TAR           = tar -cf
             COMPRESS      = gzip -9f
             COPY          = cp -f
             		/lib64/libQt5Xml.prl \
             		/lib64/libQt5Gui.prl \
             		/lib64/libQt5Core.prl
-            	$(QMAKE) -o Makefile rmapplugin.pro
+            	$(QMAKE) -spec linux-g++-64 -o Makefile rmapplugin.pro
             /usr/lib64/qt5/mkspecs/features/spec_pre.prf:
             /usr/lib64/qt5/mkspecs/common/shell-unix.conf:
             /usr/lib64/qt5/mkspecs/common/unix.conf:
             /lib64/libQt5Gui.prl:
             /lib64/libQt5Core.prl:
             qmake: FORCE
-            	@$(QMAKE) -o Makefile rmapplugin.pro
+            	@$(QMAKE) -spec linux-g++-64 -o Makefile rmapplugin.pro
             qmake_all: FORCE

rmapplugin/tmstatistics.cpp +28 0

                 label_NORM_SWF_F2_nb->setText("-");
                 label_NORM_CWF_F3_nb->setText("-");
                 label_NORM_CWF_LONG_F3_nb->setText("-");
+                label_NORM_BP1_F0_nb->setText("-");
+                label_NORM_BP2_F0_nb->setText("-");
                 label_NORM_ASM_F0_nb->setText("-");
                 //
                 label_BURST_CWF_F2_nb->setText("-");
+                label_BURST_BP1_F0_nb->setText("-");
+                label_BURST_BP2_F0_nb->setText("-");
                 //
                 label_SBM1_CWF_F1_nb->setText("-");
+                label_SBM1_BP1_F0_nb->setText("-");
+                label_SBM1_BP2_F0_nb->setText("-");
                 //
                 label_SBM2_CWF_F2_nb->setText("-");
+                label_SBM2_BP1_F0_nb->setText("-");
+                label_SBM2_BP2_F0_nb->setText("-");
                 //
                 label_PID_is->setText("-");
                 label_CAT_is->setText("-");
                                 NORM_BP2_F2_nb = NORM_BP2_F2_nb + 1;
                                 label_NORM_BP2_F2_nb->setText(QString::number(NORM_BP2_F2_nb));
                             }
+                            else if (sid == SID_BURST_BP1_F0)
+                            {
+                                BURST_BP1_F0_nb = BURST_BP1_F0_nb + 1;
+                                label_BURST_BP1_F0_nb->setText(QString::number(BURST_BP1_F0_nb));
+                            }
+                            else if (sid == SID_BURST_BP2_F0)
+                            {
+                                BURST_BP2_F0_nb = BURST_BP2_F0_nb + 1;
+                                label_BURST_BP2_F0_nb->setText(QString::number(BURST_BP2_F0_nb));
+                            }
                             else if (sid == SID_SBM1_CWF_F1)
                             {
                                 SBM1_CWF_F1_nb = SBM1_CWF_F1_nb + 1;
                                 SBM1_BP2_F0_nb = SBM1_BP2_F0_nb + 1;
                                 label_SBM1_BP2_F0_nb->setText(QString::number(SBM1_BP2_F0_nb));
                             }
+                            else if (sid == SID_SBM2_BP1_F0)
+                            {
+                                SBM2_BP1_F0_nb = SBM2_BP1_F0_nb + 1;
+                                label_SBM2_BP1_F0_nb->setText(QString::number(SBM2_BP1_F0_nb));
+                            }
+                            else if (sid == SID_SBM2_BP2_F0)
+                            {
+                                SBM2_BP2_F0_nb = SBM2_BP2_F0_nb + 1;
+                                label_SBM2_BP2_F0_nb->setText(QString::number(SBM2_BP2_F0_nb));
+                            }
                             else
                             {
                                 incrementUnknown();

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