Index: TD_AirTrap/loader.py =================================================================== diff -u -r9307b8315113adb7ad1823a19d58df6ea7e4ef8b -r05dd1cb113fc0c22b48930390cf00ec2ea930774 --- TD_AirTrap/loader.py (.../loader.py) (revision 9307b8315113adb7ad1823a19d58df6ea7e4ef8b) +++ TD_AirTrap/loader.py (.../loader.py) (revision 05dd1cb113fc0c22b48930390cf00ec2ea930774) @@ -33,13 +33,16 @@ 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_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' ) + self.sbH17State = self.find_widget(QtWidgets.QSpinBox , 'sbH17State' ) + self.sbH16State = self.find_widget(QtWidgets.QSpinBox , 'sbH16State' ) + self.sbH17RawState = self.find_widget(QtWidgets.QSpinBox , 'sbH17RawState' ) + self.sbH16RawState = self.find_widget(QtWidgets.QSpinBox , 'sbH16RawState' ) + self.sbH13State = self.find_widget(QtWidgets.QSpinBox , 'sbH13State' ) + self.sbH20State = self.find_widget(QtWidgets.QSpinBox , 'sbH20State' ) + self.sbIsAutoControlling = self.find_widget(QtWidgets.QSpinBox , 'sbIsAutoControlling' ) + self.sbAirTrapState = self.find_widget(QtWidgets.QSpinBox , 'sbAirTrapState' ) + self.sbAirPumpLowerPowerLevel = self.find_widget(QtWidgets.QSpinBox , 'sbAirPumpLowerPowerLevel') + self.sbAirPumpRaisePowerLevel = self.find_widget(QtWidgets.QSpinBox , 'sbAirPumpRaisePowerLevel') def _init_connections(self): """ @@ -55,34 +58,32 @@ initializes the widgets' properties :return: none """ - 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_inlet.setValue(0) - self.valve_state_outlet.setValue(0) + self.sbH17State .setValue(0) + self.sbH16State .setValue(0) + self.sbH17RawState .setValue(0) + self.sbH16RawState .setValue(0) + self.sbH13State .setValue(0) + self.sbH20State .setValue(0) + self.sbIsAutoControlling .setValue(0) + self.sbAirTrapState .setValue(0) + self.sbAirPumpLowerPowerLevel .setValue(0) + self.sbAirPumpRaisePowerLevel .setValue(0) - self.control.setChecked(False) - @Slot() def do_air_trap(self): """ the slot for air trap change :return: none - """ - 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( - H17_state , - H16_state , - H17_raw_state , - H16_raw_state , - H13_state , - H20_State , - controlling + self.sbH17State .value(), + self.sbH16State .value(), + self.sbH17RawState .value(), + self.sbH16RawState .value(), + self.sbH13State .value(), + self.sbH20State .value(), + self.sbIsAutoControlling .value(), + self.sbAirTrapState .value(), + self.sbAirPumpLowerPowerLevel .value(), + self.sbAirPumpRaisePowerLevel .value() )