Index: DD_Conductivity/interface.ui =================================================================== diff -u -r5e32491166e1ccf47a90c9d2db5d0b37ecf249bb -ra4f4b16cfdbaf955c6febbff8a5140aeb2ef5427 --- DD_Conductivity/interface.ui (.../interface.ui) (revision 5e32491166e1ccf47a90c9d2db5d0b37ecf249bb) +++ DD_Conductivity/interface.ui (.../interface.ui) (revision a4f4b16cfdbaf955c6febbff8a5140aeb2ef5427) @@ -83,7 +83,7 @@ - CD1 (D17) + Bicard Cond 1(D17) @@ -93,7 +93,7 @@ - CD2 (D27) + Acid & Bicard Cond 1 (D27) @@ -103,7 +103,7 @@ - CD3 (D29) + Acid & Bicard Cond 2 (D29) @@ -113,7 +113,7 @@ - CD4 (D43) + Spent Cond (D43) @@ -123,7 +123,7 @@ - CD5 (D74) + Bicarb Cond 2 (D74) Index: DD_GenDialysate/loader.py =================================================================== diff -u -r5e32491166e1ccf47a90c9d2db5d0b37ecf249bb -ra4f4b16cfdbaf955c6febbff8a5140aeb2ef5427 --- DD_GenDialysate/loader.py (.../loader.py) (revision 5e32491166e1ccf47a90c9d2db5d0b37ecf249bb) +++ DD_GenDialysate/loader.py (.../loader.py) (revision a4f4b16cfdbaf955c6febbff8a5140aeb2ef5427) @@ -75,24 +75,24 @@ the slot for dd generate dialysate data :return: none """ - GenDExec = self.execution_state .value() - isDDInPrg = int(self.dd_progess .isChecked()) - FltLevel1 = self.float_level .value() - BiCarbLvl = self.bicarb_level .value() - SpentLvl = self.spent_level .value() - HydNegPres = self.hydraulics_neg_pressure .value() - HydPosPres = self.hydraulics_pos_pressure .value() - SpentPress = self.spent_pressure .value() - IsDialGood = int(self.dial_good .isChecked()) + 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()) self.dd_interface.dd_gen_dialysate( - GenDExec , - isDDInPrg , - FltLevel1 , - BiCarbLvl , - SpentLvl , - HydNegPres , - HydPosPres , - SpentPress , - IsDialGood + gen_dialysate_exec , + dd_in_progress , + D6_level , + D63_level , + D46_level , + D9_pressure , + D18_pressure , + D51_pressure , + is_dial_good ) \ No newline at end of file Index: TD_AirTrap/interface.ui =================================================================== diff -u -r5e32491166e1ccf47a90c9d2db5d0b37ecf249bb -ra4f4b16cfdbaf955c6febbff8a5140aeb2ef5427 --- TD_AirTrap/interface.ui (.../interface.ui) (revision 5e32491166e1ccf47a90c9d2db5d0b37ecf249bb) +++ TD_AirTrap/interface.ui (.../interface.ui) (revision a4f4b16cfdbaf955c6febbff8a5140aeb2ef5427) @@ -81,7 +81,7 @@ - low Level + low Level (H17) @@ -95,7 +95,7 @@ - upper Level + upper Level (H16) @@ -109,7 +109,7 @@ - low Level Raw + low Level Raw (H17) @@ -123,7 +123,7 @@ - upper Level Raw + upper Level Raw (H16) @@ -137,7 +137,7 @@ - valve State H13 + inlet valve State (H13) @@ -151,7 +151,7 @@ - valve State H20 + outlet valve State (H20) Index: TD_AirTrap/loader.py =================================================================== diff -u -r5e32491166e1ccf47a90c9d2db5d0b37ecf249bb -ra4f4b16cfdbaf955c6febbff8a5140aeb2ef5427 --- TD_AirTrap/loader.py (.../loader.py) (revision 5e32491166e1ccf47a90c9d2db5d0b37ecf249bb) +++ TD_AirTrap/loader.py (.../loader.py) (revision a4f4b16cfdbaf955c6febbff8a5140aeb2ef5427) @@ -41,8 +41,8 @@ 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_H13 = self.find_widget(QtWidgets.QSpinBox , 'valveStateH13SpinBox') - self.valve_state_H20 = self.find_widget(QtWidgets.QSpinBox , 'valveStateH20SpinBox') + 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' ) def _init_connections(self): @@ -65,8 +65,8 @@ self.upper_level.setValue(0) self.low_level_raw.setValue(0) self.upper_level_raw.setValue(0) - self.valve_state_H13.setValue(0) - self.valve_state_H20.setValue(0) + self.valve_state_inlet.setValue(0) + self.valve_state_outlet.setValue(0) self.control.setChecked(False) @@ -76,21 +76,19 @@ the slot for air trap change :return: none """ - low_level = self.low_level.value() - upper_level = self.upper_level.value() - lower_level_raw = self.low_level_raw.value() - upper_level_raw = self.upper_level_raw.value() - valve_state_h13 = self.valve_state_H13.value() - valve_state_h20 = self.valve_state_H20.value() - - controlling = int(self.control.isChecked()) - # print(f"{low_level}\n{upper_level}\n{lower_level_raw}\n{upper_level_raw}\n{valve_state}\n{controlling}") + 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( - low_level, - upper_level, - lower_level_raw, - upper_level_raw, - valve_state_h13, - valve_state_h20, - controlling + H17_state , + H16_state , + H17_raw_state , + H16_raw_state , + H13_state , + H20_State , + controlling ) \ No newline at end of file Index: TD_BloodPump/interface.ui =================================================================== diff -u -r5e32491166e1ccf47a90c9d2db5d0b37ecf249bb -ra4f4b16cfdbaf955c6febbff8a5140aeb2ef5427 --- TD_BloodPump/interface.ui (.../interface.ui) (revision 5e32491166e1ccf47a90c9d2db5d0b37ecf249bb) +++ TD_BloodPump/interface.ui (.../interface.ui) (revision a4f4b16cfdbaf955c6febbff8a5140aeb2ef5427) @@ -76,7 +76,7 @@ - set Flow + set Flow (H4) @@ -90,7 +90,7 @@ - rotor Count + rotor Count (H4) @@ -104,7 +104,7 @@ - pres Flow + pres Flow (H4) @@ -118,7 +118,7 @@ - hall State + hall State (H6) @@ -139,7 +139,7 @@ - meas Flow + meas Flow (H4) @@ -153,7 +153,7 @@ - rotor Speed + rotor Speed (H4) @@ -167,7 +167,7 @@ - motor Speed + motor Speed (H4) @@ -181,7 +181,7 @@ - RPM + RPM (H6) @@ -195,7 +195,7 @@ - current Motor + current Motor (H4) Index: TD_BloodPump/loader.py =================================================================== diff -u -r4e2342ccd6104d0cb1f5321c24c9955c2cae69c8 -ra4f4b16cfdbaf955c6febbff8a5140aeb2ef5427 --- TD_BloodPump/loader.py (.../loader.py) (revision 4e2342ccd6104d0cb1f5321c24c9955c2cae69c8) +++ TD_BloodPump/loader.py (.../loader.py) (revision a4f4b16cfdbaf955c6febbff8a5140aeb2ef5427) @@ -79,23 +79,24 @@ the slot for bp data change :return: none """ - set_flow = self.sFlow.value() - meas_flow = self.mFlow.value() - rot_speed = self.rotSpeed.value() - mot_speed = self.motSpeed.value() - curr_motor = self.currMotor.value() - set_rpm = self.sRPM.value() - rot_count = self.rotCount.value() - pres_flow = self.presFlow.value() - rot_hall_state = self.hallState.value() - # print(f"{set_flow}, {meas_flow}\n{rot_count}, {rot_speed}\n{pres_flow}, {mot_speed}\n{rot_hall_state}, {set_rpm}") + 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( - set_flow, - meas_flow, - rot_speed, - mot_speed, - curr_motor, - set_rpm, rot_count, - pres_flow, - rot_hall_state + H4_set_flow , + H4_meas_flow , + H4_rot_speed , + H4_mot_speed , + H4_curr_motor , + H4_set_rpm , + H4_rot_count , + H4_pres_flow , + H6_rot_hall_state ) \ No newline at end of file Index: TD_Ejector/interface.ui =================================================================== diff -u -r5e32491166e1ccf47a90c9d2db5d0b37ecf249bb -ra4f4b16cfdbaf955c6febbff8a5140aeb2ef5427 --- TD_Ejector/interface.ui (.../interface.ui) (revision 5e32491166e1ccf47a90c9d2db5d0b37ecf249bb) +++ TD_Ejector/interface.ui (.../interface.ui) (revision a4f4b16cfdbaf955c6febbff8a5140aeb2ef5427) @@ -87,14 +87,14 @@ - set spd + set spd (H5) - State + State (H5) Index: TD_Ejector/loader.py =================================================================== diff -u -r4e2342ccd6104d0cb1f5321c24c9955c2cae69c8 -ra4f4b16cfdbaf955c6febbff8a5140aeb2ef5427 --- TD_Ejector/loader.py (.../loader.py) (revision 4e2342ccd6104d0cb1f5321c24c9955c2cae69c8) +++ TD_Ejector/loader.py (.../loader.py) (revision a4f4b16cfdbaf955c6febbff8a5140aeb2ef5427) @@ -63,9 +63,9 @@ the slot for ejector change :return: none """ - state = self.state.value() - set_speed = self.setSpeed.value() + H5_state = self.state.value() + H5_set_speed = self.setSpeed.value() self.td_interface.td_ejector( - state, - set_speed + H5_state , + H5_set_speed ) \ No newline at end of file Index: TD_Pressures/interface.ui =================================================================== diff -u -r5e32491166e1ccf47a90c9d2db5d0b37ecf249bb -ra4f4b16cfdbaf955c6febbff8a5140aeb2ef5427 --- TD_Pressures/interface.ui (.../interface.ui) (revision 5e32491166e1ccf47a90c9d2db5d0b37ecf249bb) +++ TD_Pressures/interface.ui (.../interface.ui) (revision a4f4b16cfdbaf955c6febbff8a5140aeb2ef5427) @@ -903,7 +903,7 @@ background-color: rgb(229, 156, 156); - Venous Limit (mmHg) + (H14) Venous Limit (mmHg) Qt::AlignCenter @@ -927,7 +927,7 @@ background-color: rgb(229, 156, 156); - Arterial Limit (mmHg) + (H2) Arterial Limit (mmHg) Qt::AlignCenter Index: TD_Pressures/loader.py =================================================================== diff -u -r5e32491166e1ccf47a90c9d2db5d0b37ecf249bb -ra4f4b16cfdbaf955c6febbff8a5140aeb2ef5427 --- TD_Pressures/loader.py (.../loader.py) (revision 5e32491166e1ccf47a90c9d2db5d0b37ecf249bb) +++ TD_Pressures/loader.py (.../loader.py) (revision a4f4b16cfdbaf955c6febbff8a5140aeb2ef5427) @@ -154,30 +154,30 @@ sends the pressures values message with given value on the screen :return: none """ - arterial_pressure = self.sldArterialValue .value() - venous_pressure = self.sldVenousValue .value() - limit_state = self.spnLimitState .value() - arterial_min = self.spnArterialLimitLow .value() - arterial_max = self.spnArterialLimitHigh .value() - venous_min = self.spnVenousLimitLow .value() - venous_max = self.spnVenousLimitHigh .value() - arterial_long = self.sldArterialValueLong .value() - venous_long = self.sldVenousValueLong .value() - tmp_pressure = self.sldTMPValue .value() - tmp_min = self.spnTMPLimitLow .value() - tmp_max = self.spnTMPLimitHigh .value() + H2_arterial_pressure = self.sldArterialValue .value() + H14_venous_pressure = self.sldVenousValue .value() + limit_state = self.spnLimitState .value() + H2_arterial_min = self.spnArterialLimitLow .value() + H2_arterial_max = self.spnArterialLimitHigh .value() + H14_venous_min = self.spnVenousLimitLow .value() + H14_venous_max = self.spnVenousLimitHigh .value() + H2_arterial_long = self.sldArterialValueLong .value() + H14_venous_long = self.sldVenousValueLong .value() + tmp_pressure = self.sldTMPValue .value() + tmp_min = self.spnTMPLimitLow .value() + tmp_max = self.spnTMPLimitHigh .value() self.td_interface.td_pressure( - arterial_pressure , - venous_pressure , - limit_state , - arterial_min , - arterial_max , - venous_min , - venous_max , - arterial_long , - venous_long , - tmp_pressure , - tmp_min , - tmp_max + H2_arterial_pressure , + H14_venous_pressure , + limit_state , + H2_arterial_min , + H2_arterial_max , + H14_venous_min , + H14_venous_max , + H2_arterial_long , + H14_venous_long , + tmp_pressure , + tmp_min , + tmp_max ) \ No newline at end of file Index: TD_Switches/interface.ui =================================================================== diff -u -r5e32491166e1ccf47a90c9d2db5d0b37ecf249bb -ra4f4b16cfdbaf955c6febbff8a5140aeb2ef5427 --- TD_Switches/interface.ui (.../interface.ui) (revision 5e32491166e1ccf47a90c9d2db5d0b37ecf249bb) +++ TD_Switches/interface.ui (.../interface.ui) (revision a4f4b16cfdbaf955c6febbff8a5140aeb2ef5427) @@ -80,7 +80,7 @@ - Door + Door (H9)