Index: TD_BloodPump/loader.py =================================================================== diff -u -r21c7894d12a3744993fd0d9940be06336c3ba4e7 -r4b4fedc07e2f374ff7618f47d00aa2db2323f91d --- TD_BloodPump/loader.py (.../loader.py) (revision 21c7894d12a3744993fd0d9940be06336c3ba4e7) +++ TD_BloodPump/loader.py (.../loader.py) (revision 4b4fedc07e2f374ff7618f47d00aa2db2323f91d) @@ -34,18 +34,25 @@ finds and creates widgets :return: none """ - self.tbReset = self.find_widget(QtWidgets.QToolButton , 'tbReset' ) - self.tbSend = self.find_widget(QtWidgets.QToolButton , 'tbSend' ) - self.tblOpMode = self.find_widget(QtWidgets.QTableWidget , 'tblOpMode' ) - self.tblSubMode = self.find_widget(QtWidgets.QTableWidget , 'tblSubMode' ) + self.tbReset = self.find_widget(QtWidgets.QToolButton , 'tbReset' ) + self.tbSend = self.find_widget(QtWidgets.QToolButton , 'tbSend' ) + self.sFlow = self.find_widget(QtWidgets.QSpinBox , 'setFlowSpinBox' ) + self.mFlow = self.find_widget(QtWidgets.QDoubleSpinBox , 'measFlowDoubleSpinBox' ) + self.rotCount = self.find_widget(QtWidgets.QSpinBox , 'rotCountSpinBox' ) + self.rotSpeed = self.find_widget(QtWidgets.QDoubleSpinBox , 'rotSpeedDoubleSpinBox' ) + self.presFlow = self.find_widget(QtWidgets.QSpinBox , 'presFlowSpinBox' ) + self.motSpeed = self.find_widget(QtWidgets.QDoubleSpinBox , 'motSpeedDoubleSpinBox' ) + self.hallState = self.find_widget(QtWidgets.QSpinBox , 'hallStateSpinBox' ) + self.sRPM = self.find_widget(QtWidgets.QDoubleSpinBox , 'rPMDoubleSpinBox' ) + def _init_connections(self): """ initializes the widgets connections :return: none """ self.tbReset.clicked.connect(self._init_widgets) - self.tbSend.clicked.connect(self.do_treatment_states) + self.tbSend.clicked.connect(self.do_bp_data) # self.tblOpMode.currentCellChanged.connect(self.do_treatment_states) # self.tblSubMode.currentCellChanged.connect(self.do_treatment_states) @@ -55,20 +62,36 @@ initializes the widgets' properties :return: none """ - self.tblOpMode.setCurrentCell(TDOpModes.MODE_INIT.value, 0) - self.tblOpMode.horizontalHeaderItem(0).setTextAlignment(QtCore.Qt.AlignLeft) - self.tblSubMode.setCurrentCell(TDStandbyStates.STANDBY_START_STATE.value, 0) - self.tblSubMode.horizontalHeaderItem(0).setTextAlignment(QtCore.Qt.AlignLeft) + self.sFlow.setValue(0) + self.mFlow.setValue(0) + self.rotCount.setValue(0) + self.rotSpeed.setValue(0) + self.presFlow.setValue(0) + self.motSpeed.setValue(0) + self.hallState.setValue(0) + self.sRPM.setValue(0) @Slot() - def do_treatment_states(self): + def do_bp_data(self): """ the slot for state change :return: none """ - op_mode = int(self.tblOpMode.verticalHeaderItem(self.tblOpMode.currentRow()).text()) - sub_mode = int(self.tblSubMode.verticalHeaderItem(self.tblSubMode.currentRow()).text()) - self.td_interface.td_operation_mode( - op_mode, - sub_mode + set_flow = self.sFlow.value() + meas_flow = self.mFlow.value() + rot_speed = self.rotSpeed.value() + mot_speed = self.motSpeed.value() + set_rpm = self.sRPM.value() + rot_count = self.rotCount.value() + pres_flow = self.presFlow.value() + rot_hall_state = self.hallState.value() + # print(f"{set_flow}, {meas_flow}\n{rot_count}, {rot_speed}\n{pres_flow}, {mot_speed}\n{rot_hall_state}, {set_rpm}") + self.td_interface.td_blood_pump( + set_flow, + meas_flow, + rot_speed, + mot_speed, + set_rpm, rot_count, + pres_flow, + rot_hall_state ) \ No newline at end of file