Index: TD_Valves/loader.py =================================================================== diff -u -r9307b8315113adb7ad1823a19d58df6ea7e4ef8b -r5875ce76e61acd0220d42445b8cfaed8c3af0a0f --- TD_Valves/loader.py (.../loader.py) (revision 9307b8315113adb7ad1823a19d58df6ea7e4ef8b) +++ TD_Valves/loader.py (.../loader.py) (revision 5875ce76e61acd0220d42445b8cfaed8c3af0a0f) @@ -31,54 +31,59 @@ :return: none """ - self.ValveID = self.find_widget(QtWidgets.QSlider , 'ValveIDSlider' ) - self.State = self.find_widget(QtWidgets.QSlider , 'StateSlider' ) - self.PosName = self.find_widget(QtWidgets.QSlider , 'PosNameSlider' ) - self.PosCount = self.find_widget(QtWidgets.QSlider , 'PosCountSlider' ) - self.NextPos = self.find_widget(QtWidgets.QSlider , 'NextPosSlider' ) + self.pbSend = self.find_widget(QtWidgets.QPushButton, 'pbSend' ) + self.sbValveID = self.find_widget(QtWidgets.QSpinBox , 'sbValveID' ) + self.sbState = self.find_widget(QtWidgets.QSpinBox , 'sbState' ) + self.sbCurrPosID = self.find_widget(QtWidgets.QSpinBox , 'sbCurrPosID' ) + self.sbCurrPos = self.find_widget(QtWidgets.QSpinBox , 'sbCurrPos' ) + self.sbCmdPos = self.find_widget(QtWidgets.QSpinBox , 'sbCmdPos' ) + self.sbPosA = self.find_widget(QtWidgets.QSpinBox , 'sbPosA' ) + self.sbPosB = self.find_widget(QtWidgets.QSpinBox , 'sbPosB' ) + self.sbPosC = self.find_widget(QtWidgets.QSpinBox , 'sbPosC' ) + self.sbPosD = self.find_widget(QtWidgets.QSpinBox , 'sbPosD' ) + self.sbMaxHomingPos = self.find_widget(QtWidgets.QSpinBox , 'sbMaxHomingPos' ) + def _init_connections(self): """ initializes the widgets connections :return: none """ - # self.tbReset.clicked.connect(self._init_widgets) - # self.tbSend.clicked.connect(self.do_valve_data) - # self.tblOpMode.currentCellChanged.connect(self.do_treatment_states) - # self.tblSubMode.currentCellChanged.connect(self.do_treatment_states) - self.ValveID .valueChanged.connect(self.do_valve_data) - self.State .valueChanged.connect(self.do_valve_data) - self.PosName .valueChanged.connect(self.do_valve_data) - self.PosCount.valueChanged.connect(self.do_valve_data) - self.NextPos .valueChanged.connect(self.do_valve_data) + self.pbSend.clicked.connect(self.do_valve_data) + @Slot() def _init_widgets(self): """ initializes the widgets' properties :return: none """ - self.ValveID.setValue(0) - self.State.setValue(0) - self.PosName.setValue(0) - self.PosCount.setValue(0) - self.NextPos.setValue(0) + self.sbValveID .setValue(0) + self.sbState .setValue(0) + self.sbCurrPosID .setValue(0) + self.sbCurrPos .setValue(0) + self.sbCmdPos .setValue(0) + self.sbPosA .setValue(0) + self.sbPosB .setValue(0) + self.sbPosC .setValue(0) + self.sbPosD .setValue(0) + self.sbMaxHomingPos .setValue(0) @Slot() def do_valve_data(self): """ the slot for Valve data change :return: none """ - valve_id = self.ValveID.value() - state = self.State.value() - pos_name = self.PosName.value() - pos_count = self.PosCount.value() - next_pos = self.NextPos.value() self.td_interface.td_valves( - valve_id , - state , - pos_name , - pos_count , - next_pos + self.sbValveID .value() , + self.sbState .value() , + self.sbCurrPosID .value() , + self.sbCurrPos .value() , + self.sbCmdPos .value() , + self.sbPosA .value() , + self.sbPosB .value() , + self.sbPosC .value() , + self.sbPosD .value() , + self.sbMaxHomingPos.value() )