Index: DD_Conductivity/loader.py =================================================================== diff -u -r5e32491166e1ccf47a90c9d2db5d0b37ecf249bb -rf9ec0e263221cccdf36e037c4729b0972cd45c07 --- DD_Conductivity/loader.py (.../loader.py) (revision 5e32491166e1ccf47a90c9d2db5d0b37ecf249bb) +++ DD_Conductivity/loader.py (.../loader.py) (revision f9ec0e263221cccdf36e037c4729b0972cd45c07) @@ -50,8 +50,6 @@ """ self.tbReset.clicked.connect(self._init_widgets) self.tbSend.clicked.connect(self.do_conductivity) - # self.tblOpMode.currentCellChanged.connect(self.do_treatment_states) - # self.tblSubMode.currentCellChanged.connect(self.do_treatment_states) @Slot() def _init_widgets(self): 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 Index: MainTreatmentData/loader.py =================================================================== diff -u -r5e32491166e1ccf47a90c9d2db5d0b37ecf249bb -rf9ec0e263221cccdf36e037c4729b0972cd45c07 --- MainTreatmentData/loader.py (.../loader.py) (revision 5e32491166e1ccf47a90c9d2db5d0b37ecf249bb) +++ MainTreatmentData/loader.py (.../loader.py) (revision f9ec0e263221cccdf36e037c4729b0972cd45c07) @@ -156,7 +156,7 @@ dialysate_temp = self.dial_temp_st_pt .value() self.td_interface.td_treatment_set_points( - blood_flow , + blood_flow , dialysate_flow , dialysate_temp ) \ No newline at end of file Index: TD_AirTrap/loader.py =================================================================== diff -u -ra4f4b16cfdbaf955c6febbff8a5140aeb2ef5427 -rf9ec0e263221cccdf36e037c4729b0972cd45c07 --- TD_AirTrap/loader.py (.../loader.py) (revision a4f4b16cfdbaf955c6febbff8a5140aeb2ef5427) +++ TD_AirTrap/loader.py (.../loader.py) (revision f9ec0e263221cccdf36e037c4729b0972cd45c07) @@ -52,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): Index: TD_Battery/loader.py =================================================================== diff -u -r5e32491166e1ccf47a90c9d2db5d0b37ecf249bb -rf9ec0e263221cccdf36e037c4729b0972cd45c07 --- TD_Battery/loader.py (.../loader.py) (revision 5e32491166e1ccf47a90c9d2db5d0b37ecf249bb) +++ TD_Battery/loader.py (.../loader.py) (revision f9ec0e263221cccdf36e037c4729b0972cd45c07) @@ -47,8 +47,6 @@ """ self.tbReset.clicked.connect(self._init_widgets) self.tbSend.clicked.connect(self.do_battery_data) - # self.tblOpMode.currentCellChanged.connect(self.do_treatment_states) - # self.tblSubMode.currentCellChanged.connect(self.do_treatment_states) @Slot() def _init_widgets(self): Index: TD_BloodPump/loader.py =================================================================== diff -u -ra4f4b16cfdbaf955c6febbff8a5140aeb2ef5427 -rf9ec0e263221cccdf36e037c4729b0972cd45c07 --- TD_BloodPump/loader.py (.../loader.py) (revision a4f4b16cfdbaf955c6febbff8a5140aeb2ef5427) +++ TD_BloodPump/loader.py (.../loader.py) (revision f9ec0e263221cccdf36e037c4729b0972cd45c07) @@ -54,8 +54,6 @@ """ self.tbReset.clicked.connect(self._init_widgets) self.tbSend.clicked.connect(self.do_bp_data) - # self.tblOpMode.currentCellChanged.connect(self.do_treatment_states) - # self.tblSubMode.currentCellChanged.connect(self.do_treatment_states) @Slot() def _init_widgets(self): @@ -79,15 +77,15 @@ the slot for bp data change :return: none """ - H4_set_flow = self.sFlow.value() - H4_meas_flow = self.mFlow.value() - H4_rot_speed = self.rotSpeed.value() - H4_mot_speed = self.motSpeed.value() - H4_curr_motor = self.currMotor.value() - H4_set_rpm = self.sRPM.value() - H4_rot_count = self.rotCount.value() - H4_pres_flow = self.presFlow.value() - H6_rot_hall_state = self.hallState.value() + H4_set_flow = self.sFlow .value() + H4_meas_flow = self.mFlow .value() + H4_rot_speed = self.rotSpeed .value() + H4_mot_speed = self.motSpeed .value() + H4_curr_motor = self.currMotor .value() + H4_set_rpm = self.sRPM .value() + H4_rot_count = self.rotCount .value() + H4_pres_flow = self.presFlow .value() + H6_rot_hall_state = self.hallState .value() self.td_interface.td_blood_pump( H4_set_flow , Index: TD_Ejector/loader.py =================================================================== diff -u -ra4f4b16cfdbaf955c6febbff8a5140aeb2ef5427 -rf9ec0e263221cccdf36e037c4729b0972cd45c07 --- TD_Ejector/loader.py (.../loader.py) (revision a4f4b16cfdbaf955c6febbff8a5140aeb2ef5427) +++ TD_Ejector/loader.py (.../loader.py) (revision f9ec0e263221cccdf36e037c4729b0972cd45c07) @@ -63,8 +63,8 @@ the slot for ejector change :return: none """ - H5_state = self.state.value() - H5_set_speed = self.setSpeed.value() + H5_state = self.state .value() + H5_set_speed = self.setSpeed .value() self.td_interface.td_ejector( H5_state , H5_set_speed Index: TD_Pressures/loader.py =================================================================== diff -u -ra4f4b16cfdbaf955c6febbff8a5140aeb2ef5427 -rf9ec0e263221cccdf36e037c4729b0972cd45c07 --- TD_Pressures/loader.py (.../loader.py) (revision a4f4b16cfdbaf955c6febbff8a5140aeb2ef5427) +++ TD_Pressures/loader.py (.../loader.py) (revision f9ec0e263221cccdf36e037c4729b0972cd45c07) @@ -32,25 +32,23 @@ finds and creates widgets :return: none """ - self.lblArterialTitle = self.find_widget(QtWidgets.QLabel ,'lblArterialTitle') - self.lblVenousTitle = self.find_widget(QtWidgets.QLabel ,'lblVenousTitle') - self.lblTMPTitle = self.find_widget(QtWidgets.QLabel ,'lblTMPTitle') + self.lblArterialTitle = self.find_widget(QtWidgets.QLabel ,'lblArterialTitle') + self.lblVenousTitle = self.find_widget(QtWidgets.QLabel ,'lblVenousTitle') + self.lblTMPTitle = self.find_widget(QtWidgets.QLabel ,'lblTMPTitle') - self.lblArterialLimitLow = self.find_widget(QtWidgets.QLabel ,'lblArterialLimitLow') + self.lblArterialLimitLow = self.find_widget(QtWidgets.QLabel ,'lblArterialLimitLow') self.lblArterialLimitHigh = self.find_widget(QtWidgets.QLabel ,'lblArterialLimitHigh') self.lblVenousLimitLow = self.find_widget(QtWidgets.QLabel ,'lblVenousLimitLow') self.lblVenousLimitHigh = self.find_widget(QtWidgets.QLabel ,'lblVenousLimitHigh') self.lblTMPLimitLow = self.find_widget(QtWidgets.QLabel ,'lblTMPLimitLow') self.lblTMPLimitHigh = self.find_widget(QtWidgets.QLabel ,'lblTMPLimitHigh') - # self.lblAVPressuresAction = self.find_widget(QtWidgets.QLabel ,'lblAVPressuresAction') self.spnArterialLimitLow = self.find_widget(QtWidgets.QSpinBox ,'spnArterialLimitLow') self.spnArterialLimitHigh = self.find_widget(QtWidgets.QSpinBox ,'spnArterialLimitHigh') self.spnVenousLimitLow = self.find_widget(QtWidgets.QSpinBox ,'spnVenousLimitLow') self.spnVenousLimitHigh = self.find_widget(QtWidgets.QSpinBox ,'spnVenousLimitHigh') self.spnTMPLimitLow = self.find_widget(QtWidgets.QSpinBox ,'spnTMPLimitLow') self.spnTMPLimitHigh = self.find_widget(QtWidgets.QSpinBox ,'spnTMPLimitHigh') - # self.spnAVPressuresRejectReason = self.find_spinbox('spnAVPressuresRejectReason') self.sldArterialValue = self.find_widget(QtWidgets.QSlider ,'sldArterialValue') self.sldArterialValueLong = self.find_widget(QtWidgets.QSlider ,'sldArterialValueLong') Index: TD_Voltages/loader.py =================================================================== diff -u -r4e2342ccd6104d0cb1f5321c24c9955c2cae69c8 -rf9ec0e263221cccdf36e037c4729b0972cd45c07 --- TD_Voltages/loader.py (.../loader.py) (revision 4e2342ccd6104d0cb1f5321c24c9955c2cae69c8) +++ TD_Voltages/loader.py (.../loader.py) (revision f9ec0e263221cccdf36e037c4729b0972cd45c07) @@ -95,7 +95,7 @@ fpga_vcc = self.fpga_vcc.value() fpga_vaux = self.fpga_vaux.value() fpga_vpvn = self.fpga_vpvn.value() - self.td_interface.td_voltages( + self.td_interface.td_voltage( line_1_2v, line_3_3v, line_logic_5v, line_sensors_5v, line_24v, line_regen_24v, fpga_adc_ref, res_ref, fpga_vcc,