##// END OF EJS Templates
last commit before release
leroy -
r54:2eb8a970568a default
parent child
Show More
@@ -132,12 +132,12 void HKDisplay::setupSpaceWireIFStatisti
132 hk_lfr_dpu_spw_pkt_rcv_cnt = new QLabel("hk_lfr_dpu_spw_pkt_rcv_cnt: -");
132 hk_lfr_dpu_spw_pkt_rcv_cnt = new QLabel("hk_lfr_dpu_spw_pkt_rcv_cnt: -");
133 hk_lfr_dpu_spw_pkt_sent_cnt = new QLabel("hk_lfr_dpu_spw_pkt_sent_cnt: -");
133 hk_lfr_dpu_spw_pkt_sent_cnt = new QLabel("hk_lfr_dpu_spw_pkt_sent_cnt: -");
134 hk_lfr_dpu_spw_tick_out_cnt = new QLabel("hk_lfr_dpu_spw_tick_out_cnt: -");
134 hk_lfr_dpu_spw_tick_out_cnt = new QLabel("hk_lfr_dpu_spw_tick_out_cnt: -");
135 hk_lfr_dpu_spw_last_timc = new QLabel("hk_lfr_dpu_spw_last_timc: -");
135 hk_lfr_dpu_spw_last_time = new QLabel("hk_lfr_dpu_spw_last_time: -");
136
136
137 box_spacewireIFStatisctics->addWidget(hk_lfr_dpu_spw_pkt_rcv_cnt);
137 box_spacewireIFStatisctics->addWidget(hk_lfr_dpu_spw_pkt_rcv_cnt);
138 box_spacewireIFStatisctics->addWidget(hk_lfr_dpu_spw_pkt_sent_cnt);
138 box_spacewireIFStatisctics->addWidget(hk_lfr_dpu_spw_pkt_sent_cnt);
139 box_spacewireIFStatisctics->addWidget(hk_lfr_dpu_spw_tick_out_cnt);
139 box_spacewireIFStatisctics->addWidget(hk_lfr_dpu_spw_tick_out_cnt);
140 box_spacewireIFStatisctics->addWidget(hk_lfr_dpu_spw_last_timc);
140 box_spacewireIFStatisctics->addWidget(hk_lfr_dpu_spw_last_time);
141 box_spacewireIFStatisctics->insertStretch(5);
141 box_spacewireIFStatisctics->insertStretch(5);
142
142
143 groupbox_spacewireIFStatisctics->setLayout(box_spacewireIFStatisctics->layout());
143 groupbox_spacewireIFStatisctics->setLayout(box_spacewireIFStatisctics->layout());
@@ -393,9 +393,9 void HKDisplay::updateSpaceWireIFStatist
393 + QString::number(
393 + QString::number(
394 housekeepingPacket->hk_lfr_dpu_spw_tick_out_cnt)
394 housekeepingPacket->hk_lfr_dpu_spw_tick_out_cnt)
395 );
395 );
396 hk_lfr_dpu_spw_last_timc->setText("hk_lfr_dpu_spw_last_timc: "
396 hk_lfr_dpu_spw_last_time->setText("hk_lfr_dpu_spw_last_time: "
397 + QString::number(
397 + QString::number(
398 housekeepingPacket->hk_lfr_dpu_spw_last_timc)
398 housekeepingPacket->hk_lfr_dpu_spw_last_time)
399 );
399 );
400 }
400 }
401
401
@@ -116,7 +116,7 private:
116 QLabel *hk_lfr_dpu_spw_pkt_rcv_cnt;
116 QLabel *hk_lfr_dpu_spw_pkt_rcv_cnt;
117 QLabel *hk_lfr_dpu_spw_pkt_sent_cnt;
117 QLabel *hk_lfr_dpu_spw_pkt_sent_cnt;
118 QLabel *hk_lfr_dpu_spw_tick_out_cnt;
118 QLabel *hk_lfr_dpu_spw_tick_out_cnt;
119 QLabel *hk_lfr_dpu_spw_last_timc;
119 QLabel *hk_lfr_dpu_spw_last_time;
120 // hk_lfr_last_fail_addr
120 // hk_lfr_last_fail_addr
121 QLabel *hk_lfr_last_fail_addr;
121 QLabel *hk_lfr_last_fail_addr;
122 // hk_lfr_temp_
122 // hk_lfr_temp_
@@ -1,6 +1,6
1 <?xml version="1.0" encoding="UTF-8"?>
1 <?xml version="1.0" encoding="UTF-8"?>
2 <!DOCTYPE QtCreatorProject>
2 <!DOCTYPE QtCreatorProject>
3 <!-- Written by QtCreator 2.8.1, 2013-11-07T12:35:53. -->
3 <!-- Written by QtCreator 2.8.1, 2013-11-07T14:48:17. -->
4 <qtcreator>
4 <qtcreator>
5 <data>
5 <data>
6 <variable>ProjectExplorer.Project.ActiveTarget</variable>
6 <variable>ProjectExplorer.Project.ActiveTarget</variable>
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