Index: TD_Pre_Treatment/interface.ui
===================================================================
diff -u -r5834e4d46013d721aef8d1c81167321824403d0c -rfcab7a53c2b153845610fa16e6c3853b9ade3d87
--- TD_Pre_Treatment/interface.ui (.../interface.ui) (revision 5834e4d46013d721aef8d1c81167321824403d0c)
+++ TD_Pre_Treatment/interface.ui (.../interface.ui) (revision fcab7a53c2b153845610fa16e6c3853b9ade3d87)
@@ -6,17 +6,159 @@
0
0
- 813
- 675
+ 836
+ 703
&2 Pre-Treatment/&1 Pre-Treatment
-
+
-
-
-
+
-
+
+
+
+ 10
+
+
+
+ color: rgb(238, 238, 236);
+background-color:rgb(173, 127, 168)
+
+
+ [0xA2] Start Treatment
+
+
+ Qt::AlignCenter
+
+
+
+ -
+
+
+
+ 0
+ 0
+
+
+
+
+ 352
+ 0
+
+
+
+
+ 16777215
+ 16777215
+
+
+
+
+ 10
+
+
+
+ color: rgb(238, 238, 236);
+background-color: rgb(92, 53, 102);
+
+
+
+ 215 : [0xD700] : Patient Connected Confirm
+
+
+ Qt::AlignCenter
+
+
+
+ -
+
+
-
+
+
+
+ 0
+ 0
+
+
+
+
+ 0
+ 0
+
+
+
+ false
+
+
+ QFrame::WinPanel
+
+
+ QFrame::Sunken
+
+
+ -
+
+
+ Qt::AlignCenter
+
+
+
+ -
+
+
+ Qt::Horizontal
+
+
+
+ 40
+ 20
+
+
+
+
+ -
+
+
+ Reason
+
+
+
+ -
+
+
+ -
+
+
+ Send
+
+
+
+ -
+
+
+ ⟲
+
+
+
+ -
+
+
+ Qt::Horizontal
+
+
+
+ 40
+ 20
+
+
+
+
+
+
+ -
-
@@ -121,10 +263,95 @@
+ -
+
+
+ Req [0xA1]
+
+
+
+ -
+
+
+ Req [0x45]
+
+
+
+ -
+
+
+
+ 10
+
+
+
+ color: rgb(238, 238, 236);
+background-color:rgb(173, 127, 168)
+
+
+ 70 :[0x4600] Initiate Treatment
+
+
+ Qt::AlignCenter
+
+
+
-
+
+
+ Req [0x92]
+
+
+
+ -
+
+
+
+ 0
+ 0
+
+
+
+
+ 352
+ 0
+
+
+
+
+ 16777215
+ 16777215
+
+
+
+
+ 10
+
+
+
+ color: rgb(238, 238, 236);
+background-color: rgb(92, 53, 102);
+
+
+
+ 147 : [0x9300] : Auto Load
+
+
+ Qt::AlignCenter
+
+
+
+ -
-
-
-
+
-
+
+
+ ⟲
+
+
+
+ -
+
Qt::Horizontal
@@ -136,20 +363,7 @@
- -
-
-
-
- 0
- 0
-
-
-
- Reason
-
-
-
- -
+
-
@@ -162,8 +376,8 @@
- -
-
+
-
+
Qt::Horizontal
@@ -175,19 +389,50 @@
- -
-
-
- Qt::Horizontal
+
-
+
+
+
+ 0
+ 0
+
-
+
- 40
- 20
+ 0
+ 0
-
+
+ false
+
+
+ QFrame::WinPanel
+
+
+ QFrame::Sunken
+
+
+ -
+
+
+ Qt::AlignCenter
+
+
+ -
+
+
+
+ 0
+ 0
+
+
+
+ Reason
+
+
+
-
@@ -201,15 +446,26 @@
- -
-
+
+
+ -
+
+
+ Req [0xD6]
+
+
+
+ -
+
+
-
+
⟲
-
-
+
0
@@ -239,9 +495,124 @@
+ -
+
+
+
+ 0
+ 0
+
+
+
+ Reason
+
+
+
+ -
+
+
+ Qt::Horizontal
+
+
+
+ 40
+ 20
+
+
+
+
+ -
+
+
+ Qt::Horizontal
+
+
+
+ 40
+ 20
+
+
+
+
+ -
+
+
+
+ 100
+ 16777215
+
+
+
+ Send
+
+
+
+ -
+
+
+
+ 50
+ 16777215
+
+
+
+ 900
+
+
+
- -
+
-
+
+
-
+
+
+ Qt::Horizontal
+
+
+
+ 40
+ 20
+
+
+
+
+ -
+
+
+
+ 100
+ 16777215
+
+
+
+ Validate
+
+
+
+ -
+
+
+ ⟲
+
+
+
+ -
+
+
+ Qt::Horizontal
+
+
+
+ 40
+ 20
+
+
+
+
+
+
+ -
-
@@ -1801,7 +2172,7 @@
- -
+
-
@@ -1813,250 +2184,20 @@
background-color:rgb(173, 127, 168)
- 53:[0x3500] Create Rx
+ 64:[0x4000] Create Rx
Qt::AlignCenter
- -
-
-
-
- 10
-
-
-
- color: rgb(238, 238, 236);
-background-color:rgb(173, 127, 168)
-
+
-
+
- Start Treatment
+ Req [0x3F]
-
- Qt::AlignCenter
-
- -
-
-
-
-
-
- Qt::Horizontal
-
-
-
- 40
- 20
-
-
-
-
- -
-
-
- Qt::Horizontal
-
-
-
- 40
- 20
-
-
-
-
- -
-
-
-
- 100
- 16777215
-
-
-
- Validate
-
-
-
- -
-
-
- ⟲
-
-
-
- -
-
-
- Qt::Horizontal
-
-
-
- 40
- 20
-
-
-
-
-
-
- -
-
-
-
- 0
- 0
-
-
-
-
- 352
- 0
-
-
-
-
- 16777215
- 16777215
-
-
-
-
- 10
-
-
-
- color: rgb(238, 238, 236);
-background-color: rgb(92, 53, 102);
-
-
-
- 146 : [0x9200] : Auto Load
-
-
- Qt::AlignCenter
-
-
-
- -
-
-
-
-
-
-
- 0
- 0
-
-
-
-
- 0
- 0
-
-
-
- false
-
-
- QFrame::WinPanel
-
-
- QFrame::Sunken
-
-
- -
-
-
- Qt::AlignCenter
-
-
-
- -
-
-
- Qt::Horizontal
-
-
-
- 40
- 20
-
-
-
-
- -
-
-
- -
-
-
- Reason
-
-
-
- -
-
-
- Qt::Horizontal
-
-
-
- 40
- 20
-
-
-
-
- -
-
-
- Send
-
-
-
- -
-
-
- ⟲
-
-
-
- -
-
-
- Qt::Horizontal
-
-
-
- 40
- 20
-
-
-
-
-
-
- -
-
-
-
- 10
-
-
-
- color: rgb(238, 238, 236);
-background-color:rgb(173, 127, 168)
-
-
- 69 :[0x4500] Pre-Treatment
-
-
- Qt::AlignCenter
-
-
-
Index: TD_Pre_Treatment/loader.py
===================================================================
diff -u -ra7779af44ced3be6e30e4d4d67125d171a641d09 -rfcab7a53c2b153845610fa16e6c3853b9ade3d87
--- TD_Pre_Treatment/loader.py (.../loader.py) (revision a7779af44ced3be6e30e4d4d67125d171a641d09)
+++ TD_Pre_Treatment/loader.py (.../loader.py) (revision fcab7a53c2b153845610fa16e6c3853b9ade3d87)
@@ -36,23 +36,22 @@
if self.can_interface is not None:
channel_id = CAN.CanChannels.ui_to_td_ch_id
- create_tx_request_message_id = MsgIds.MSG_ID_UI_INITIATE_TREATMENT_WORKFLOW.value
self.can_interface.register_receiving_publication_function(channel_id,
- create_tx_request_message_id,
+ MsgIds.MSG_ID_UI_INITIATE_TREATMENT_WORKFLOW.value,
self.handle_create_tx_request)
- load_request_message_id = MsgIds.MSG_ID_UI_ADJUST_DISPOSABLES_CONFIRM_REQUEST.value
self.can_interface.register_receiving_publication_function(channel_id,
- load_request_message_id,
+ MsgIds.MSG_ID_UI_ADJUST_DISPOSABLES_CONFIRM_REQUEST.value,
self.handle_load_request)
- start_tx_request_message_id = MsgIds.MSG_ID_UI_ADJUST_START_TREATMENT_REQUEST.value
self.can_interface.register_receiving_publication_function(channel_id,
- start_tx_request_message_id,
+ MsgIds.MSG_ID_UI_ADJUST_START_TREATMENT_REQUEST.value,
self.handle_start_tx_request)
-
- validate_request_message_id = MsgIds.MSG_ID_UI_TREATMENT_PARAMS_TO_VALIDATE.value
self.can_interface.register_receiving_publication_function(channel_id,
- validate_request_message_id,
+ MsgIds.MSG_ID_UI_TREATMENT_PARAMS_TO_VALIDATE.value,
self.handle_validate_request)
+ self.can_interface.register_receiving_publication_function(channel_id,
+ MsgIds.MSG_ID_UI_SETUP_CONNECTION_CONFIRM_REQUEST.value,
+ self.handle_patient_connection_confirm)
+
def _init_loader(self):
"""
@@ -65,13 +64,17 @@
self.btnValidateReset = self.find_widget(QtWidgets.QToolButton, 'btnValidateReset' )
self.btnAutoLoad = self.find_widget(QtWidgets.QPushButton, 'btnAutoLoadSend' )
self.btnAutoLoadReset = self.find_widget(QtWidgets.QToolButton, 'btnAutoLoadReset' )
+ self.btnPatientConnectConfirmReset = self.find_widget(QtWidgets.QToolButton, 'btnPatientConnectConfirmReset' )
+ self.btnPatientConnectConfirmSend = self.find_widget(QtWidgets.QPushButton, 'btnPatientConnectConfirmSend' )
self.btnStartTxReset = self.find_widget(QtWidgets.QToolButton, 'btnStartTxReset' )
self.spnCreateRxRejectReason = self.find_widget(QtWidgets.QSpinBox , 'spnCreateRxRejectReason' )
self.spnAutoLoadRejectReason = self.find_widget(QtWidgets.QSpinBox , 'spnLoadReasonSpinBox' )
+ self.spnPatientConnectConfirmRejectionReason = self.find_widget(QtWidgets.QSpinBox , 'spnPatientConnectConfirmRejectionReason' )
self.spnStartTxRejectReason = self.find_widget(QtWidgets.QSpinBox , 'spnStartTreatmentRejectReason' )
self.lbAutoLoad = self.find_widget(QtWidgets.QLabel , 'lbAutoLoad' )
+ self.lbPatientConnectConfirm = self.find_widget(QtWidgets.QLabel , 'lbPatientConnectConfirm' )
self.lbStartTreatment = self.find_widget(QtWidgets.QLabel , 'lbStartTreatment' )
self.lbCreateTx = self.find_widget(QtWidgets.QLabel , 'lbCreateTx' )
@@ -134,23 +137,27 @@
:return: none
"""
self.do_validateReset()
- self.spnCreateRxRejectReason.setValue(0)
- self.spnAutoLoadRejectReason.setValue(0)
- self.spnStartTxRejectReason .setValue(0)
+ self.spnCreateRxRejectReason .setValue(0)
+ self.spnAutoLoadRejectReason .setValue(0)
+ self.spnStartTxRejectReason .setValue(0)
+ self.spnPatientConnectConfirmRejectionReason .setValue(0)
def _init_connections(self):
"""
initializes the widgets connections
:return:
"""
- self.btnCreate_tx .clicked.connect(self.do_create_tx )
- self.btnCreateReset .clicked.connect(self.do_createReset )
- self.btnAutoLoadReset .clicked.connect(self.do_autoLoadReset )
- self.btnStartTxReset .clicked.connect(self.do_startTxReset )
- self.btnValidate .clicked.connect(self.do_validate )
- self.btnValidateReset .clicked.connect(self.do_validateReset )
- self.btnAutoLoad .clicked.connect(self.do_auto_load )
+ self.btnCreate_tx .clicked.connect(self.do_create_tx )
+ self.btnCreateReset .clicked.connect(self.do_createReset )
+ self.btnAutoLoadReset .clicked.connect(self.do_autoLoadReset )
+ self.btnStartTxReset .clicked.connect(self.do_startTxReset )
+ self.btnValidate .clicked.connect(self.do_validate )
+ self.btnValidateReset .clicked.connect(self.do_validateReset )
+ self.btnAutoLoad .clicked.connect(self.do_auto_load )
+ self.btnPatientConnectConfirmSend .clicked.connect(self.do_patient_connect_confirm )
+ self.btnPatientConnectConfirmReset .clicked.connect(self.do_patient_connect_reset )
+
@Slot()
def do_create_tx(self):
self.lbCreateTx.setText("-")
@@ -159,25 +166,41 @@
else:
self.td_interface.td_Treatment_Parameters_CreateRx (self.spnCreateRxRejectReason.value())
+
@Slot()
def do_createReset(self):
self.spnCreateRxRejectReason.setValue(0)
self.lbCreateTx.setText("-")
+
@Slot()
def do_autoLoadReset(self):
self.btnAutoLoadReset.setValue(0)
self.lbAutoLoad.setText("-")
+
def do_startTxReset(self):
self.lbStartTreatment.setText("-")
+
@Slot()
def do_auto_load(self):
reason = self.spnAutoLoadRejectReason.value()
self.td_interface.td_blood_set_auto_load_response(reason)
self.lbAutoLoad.setText("-")
+
+
+ @Slot()
+ def do_patient_connect_confirm(self):
+ reason = self.spnPatientConnectConfirmRejectionReason.value()
+ self.td_interface.td_patient_connect_confirm_response(reason)
+ self.lbPatientConnectConfirm.setText("-")
+
+ def do_patient_connect_reset(self):
+ self.lbPatientConnectConfirm.setText("-")
+
+
@Slot()
def do_validate(self):
"""
@@ -275,6 +298,7 @@
"""
self.lbAutoLoad.setText("Requested")
+
@Slot()
def handle_create_tx_request(self, message, timestamp = 0.0):
"""
@@ -283,6 +307,7 @@
"""
self.lbCreateTx.setText("Create Tx Requested")
+
@Slot()
def handle_start_tx_request(self, message, timestamp = 0.0):
"""
@@ -291,7 +316,17 @@
"""
self.lbStartTreatment.setText("Start Tx Requested")
+
@Slot()
+ def handle_patient_connection_confirm(self, message, timestamp = 0.0):
+ """
+ Called when the user requests to firmware from UI
+ @return: None
+ """
+ self.lbPatientConnectConfirm.setText("Patient Connnect Confirm Requested")
+
+
+ @Slot()
def handle_validate_request(self, message, timestamp = 0.0):
"""
Called when the user requests to firmware from UI