Index: dialin/hd/ui_proxy.py =================================================================== diff -u -r4fc17d66100edef4aa6a18ae93ae5b45a75213e6 -ra3aac784628c2e6428cbc2a21aa4df7dd8a408df --- dialin/hd/ui_proxy.py (.../ui_proxy.py) (revision 4fc17d66100edef4aa6a18ae93ae5b45a75213e6) +++ dialin/hd/ui_proxy.py (.../ui_proxy.py) (revision a3aac784628c2e6428cbc2a21aa4df7dd8a408df) @@ -262,6 +262,14 @@ """ return self.fpga_version + def get_reject_reasons(self): + """ + Gets all possible reject reasons + + @return: OrderedDict(), {"": ... } + """ + return self.reject_reasons + def get_treatment_parameters(self): """ Gets the array of treatment parameters set by user or Dialin @@ -270,6 +278,23 @@ """ return self.treatment_parameters + def get_treatment_parameters_reject_reasons(self): + """ + Gets the array of reject reasons for treatment parameters by HD firmware + + @return: the array of reject reasons + """ + return self.treatment_parameters_reject_reasons + + def get_treatment_parameters_valid(self): + """ + Gets the T/F flag for whether treatment parameters + are considered valid by HD. + + @return: True if treatment parameters are valid, False if not + """ + return self.treatment_parameters_valid + def get_min_treatment_duration_min(self): """ Gets the min treatment duration @@ -334,14 +359,6 @@ """ return self.duration_change_reject_reason - def get_reject_reasons(self): - """ - Gets all possible reject reasons - - @return: OrderedDict(), {"": ... } - """ - return self.reject_reasons - def get_duration_change_time_min(self): """ Gets the duration change time @@ -444,177 +461,6 @@ """ return self.target_dialysate_flow_rate - def get_treatment_parameters_valid(self): - """ - Gets the T/F flag for whether treatment parameters - are considered valid by HD. - - @return: True if treatment parameters are valid, False if not - """ - return self.treatment_parameters_valid - - def get_treatment_parameters_reject_reasons(self): - """ - Gets the reject reason codes for the treatment parameters - sent to the HD for validation. - - @return: The array of reject reason codes for all treatment parameters - """ - return self.treatment_parameters_reject_reasons - - def get_blood_flow_rate_reject_reason(self): - """ - Gets the reject reason code for the blood flow rate - treatment parameter. - - @return: The reject reason code for the blood flow rate - """ - return self.blood_flow_rate_reject_reason - - def get_dialysate_flow_rate_reject_reason(self): - """ - Gets the reject reason code for the dialysate flow rate - treatment parameter. - - @return: The reject reason code for the dialysate flow rate - """ - return self.dialysate_flow_rate_reject_reason - - def get_treatment_duration_reject_reason(self): - """ - Gets the reject reason code for the treatment duration - treatment parameter. - - @return: The reject reason code for the treatment duration - """ - return self.treatment_duration_reject_reason - - def get_heparin_pre_stop_time_reject_reason(self): - """ - Gets the reject reason code for the Heparin pre-stop - time treatment parameter. - - @return: The reject reason code for the Heparin pre-stop time - """ - return self.heparin_pre_stop_time_reject_reason - - def get_saline_bolus_volume_reject_reason(self): - """ - Gets the reject reason code for the saline bolus volume - treatment parameter. - - @return: The reject reason code for the saline bolus volume - """ - return self.saline_bolus_volume_reject_reason - - def get_acid_concentrate_reject_reason(self): - """ - Gets the reject reason code for the acid concentrate - treatment parameter. - - @return: The reject reason code for the acid concentrate - """ - return self.acid_concentrate_reject_reason - - def get_bicarb_concentrate_reject_reason(self): - """ - Gets the reject reason code for the bicarbonate - concentrate treatment parameter. - - @return: The reject reason code for the bicarbonate concentrate - """ - return self.bicarb_concentrate_reject_reason - - def get_dialyzer_type_reject_reason(self): - """ - Gets the reject reason code for the dialyzer type treatment - parameter. - - @return: The reject reason code for the dialyzer type - """ - return self.dialyzer_type_reject_reason - - def get_blood_pressure_meas_interval_reject_reason(self): - """ - Gets the reject reason code for the BP measurement interval - treatment parameter. - - @return: The reject reason code for the BP measurement interval - """ - return self.blood_pressure_meas_interval_reject_reason - - def get_rinseback_flow_rate_reject_reason(self): - """ - Gets the reject reason code for the rinseback flow rate - treatment parameter. - - @return: The reject reason code for the rinseback flow rate - """ - return self.rinseback_flow_rate_reject_reason - - def get_arterial_pressure_low_alarm_limit_reject_reason(self): - """ - Gets the reject reason code for the arterial pressure low alarm - limit treatment parameter. - - @return: The reject reason code for the arterial pressure low alarm limit - """ - return self.arterial_pressure_low_alarm_limit_reject_reason - - def get_arterial_pressure_high_alarm_limit_reject_reason(self): - """ - Gets the reject reason code for the arterial pressure high alarm - limit treatment parameter. - - @return: The reject reason code for the arterial pressure high alarm limit - """ - return self.arterial_pressure_high_alarm_limit_reject_reason - - def get_venous_pressure_low_alarm_limit_reject_reason(self): - """ - Gets the reject reason code for the venous pressure low alarm - limit treatment parameter. - - @return: The reject reason code for the venous pressure low alarm limit - """ - return self.venous_pressure_low_alarm_limit_reject_reason - - def get_venous_pressure_high_alarm_limit_reject_reason(self): - """ - Gets the reject reason code for the venous pressure high alarm - limit treatment parameter. - - @return: The reject reason code for the venous pressure high alarm limit - """ - return self.venous_pressure_high_alarm_limit_reject_reason - - def get_heparin_dispense_rate_reject_reason(self): - """ - Gets the reject reason code for the Heparin dispense rate - treatment parameter. - - @return: The reject reason code for the Heparin dispense rate - """ - return self.heparin_dispense_rate_reject_reason - - def get_heparin_bolus_volume_reject_reason(self): - """ - Gets the reject reason code for the Heparin bolus volume - treatment parameter. - - @return: The reject reason code for the Heparin bolus volume - """ - return self.heparin_bolus_volume_reject_reason - - def get_dialysate_temperature_reject_reason(self): - """ - Gets the reject reason code for the dialysate temperature - treatment parameter. - - @return: The reject reason code for dialysate temperature - """ - return self.dialysate_temperature_reject_reason - def get_saline_bolus_reject_reason(self): """ Gets the reject reason code for the saline bolus request @@ -857,23 +703,23 @@ self.treatment_parameters_valid = True else: self.treatment_parameters_valid = False - self.blood_flow_rate_reject_reason = bld[0] - self.dialysate_flow_rate_reject_reason = dia[0] - self.treatment_duration_reject_reason = dur[0] - self.heparin_pre_stop_time_reject_reason = sto[0] - self.saline_bolus_volume_reject_reason = sal[0] - self.acid_concentrate_reject_reason = acd[0] - self.bicarb_concentrate_reject_reason = bic[0] - self.dialyzer_type_reject_reason = dlz[0] - self.blood_pressure_meas_interval_reject_reason = bpi[0] - self.rinseback_flow_rate_reject_reason = rbf[0] - self.arterial_pressure_low_alarm_limit_reject_reason = apl[0] - self.arterial_pressure_high_alarm_limit_reject_reason = aph[0] - self.venous_pressure_low_alarm_limit_reject_reason = vpl[0] - self.venous_pressure_high_alarm_limit_reject_reason = vph[0] - self.heparin_dispense_rate_reject_reason = hdr[0] - self.heparin_bolus_volume_reject_reason = hbv[0] - self.dialysate_temperature_reject_reason = tmp[0] + self.treatment_parameters_reject_reasons[self.TreatmentParameters.TREATMENT_PARAM_BLOOD_FLOW_RATE_ML_MIN.value] = bld[0] + self.treatment_parameters_reject_reasons[self.TreatmentParameters.TREATMENT_PARAM_DIALYSATE_FLOW_RATE_ML_MIN.value] = dia[0] + self.treatment_parameters_reject_reasons[self.TreatmentParameters.TREATMENT_PARAM_TREATMENT_DURATION_MIN.value] = dur[0] + self.treatment_parameters_reject_reasons[self.TreatmentParameters.TREATMENT_PARAM_HEPARIN_PRESTOP_MIN.value] = sto[0] + self.treatment_parameters_reject_reasons[self.TreatmentParameters.TREATMENT_PARAM_SALINE_BOLUS_VOLUME_ML.value] = sal[0] + self.treatment_parameters_reject_reasons[self.TreatmentParameters.TREATMENT_PARAM_ACID_CONCENTRATE.value] = acd[0] + self.treatment_parameters_reject_reasons[self.TreatmentParameters.TREATMENT_PARAM_BICARB_CONCENTRATE.value] = bic[0] + self.treatment_parameters_reject_reasons[self.TreatmentParameters.TREATMENT_PARAM_DIALYZER_TYPE.value] = dlz[0] + self.treatment_parameters_reject_reasons[self.TreatmentParameters.TREATMENT_PARAM_BLOOD_PRESSURE_MEAS_INTERVAL_MIN.value] = bpi[0] + self.treatment_parameters_reject_reasons[self.TreatmentParameters.TREATMENT_PARAM_RINSEBACK_FLOW_RATE_ML_MIN.value] = rbf[0] + self.treatment_parameters_reject_reasons[self.TreatmentParameters.TREATMENT_PARAM_ARTERIAL_PRESSURE_HIGH_LIMIT_MMHG.value] = apl[0] + self.treatment_parameters_reject_reasons[self.TreatmentParameters.TREATMENT_PARAM_ARTERIAL_PRESSURE_LOW_LIMIT_MMHG.value] = aph[0] + self.treatment_parameters_reject_reasons[self.TreatmentParameters.TREATMENT_PARAM_VENOUS_PRESSURE_HIGH_LIMIT_MMHG.value] = vpl[0] + self.treatment_parameters_reject_reasons[self.TreatmentParameters.TREATMENT_PARAM_VENOUS_PRESSURE_LOW_LIMIT_MMHG.value] = vph[0] + self.treatment_parameters_reject_reasons[self.TreatmentParameters.TREATMENT_PARAM_HEPARIN_DISPENSE_RATE_ML_HR.value] = hdr[0] + self.treatment_parameters_reject_reasons[self.TreatmentParameters.TREATMENT_PARAM_HEPARIN_BOLUS_VOLUME_ML.value] = hbv[0] + self.treatment_parameters_reject_reasons[self.TreatmentParameters.TREATMENT_PARAM_DIALYSATE_TEMPERATURE_C.value] = tmp[0] @_publish([ "min_treatment_duration_min",