Index: DD_Calibration/loader.py =================================================================== diff -u -r95474c125e6f45fc7659e76d27390ac006ed6c76 -rfc2bcc5d5a0af8e977e5a1c35e2b5573630984df --- DD_Calibration/loader.py (.../loader.py) (revision 95474c125e6f45fc7659e76d27390ac006ed6c76) +++ DD_Calibration/loader.py (.../loader.py) (revision fc2bcc5d5a0af8e977e5a1c35e2b5573630984df) @@ -171,6 +171,12 @@ "Ultrafiltration", ] + self.acidConcList = [ + "08-1251-1", + "08-2251-0", + "08-3251-9", + ] + # Pressures self.tbGetPressureSend = self.find_widget(QtWidgets.QToolButton , 'tbGetPressureSend' ) self.lbGetPressuresReq = self.find_widget(QtWidgets.QLabel , 'lbGetPressuresReq' ) @@ -253,8 +259,82 @@ self.sbSetD12PumpTargetPumpSpeed = self.find_widget(QtWidgets.QSpinBox , 'sbSetD12PumpTargetPumpSpeed' ) self.sbSetD12PumpCalibrationTime = self.find_widget(QtWidgets.QSpinBox , 'sbSetD12PumpCalibrationTime' ) + # D48 Pump + self.tbGetD48PumpSend = self.find_widget(QtWidgets.QToolButton , 'tbGetD48PumpSend' ) + self.lbGetD48PumpReq = self.find_widget(QtWidgets.QLabel , 'lbGetD48PumpReq' ) + self.cbGetD48PumpAccepted = self.find_widget(QtWidgets.QCheckBox , 'cbGetD48PumpAccepted' ) + self.sbGetD48PumpRejectionReason = self.find_widget(QtWidgets.QSpinBox , 'sbGetD48PumpRejectionReason' ) + self.sbGetD48PumpGain = self.find_widget(QtWidgets.QDoubleSpinBox , 'sbGetD48PumpGain' ) + self.sbGetD48PumpOffset = self.find_widget(QtWidgets.QDoubleSpinBox , 'sbGetD48PumpOffset' ) + self.sbGetD48PumpCalibrationTime = self.find_widget(QtWidgets.QSpinBox , 'sbGetD48PumpCalibrationTime' ) + + self.tbSetD48PumpSend = self.find_widget(QtWidgets.QToolButton , 'tbSetD48PumpSend' ) + self.lbSetD48PumpGain = self.find_widget(QtWidgets.QLabel , 'lbSetD48PumpGain' ) + self.lbSetD48PumpOffset = self.find_widget(QtWidgets.QLabel , 'lbSetD48PumpOffset' ) + self.lbSetD48PumpCalibrationTime = self.find_widget(QtWidgets.QLabel , 'lbSetD48PumpCalibrationTime' ) + self.cbSetD48PumpAccepted = self.find_widget(QtWidgets.QCheckBox , 'cbSetD48PumpAccepted' ) + self.sbSetD48PumpRejectionReason = self.find_widget(QtWidgets.QSpinBox , 'sbSetD48PumpRejectionReason' ) + self.sbSetD48PumpGain = self.find_widget(QtWidgets.QSpinBox , 'sbSetD48PumpGain' ) + self.sbSetD48PumpOffset = self.find_widget(QtWidgets.QSpinBox , 'sbSetD48PumpOffset' ) + self.sbSetD48PumpCalibrationTime = self.find_widget(QtWidgets.QSpinBox , 'sbSetD48PumpCalibrationTime' ) + # Acid Concentrates + self.tbGetAcidConcSend = self.find_widget(QtWidgets.QToolButton , 'tbGetAcidConcSend' ) + self.lbGetAcidConcReq = self.find_widget(QtWidgets.QLabel , 'lbGetAcidConcReq' ) + self.cbGetAcidConcAccepted = self.find_widget(QtWidgets.QCheckBox , 'cbGetAcidConcAccepted' ) + self.sbGetAcidConcRejectionReason = self.find_widget(QtWidgets.QSpinBox , 'sbGetAcidConcRejectionReason' ) + self.sbGetAcidConcIndex = self.find_widget(QtWidgets.QSpinBox , 'sbGetAcidConcIndex' ) + self.sbGetAcidConcMixRatio = self.find_widget(QtWidgets.QDoubleSpinBox , 'sbGetAcidConcMixRatio' ) + self.sbGetAcidConcFullBottleVolume = self.find_widget(QtWidgets.QDoubleSpinBox , 'sbGetAcidConcFullBottleVolume' ) + self.sbGetAcidConcUSPerCM = self.find_widget(QtWidgets.QDoubleSpinBox , 'sbGetAcidConcUSPerCM' ) + self.sbGetAcidConcBottleTemp = self.find_widget(QtWidgets.QDoubleSpinBox , 'sbGetAcidConcBottleTemp' ) + self.sbGetAcidConcCalibrationTime = self.find_widget(QtWidgets.QSpinBox , 'sbGetAcidConcCalibrationTime' ) + self.tbSetAcidConcSend = self.find_widget(QtWidgets.QToolButton , 'tbSetAcidConcSend' ) + self.lbSetAcidConcIndex = self.find_widget(QtWidgets.QLabel , 'lbSetAcidConcIndex' ) + self.lbSetAcidConcMixRatio = self.find_widget(QtWidgets.QLabel , 'lbSetAcidConcMixRatio' ) + self.lbSetAcidConcFullBottleVolume = self.find_widget(QtWidgets.QLabel , 'lbSetAcidConcFullBottleVolume' ) + self.lbSetAcidConcUSPerCM = self.find_widget(QtWidgets.QLabel , 'lbSetAcidConcUSPerCM' ) + self.lbSetAcidConcBottleTemp = self.find_widget(QtWidgets.QLabel , 'lbSetAcidConcBottleTemp' ) + self.lbSetAcidConcCalibrationTime = self.find_widget(QtWidgets.QLabel , 'lbSetAcidConcCalibrationTime' ) + self.cbSetAcidConcAccepted = self.find_widget(QtWidgets.QCheckBox , 'cbSetAcidConcAccepted' ) + self.sbSetAcidConcRejectionReason = self.find_widget(QtWidgets.QSpinBox , 'sbSetAcidConcRejectionReason' ) + self.sbSetAcidConcIndex = self.find_widget(QtWidgets.QSpinBox , 'sbSetAcidConcIndex' ) + self.sbSetAcidConcMixRatio = self.find_widget(QtWidgets.QSpinBox , 'sbSetAcidConcMixRatio' ) + self.sbSetAcidConcFullBottleVolume = self.find_widget(QtWidgets.QSpinBox , 'sbSetAcidConcFullBottleVolume' ) + self.sbSetAcidConcUSPerCM = self.find_widget(QtWidgets.QSpinBox , 'sbSetAcidConcUSPerCM' ) + self.sbSetAcidConcBottleTemp = self.find_widget(QtWidgets.QSpinBox , 'sbSetAcidConcBottleTemp' ) + self.sbSetAcidConcCalibrationTime = self.find_widget(QtWidgets.QSpinBox , 'sbSetAcidConcCalibrationTime' ) + + # Acid Concentrates + self.tbGetBicarbConcSend = self.find_widget(QtWidgets.QToolButton , 'tbGetBicarbConcSend' ) + self.lbGetBicarbConcReq = self.find_widget(QtWidgets.QLabel , 'lbGetBicarbConcReq' ) + self.cbGetBicarbConcAccepted = self.find_widget(QtWidgets.QCheckBox , 'cbGetBicarbConcAccepted' ) + self.sbGetBicarbConcRejectionReason = self.find_widget(QtWidgets.QSpinBox , 'sbGetBicarbConcRejectionReason' ) + self.sbGetBicarbConcIndex = self.find_widget(QtWidgets.QSpinBox , 'sbGetBicarbConcIndex' ) + self.sbGetBicarbConcMixRatio = self.find_widget(QtWidgets.QDoubleSpinBox , 'sbGetBicarbConcMixRatio' ) + self.sbGetBicarbConcFullBottleVolume = self.find_widget(QtWidgets.QDoubleSpinBox , 'sbGetBicarbConcFullBottleVolume' ) + self.sbGetBicarbConcUSPerCM = self.find_widget(QtWidgets.QDoubleSpinBox , 'sbGetBicarbConcUSPerCM' ) + self.sbGetBicarbConcBottleTemp = self.find_widget(QtWidgets.QDoubleSpinBox , 'sbGetBicarbConcBottleTemp' ) + self.sbGetBicarbConcCalibrationTime = self.find_widget(QtWidgets.QSpinBox , 'sbGetBicarbConcCalibrationTime' ) + + self.tbSetBicarbConcSend = self.find_widget(QtWidgets.QToolButton , 'tbSetBicarbConcSend' ) + self.lbSetBicarbConcIndex = self.find_widget(QtWidgets.QLabel , 'lbSetBicarbConcIndex' ) + self.lbSetBicarbConcMixRatio = self.find_widget(QtWidgets.QLabel , 'lbSetBicarbConcMixRatio' ) + self.lbSetBicarbConcFullBottleVolume = self.find_widget(QtWidgets.QLabel , 'lbSetBicarbConcFullBottleVolume' ) + self.lbSetBicarbConcUSPerCM = self.find_widget(QtWidgets.QLabel , 'lbSetBicarbConcUSPerCM' ) + self.lbSetBicarbConcBottleTemp = self.find_widget(QtWidgets.QLabel , 'lbSetBicarbConcBottleTemp' ) + self.lbSetBicarbConcCalibrationTime = self.find_widget(QtWidgets.QLabel , 'lbSetBicarbConcCalibrationTime' ) + self.cbSetBicarbConcAccepted = self.find_widget(QtWidgets.QCheckBox , 'cbSetBicarbConcAccepted' ) + self.sbSetBicarbConcRejectionReason = self.find_widget(QtWidgets.QSpinBox , 'sbSetBicarbConcRejectionReason' ) + self.sbSetBicarbConcIndex = self.find_widget(QtWidgets.QSpinBox , 'sbSetBicarbConcIndex' ) + self.sbSetBicarbConcMixRatio = self.find_widget(QtWidgets.QSpinBox , 'sbSetBicarbConcMixRatio' ) + self.sbSetBicarbConcFullBottleVolume = self.find_widget(QtWidgets.QSpinBox , 'sbSetBicarbConcFullBottleVolume' ) + self.sbSetBicarbConcUSPerCM = self.find_widget(QtWidgets.QSpinBox , 'sbSetBicarbConcUSPerCM' ) + self.sbSetBicarbConcBottleTemp = self.find_widget(QtWidgets.QSpinBox , 'sbSetBicarbConcBottleTemp' ) + self.sbSetBicarbConcCalibrationTime = self.find_widget(QtWidgets.QSpinBox , 'sbSetBicarbConcCalibrationTime' ) + + def _init_connections(self): """ initializes the widget's connections @@ -268,6 +348,12 @@ self.tbSetConcPumpSend .clicked.connect ( self.do_set_conc_pump_response ) self.tbGetD12PumpSend .clicked.connect ( self.do_get_d12_pump_response ) self.tbSetD12PumpSend .clicked.connect ( self.do_set_d12_pump_response ) + self.tbGetD48PumpSend .clicked.connect ( self.do_get_d48_pump_response ) + self.tbSetD48PumpSend .clicked.connect ( self.do_set_d48_pump_response ) + self.tbGetAcidConcSend .clicked.connect ( self.do_get_acid_conc_response ) + self.tbSetAcidConcSend .clicked.connect ( self.do_set_acid_conc_response ) + self.tbGetBicarbConcSend .clicked.connect ( self.do_get_bicarb_conc_response ) + self.tbSetBicarbConcSend .clicked.connect ( self.do_set_bicarb_conc_response ) def getIntValue (self, message): @@ -294,6 +380,12 @@ self.init_set_ConcPump() self.init_get_d12_pump() self.init_set_d12_pump() + self.init_get_d48_pump() + self.init_set_d48_pump() + self.init_get_acidConc_pump() + self.init_set_acidConc_pump() + self.init_get_bicarbConc_pump() + self.init_set_bicarbConc_pump() def init_get_pressures(self): @@ -378,7 +470,75 @@ self.sbSetD12PumpCalibrationTime .setValue (0) + def init_get_d48_pump(self): + self.lbGetD48PumpReq .setText ("-") + self.sbGetD48PumpRejectionReason .setValue (0) + self.sbGetD48PumpGain .setValue (0) + self.sbGetD48PumpOffset .setValue (0) + self.sbGetD48PumpCalibrationTime .setValue (0) + self.cbGetD48PumpAccepted .setChecked ( True ) + + def init_set_d48_pump(self): + self.lbSetD48PumpGain .setText ("-") + self.lbSetD48PumpOffset .setText ("-") + self.lbSetD48PumpCalibrationTime .setText ("-") + self.cbSetD48PumpAccepted .setChecked ( True ) + self.sbSetD48PumpGain .setValue (0) + self.sbSetD48PumpOffset .setValue (0) + self.sbSetD48PumpCalibrationTime .setValue (0) + + + def init_get_acidConc_pump(self): + self.lbGetAcidConcReq .setText ("-") + self.sbGetAcidConcRejectionReason .setValue (0) + self.sbGetAcidConcMixRatio .setValue (0) + self.sbGetAcidConcFullBottleVolume .setValue (0) + self.sbGetAcidConcUSPerCM .setValue (0) + self.sbGetAcidConcBottleTemp .setValue (0) + self.sbGetAcidConcCalibrationTime .setValue (0) + self.cbGetAcidConcAccepted .setChecked ( True ) + + + def init_set_acidConc_pump(self): + self.lbSetAcidConcMixRatio .setText ("-") + self.lbSetAcidConcFullBottleVolume .setText ("-") + self.lbSetAcidConcUSPerCM .setText ("-") + self.lbSetAcidConcBottleTemp .setText ("-") + self.lbSetAcidConcCalibrationTime .setText ("-") + self.cbSetAcidConcAccepted .setChecked ( True ) + self.sbSetAcidConcMixRatio .setValue (0) + self.sbSetAcidConcFullBottleVolume .setValue (0) + self.sbSetAcidConcUSPerCM .setValue (0) + self.sbSetAcidConcBottleTemp .setValue (0) + self.sbSetAcidConcCalibrationTime .setValue (0) + + + def init_get_bicarbConc_pump(self): + self.lbGetBicarbConcReq .setText ("-") + self.sbGetBicarbConcRejectionReason .setValue (0) + self.sbGetBicarbConcMixRatio .setValue (0) + self.sbGetBicarbConcFullBottleVolume .setValue (0) + self.sbGetBicarbConcUSPerCM .setValue (0) + self.sbGetBicarbConcBottleTemp .setValue (0) + self.sbGetBicarbConcCalibrationTime .setValue (0) + self.cbGetBicarbConcAccepted .setChecked ( True ) + + + def init_set_bicarbConc_pump(self): + self.lbSetBicarbConcMixRatio .setText ("-") + self.lbSetBicarbConcFullBottleVolume .setText ("-") + self.lbSetBicarbConcUSPerCM .setText ("-") + self.lbSetBicarbConcBottleTemp .setText ("-") + self.lbSetBicarbConcCalibrationTime .setText ("-") + self.cbSetBicarbConcAccepted .setChecked ( True ) + self.sbSetBicarbConcMixRatio .setValue (0) + self.sbSetBicarbConcFullBottleVolume .setValue (0) + self.sbSetBicarbConcUSPerCM .setValue (0) + self.sbSetBicarbConcBottleTemp .setValue (0) + self.sbSetBicarbConcCalibrationTime .setValue (0) + + @Slot() def handle_get_calibration_pressures(self, message, timestamp = 0.0): """ @@ -485,38 +645,79 @@ def handle_get_d48_pump_pressures(self, message, timestamp = 0.0): message = message['message'] self.index = MsgFieldPositions.START_POS_FIELD_1 + self.lbGetD48PumpReq.setText("Received") @Slot() def handle_set_d48_pump_pressures(self, message, timestamp = 0.0): message = message['message'] self.index = MsgFieldPositions.START_POS_FIELD_1 + gain = f"{self.getFloatValue(message):.3f}" + offset = f"{self.getFloatValue(message):.3f}" + caltime = str(self.getIntValue(message)) + self.lbSetD48PumpGain .setText(gain) + self.lbSetD48PumpOffset .setText(offset) + self.lbSetD48PumpCalibrationTime .setText(caltime) + @Slot() def handle_get_acid_conc_pressures(self, message, timestamp = 0.0): message = message['message'] self.index = MsgFieldPositions.START_POS_FIELD_1 + value = self.getIntValue(message) + cmdString = self.acidConcList[value] if value >= 0 and value < len(self.acidConcList) else "" + self.lbGetAcidConcReq.setText(f"{cmdString} ({value})") @Slot() def handle_set_acid_conc_pressures(self, message, timestamp = 0.0): message = message['message'] self.index = MsgFieldPositions.START_POS_FIELD_1 + value = self.getIntValue(message) + mix = f"{self.getFloatValue(message):.3f}" + start = f"{self.getFloatValue(message):.3f}" + perCM = f"{self.getFloatValue(message):.3f}" + Temp = f"{self.getFloatValue(message):.3f}" + caltime = str(self.getIntValue(message)) + cmdString = self.acidConcList[value] if value >= 0 and value < len(self.acidConcList) else "" + self.lbSetAcidConcIndex .setText(f"{cmdString} ({value})") + self.lbSetAcidConcMixRatio .setText(mix ) + self.lbSetAcidConcFullBottleVolume .setText(start) + self.lbSetAcidConcUSPerCM .setText(perCM) + self.lbSetAcidConcBottleTemp .setText(Temp ) + self.lbSetAcidConcCalibrationTime .setText(caltime) + @Slot() def handle_get_bicarb_conc_pressures(self, message, timestamp = 0.0): message = message['message'] self.index = MsgFieldPositions.START_POS_FIELD_1 + value = self.getIntValue(message) + cmdString = self.acidConcList[value] if value >= 0 and value < len(self.acidConcList) else "" + self.lbGetBicarbConcReq.setText(f"{cmdString} ({value})") - @Slot() def handle_set_bicarb_conc_pressures(self, message, timestamp = 0.0): message = message['message'] self.index = MsgFieldPositions.START_POS_FIELD_1 + value = self.getIntValue(message) + mix = f"{self.getFloatValue(message):.3f}" + start = f"{self.getFloatValue(message):.3f}" + perCM = f"{self.getFloatValue(message):.3f}" + Temp = f"{self.getFloatValue(message):.3f}" + caltime = str(self.getIntValue(message)) + cmdString = self.acidConcList[value] if value >= 0 and value < len(self.acidConcList) else "" + self.lbSetBicarbConcIndex .setText(f"{cmdString} ({value})") + self.lbSetBicarbConcMixRatio .setText(mix ) + self.lbSetBicarbConcFullBottleVolume .setText(start) + self.lbSetBicarbConcUSPerCM .setText(perCM) + self.lbSetBicarbConcBottleTemp .setText(Temp ) + self.lbSetBicarbConcCalibrationTime .setText(caltime) + @Slot() def handle_get_accel_sensor_pressures(self, message, timestamp = 0.0): message = message['message'] @@ -646,31 +847,88 @@ self.sbSetD12PumpCalibrationTime .value() ) - # @Slot() - # def do_get_d48_pump_response(self): + @Slot() + def do_get_d48_pump_response(self): + self.lbGetD48PumpReq .setText ("-") + self.dd_interface.dd_get_calibration_D48Pump_sensor_record( self.cbGetD48PumpAccepted .isChecked() , + self.sbGetD48PumpRejectionReason .value() , + self.sbGetD48PumpGain .value() , + self.sbGetD48PumpOffset .value() , + self.sbGetD48PumpCalibrationTime .value() ) + @Slot() + def do_set_d48_pump_response(self): + self.lbSetD48PumpGain .setText ("-") + self.lbSetD48PumpOffset .setText ("-") + self.lbSetD48PumpCalibrationTime .setText ("-") + self.dd_interface.dd_set_calibration_D48_sensor_record( self.cbSetD48PumpAccepted .isChecked() , + self.sbSetD48PumpRejectionReason .value() , + self.sbSetD48PumpGain .value() , + self.sbSetD48PumpOffset .value() , + self.sbSetD48PumpCalibrationTime .value() ) - # @Slot() - # def do_set_d48_pump_response(self): + + @Slot() + def do_get_acid_conc_response(self): + self.lbGetAcidConcReq .setText ("-") + self.dd_interface.dd_get_calibration_acid_conc_record( self.cbGetAcidConcAccepted .isChecked() , + self.sbGetAcidConcRejectionReason .value() , + self.sbGetAcidConcIndex .value() , + self.sbGetAcidConcMixRatio .value() , + self.sbGetAcidConcFullBottleVolume .value() , + self.sbGetAcidConcUSPerCM .value() , + self.sbGetAcidConcBottleTemp .value() , + self.sbGetAcidConcCalibrationTime .value() ) + @Slot() + def do_set_acid_conc_response(self): + self.lbSetAcidConcMixRatio .setText ("-") + self.lbSetAcidConcFullBottleVolume .setText ("-") + self.lbSetAcidConcUSPerCM .setText ("-") + self.lbSetAcidConcBottleTemp .setText ("-") + self.lbSetAcidConcCalibrationTime .setText ("-") + self.dd_interface.dd_set_calibration_acid_conc_record( self.cbSetAcidConcAccepted .isChecked() , + self.sbSetAcidConcRejectionReason .value() , + self.sbSetAcidConcIndex .value() , + self.sbSetAcidConcMixRatio .value() , + self.sbSetAcidConcFullBottleVolume .value() , + self.sbSetAcidConcUSPerCM .value() , + self.sbSetAcidConcBottleTemp .value() , + self.sbSetAcidConcCalibrationTime .value() ) + - # @Slot() - # def do_get_acid_conc_response(self): + @Slot() + def do_get_bicarb_conc_response(self): + self.lbGetBicarbConcReq .setText ("-") + self.dd_interface.dd_get_calibration_bicarb_conc_record( self.cbGetBicarbConcAccepted .isChecked() , + self.sbGetBicarbConcRejectionReason .value() , + self.sbGetBicarbConcIndex .value() , + self.sbGetBicarbConcMixRatio .value() , + self.sbGetBicarbConcFullBottleVolume .value() , + self.sbGetBicarbConcUSPerCM .value() , + self.sbGetBicarbConcBottleTemp .value() , + self.sbGetBicarbConcCalibrationTime .value() ) - # @Slot() - # def do_set_acid_conc_response(self): + @Slot() + def do_set_bicarb_conc_response(self): + self.lbSetBicarbConcMixRatio .setText ("-") + self.lbSetBicarbConcFullBottleVolume .setText ("-") + self.lbSetBicarbConcUSPerCM .setText ("-") + self.lbSetBicarbConcBottleTemp .setText ("-") + self.lbSetBicarbConcCalibrationTime .setText ("-") + self.dd_interface.dd_set_calibration_bicarb_conc_record( self.cbSetBicarbConcAccepted .isChecked() , + self.sbSetBicarbConcRejectionReason .value() , + self.sbSetBicarbConcIndex .value() , + self.sbSetBicarbConcMixRatio .value() , + self.sbSetBicarbConcFullBottleVolume .value() , + self.sbSetBicarbConcUSPerCM .value() , + self.sbSetBicarbConcBottleTemp .value() , + self.sbSetBicarbConcCalibrationTime .value() ) - # @Slot() - # def do_get_bicarb_conc_response(self): - # @Slot() - # def do_set_bicarb_conc_response(self): - - - # @Slot() # def do_get_accelerometer_sensor_response(self):