Index: DD_GenDialysate/loader.py =================================================================== diff -u -rf9ec0e263221cccdf36e037c4729b0972cd45c07 -r6bd728aa86080ea157418fe90e69c48756c5565e --- DD_GenDialysate/loader.py (.../loader.py) (revision f9ec0e263221cccdf36e037c4729b0972cd45c07) +++ DD_GenDialysate/loader.py (.../loader.py) (revision 6bd728aa86080ea157418fe90e69c48756c5565e) @@ -30,19 +30,15 @@ finds and creates widgets :return: none """ - self.tbReset = self.find_widget(QtWidgets.QToolButton , 'tbReset' ) - self.tbSend = self.find_widget(QtWidgets.QToolButton , 'tbSend' ) + self.tbReset = self.find_widget(QtWidgets.QToolButton , 'tbReset' ) + self.tbSend = self.find_widget(QtWidgets.QToolButton , 'tbSend' ) - self.execution_state = self.find_widget(QtWidgets.QSpinBox , 'ExecStateSpinBox') - self.dd_progess = self.find_widget(QtWidgets.QCheckBox , 'DDProgCheckBox' ) - self.floater_level = self.find_widget(QtWidgets.QSpinBox , 'D6spinBox' ) - self.bicarb_level = self.find_widget(QtWidgets.QSpinBox , 'D63spinBox' ) - self.spent_level = self.find_widget(QtWidgets.QSpinBox , 'D46SpinBox' ) - self.hydraulics_neg_pressure = self.find_widget(QtWidgets.QDoubleSpinBox , 'D9DoubleSpinBox' ) - self.hydraulics_pos_pressure = self.find_widget(QtWidgets.QDoubleSpinBox , 'D18DoubleSpinBox') - self.spent_pressure = self.find_widget(QtWidgets.QDoubleSpinBox , 'D51DoubleSpinBox') - self.dial_good = self.find_widget(QtWidgets.QCheckBox , 'dialGoodCheckBox') + self.execution_state = self.find_widget(QtWidgets.QSpinBox , 'ExecStateSpinBox' ) + self.dd_progess = self.find_widget(QtWidgets.QCheckBox , 'DDProgCheckBox' ) + self.dial_good = self.find_widget(QtWidgets.QCheckBox , 'dialGoodCheckBox' ) + self.CurrentQdDoubleSpinBox = self.find_widget(QtWidgets.QDoubleSpinBox , 'CurrentQdDoubleSpinBox' ) + def _init_connections(self): """ initializes the widgets connections @@ -59,14 +55,10 @@ """ self.execution_state .setValue(0) self.dd_progess .setChecked(False) - self.floater_level .setValue(0) - self.bicarb_level .setValue(0) - self.spent_level .setValue(0) - self.hydraulics_neg_pressure .setValue(0) - self.hydraulics_pos_pressure .setValue(0) - self.spent_pressure .setValue(0) self.dial_good .setChecked(False) + self.CurrentQdDoubleSpinBox .setValue(0) + @Slot() def do_gen_dialysate(self): """ @@ -75,22 +67,12 @@ """ gen_dialysate_exec = self.execution_state .value() dd_in_progress = int(self.dd_progess .isChecked()) - D6_floater_level_1 = self.floater_level .value() - D63_bicarb_level = self.bicarb_level .value() - D46_spent_level = self.spent_level .value() - D9_hyd_negative_press = self.hydraulics_neg_pressure .value() - D18_hyd_positive_press = self.hydraulics_pos_pressure .value() - D51_spend_pressure = self.spent_pressure .value() is_dial_good = int(self.dial_good .isChecked()) + currentQd = self.CurrentQdDoubleSpinBox .value() self.dd_interface.dd_gen_dialysate( gen_dialysate_exec , dd_in_progress , - D6_floater_level_1 , - D63_bicarb_level , - D46_spent_level , - D9_hyd_negative_press , - D18_hyd_positive_press, - D51_spend_pressure , - is_dial_good + is_dial_good , + currentQd ) \ No newline at end of file