Index: TD_AirTrap/loader.py =================================================================== diff -u -rf05537cca2e7e054a5124d4f5f9ed3ad26264458 -rf9ec0e263221cccdf36e037c4729b0972cd45c07 --- TD_AirTrap/loader.py (.../loader.py) (revision f05537cca2e7e054a5124d4f5f9ed3ad26264458) +++ TD_AirTrap/loader.py (.../loader.py) (revision f9ec0e263221cccdf36e037c4729b0972cd45c07) @@ -41,7 +41,8 @@ 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.valve_state_inlet = self.find_widget(QtWidgets.QSpinBox , 'valveStateH13SpinBox') + self.valve_state_outlet = self.find_widget(QtWidgets.QSpinBox , 'valveStateH20SpinBox') self.control = self.find_widget(QtWidgets.QCheckBox , 'controlCheckBox' ) def _init_connections(self): @@ -51,8 +52,6 @@ """ self.tbReset.clicked.connect(self._init_widgets) self.tbSend.clicked.connect(self.do_air_trap) - # self.tblOpMode.currentCellChanged.connect(self.do_treatment_states) - # self.tblSubMode.currentCellChanged.connect(self.do_treatment_states) @Slot() def _init_widgets(self): @@ -64,7 +63,8 @@ self.upper_level.setValue(0) self.low_level_raw.setValue(0) self.upper_level_raw.setValue(0) - self.valve_state.setValue(0) + self.valve_state_inlet.setValue(0) + self.valve_state_outlet.setValue(0) self.control.setChecked(False) @@ -74,19 +74,19 @@ the slot for air trap change :return: none """ - 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}") + H17_state = self.low_level.value() + H16_state = self.upper_level.value() + H17_raw_state = self.low_level_raw.value() + H16_raw_state = self.upper_level_raw.value() + H13_state = self.valve_state_inlet.value() + H20_State = self.valve_state_outlet.value() + controlling = int(self.control.isChecked()) self.td_interface.td_air_trap( - low_level, - upper_level, - lower_level_raw, - upper_level_raw, - valve_state, - controlling + H17_state , + H16_state , + H17_raw_state , + H16_raw_state , + H13_state , + H20_State , + controlling ) \ No newline at end of file