Index: DD_GenDialysate/loader.py =================================================================== diff -u -ra4f4b16cfdbaf955c6febbff8a5140aeb2ef5427 -rf9ec0e263221cccdf36e037c4729b0972cd45c07 --- DD_GenDialysate/loader.py (.../loader.py) (revision a4f4b16cfdbaf955c6febbff8a5140aeb2ef5427) +++ DD_GenDialysate/loader.py (.../loader.py) (revision f9ec0e263221cccdf36e037c4729b0972cd45c07) @@ -35,7 +35,7 @@ self.execution_state = self.find_widget(QtWidgets.QSpinBox , 'ExecStateSpinBox') self.dd_progess = self.find_widget(QtWidgets.QCheckBox , 'DDProgCheckBox' ) - self.float_level = self.find_widget(QtWidgets.QSpinBox , 'D6spinBox' ) + 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' ) @@ -50,8 +50,6 @@ """ self.tbReset.clicked.connect(self._init_widgets) self.tbSend.clicked.connect(self.do_gen_dialysate) - # self.tblOpMode.currentCellChanged.connect(self.do_treatment_states) - # self.tblSubMode.currentCellChanged.connect(self.do_treatment_states) @Slot() def _init_widgets(self): @@ -61,7 +59,7 @@ """ self.execution_state .setValue(0) self.dd_progess .setChecked(False) - self.float_level .setValue(0) + self.floater_level .setValue(0) self.bicarb_level .setValue(0) self.spent_level .setValue(0) self.hydraulics_neg_pressure .setValue(0) @@ -75,24 +73,24 @@ the slot for dd generate dialysate data :return: none """ - gen_dialysate_exec = self.execution_state .value() - dd_in_progress = int(self.dd_progess .isChecked()) - D6_level = self.float_level .value() - D63_level = self.bicarb_level .value() - D46_level = self.spent_level .value() - D9_pressure = self.hydraulics_neg_pressure .value() - D18_pressure = self.hydraulics_pos_pressure .value() - D51_pressure = self.spent_pressure .value() - is_dial_good = int(self.dial_good .isChecked()) + 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()) self.dd_interface.dd_gen_dialysate( - gen_dialysate_exec , - dd_in_progress , - D6_level , - D63_level , - D46_level , - D9_pressure , - D18_pressure , - D51_pressure , - is_dial_good + 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 ) \ No newline at end of file