Index: simulator/plugins/createtreatment/loader.py =================================================================== diff -u -r967521dff94783ce48b50abc8db6bcd67bb501bf -rf25c9bd941b70a9c0c85271d9e5e91142d78cb63 --- simulator/plugins/createtreatment/loader.py (.../loader.py) (revision 967521dff94783ce48b50abc8db6bcd67bb501bf) +++ simulator/plugins/createtreatment/loader.py (.../loader.py) (revision f25c9bd941b70a9c0c85271d9e5e91142d78cb63) @@ -76,8 +76,8 @@ """ self.interface.hd.cmd_send_treatment_parameter_manual_validation_response([ 1, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 ]) self.lblCreateAction.setText('Accepted ') @@ -92,9 +92,9 @@ print(reason) self.interface.hd.cmd_send_treatment_parameter_manual_validation_response([ reason, - 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1 + 0, 1, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, + 0, 0, 1, 0, 0, 0 ]) self.lblCreateAction.setText('Rejected ' + "{}".format(reason)) Index: simulator/plugins/postTreatment/interface.ui =================================================================== diff -u -r80e41aa60d1fe7534b4c082f087f708afb89c38d -rf25c9bd941b70a9c0c85271d9e5e91142d78cb63 --- simulator/plugins/postTreatment/interface.ui (.../interface.ui) (revision 80e41aa60d1fe7534b4c082f087f708afb89c38d) +++ simulator/plugins/postTreatment/interface.ui (.../interface.ui) (revision f25c9bd941b70a9c0c85271d9e5e91142d78cb63) @@ -6,48 +6,2405 @@ 0 0 - 1249 - 944 + 1185 + 1048 &5 Post-Treatment/&0 Treatment Log - - - - - - 10 - - - - color: rgb(238, 238, 236); -background-color: rgb(191, 64, 105); - - - Post Treatment - - - Qt::AlignCenter - - + + + + + + + + 315 + 0 + + + + + 315 + 16777215 + + + + + Courier + + + + 3(U32)Blood Flow Rate + + + leBloodFlowRate + + + + + + + + Courier + + + + 9999999999 + + + 43 + + + 10 + + + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter + + + + + + + + 80 + 0 + + + + + Courier + + + + (mL/min) + + + + - - - - + + + + + + + 295 + 0 + + + + + 295 + 16777215 + + + + + Courier + + + + 20(F32)Average Dialysate Temp + + + leAverageDialysateTemp + + + + + + + + Courier + + + + 99999.999 + + + 20.567 + + + 9 + + + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter + + + + + + + + 80 + 0 + + + + + Courier + + + + (Celsius) + + + + + + + + + + + + 315 + 0 + + + + + 315 + 16777215 + + + + + Courier + + + + 4(U32)Dialysate Flow Rate + + + leDialysateFlowRate + + + + + + + + Courier + + + + 9999999999 + + + 44 + + + 10 + + + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter + + + + + + + + 80 + 0 + + + + + Courier + + + + (mL/min) + + + + + + + + + + + + 295 + 0 + + + + + 295 + 16777215 + + + + + Courier + + + + 21(F32)Origin UF Volume + + + leTargetUFVolume + + + + + + + + Courier + + + + 99999.999 + + + 21.678 + + + 9 + + + + + + + + 80 + 0 + + + + + Courier + + + + (L) + + + + + + + + + + + + 315 + 0 + + + + + 315 + 16777215 + + + + + Courier + + + + 5(U32)Treatment Duration + + + leTreatmentDuration + + + + + + + + Courier + + + + 9999999999 + + + 480 + + + 10 + + + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter + + + + + + + + 80 + 0 + + + + + Courier + + + + (sec) + + + + + + + + + + + + 295 + 0 + + + + + 295 + 16777215 + + + + + Courier + + + + 22(F32)Target UF Volume + + + leTargetUFVolume + + + + + + + + Courier + + + + 99999.999 + + + 22.789 + + + 9 + + + + + + + + 80 + 0 + + + + + Courier + + + + (L) + + + + + + + + + + + + 315 + 0 + + + + + 315 + 16777215 + + + + + Courier + + + + 6(U32)Actual Treatment Duration + + + leActualTreatmentDuration + + + + + + + + Courier + + + + 9999999999 + + + 120 + + + 10 + + + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter + + + + + + + + 80 + 0 + + + + + Courier + + + + (sec) + + + + + + + + + + + + 295 + 0 + + + + + 295 + 16777215 + + + + + Courier + + + + 23(F32)Actual UF Volume + + + leActualUFVolume + + + + + + + + Courier + + + + 99999.999 + + + 23.891 + + + 9 + + + + + + + + 80 + 0 + + + + + Courier + + + + (L) + + + + + + + + + + + + 315 + 0 + + + + + 315 + 16777215 + + + + + Courier + + + + 7(U32)Acid Concentrate Type + + + leAcidConcentrateType + + + + + + + + Courier + + + + 9999999999 + + + 1 + + + 10 + + + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter + + + + + + + + 80 + 0 + + + + + Courier + + + + (enum) + + + + + + + + + + + + 295 + 0 + + + + + 295 + 16777215 + + + + + Courier + + + + 24(F32)Origin UF Rate + + + leTargetUFRate + + + + + + + + Courier + + + + 99999.999 + + + 24.912 + + + 9 + + + + + + + + 80 + 0 + + + + + Courier + + + + (mL/min) + + + + + + + + + + + + 315 + 0 + + + + + 315 + 16777215 + + + + + Courier + + + + 8(U32)Bicarbonate Concentrate Type + + + leBicarbonateConcentrateType + + + + + + + + Courier + + + + 9999999999 + + + 0 + + + 10 + + + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter + + + + + + + + 80 + 0 + + + + + Courier + + + + (enum) + + + + + + + + + + + + 295 + 0 + + + + + 295 + 16777215 + + + + + Courier + + + + 25(F32)Target UF Rate + + + leTargetUFRate + + + + + + + + Courier + + + + 99999.999 + + + 25.123 + + + 9 + + + + + + + + 80 + 0 + + + + + Courier + + + + (mL/min) + + + + + + + + + + + + 315 + 0 + + + + + 315 + 16777215 + + + + + Courier + + + + 9(U32)Potassium Concentration + + + lePotassiumConcentration + + + + + + + + Courier + + + + 9999999999 + + + 9 + + + 10 + + + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter + + + + + + + + 80 + 0 + + + + + Courier + + + + (mEq/L) + + + + + + + + + + + + 295 + 0 + + + + + 295 + 16777215 + + + + + Courier + + + + 26(F32)Actual UF Rate + + + leActualUFRate + + + + + + + + Courier + + + + 99999.999 + + + 26.234 + + + 9 + + + + + + + + 80 + 0 + + + + + Courier + + + + (mL/min) + + + + + + + + + + + + 315 + 0 + + + + + 315 + 16777215 + + + + + Courier + + + + 10(U32)Calcium Concentration + + + leCalciumConcentration + + + + + + + + Courier + + + + 9999999999 + + + 10 + + + 10 + + + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter + + + + + + + + 80 + 0 + + + + + Courier + + + + (mEq/L) + + + + + + + + + + + + 295 + 0 + + + + + 295 + 16777215 + + + + + Courier + + + + 27(U32)Saline Bolus Volume + + + leSalineBolusVolume + + + + + + + + Courier + + + + 9999999999 + + + 27 + + + 10 + + + + + + + + 80 + 0 + + + + + Courier + + + + (mL) + + + + + + + + + + + + 315 + 0 + + + + + 315 + 16777215 + + + + + Courier + + + + 11(U32)Bicarbonate Concentration + + + leBicarbonateConcentration + + + + + + + + Courier + + + + 9999999999 + + + 11 + + + 10 + + + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter + + + + + + + + 80 + 0 + + + + + Courier + + + + (mEq/L) + + + + + + + + + + + + 295 + 0 + + + + + 295 + 16777215 + + + + + Courier + + + + 28(F32)Heparin Bolus Volume + + + leHeparinBolusVolume + + + + + + + + Courier + + + + 99999.999 + + + 28.345 + + + 9 + + + + + + + + 80 + 0 + + + + + Courier + + + + (mL) + + + + + + + + + + + + 315 + 0 + + + + + 315 + 16777215 + + + + + Courier + + + + 12(U32)Sodium Concentration + + + leSodiumConcentration + + + + + + + + Courier + + + + 9999999999 + + + 12 + + + 10 + + + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter + + + + + + + + 80 + 0 + + + + + Courier + + + + (mEq/L) + + + + + + + + + + + + 295 + 0 + + + + + 295 + 16777215 + + + + + Courier + + + + 29(F32)Heparin Dispense Rate + + + leHeparinDispenseRate + + + + + + + + Courier + + + + 99999.999 + + + 29.456 + + + 9 + + + + + + + + 80 + 0 + + + + + Courier + + + + (mL/hr) + + + + + + + + + + + + 315 + 0 + + + + + 315 + 16777215 + + + + + Courier + + + + 13(F32)Dialysate Temperature + + + leDialysateTemperature + + + + + + + + Courier + + + + 99999.999 + + + 13.123 + + + 9 + + + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter + + + + + + + + 80 + 0 + + + + + Courier + + + + (Celsius) + + + + + + + + + + + + 295 + 0 + + + + + 295 + 16777215 + + + + + Courier + + + + 30(U32)Heparin Stop + + + leHeparinPreStop + + + + + + + + Courier + + + + 9999999999 + + + 30 + + + 10 + + + + + + + + 80 + 0 + + + + + Courier + + + + (min) + + + + + + + + + + + + 315 + 0 + + + + + 315 + 16777215 + + + + + Courier + + + + 14(U32)Dialyzer Type + + + leDialyzerType + + + + + + + + Courier + + + + 9999999999 + + + 2 + + + 10 + + + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter + + + + + + + + 80 + 0 + + + + + Courier + + + + (enum) + + + + + + + + + + + + 295 + 0 + + + + + 295 + 16777215 + + + + + Courier + + + + 31(F32)Heparin Delivered Volume + + + leHeparinDeliveredVolume + + + + + + + + Courier + + + + 99999.999 + + + 31.567 + + + 9 + + + + + + + + 80 + 0 + + + + + Courier + + + + (mL) + + + + + + + + + + + + 315 + 0 + + + + + 315 + 16777215 + + + + + Courier + + + + 15(U32)Treatment Start Date and Time + + + leTreatmentStartDateTime + + + + + + + + Courier + + + + 9999999999 + + + 1620913600 + + + 10 + + + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter + + + + + + + + 80 + 0 + + + + + Courier + + + + (epoch) + + + + + + + + + + + + 295 + 0 + + + + + 295 + 16777215 + + + + + Courier + + + + 32(U32)Heparin Type + + + leDialyzerType + + + + + + + + Courier + + + + 9999999999 + + + 0 + + + 10 + + + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter + + + + + + + + 80 + 0 + + + + + Courier + + + + (enum) + + + + + + + + + + + + 315 + 0 + + + + + 315 + 16777215 + + + + + Courier + + + + 16(U32)Treatment End Date and Time + + + leTreatmentStartDateTime + + + + + + + + Courier + + + + 9999999999 + + + 1620915000 + + + 10 + + + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter + + + + + + + + 80 + 0 + + + + + Courier + + + + (epoch) + + + + + + + + + + + + 295 + 0 + + + + + 295 + 16777215 + + + + + Courier + + + + 33(F32)Average Arterial Pressure + + + leAverageArterialPressure + + + + + + + + Courier + + + + 99999.999 + + + 33.675 + + + 9 + + + + + + + + 80 + 0 + + + + + Courier + + + + (mmHg) + + + + + + + + + + + + 315 + 0 + + + + + 315 + 16777215 + + + + + Courier + + + + 17(F32)Average Blood Flow + + + leAverageBloodFlow + + + + + + + + Courier + + + + 99999.999 + + + 17.234 + + + 9 + + + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter + + + + + + + + 80 + 0 + + + + + Courier + + + + (mL/min) + + + + + + + + + + + + 295 + 0 + + + + + 295 + 16777215 + + + + + Courier + + + + 34(F32)Average Venous Pressure + + + leAverageVenousPressure + + + + + + + + Courier + + + + 99999.999 + + + 34.789 + + + 9 + + + + + + + + 80 + 0 + + + + + Courier + + + + (mmHg) + + + + + + + + + + + + 315 + 0 + + + + + 315 + 16777215 + + + + + Courier + + + + 18(F32)Average Dialysate Flow + + + leAverageDialysateFlow + + + + + + + + Courier + + + + 99999.999 + + + 18.345 + + + 9 + + + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter + + + + + + + + 80 + 0 + + + + + Courier + + + + (mL/min) + + + + + + + + + + + + 295 + 0 + + + + + 295 + 16777215 + + + + + Courier + + + + 35(U32)Device ID + + + leDeviceID + + + + + + + + Courier + + + + 9999 + + + 1234 + + + 4 + + + + + + + + 80 + 0 + + + + + Courier + + + + (string) + + + + + + + + + + + + 315 + 0 + + + + + 315 + 16777215 + + + + + Courier + + + + 19(F32)Dialysate Volume Used + + + leDialysateVolumeUsed + + + + + + + + Courier + + + + 99999.999 + + + 19.456 + + + 9 + + + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter + + + + + + + + 80 + 0 + + + + + Courier + + + + (L) + + + + + + + + + + + + 295 + 0 + + + + + 295 + 16777215 + + + + + Courier + + + + 36(U32)Water Sample Test Result + + + leWaterSampleTestResult + + + + + + + + Courier + + + + 9999999999 + + + 1 + + + 10 + + + + + + + + 80 + 0 + + + + + Courier + + + + (0/1) + + + + + + + + + - + + + + 0 + 0 + + + + + 10 + + + + color: rgb(238, 238, 236); +background-color: rgb(191, 64, 105); + + + Treatment Log Data + + + Qt::AlignCenter + + + + + + + + 10 + + + + Send + + + + + + + + + - 315 + 245 0 - 315 + 245 16777215 @@ -57,36 +2414,36 @@ - 17(F32)Average Blood Flow + 1(U32) Blood Flow Rate - leAverageBloodFlow + leBloodFlowRate - + Courier - 99999.999 + 9999999999 - 17.234 + 1 - 9 + 10 Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter - + 80 @@ -105,19 +2462,19 @@ - - + + - + - 315 + 245 0 - 315 + 245 16777215 @@ -127,15 +2484,15 @@ - 9(U32)Potassium Concentration + 2(U32) Dialysate Flow Rate - lePotassiumConcentration + leDialysateFlowRate - + Courier @@ -145,7 +2502,7 @@ 9999999999 - 9 + 2 10 @@ -156,7 +2513,7 @@ - + 80 @@ -169,25 +2526,25 @@ - (mEq/L) + (mL/min) - - + + - + - 295 + 245 0 - 295 + 245 16777215 @@ -197,15 +2554,82 @@ - 30(F32)Average Arterial Pressure + 3(F32) UF Rate + leTargetUFRate + + + + + + + + Courier + + + + 99999.999 + + + 20.891 + + + 9 + + + + + + + + 80 + 0 + + + + + Courier + + + + (mL/min) + + + + + + + + + + + + 245 + 0 + + + + + 245 + 16777215 + + + + + Courier + + + + 4(F32) Arterial Pressure + + leAverageArterialPressure - + Courier @@ -215,15 +2639,15 @@ 99999.999 - 30.456 + 29.456 9 - + 80 @@ -242,19 +2666,19 @@ - - + + - + - 295 + 245 0 - 295 + 245 16777215 @@ -264,15 +2688,15 @@ - 29(F32)Heparin Delivered Volume + 5(F32) Venous Pressure - leHeparinDeliveredVolume + leAverageVenousPressure - + Courier @@ -282,15 +2706,15 @@ 99999.999 - 29.345 + 30.567 9 - + 80 @@ -303,18 +2727,35 @@ - (mL) + (mmHg) - - + + + + Qt::Vertical + + + + 20 + 40 + + + + + + + + + + - + - + 0 @@ -331,15 +2772,15 @@ background-color: rgb(191, 64, 105); - Treatment Log Data + Treatment Log Alarm Qt::AlignCenter - + 10 @@ -353,18 +2794,18 @@ - + - + - 245 + 165 0 - 245 + 165 16777215 @@ -374,15 +2815,15 @@ - 1(U32) Blood Flow Rate + 1(U32) Alarm ID - leBloodFlowRate + leTreatmentStartDateTime - + Courier @@ -392,7 +2833,7 @@ 9999999999 - 1 + 0 10 @@ -402,39 +2843,21 @@ - - - - - 80 - 0 - - - - - Courier - - - - (mL/min) - - - - + - + - 245 + 165 0 - 245 + 165 16777215 @@ -444,134 +2867,146 @@ - 2(U32) Dialysate Flow Rate + 2(F32) Param 1 - leDialysateFlowRate + leBloodFlowRate - + Courier - 9999999999 + 9999999999.999 - 2 + 41.1 - 10 + 14 Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter - - - - - 80 - 0 - - - - - Courier - - - - (mL/min) - - - + + + + - + + + + 165 + 0 + + + + + 165 + 16777215 + + + + + Courier + + + + 3(F32) Param 2 + + + leBloodFlowRate + + + + + + + + Courier + + + + 9999999999.999 + + + 42.2 + + + 14 + + + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter + + + + + + + + + - - - - 245 - 0 - + + + + 0 + 0 + - - - 245 - 16777215 - - - Courier + 10 - - 3(F32) UF Rate + + color: rgb(238, 238, 236); +background-color: rgb(191, 64, 105); - - leTargetUFRate - - - - - - - - Courier - - - - 99999.999 - - 20.891 + Treatment Log Event - - 9 + + Qt::AlignCenter - - - - 80 - 0 - - + - Courier + 10 - (mL/min) + Send - + - + - 245 + 165 0 - 245 + 165 16777215 @@ -581,64 +3016,49 @@ - 4(F32) Arterial Pressure + 1(U32) Event ID - leAverageArterialPressure + leTreatmentStartDateTime - + Courier - 99999.999 + 9999999999 - 29.456 + 0 - 9 + 10 - - - - - - - 80 - 0 - + + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter - - - Courier - - - - (mmHg) - - + - + - 245 + 165 0 - 245 + 165 16777215 @@ -648,1689 +3068,40 @@ - 5(F32) Venous Pressure + 2(F32) Old - leAverageVenousPressure + leBloodFlowRate - + Courier - 99999.999 + 9999999999.999 - 30.567 + 51.1 - 9 + 14 - - - - - - - 80 - 0 - + + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter - - - Courier - - - - (mmHg) - - - - Qt::Vertical - - - - 20 - 40 - - - - - - - - - - - - - 315 - 0 - - - - - 315 - 16777215 - - - - - Courier - - - - 16(U32)Treatment End Date and Time - - - leTreatmentStartDateTime - - - - - - - - Courier - - - - 9999999999 - - - 1620915000 - - - 10 - - - Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter - - - - - - - - 80 - 0 - - - - - Courier - - - - (epoch) - - - - - - - - - - - - 315 - 0 - - - - - 315 - 16777215 - - - - - Courier - - - - 10(U32)Calcium Concentration - - - leCalciumConcentration - - - - - - - - Courier - - - - 9999999999 - - - 10 - - - 10 - - - Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter - - - - - - - - 80 - 0 - - - - - Courier - - - - (mEq/L) - - - - - - - - - - - - 10 - - - - Accept - - - - - - - - 10 - - - - color: rgb(238, 238, 236); -background-color: rgb(191, 64, 105); - - - Treatment Log Data Response - - - Qt::AlignCenter - - - - - - - - 0 - 0 - - - - - 50 - 0 - - - - reason - - - Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter - - - - - - - - 10 - - - - Reject - - - - - - - - 0 - 0 - - - - - 10 - - - - QFrame::StyledPanel - - - QFrame::Plain - - - - - - - - - - - 0 - 0 - - - - - 10 - - - - - - - - - - - - - 315 - 0 - - - - - 315 - 16777215 - - - - - Courier - - - - 11(U32)Bicarbonate Concentration - - - leBicarbonateConcentration - - - - - - - - Courier - - - - 9999999999 - - - 11 - - - 10 - - - Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter - - - - - - - - 80 - 0 - - - - - Courier - - - - (mEq/L) - - - - - - - - - - - - 315 - 0 - - - - - 315 - 16777215 - - - - - Courier - - - - 18(F32)Average Dialysate Flow - - - leAverageDialysateFlow - - - - - - - - Courier - - - - 99999.999 - - - 18.345 - - - 9 - - - Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter - - - - - - - - 80 - 0 - - - - - Courier - - - - (mL/min) - - - - - - - - - - - - 295 - 0 - - - - - 295 - 16777215 - - - - - Courier - - - - 28(U32)Heparin Stop - - - leHeparinPreStop - - - - - - - - Courier - - - - 9999999999 - - - 28 - - - 10 - - - - - - - - 80 - 0 - - - - - Courier - - - - (min) - - - - - - - - - Qt::Vertical - - - - - - - - - - 315 - 0 - - - - - 315 - 16777215 - - - - - Courier - - - - 8(U32)Bicarbonate Concentrate Type - - - leBicarbonateConcentrateType - - - - - - - - Courier - - - - 9999999999 - - - 0 - - - 10 - - - Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter - - - - - - - - 80 - 0 - - - - - Courier - - - - (enum) - - - - - - - - - - - - 295 - 0 - - - - - 295 - 16777215 - - - - - Courier - - - - 25(U32)Saline Bolus Volume - - - leSalineBolusVolume - - - - - - - - Courier - - - - 9999999999 - - - 25 - - - 10 - - - - - - - - 80 - 0 - - - - - Courier - - - - (mL) - - - - - - - - - - - - 295 - 0 - - - - - 295 - 16777215 - - - - - Courier - - - - 31(F32)Average Venous Pressure - - - leAverageVenousPressure - - - - - - - - Courier - - - - 99999.999 - - - 31.567 - - - 9 - - - - - - - - 80 - 0 - - - - - Courier - - - - (mmHg) - - - - - - - - - - - - 295 - 0 - - - - - 295 - 16777215 - - - - - Courier - - - - 32(U32)Device ID - - - leDeviceID - - - - - - - - Courier - - - - 9999 - - - 1234 - - - 4 - - - - - - - - 80 - 0 - - - - - Courier - - - - (string) - - - - - - - - - - - - 315 - 0 - - - - - 315 - 16777215 - - - - - Courier - - - - 4(U32)Dialysate Flow Rate - - - leDialysateFlowRate - - - - - - - - Courier - - - - 9999999999 - - - 42 - - - 10 - - - Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter - - - - - - - - 80 - 0 - - - - - Courier - - - - (mL/min) - - - - - - - - - - - - 10 - - - - Accept - - - - - - - - 0 - 0 - - - - - 10 - - - - - - - - - 0 - 0 - - - - - 50 - 0 - - - - reason - - - Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter - - - - - - - - 0 - 0 - - - - - 10 - - - - QFrame::StyledPanel - - - QFrame::Plain - - - - - - - - - - - 10 - - - - Reject - - - - - - - - 10 - - - - color: rgb(238, 238, 236); -background-color: rgb(191, 64, 50); - - - Disposables Removal Confirm Response - - - Qt::AlignCenter - - - - - - - - - - - - 315 - 0 - - - - - 315 - 16777215 - - - - - Courier - - - - 14(U32)Dialyzer Type - - - leDialyzerType - - - - - - - - Courier - - - - 9999999999 - - - 2 - - - 10 - - - Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter - - - - - - - - 80 - 0 - - - - - Courier - - - - (enum) - - - - - - - - - - - - 315 - 0 - - - - - 315 - 16777215 - - - - - Courier - - - - 12(U32)Sodium Concentration - - - leSodiumConcentration - - - - - - - - Courier - - - - 9999999999 - - - 12 - - - 10 - - - Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter - - - - - - - - 80 - 0 - - - - - Courier - - - - (mEq/L) - - - - - - - - - - - - 295 - 0 - - - - - 295 - 16777215 - - - - - Courier - - - - 24(F32)Actual UF Rate - - - leActualUFRate - - - - - - - - Courier - - - - 99999.999 - - - 24.912 - - - 9 - - - - - - - - 80 - 0 - - - - - Courier - - - - (mL/min) - - - - - - - - - - - - 315 - 0 - - - - - 315 - 16777215 - - - - - Courier - - - - 7(U32)Acid Concentrate Type - - - leAcidConcentrateType - - - - - - - - Courier - - - - 9999999999 - - - 1 - - - 10 - - - Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter - - - - - - - - 80 - 0 - - - - - Courier - - - - (enum) - - - - - - - - - - - - 315 - 0 - - - - - 315 - 16777215 - - - - - Courier - - - - 3(U32)Blood Flow Rate - - - leBloodFlowRate - - - - - - - - Courier - - - - 9999999999 - - - 41 - - - 10 - - - Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter - - - - - - - - 80 - 0 - - - - - Courier - - - - (mL/min) - - - - - - - - - - - - 315 - 0 - - - - - 315 - 16777215 - - - - - Courier - - - - 6(U32)Actual Treatment Duration - - - leActualTreatmentDuration - - - - - - - - Courier - - - - 9999999999 - - - 120 - - - 10 - - - Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter - - - - - - - - 80 - 0 - - - - - Courier - - - - (sec) - - - - - - - - - - - - 315 - 0 - - - - - 315 - 16777215 - - - - - Courier - - - - 15(U32)Treatment Start Date and Time - - - leTreatmentStartDateTime - - - - - - - - Courier - - - - 9999999999 - - - 1620913600 - - - 10 - - - Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter - - - - - - - - 80 - 0 - - - - - Courier - - - - (epoch) - - - - - - - - - - - - 315 - 0 - - - - - 315 - 16777215 - - - - - Courier - - - - 13(F32)Dialysate Temperature - - - leDialysateTemperature - - - - - - - - Courier - - - - 99999.999 - - - 13.123 - - - 9 - - - Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter - - - - - - - - 80 - 0 - - - - - Courier - - - - (Celsius) - - - - - - - - - + - - - - - - 0 - 0 - - - - - 10 - - - - color: rgb(238, 238, 236); -background-color: rgb(191, 64, 105); - - - Treatment Log Alarm - - - Qt::AlignCenter - - - - - - - - 10 - - - - Send - - - - - - - - - - - - 165 - 0 - - - - - 165 - 16777215 - - - - - Courier - - - - 1(U32) Alarm ID - - - leTreatmentStartDateTime - - - - - - - - Courier - - - - 9999999999 - - - 0 - - - 10 - - - Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter - - - - - - - - - - - - 165 - 0 - - - - - 165 - 16777215 - - - - - Courier - - - - 2(F32) Param 1 - - - leBloodFlowRate - - - - - - - - Courier - - - - 9999999999.999 - - - 41.1 - - - 14 - - - Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter - - - - - - - - - - - + 165 @@ -2349,15 +3120,15 @@ - 3(F32) Param 2 + 3(F32) New leBloodFlowRate - + Courier @@ -2367,7 +3138,7 @@ 9999999999.999 - 42.2 + 51.2 14 @@ -2379,848 +3150,277 @@ - - - - - - - - - 0 - 0 - - - - - 10 - - - - color: rgb(238, 238, 236); -background-color: rgb(191, 64, 105); - - - Treatment Log Event - - - Qt::AlignCenter - - - - - - - - 10 - - - - Send - - - - - - - - - - - - 165 - 0 - - - - - 165 - 16777215 - - - - - Courier - - - - 1(U32) Event ID - - - leTreatmentStartDateTime - - - - - - - - Courier - - - - 9999999999 - - - 0 - - - 10 - - - Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter - - - - - - - - - - - - 165 - 0 - - - - - 165 - 16777215 - - - - - Courier - - - - 2(F32) Old - - - leBloodFlowRate - - - - - - - - Courier - - - - 9999999999.999 - - - 51.1 - - - 14 - - - Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter - - - - - - - - - - - - 165 - 0 - - - - - 165 - 16777215 - - - - - Courier - - - - 3(F32) New - - - leBloodFlowRate - - - - - - - - Courier - - - - 9999999999.999 - - - 51.2 - - - 14 - - - Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter - - - - - - - - - - - Qt::Vertical - - - - 20 - 40 - - - - - - - - - - - 295 - 0 - - - - - 295 - 16777215 - - - - - Courier - - - - 27(F32)Heparin Dispense Rate - - - leHeparinDispenseRate - - - - - - - - Courier - - - - 99999.999 - - - 27.234 - - - 9 - - - - - - - - 80 - 0 - - - - - Courier - - - - (mL/hr) - - - - + + + + Qt::Vertical + + + + 20 + 40 + + + - - - - - - - 295 - 0 - - - - - 295 - 16777215 - - - - - Courier - - - - 26(F32)Heparin Bolus Volume - - - leHeparinBolusVolume - - - - - - - - Courier - - - - 99999.999 - - - 26.123 - - - 9 - - - - - - - - 80 - 0 - - - - - Courier - - - - (mL) - - - - + + + + + + Qt::Vertical + + + + 20 + 40 + + + + + + + + + + + 10 + + + + Accept + + - - - - - - - 295 - 0 - - - - - 295 - 16777215 - - - - - Courier - - - - 33(U32)Water Sample Test Result - - - leWaterSampleTestResult - - - - - - - - Courier - - - - 9999999999 - - - 1 - - - 10 - - - - - - - - 80 - 0 - - - - - Courier - - - - (0/1) - - - - + + + + + 10 + + + + color: rgb(238, 238, 236); +background-color: rgb(191, 64, 105); + + + Treatment Log Data Response + + + Qt::AlignCenter + + - - - - - - - 315 - 0 - - - - - 315 - 16777215 - - - - - Courier - - - - 5(U32)Treatment Duration - - - leTreatmentDuration - - - - - - - - Courier - - - - 9999999999 - - - 480 - - - 10 - - - Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter - - - - - - - - 80 - 0 - - - - - Courier - - - - (sec) - - - - + + + + + 0 + 0 + + + + + 50 + 0 + + + + reason + + + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter + + - - - - - - - 295 - 0 - - - - - 295 - 16777215 - - - - - Courier - - - - 23(F32)Target UF Rate - - - leTargetUFRate - - - - - - - - Courier - - - - 99999.999 - - - 23.891 - - - 9 - - - - - - - - 80 - 0 - - - - - Courier - - - - (mL/min) - - - - + + + + + 10 + + + + Reject + + - - - - - - - 295 - 0 - - - - - 295 - 16777215 - - - - - Courier - - - - 22(F32)Actual UF Volume - - - leActualUFVolume - - - - - - - - Courier - - - - 99999.999 - - - 22.789 - - - 9 - - - - - - - - 80 - 0 - - - - - Courier - - - - (L) - - - - + + + + + 0 + 0 + + + + + 10 + + + + QFrame::StyledPanel + + + QFrame::Plain + + + + + - - - - - - - 295 - 0 - - - - - 295 - 16777215 - - - - - Courier - - - - 21(F32)Target UF Volume - - - leTargetUFVolume - - - - - - - - Courier - - - - 99999.999 - - - 21.678 - - - 9 - - - - - - - - 80 - 0 - - - - - Courier - - - - (L) - - - - + + + + + 0 + 0 + + + + + 10 + + + - - - - - - - 295 - 0 - - - - - 295 - 16777215 - - - - - Courier - - - - 20(F32)Average Dialysate Temp - - - leAverageDialysateTemp - - - - - - - - Courier - - - - 99999.999 - - - 20.567 - - - 9 - - - Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter - - - - - - - - 80 - 0 - - - - - Courier - - - - (Celsius) - - - - + + + + + + + 10 + + + + color: rgb(238, 238, 236); +background-color: rgb(191, 64, 105); + + + Post Treatment + + + Qt::AlignCenter + + + + + + + + + + 10 + + + + Accept + + - - - - - - 295 - 0 - - - - - 295 - 16777215 - - - - - Courier - - - - 19(F32)Dialysate Volume Used - - - leDialysateVolumeUsed - - - - - - - - Courier - - - - 99999.999 - - - 19.456 - - - 9 - - - Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter - - - - - - - - 80 - 0 - - - - - Courier - - - - (L) - - - - + + + + 0 + 0 + + + + + 10 + + + + + + + + 0 + 0 + + + + + 50 + 0 + + + + reason + + + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter + + + + + + + + 0 + 0 + + + + + 10 + + + + QFrame::StyledPanel + + + QFrame::Plain + + + + + + + + + + + 10 + + + + Reject + + + + + + + + 10 + + + + color: rgb(238, 238, 236); +background-color: rgb(191, 64, 50); + + + Disposables Removal Confirm Response + + + Qt::AlignCenter + + + - - + + Qt::Vertical - - - 20 - 40 - - - + Index: simulator/plugins/postTreatment/loader.py =================================================================== diff -u -r80e41aa60d1fe7534b4c082f087f708afb89c38d -rf25c9bd941b70a9c0c85271d9e5e91142d78cb63 --- simulator/plugins/postTreatment/loader.py (.../loader.py) (revision 80e41aa60d1fe7534b4c082f087f708afb89c38d) +++ simulator/plugins/postTreatment/loader.py (.../loader.py) (revision f25c9bd941b70a9c0c85271d9e5e91142d78cb63) @@ -49,15 +49,18 @@ leDialysateVolumeUsed: QtWidgets.QLineEdit leAverageDialysateTemp: QtWidgets.QLineEdit + leOriginUFVolume: QtWidgets.QLineEdit leTargetUFVolume: QtWidgets.QLineEdit leActualUFVolume: QtWidgets.QLineEdit + leOriginUFRate: QtWidgets.QLineEdit leTargetUFRate: QtWidgets.QLineEdit leActualUFRate: QtWidgets.QLineEdit leSalineBolusVolume: QtWidgets.QLineEdit leHeparinBolusVolume: QtWidgets.QLineEdit leHeparinDispenseRate: QtWidgets.QLineEdit leHeparinPreStop: QtWidgets.QLineEdit leHeparinDeliveredVolume: QtWidgets.QLineEdit + leHeparinType: QtWidgets.QLineEdit leAverageArterialPressure: QtWidgets.QLineEdit leAverageVenousPressure: QtWidgets.QLineEdit leDeviceID: QtWidgets.QLineEdit @@ -117,15 +120,18 @@ self.leDialysateVolumeUsed = self.find_line_edit('leDialysateVolumeUsed') self.leAverageDialysateTemp = self.find_line_edit('leAverageDialysateTemp') + self.leOriginUFVolume = self.find_line_edit('leOriginUFVolume') self.leTargetUFVolume = self.find_line_edit('leTargetUFVolume') self.leActualUFVolume = self.find_line_edit('leActualUFVolume') + self.leOriginUFRate = self.find_line_edit('leOriginUFRate') self.leTargetUFRate = self.find_line_edit('leTargetUFRate') self.leActualUFRate = self.find_line_edit('leActualUFRate') self.leSalineBolusVolume = self.find_line_edit('leSalineBolusVolume') self.leHeparinBolusVolume = self.find_line_edit('leHeparinBolusVolume') self.leHeparinDispenseRate = self.find_line_edit('leHeparinDispenseRate') self.leHeparinPreStop = self.find_line_edit('leHeparinPreStop') self.leHeparinDeliveredVolume = self.find_line_edit('leHeparinDeliveredVolume') + self.leHeparinType = self.find_line_edit('leHeparinType') self.leAverageArterialPressure = self.find_line_edit('leAverageArterialPressure') self.leAverageVenousPressure = self.find_line_edit('leAverageVenousPressure') self.leDeviceID = self.find_line_edit('leDeviceID') @@ -257,15 +263,18 @@ float(self.leAverageDialysateFlow.text()), float(self.leDialysateVolumeUsed.text()), float(self.leAverageDialysateTemp.text()), + float(self.leOriginUFVolume.text()), float(self.leTargetUFVolume.text()), float(self.leActualUFVolume.text()), + float(self.leOriginUFRate.text()), float(self.leTargetUFRate.text()), float(self.leActualUFRate.text()), int(self.leSalineBolusVolume.text()), float(self.leHeparinBolusVolume.text()), float(self.leHeparinDispenseRate.text()), int(self.leHeparinPreStop.text()), float(self.leHeparinDeliveredVolume.text()), + int(self.leHeparinType.text()), float(self.leAverageArterialPressure.text()), float(self.leAverageVenousPressure.text()), int(self.leDeviceID.text()), Index: simulator/run.py =================================================================== diff -u -r967521dff94783ce48b50abc8db6bcd67bb501bf -rf25c9bd941b70a9c0c85271d9e5e91142d78cb63 --- simulator/run.py (.../run.py) (revision 967521dff94783ce48b50abc8db6bcd67bb501bf) +++ simulator/run.py (.../run.py) (revision f25c9bd941b70a9c0c85271d9e5e91142d78cb63) @@ -9,7 +9,7 @@ from simulator.interface import SimulationInterface -def main(): +def main(hd_auto_response=False, dg_auto_response=False): """ the main function which initializes the Simulator and starts it. :return: none @@ -19,7 +19,7 @@ # create qt application app = QtWidgets.QApplication(sys.argv) - simulator = Simulator() + simulator = Simulator(hd_auto_response, dg_auto_response) simulator.show() SimulationInterface.hd_instance_counter_check() @@ -34,4 +34,4 @@ if __name__ == "__main__": QtCore.QCoreApplication.setAttribute(QtCore.Qt.AA_ShareOpenGLContexts) - main() + main(True, False) Index: simulator/simulator/interface.py =================================================================== diff -u -r4da03e2d7ca1895efdbdff0c59114cdca1bfd6b7 -rf25c9bd941b70a9c0c85271d9e5e91142d78cb63 --- simulator/simulator/interface.py (.../interface.py) (revision 4da03e2d7ca1895efdbdff0c59114cdca1bfd6b7) +++ simulator/simulator/interface.py (.../interface.py) (revision f25c9bd941b70a9c0c85271d9e5e91142d78cb63) @@ -15,9 +15,9 @@ dg: DGSimulator = None alarm: HDAlarmsSimulator = None - def __init__(self): - self.hd = HDSimulator(console_out=True, passive_mode=False) - self.dg = DGSimulator(console_out=True, passive_mode=False) + def __init__(self, hd_auto_response=False, dg_auto_response=False): + self.hd = HDSimulator(console_out=True, passive_mode=False, auto_response=hd_auto_response) + self.dg = DGSimulator(console_out=True, passive_mode=False, auto_response=dg_auto_response) self.alarm = HDAlarmsSimulator(self.hd.can_interface, self.hd.logger) @staticmethod Index: simulator/simulator/simulator.py =================================================================== diff -u -r967521dff94783ce48b50abc8db6bcd67bb501bf -rf25c9bd941b70a9c0c85271d9e5e91142d78cb63 --- simulator/simulator/simulator.py (.../simulator.py) (revision 967521dff94783ce48b50abc8db6bcd67bb501bf) +++ simulator/simulator/simulator.py (.../simulator.py) (revision f25c9bd941b70a9c0c85271d9e5e91142d78cb63) @@ -31,8 +31,8 @@ plugins = [] - def __init__(self): - super().__init__(os.path.dirname(__file__), SimulationInterface()) + def __init__(self, hd_auto_response=False, dg_auto_response=False): + super().__init__(os.path.dirname(__file__), SimulationInterface(hd_auto_response, dg_auto_response)) if self.__check_can_bus(): self.__init_plugins()