Index: TD_Vitals/interface.ui =================================================================== diff -u -r3106c9d27f114fa3e7e435b3eeba9cfcfe178bf7 -rda3f9cf33bc59c7b43a35ec910658b39d99c6e01 --- TD_Vitals/interface.ui (.../interface.ui) (revision 3106c9d27f114fa3e7e435b3eeba9cfcfe178bf7) +++ TD_Vitals/interface.ui (.../interface.ui) (revision da3f9cf33bc59c7b43a35ec910658b39d99c6e01) @@ -6,10 +6,16 @@ 0 0 - 330 - 224 + 421 + 243 + + + 50 + 0 + + 100000 @@ -21,129 +27,275 @@ - - - QFrame::StyledPanel - - - QFrame::Raised - - - - 2 - - - 2 - - - 2 - - - 2 - - - - - - - - 250 - 0 - - - - - 10 - - - - color: rgb(238, 238, 236); -background-color: rgb(92, 53, 102); + + + + + + + + 0 + 0 + + + + + 352 + 0 + + + + + 16777215 + 16777215 + + + + + 10 + + + + color: rgb(238, 238, 236); +background-color: rgb(255, 80, 102); - - - 100 : [0x6400] : Vitals Response - - - Qt::AlignCenter - - - - - - - Send - - - - - - - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - 2 - - - 2 - - - - - - 0 - 0 - - - - - 0 - 0 - - - - Reason - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - - - - - - 0 - 0 - - - - Qt::AlignCenter - - - 900 - - - - - - - - - Qt::Vertical - - - - 0 - 0 - - - - - - + + + 101 : [0x6500] : Treatment Vitals + + + Qt::AlignCenter + + + + + + + send + + + + + + + + + + + + 180 + 0 + + + + Systolic + + + + + + + 60 + + + 250 + + + 120 + + + + + + + + + + + + 0 + 0 + + + + + 352 + 0 + + + + + 16777215 + 16777215 + + + + + 10 + + + + color: rgb(238, 238, 236); +background-color: rgb(255, 80, 102); + + + + 99 : [0x6300] : Treatment Vitals Request + + + Qt::AlignCenter + + + + + + + send + + + + + + + + + + + + 180 + 0 + + + + Diastolic + + + + + + + 40 + + + 200 + + + 80 + + + + + + + + + + + + 0 + 0 + + + + false + + + QFrame::WinPanel + + + QFrame::Sunken + + + - + + + Qt::AlignCenter + + + + + + + + + + 0 + 0 + + + + Response 100 : [0x6400] + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + + 50 + 0 + + + + Reason + + + + + + + 900 + + + + + + + + + + + + + + 180 + 0 + + + + Heart Rate + + + + + + + 40 + + + 180 + + + 100 + + + + + + Index: TD_Vitals/loader.py =================================================================== diff -u -r3106c9d27f114fa3e7e435b3eeba9cfcfe178bf7 -rda3f9cf33bc59c7b43a35ec910658b39d99c6e01 --- TD_Vitals/loader.py (.../loader.py) (revision 3106c9d27f114fa3e7e435b3eeba9cfcfe178bf7) +++ TD_Vitals/loader.py (.../loader.py) (revision da3f9cf33bc59c7b43a35ec910658b39d99c6e01) @@ -36,20 +36,25 @@ finds and creates widgets :return: none """ - self.tbVitalsRspSend = self.find_widget(QtWidgets.QToolButton , 'tbVitalsRspSend' ) - self.sbVitalsReason = self.find_widget(QtWidgets.QSpinBox , 'VitalsReasonSpinBox' ) - self.tbVitalsSend = self.find_widget(QtWidgets.QToolButton , 'tbVitalsSend' ) + self.tbSend = self.find_widget(QtWidgets.QToolButton , 'tbSend' ) + self.tbSendResponse = self.find_widget(QtWidgets.QToolButton , 'tbSendResponse' ) + self.sbSystolic = self.find_widget(QtWidgets.QSpinBox , 'SystolicSpinBox' ) self.sbDiastolic = self.find_widget(QtWidgets.QSpinBox , 'DiastolicSpinBox' ) self.sbHeartRate = self.find_widget(QtWidgets.QSpinBox , 'HeartRateSpinBox' ) + self.sbVitalsReason = self.find_widget(QtWidgets.QSpinBox , 'VitalsReasonSpinBox' ) + self.lbRequest = self.find_widget(QtWidgets.QLabel , 'lbRequest' ) def _init_connections(self): """ initializes the widgets connections :return: none """ - self.tbVitalsRspSend.clicked .connect(self.do_vitals_rsp ) - self.tbVitalsSend .clicked .connect(self.do_vitals_data ) + self.tbSend .clicked .connect(self.do_send ) + self.tbSendResponse .clicked .connect(self.do_sendResponse ) + self.sbSystolic .valueChanged.connect(self.do_vitals_data ) + self.sbDiastolic .valueChanged.connect(self.do_vitals_data ) + self.sbHeartRate .valueChanged.connect(self.do_vitals_data ) def _init_widgets(self): @@ -64,8 +69,12 @@ @Slot() - def do_vitals_rsp(self): - self.td_interface.td_vitals_adjustment_response(self.sbVitalsReason.value()) + def handle_vitals_request(self, message, timestamp = 0.0): + """ + Called when the user requests to firmware from UI + @return: None + """ + self.lbRequest.setText("Requested") @Slot() @@ -83,3 +92,22 @@ diastolic , heartRate ) + + @Slot() + def do_send(self): + """ + the slot for treatment set point Data + :return: none + """ + self.do_vitals_data() + + + @Slot() + def do_sendResponse(self): + """ + the slot for treatment set point Data + :return: none + """ + self.lbRequest.setText("-") + reason = self.sbVitalsReason.value() + self.td_interface.td_vitals_adjustment_response(reason) \ No newline at end of file