Index: TD_Post_Treatment/interface.ui
===================================================================
diff -u -rb0db89757f584c9392c903594523ce550b7e144a -r8cc5de416e6f750c91b06e91060efbce93d789bc
--- TD_Post_Treatment/interface.ui (.../interface.ui) (revision b0db89757f584c9392c903594523ce550b7e144a)
+++ TD_Post_Treatment/interface.ui (.../interface.ui) (revision 8cc5de416e6f750c91b06e91060efbce93d789bc)
@@ -105,7 +105,7 @@
- Req [0xA8]
+ Req [0xAB]
@@ -274,7 +274,7 @@
- 169 : [0xA900] : Patient Disconnect Confirm
+ 169 : [0xAC00] : Patient Disconnect Confirm
Qt::AlignCenter
@@ -303,7 +303,7 @@
- Req [0xA6]
+ Req [0xA9]
@@ -338,7 +338,7 @@
- 167 : [0xA700] : Treatment Review Logs
+ 167 : [0xAA00] : Treatment Review Logs
Qt::AlignCenter
Index: TD_Vitals/interface.ui
===================================================================
diff -u -rda3f9cf33bc59c7b43a35ec910658b39d99c6e01 -r8cc5de416e6f750c91b06e91060efbce93d789bc
--- TD_Vitals/interface.ui (.../interface.ui) (revision da3f9cf33bc59c7b43a35ec910658b39d99c6e01)
+++ TD_Vitals/interface.ui (.../interface.ui) (revision 8cc5de416e6f750c91b06e91060efbce93d789bc)
@@ -6,7 +6,7 @@
0
0
- 421
+ 391
243
@@ -297,237 +297,6 @@
- -
-
-
- QFrame::StyledPanel
-
-
- QFrame::Raised
-
-
-
- 2
-
-
- 2
-
-
- 2
-
-
- 2
-
-
-
-
-
-
-
-
-
- 0
- 0
-
-
-
-
- 250
- 0
-
-
-
-
- 16777215
- 16777215
-
-
-
-
- 10
-
-
-
- color: rgb(238, 238, 236);
-background-color: rgb(92, 53, 102);
-
-
-
- 101 : [0x6500] : Treatment Vitals
-
-
- Qt::AlignCenter
-
-
-
- -
-
-
- Send
-
-
-
-
-
- -
-
-
- Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter
-
-
- 2
-
-
- 2
-
-
-
-
-
-
- 0
- 0
-
-
-
-
- 0
- 0
-
-
-
- Systolic
-
-
- Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter
-
-
-
- -
-
-
-
- 0
- 0
-
-
-
- Qt::AlignCenter
-
-
- 60
-
-
- 250
-
-
- 120
-
-
-
- -
-
-
-
- 0
- 0
-
-
-
-
- 0
- 0
-
-
-
- Diastolic
-
-
- Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter
-
-
-
- -
-
-
-
- 0
- 0
-
-
-
- Qt::AlignCenter
-
-
- 40
-
-
- 200
-
-
- 80
-
-
-
- -
-
-
-
- 0
- 0
-
-
-
-
- 0
- 0
-
-
-
- Heart Rate
-
-
- Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter
-
-
-
- -
-
-
-
- 0
- 0
-
-
-
- Qt::AlignCenter
-
-
- 40
-
-
- 180
-
-
- 100
-
-
-
-
-
- -
-
-
- Qt::Vertical
-
-
-
- 0
- 0
-
-
-
-
-
-
-
Index: TD_Vitals/loader.py
===================================================================
diff -u -rda3f9cf33bc59c7b43a35ec910658b39d99c6e01 -r8cc5de416e6f750c91b06e91060efbce93d789bc
--- TD_Vitals/loader.py (.../loader.py) (revision da3f9cf33bc59c7b43a35ec910658b39d99c6e01)
+++ TD_Vitals/loader.py (.../loader.py) (revision 8cc5de416e6f750c91b06e91060efbce93d789bc)
@@ -30,6 +30,12 @@
self.can_interface = self.td_interface.can_interface
super().__init__(os.path.dirname(__file__))
+ if self.can_interface is not None:
+ channel_id = CAN.DenaliChannels.ui_to_td_ch_id
+ vitals_request_message_id = MsgIds.MSG_ID_UI_BLOOD_PRESSURE_REQUEST.value
+ self.can_interface.register_receiving_publication_function(channel_id,
+ vitals_request_message_id,
+ self.handle_vitals_request)
def _init_loader(self):
"""
@@ -56,18 +62,17 @@
self.sbDiastolic .valueChanged.connect(self.do_vitals_data )
self.sbHeartRate .valueChanged.connect(self.do_vitals_data )
-
def _init_widgets(self):
"""
initializes the widgets' properties
:return: none
"""
- self.sbVitalsReason .setValue(0)
+
self.sbSystolic .setValue(120)
self.sbDiastolic .setValue(80)
self.sbHeartRate .setValue(100)
+ self.sbVitalsReason .setValue(0)
-
@Slot()
def handle_vitals_request(self, message, timestamp = 0.0):
"""
@@ -76,7 +81,6 @@
"""
self.lbRequest.setText("Requested")
-
@Slot()
def do_vitals_data(self):
"""