HG_REPOSITORIES/LPP/INSTRUMENTATION/SOLO_LFR/LPPMON_PLUGINS_PAUL Commit - r54:2eb8a970568a

last commit before release

leroy -

r54:2eb8a970568a default

parent child

Context file:

r54:2eb8a970568a

common_PLE/hkdisplay.cpp +4 -4

                  hk_lfr_dpu_spw_pkt_rcv_cnt = new QLabel("hk_lfr_dpu_spw_pkt_rcv_cnt: -");
                  hk_lfr_dpu_spw_pkt_sent_cnt = new QLabel("hk_lfr_dpu_spw_pkt_sent_cnt: -");
                  hk_lfr_dpu_spw_tick_out_cnt = new QLabel("hk_lfr_dpu_spw_tick_out_cnt: -");
-                 hk_lfr_dpu_spw_last_timc = new QLabel("hk_lfr_dpu_spw_last_timc: -");
+                 hk_lfr_dpu_spw_last_time = new QLabel("hk_lfr_dpu_spw_last_time: -");
                  box_spacewireIFStatisctics->addWidget(hk_lfr_dpu_spw_pkt_rcv_cnt);
                  box_spacewireIFStatisctics->addWidget(hk_lfr_dpu_spw_pkt_sent_cnt);
                  box_spacewireIFStatisctics->addWidget(hk_lfr_dpu_spw_tick_out_cnt);
-                 box_spacewireIFStatisctics->addWidget(hk_lfr_dpu_spw_last_timc);
+                 box_spacewireIFStatisctics->addWidget(hk_lfr_dpu_spw_last_time);
                  box_spacewireIFStatisctics->insertStretch(5);
                  groupbox_spacewireIFStatisctics->setLayout(box_spacewireIFStatisctics->layout());
                                                       + QString::number(
                                                           housekeepingPacket->hk_lfr_dpu_spw_tick_out_cnt)
                                                       );
-                 hk_lfr_dpu_spw_last_timc->setText("hk_lfr_dpu_spw_last_timc: "
+                 hk_lfr_dpu_spw_last_time->setText("hk_lfr_dpu_spw_last_time: "
                                                    + QString::number(
-                                                       housekeepingPacket->hk_lfr_dpu_spw_last_timc)
+                                                       housekeepingPacket->hk_lfr_dpu_spw_last_time)
                                                    );
              }

common_PLE/hkdisplay.h +1 -1

                  QLabel *hk_lfr_dpu_spw_pkt_rcv_cnt;
                  QLabel *hk_lfr_dpu_spw_pkt_sent_cnt;
                  QLabel *hk_lfr_dpu_spw_tick_out_cnt;
-                 QLabel *hk_lfr_dpu_spw_last_timc;
+                 QLabel *hk_lfr_dpu_spw_last_time;
                  // hk_lfr_last_fail_addr
                  QLabel *hk_lfr_last_fail_addr;
                  // hk_lfr_temp_

gse_lesia/gselesia.pro.user +1 -1

              <?xml version="1.0" encoding="UTF-8"?>
              <!DOCTYPE QtCreatorProject>
-             <!-- Written by QtCreator 2.8.1, 2013-11-07T12:35:53. -->
+             <!-- Written by QtCreator 2.8.1, 2013-11-07T14:48:17. -->
              <qtcreator>
               <data>
                <variable>ProjectExplorer.Project.ActiveTarget</variable>

gse_lesia/lfrsgse binary modified 0 0

NO CONTENT: modified file, binary diff hidden

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