Index: sources/gui/qml/pages/treatment/TreatmentCreate.qml =================================================================== diff -u -rc71deaab48699cffdf9db816dfac2778d79c2238 -r2d09ae36f6b791e0415a87b6f14f582d4b434d7d --- sources/gui/qml/pages/treatment/TreatmentCreate.qml (.../TreatmentCreate.qml) (revision c71deaab48699cffdf9db816dfac2778d79c2238) +++ sources/gui/qml/pages/treatment/TreatmentCreate.qml (.../TreatmentCreate.qml) (revision 2d09ae36f6b791e0415a87b6f14f582d4b434d7d) @@ -28,6 +28,7 @@ * which is the default screen in the "Manager" stack */ ScreenItem { id: _root + objectName: "TreatmentCreate"; // SquishQt testability signal clickedBack() signal clickedContinue() backgroundRect.color: Colors.backgroundMainMenu @@ -81,7 +82,6 @@ units: qsTr(" mL/min") min: vCreateTreatment.bloodFlowRateMin max: vCreateTreatment.bloodFlowRateMax - value: vCreateTreatment.bloodFlowRate onSliderChanged: { vCreateTreatment.bloodFlowRate = value; } @@ -172,7 +172,7 @@ } RectSelectCreateTreatment { - id: _dialyserType + id: _dialyzerType name: "Dialyzer Type" numRows: 3 numCols: 2 @@ -213,6 +213,8 @@ lowMax: vCreateTreatment.arterialPressureLimitLowMax highMin: vCreateTreatment.arterialPressureLimitHighMin highMax: vCreateTreatment.arterialPressureLimitHighMax + lowValue: vCreateTreatment.arterialPressureLimitLowMin + highValue: vCreateTreatment.arterialPressureLimitHighMin onLowSliderChanged: { vCreateTreatment.arterialPressureLimitLow = lowValue } @@ -241,6 +243,8 @@ lowMax: vCreateTreatment.venousPressureLimitLowMax highMin: vCreateTreatment.venousPressureLimitHighMin highMax: vCreateTreatment.venousPressureLimitHighMax + lowValue: vCreateTreatment.venousPressureLimitLowMin + highValue: vCreateTreatment.venousPressureLimitHighMin onLowSliderChanged: { vCreateTreatment.venousPressureLimitLow = lowValue } @@ -282,7 +286,7 @@ borderColor: Colors.createTreatmentNotReady textColor: Colors.createTrTextNotReady button.onClicked: { - console.log("continue enabled: " + vCreateTreatment.continueEnabled); + vCreateTreatment.saveTreatmentProfile = false; if (vCreateTreatment.continueEnabled) { _root.clickedContinue() } @@ -363,7 +367,7 @@ _salineBolus.setActive(false); _acidConcentrate.setActive(false); _bicarbonateConcentrate.setActive(false); - _dialyserType.setActive(false); + _dialyzerType.setActive(false); _dialysateTemperature.isActive = false; _arterialPressureLimits.isLowActive = false; @@ -376,12 +380,99 @@ } onFwValidationFailed: { - console.debug("Fw validation failed: " + reason); + console.debug("Fw validation failed: " + reason) } onBloodFlowRate_ValidationFailed: { - console.debug("Blood flow validation failed: " + reason); + console.debug("Blood flow validation failed: " + reason) + _bloodFlowRate.setValid(false) } + + onDialysateFlowRate_ValidationFailed: { + console.debug("Dialysate flow rate validation failed: " + reason) + _dialysateFlowRate.setValid(false) + } + + + onDuration_ValidationFailed: { + console.debug("Duration validation failed: " + reason) + _duration.setValid(false) + } + + onHeparinDispensingRate_ValidationFailed: { + console.debug("Heparin dispensing rate validation failed: " + reason) + _heparinDispensingRate.setValid(false) + } + + onHeparinBolusVolume_ValidationFailed: { + console.debug("Heparin bolus volume validation failed: " + reason) + _heparinBolusVolume.setValid(false) + } + + onHeparinStopTime_ValidationFailed: { + console.debug("Heparin stop time validation failed: " + reason) + _heparinStopTime.setValid(false) + + } + + onSalineBolusVolume_ValidationFailed: { + console.debug("Saline bolus volume validation failed: " + reason) + _salineBolus.setValid(false) + + } + + onAcidConcentrate_ValidationFailed: { + console.debug("Acid concentrate validation failed: " + reason) + _acidConcentrate.setValid(false) + + } + + onBicarbonateConcentrate_ValidationFailed: { + console.debug("Bicarbonate concentrate validation failed: " + reason) + _bicarbonateConcentrate.setValid(false) + } + + onDialyzerType_ValidationFailed: { + console.debug("Dialyzer type validation failed: " + reason) + _dialyzerType.setValid(false) + } + + onDialysateTemp_ValidationFailed: { + console.debug("Dialysate temp validation failed: " + reason) + _dialysateTemperature.setValid(false) + } + + onArterialPressureLimitLow_ValidationFailed: { + console.debug("Arterial pressure limit low validation failed: " + reason) + _arterialPressureLimits.setLowValid(false) + } + + onArterialPressureLimitHigh_ValidationFailed: { + console.debug("Arterial pressure limit high validation failed: " + reason) + _arterialPressureLimits.setHighValid(false) + } + + onVenousPressureLimitLow_ValidationFailed: { + console.debug("Venous pressure limit low validation failed: " + reason) + _venousPressureLimits.setLowValid(false) + } + + onVenousPressureLimitHigh_ValidationFailed: { + console.debug("Venous pressure limit high validation failed: " + reason) + _venousPressureLimits.setHighValid(false) + } + + onBloodPressureMeasureInterval_ValidationFailed: { + console.debug("Blood pressure measure interval validation failed: " + reason) + _bloodPressureMeasurementInterval.setValid(false) + } + + onRinsebackFlowRate_ValidationFailed: { + console.debug("Rinseback flow rate validation failed: " + reason) + _rinsebackFlowRate.setValid(false) + } + + }