Index: TD_AirTrap/loader.py =================================================================== diff -u -r21c7894d12a3744993fd0d9940be06336c3ba4e7 -r4b4fedc07e2f374ff7618f47d00aa2db2323f91d --- TD_AirTrap/loader.py (.../loader.py) (revision 21c7894d12a3744993fd0d9940be06336c3ba4e7) +++ TD_AirTrap/loader.py (.../loader.py) (revision 4b4fedc07e2f374ff7618f47d00aa2db2323f91d) @@ -34,18 +34,23 @@ 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.low_level = self.find_widget(QtWidgets.QSpinBox , 'lowLevelSpinBox' ) + self.upper_level = self.find_widget(QtWidgets.QSpinBox , 'upperLevelSpinBox' ) + self.low_level_raw = self.find_widget(QtWidgets.QSpinBox , 'lowLevelRawSpinBox' ) + self.upper_level_raw = self.find_widget(QtWidgets.QSpinBox , 'upperLevelRawSpinBox') + self.valve_state = self.find_widget(QtWidgets.QSpinBox , 'valveStateSpinBox' ) + self.control = self.find_widget(QtWidgets.QCheckBox , 'controlCheckBox' ) + 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_air_trap) # self.tblOpMode.currentCellChanged.connect(self.do_treatment_states) # self.tblSubMode.currentCellChanged.connect(self.do_treatment_states) @@ -55,20 +60,33 @@ 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.low_level.setValue(0) + self.upper_level.setValue(0) + self.low_level_raw.setValue(0) + self.upper_level_raw.setValue(0) + self.valve_state.setValue(0) + self.control.setChecked(False) + @Slot() - def do_treatment_states(self): + def do_air_trap(self): """ - the slot for state change + the slot for air trap :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 + low_level = self.low_level.value() + upper_level = self.upper_level.value() + lower_level_raw = self.low_level_raw.value() + upper_level_raw = self.upper_level_raw.value() + valve_state = self.valve_state.value() + + controlling = self.control.isChecked() + # print(f"{low_level}\n{upper_level}\n{lower_level_raw}\n{upper_level_raw}\n{valve_state}\n{controlling}") + self.td_interface.td_air_trap( + low_level, + upper_level, + lower_level_raw, + upper_level_raw, + valve_state, + controlling ) \ No newline at end of file