Index: sources/gui/qml/components/SliderCreateTreatment.qml =================================================================== diff -u -rfe1cc7af9637a8485b6948b50eb5fb06e4c83740 -rfac59d7894468db257f120e58e19324a32fcbe0f --- sources/gui/qml/components/SliderCreateTreatment.qml (.../SliderCreateTreatment.qml) (revision fe1cc7af9637a8485b6948b50eb5fb06e4c83740) +++ sources/gui/qml/components/SliderCreateTreatment.qml (.../SliderCreateTreatment.qml) (revision fac59d7894468db257f120e58e19324a32fcbe0f) @@ -87,7 +87,7 @@ step : Variables.bloodFlowResolution ticks : true onValueChanged: { - _selected_value.text = value + _root.units + _selected_value.text = value + " " + _root.units sliderChanged() } Index: sources/gui/qml/components/SliderDoubleCreateTreatment.qml =================================================================== diff -u -rfe1cc7af9637a8485b6948b50eb5fb06e4c83740 -rfac59d7894468db257f120e58e19324a32fcbe0f --- sources/gui/qml/components/SliderDoubleCreateTreatment.qml (.../SliderDoubleCreateTreatment.qml) (revision fe1cc7af9637a8485b6948b50eb5fb06e4c83740) +++ sources/gui/qml/components/SliderDoubleCreateTreatment.qml (.../SliderDoubleCreateTreatment.qml) (revision fac59d7894468db257f120e58e19324a32fcbe0f) @@ -112,7 +112,7 @@ step : Variables.bloodFlowResolution ticks : true onValueChanged: { - _lowSelectedValue.text = value + _root.lowUnits; + _lowSelectedValue.text = value + " " + _root.lowUnits; lowSliderChanged() } onActiveChanged: { @@ -165,7 +165,7 @@ step : Variables.bloodFlowResolution ticks : true onValueChanged: { - _highSelectedValue.text = value + _root.highUnits; + _highSelectedValue.text = value + " " + _root.highUnits; highSliderChanged() } Index: sources/gui/qml/globals/Variables.qml =================================================================== diff -u -r7edcaf054062754370e0abd165f17ca9941b7d07 -rfac59d7894468db257f120e58e19324a32fcbe0f --- sources/gui/qml/globals/Variables.qml (.../Variables.qml) (revision 7edcaf054062754370e0abd165f17ca9941b7d07) +++ sources/gui/qml/globals/Variables.qml (.../Variables.qml) (revision fac59d7894468db257f120e58e19324a32fcbe0f) @@ -76,7 +76,7 @@ readonly property int progressbarRectWidth : 620 readonly property int sliderTextMargin : 20 - readonly property int cTreatmentSpacing : 60 + readonly property int treatmentSpacing : 60 readonly property int notificationHeight : 50 readonly property int notificationIconSize : 36 @@ -121,5 +121,7 @@ // - Fluid readonly property string unitTextSaline : qsTr("mL") readonly property string unitTextHeparin : qsTr("mL") + // - Create Treatment + readonly property string unitTextBPMeasurementInterval : qsTr("min") } Index: sources/gui/qml/pages/treatment/TreatmentBegin.qml =================================================================== diff -u -r810e4b12507feba688c3ea2ab045040214661298 -rfac59d7894468db257f120e58e19324a32fcbe0f --- sources/gui/qml/pages/treatment/TreatmentBegin.qml (.../TreatmentBegin.qml) (revision 810e4b12507feba688c3ea2ab045040214661298) +++ sources/gui/qml/pages/treatment/TreatmentBegin.qml (.../TreatmentBegin.qml) (revision fac59d7894468db257f120e58e19324a32fcbe0f) @@ -45,8 +45,7 @@ } - Flickable { - id: _flickable + Flickable { id: _flickable anchors.top: _topMenuBar.bottom anchors.left: parent.left anchors.bottom: parent.bottom @@ -55,9 +54,19 @@ contentHeight: _column.implicitHeight clip: true - Column { - id: _column - spacing: Variables.cTreatmentSpacing + ScrollBar.vertical: ScrollBar { id: _scrollBar + anchors.right: _flickable.right + anchors.rightMargin: 3 + contentItem: Rectangle { + color: Colors.backgroundRangeRect + implicitWidth: 6 + radius: width / 2 + width: 3 + } + } + + Column { id: _column + spacing: Variables.treatmentSpacing anchors.horizontalCenter: parent.horizontalCenter; anchors.fill: parent; @@ -78,37 +87,6 @@ } } - states: [ - State { - when: _flickable.movingVertically - PropertyChanges { - target: _verticalScrollBar - opacity: 0.8 - } - } - ] - - ScrollBar { - anchors.top: _flickable.top - anchors.bottom: _flickable.bottom - id: _verticalScrollBar - size: _flickable.height / _column.implicitHeight - active: true - anchors.right: _flickable.right - anchors.rightMargin: 5 - opacity: 0 - orientation: Qt.Vertical - position: _flickable.visibleArea.yPosition - - contentItem: Rectangle { - color: Colors.backgroundRangeRect - implicitWidth: 6 - radius: width / 2 - width: 3 - } - - } - onVisibleChanged: { if (visible) { _mainMenu.hidden = true Index: sources/gui/qml/pages/treatment/TreatmentConfirm.qml =================================================================== diff -u -r810e4b12507feba688c3ea2ab045040214661298 -rfac59d7894468db257f120e58e19324a32fcbe0f --- sources/gui/qml/pages/treatment/TreatmentConfirm.qml (.../TreatmentConfirm.qml) (revision 810e4b12507feba688c3ea2ab045040214661298) +++ sources/gui/qml/pages/treatment/TreatmentConfirm.qml (.../TreatmentConfirm.qml) (revision fac59d7894468db257f120e58e19324a32fcbe0f) @@ -55,9 +55,20 @@ contentHeight: _column.implicitHeight clip: true + ScrollBar.vertical: ScrollBar { id: _scrollBar + anchors.right: _flickable.right + anchors.rightMargin: 3 + contentItem: Rectangle { + color: Colors.backgroundRangeRect + implicitWidth: 6 + radius: width / 2 + width: 3 + } + } + Column { id: _column - spacing: Variables.cTreatmentSpacing + spacing: Variables.treatmentSpacing anchors.horizontalCenter: parent.horizontalCenter; anchors.fill: parent; @@ -79,37 +90,6 @@ } } - states: [ - State { - when: _flickable.movingVertically - PropertyChanges { - target: _verticalScrollBar - opacity: 0.8 - } - } - ] - - ScrollBar { - anchors.top: _flickable.top - anchors.bottom: _flickable.bottom - id: _verticalScrollBar - size: _flickable.height / _column.implicitHeight - active: true - anchors.right: _flickable.right - anchors.rightMargin: 5 - opacity: 0 - orientation: Qt.Vertical - position: _flickable.visibleArea.yPosition - - contentItem: Rectangle { - color: Colors.backgroundRangeRect - implicitWidth: 6 - radius: width / 2 - width: 3 - } - - } - onVisibleChanged: { if (visible) { _mainMenu.hidden = true Index: sources/gui/qml/pages/treatment/TreatmentCreate.qml =================================================================== diff -u -r2c35a3fa17eef76c7a47578974b928c03f67c83d -rfac59d7894468db257f120e58e19324a32fcbe0f --- sources/gui/qml/pages/treatment/TreatmentCreate.qml (.../TreatmentCreate.qml) (revision 2c35a3fa17eef76c7a47578974b928c03f67c83d) +++ sources/gui/qml/pages/treatment/TreatmentCreate.qml (.../TreatmentCreate.qml) (revision fac59d7894468db257f120e58e19324a32fcbe0f) @@ -44,8 +44,7 @@ } - Flickable { - id: _flickable + Flickable { id: _flickable anchors.top: _topMenuBar.bottom anchors.left: parent.left anchors.bottom: parent.bottom @@ -54,9 +53,19 @@ contentHeight: _column.implicitHeight clip: true - Column { - id: _column - spacing: Variables.cTreatmentSpacing + ScrollBar.vertical: ScrollBar { id: _scrollBar + anchors.right: _flickable.right + anchors.rightMargin: 3 + contentItem: Rectangle { + color: Colors.backgroundRangeRect + implicitWidth: 6 + radius: width / 2 + width: 3 + } + } + + Column { id: _column + spacing: Variables.treatmentSpacing anchors.horizontalCenter: parent.horizontalCenter; anchors.fill: parent; @@ -76,114 +85,105 @@ } - SliderCreateTreatment { - id: _bloodFlowRate + SliderCreateTreatment { id: _bloodFlowRate objectName: "_bloodFlowRate" sliderObjectName: objectName + "Slider" selectedValueObjectName: objectName + "Value" - text: "Blood Flow Rate" - units: qsTr(" mL/min") + text: qsTr("Blood Flow Rate") + units: qsTr("mL/min") min: vCreateTreatment.bloodFlowRateMin max: vCreateTreatment.bloodFlowRateMax onSliderChanged: { vCreateTreatment.bloodFlowRate = value; } } - SliderCreateTreatment { - id: _dialysateFlowRate + SliderCreateTreatment { id: _dialysateFlowRate objectName: "_dialysateFlowRate" sliderObjectName: objectName + "Slider" selectedValueObjectName: objectName + "Value" - text: "Dialysate Flow Rate" - units: qsTr(" mL/min") + text: qsTr("Dialysate Flow Rate") + units: qsTr("mL/min") min: vCreateTreatment.dialysateFlowRateMin max: vCreateTreatment.dialysateFlowRateMax onSliderChanged: { vCreateTreatment.dialysateFlowRate = value; } } - SliderCreateTreatment { - id: _duration + SliderCreateTreatment { id: _duration objectName: "_duration" sliderObjectName: objectName + "Slider" selectedValueObjectName: objectName + "Value" - text: "Duration" - units: qsTr(" min") + text: qsTr("Duration") + units: qsTr("min") min: vCreateTreatment.durationMin max: vCreateTreatment.durationMax onSliderChanged: { vCreateTreatment.duration = value; } } - SliderCreateTreatment { - id: _heparinDispensingRate + SliderCreateTreatment { id: _heparinDispensingRate objectName: "_heparinDispensingRate" sliderObjectName: objectName + "Slider" selectedValueObjectName: objectName + "Value" - text: "Heparin Dispensing Rate" - units: qsTr(" mL/hr") + text: qsTr("Heparin Dispensing Rate") + units: qsTr("mL/hr") min: vCreateTreatment.heparinDispensingRateMin max: vCreateTreatment.heparinDispensingRateMax onSliderChanged: { vCreateTreatment.heparinDispensingRate = value; } } - SliderCreateTreatment { - id: _heparinBolusVolume + SliderCreateTreatment { id: _heparinBolusVolume objectName: "_heparinBolusVolume" sliderObjectName: objectName + "Slider" selectedValueObjectName: objectName + "Value" - text: "Heparin Bolus Volume" - units: qsTr(" mL") + text: qsTr("Heparin Bolus Volume") + units: qsTr("mL") min: vCreateTreatment.heparinBolusVolumeMin max: vCreateTreatment.heparinBolusVolumeMax onSliderChanged: { vCreateTreatment.heparinBolusVolume = value; } } - SliderCreateTreatment { - id: _heparinStopTime + SliderCreateTreatment { id: _heparinStopTime objectName: "_heparinStopTime" sliderObjectName: objectName + "Slider" selectedValueObjectName: objectName + "Value" - text: "Heparin Stop Time" - units: qsTr(" min") + text: qsTr("Heparin Stop Time") + units: qsTr("min") min: vCreateTreatment.heparinStopTimeMin max: vCreateTreatment.heparinStopTimeMax onSliderChanged: { vCreateTreatment.heparinStopTime = value; } } - RectSelectCreateTreatment { - id: _salineBolus + RectSelectCreateTreatment { id: _salineBolus objectName: "_salineBolusRect" - name: "Saline Bolus" + name: qsTr("Saline Bolus") buttonNames: vCreateTreatment.salineBolusOptions onButtonClicked: { vCreateTreatment.salineBolusVolume = selectedIndex; } } - RectSelectCreateTreatment { - id: _acidConcentrate + RectSelectCreateTreatment { id: _acidConcentrate objectName: "_acidConcentrateRect" - name: "Acid Concentrate" + name: qsTr("Acid Concentrate") buttonNames: vCreateTreatment.acidConcentrateOptions; onButtonClicked: { vCreateTreatment.acidConcentrate = selectedIndex; } } - RectSelectCreateTreatment { - id: _bicarbonateConcentrate + RectSelectCreateTreatment { id: _bicarbonateConcentrate objectName: "_bicarbonateConcentrateRect" - name: "Bicarbonate Concentrate" + name: qsTr("Bicarbonate Concentrate") numRows: 1 numCols: 2 buttonNames: vCreateTreatment.bicarbonateConcentrateOptions; @@ -192,10 +192,9 @@ } } - RectSelectCreateTreatment { - id: _dialyzerType + RectSelectCreateTreatment { id: _dialyzerType objectName: "_dialyzerTypeRect" - name: "Dialyzer Type" + name: qsTr("Dialyzer Type") numRows: 3 numCols: 2 buttonNames: vCreateTreatment.dialyzerTypeOptions; @@ -204,13 +203,12 @@ } } - SliderCreateTreatment { - id: _dialysateTemperature + SliderCreateTreatment { id: _dialysateTemperature objectName: "_dialysateTemperature" sliderObjectName: objectName + "Slider" selectedValueObjectName: objectName + "Value" - text: "Dialysate Temperature" - units: qsTr(" C") + text: qsTr("Dialysate Temperature") + units: qsTr("C") step: 0.1 min: vCreateTreatment.dialysateTempMin max: vCreateTreatment.dialysateTempMax @@ -219,26 +217,24 @@ } } - Text { - id: _arterialPressureLimitsTitle - text: "Arterial Pressure Limits" + Text { id: _arterialPressureLimitsTitle + text: qsTr("Arterial Pressure Limits") anchors.left: _arterialPressureLimits.left font.pixelSize: Fonts.fontPixelFluidText color: Colors.textMain; } - SliderDoubleCreateTreatment { - id: _arterialPressureLimits + SliderDoubleCreateTreatment { id: _arterialPressureLimits objectName: "_arterialPressureLimits" lowSliderObjectName: objectName + "LowSlider" lowSelectedValueObjectName: objectName + "LowValue" highSliderObjectName: objectName + "HighSlider" highSelectedValueObjectName: objectName + "HighValue" - lowTitle: "Low" - lowUnits: " mmHg" - highTitle: "High" - highUnits: " mmHg" + lowTitle: qsTr("Low") + lowUnits: qsTr("mmHg") + highTitle: qsTr("High") + highUnits: qsTr("mmHg") lowMin: vCreateTreatment.arterialPressureLimitLowMin lowMax: vCreateTreatment.arterialPressureLimitLowMax highMin: vCreateTreatment.arterialPressureLimitHighMin @@ -254,26 +250,24 @@ } - Text { - id: _venousPressureLimitsTitle - text: "Venous Pressure Limits" + Text { id: _venousPressureLimitsTitle + text: qsTr("Venous Pressure Limits") anchors.left: _venousPressureLimits.left font.pixelSize: Fonts.fontPixelFluidText color: Colors.textMain; } - SliderDoubleCreateTreatment { - id: _venousPressureLimits + SliderDoubleCreateTreatment { id: _venousPressureLimits objectName: "_venousPressureLimits" lowSliderObjectName: objectName + "LowSlider" lowSelectedValueObjectName: objectName + "LowValue" highSliderObjectName: objectName + "HighSlider" highSelectedValueObjectName: objectName + "HighValue" - lowTitle: "Low" - lowUnits: " mmHg" - highTitle: "High" - highUnits: " mmHg" + lowTitle: qsTr("Low") + lowUnits: Variables.unitTextBloodPressure + highTitle: qsTr("High") + highUnits: Variables.unitTextBloodPressure lowMin: vCreateTreatment.venousPressureLimitLowMin lowMax: vCreateTreatment.venousPressureLimitLowMax highMin: vCreateTreatment.venousPressureLimitHighMin @@ -288,13 +282,12 @@ } } - SliderCreateTreatment { - id: _bloodPressureMeasurementInterval + SliderCreateTreatment { id: _bloodPressureMeasurementInterval objectName: "_bloodPressureMeasurementInterval" sliderObjectName: objectName + "Slider" selectedValueObjectName: objectName + "Value" - text: "Blood Pressure Measurement Interval" - units: qsTr(" min") + text: qsTr("Blood Pressure Measurement Interval") + units: Variables.unitTextBPMeasurementInterval min: vCreateTreatment.bloodPressureMeasureIntervalMin max: vCreateTreatment.bloodPressureMeasureIntervalMax step: 1 @@ -304,13 +297,12 @@ } } - SliderCreateTreatment { - id: _rinsebackFlowRate + SliderCreateTreatment { id: _rinsebackFlowRate objectName: "_rinsebackFlowRate" sliderObjectName: objectName + "Slider" selectedValueObjectName: objectName + "Value" - text: "Rinseback Flow Rate" - units: qsTr(" mL/min") + text: qsTr("Rinseback Flow Rate") + units: Variables.unitTextFlowRate min: vCreateTreatment.rinsebackFlowRateMin max: vCreateTreatment.rinsebackFlowRateMax step: 1 @@ -349,37 +341,6 @@ } } - states: [ - State { - when: _flickable.movingVertically - PropertyChanges { - target: _verticalScrollBar - opacity: 0.8 - } - } - ] - - ScrollBar { - anchors.top: _flickable.top - anchors.bottom: _flickable.bottom - id: _verticalScrollBar - size: _flickable.height / _column.implicitHeight - active: true - anchors.right: _flickable.right - anchors.rightMargin: 5 - opacity: 0 - orientation: Qt.Vertical - position: _flickable.visibleArea.yPosition - - contentItem: Rectangle { - color: Colors.backgroundRangeRect - implicitWidth: 6 - radius: width / 2 - width: 3 - } - - } - onVisibleChanged: { if (visible) { _mainMenu.hidden = true @@ -397,7 +358,6 @@ } onResetCreateTreatment: { - console.log("resetting create treatment"); _bloodFlowRate.isActive = false; _dialysateFlowRate.isActive = false; _duration.isActive = false; @@ -422,92 +382,74 @@ } onFwValidationFailed: { - console.debug("Fw validation failed: " + reason) } onBloodFlowRate_ValidationFailed: { - 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) } } Index: sources/gui/qml/pages/treatment/TreatmentPrime.qml =================================================================== diff -u -rf463d5a69bb97d84de2c835984619ac18c574da2 -rfac59d7894468db257f120e58e19324a32fcbe0f --- sources/gui/qml/pages/treatment/TreatmentPrime.qml (.../TreatmentPrime.qml) (revision f463d5a69bb97d84de2c835984619ac18c574da2) +++ sources/gui/qml/pages/treatment/TreatmentPrime.qml (.../TreatmentPrime.qml) (revision fac59d7894468db257f120e58e19324a32fcbe0f) @@ -17,7 +17,6 @@ // Qt import QtQuick 2.12 import QtQuick.Controls 2.12 -import QtQuick.Layouts 1.12 // Project // Qml imports @@ -45,8 +44,7 @@ } - Flickable { - id: _flickable + Flickable { id: _flickable anchors.top: _topMenuBar.bottom anchors.left: parent.left anchors.bottom: parent.bottom @@ -55,9 +53,19 @@ contentHeight: _column.implicitHeight clip: true - Column { - id: _column - spacing: Variables.cTreatmentSpacing + ScrollBar.vertical: ScrollBar { id: _scrollBar + anchors.right: _flickable.right + anchors.rightMargin: 3 + contentItem: Rectangle { + color: Colors.backgroundRangeRect + implicitWidth: 6 + radius: width / 2 + width: 3 + } + } + + Column { id: _column + spacing: Variables.treatmentSpacing anchors.horizontalCenter: parent.horizontalCenter; anchors.fill: parent; @@ -68,7 +76,7 @@ font.pixelSize: Fonts.fontPixelTitle } - TouchRect { id : _continueRect + TouchRect { anchors.horizontalCenter: parent.horizontalCenter text.text: qsTr("CONTINUE TO TREATMENT") button.onClicked: { @@ -78,36 +86,6 @@ } } - states: [ - State { - when: _flickable.movingVertically - PropertyChanges { - target: _verticalScrollBar - opacity: 0.8 - } - } - ] - - ScrollBar { - anchors.top: _flickable.top - anchors.bottom: _flickable.bottom - id: _verticalScrollBar - size: _flickable.height / _column.implicitHeight - active: true - anchors.right: _flickable.right - anchors.rightMargin: 5 - opacity: 0 - orientation: Qt.Vertical - position: _flickable.visibleArea.yPosition - - contentItem: Rectangle { - color: Colors.backgroundRangeRect - implicitWidth: 6 - radius: width / 2 - width: 3 - } - } - onVisibleChanged: { if (visible) { _mainMenu.hidden = true