Index: denali.pro.user =================================================================== diff -u -r28f3f8dd18981262995386d29d3c2ab31418bfc4 -reefe8acbe5b10deb379c5e4ceabeaa95d429410e --- denali.pro.user (.../denali.pro.user) (revision 28f3f8dd18981262995386d29d3c2ab31418bfc4) +++ denali.pro.user (.../denali.pro.user) (revision eefe8acbe5b10deb379c5e4ceabeaa95d429410e) @@ -1,6 +1,6 @@ - + EnvironmentId @@ -100,11 +100,11 @@ qmake QtProjectManager.QMakeBuildStep - false + true false false - false + true true @@ -1182,8 +1182,8 @@ true true false - false - true + true + false /home/denali/Projects/tmp/build/denali-Desktop_Qt_5_12_5_GCC_64bit-Debug Index: denali.qrc =================================================================== diff -u -r820a00638e0573a5b0c51ed0b3e38d605d4400be -reefe8acbe5b10deb379c5e4ceabeaa95d429410e --- denali.qrc (.../denali.qrc) (revision 820a00638e0573a5b0c51ed0b3e38d605d4400be) +++ denali.qrc (.../denali.qrc) (revision eefe8acbe5b10deb379c5e4ceabeaa95d429410e) @@ -60,7 +60,8 @@ sources/gui/qml/components/RangeRect.qml sources/gui/qml/components/RangeBar.qml sources/gui/qml/components/Circle.qml - sources/gui/qml/components/CircleWithText.qml + sources/gui/qml/components/StepBullet.qml + sources/gui/qml/components/StepIndicator.qml sources/gui/qml/components/TimeText.qml sources/gui/qml/components/ProgressCircle.qml sources/gui/qml/components/Slider.qml Fisheye: Tag eefe8acbe5b10deb379c5e4ceabeaa95d429410e refers to a dead (removed) revision in file `sources/gui/qml/components/CircleWithText.qml'. Fisheye: No comparison available. Pass `N' to diff? Index: sources/gui/qml/components/ConfirmTreatmentSubTable.qml =================================================================== diff -u -rd94a2b9334b1b35739b637472e8c3054d7b9b804 -reefe8acbe5b10deb379c5e4ceabeaa95d429410e --- sources/gui/qml/components/ConfirmTreatmentSubTable.qml (.../ConfirmTreatmentSubTable.qml) (revision d94a2b9334b1b35739b637472e8c3054d7b9b804) +++ sources/gui/qml/components/ConfirmTreatmentSubTable.qml (.../ConfirmTreatmentSubTable.qml) (revision eefe8acbe5b10deb379c5e4ceabeaa95d429410e) @@ -14,62 +14,50 @@ // Qt import QtQuick 2.12 -import QtQuick.Layouts 1.12 +//import QtQuick.Layouts 1.12 // Project // Qml imports import "qrc:/globals" import "qrc:/components" -Rectangle { - id: _root - property var prescriptionKeys: [] - property var prescriptionValues: [] - property var operatingKeys: [] - property var operatingValues: [] +Rectangle { id: _root + property var prescriptionKeys : [] + property var prescriptionValues : [] + property var operatingKeys : [] + property var operatingValues : [] objectName: "ConfirmTreatmentSubTable" - color: "transparent" + color: Colors.transparent - GridLayout { - id: _prescription_grid - anchors.top: parent.top - anchors.topMargin: Variables.sliderTextMargin + Column { id: _prescriptionColumn + anchors { + top: parent.top + topMargin: Variables.sliderTextMargin + } width: _root.width / 2 - rows: _root.prescriptionKeys.length - columns: 1 - - Repeater { - id: _prescription_repeater + Repeater { id: _prescription_repeater model: prescriptionKeys ConfirmTreatmentTableEntry { - key: prescriptionKeys[index] - value: prescriptionValues[index] + key : prescriptionKeys[index] + value : prescriptionValues[index] } } } - GridLayout { - id: _operating_grid - anchors.top: parent.top - anchors.topMargin: Variables.sliderTextMargin - anchors.left: _prescription_grid.right - rows: _root.prescriptionKeys.length + Column { id: _operatingColumn + anchors { + top : parent.top + topMargin : Variables.sliderTextMargin + left : _prescriptionColumn.right + } width: _root.width / 2 - columns: 1 - - Repeater { - id: _operating_repeater + Repeater { id: _operating_repeater model: operatingKeys ConfirmTreatmentTableEntry { - key: operatingKeys[index] + key : operatingKeys[index] value: operatingValues[index] } - - } } - - - } Index: sources/gui/qml/components/GridSelection.qml =================================================================== diff -u -rb62ab443e75b76a91e35aca6ba2efd84e7199602 -reefe8acbe5b10deb379c5e4ceabeaa95d429410e --- sources/gui/qml/components/GridSelection.qml (.../GridSelection.qml) (revision b62ab443e75b76a91e35aca6ba2efd84e7199602) +++ sources/gui/qml/components/GridSelection.qml (.../GridSelection.qml) (revision eefe8acbe5b10deb379c5e4ceabeaa95d429410e) @@ -15,7 +15,6 @@ // Qt import QtQuick 2.12 -import QtQuick.Layouts 1.12 // Project @@ -69,7 +68,7 @@ color: Colors.textMain; } - GridLayout { + Grid { id: _grid anchors.top: _text.bottom anchors.topMargin: Variables.sliderTextMargin Index: sources/gui/qml/components/StepBullet.qml =================================================================== diff -u --- sources/gui/qml/components/StepBullet.qml (revision 0) +++ sources/gui/qml/components/StepBullet.qml (revision eefe8acbe5b10deb379c5e4ceabeaa95d429410e) @@ -0,0 +1,66 @@ +/*! + * + * Copyright (c) 2019-2020 Diality Inc. - All Rights Reserved. + * \copyright + * THIS CODE MAY NOT BE COPIED OR REPRODUCED IN ANY FORM, IN PART OR IN + * WHOLE, WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER. + * + * \file StepBullet.qml + * \author (last) Behrouz NematiPour + * \date (last) 01-Jan-2021 + * \author (original) Peter Lucia + * \date (original) 03-Aug-2020 + * + */ + +// Qt +import QtQuick 2.12 + +// Project + +// Qml imports +import "qrc:/globals" +import "qrc:/components" + +/*! + * \brief A filled circle with text below it, used to build a step-by-step progress indicator + */ +Item { id: _root + + QtObject { id: _private + readonly property real diameter : _root.active ? 15 : 10 + } + + readonly property color color : _circle.color + + property string text : "" + property bool active : false + property color colorActive : Colors.createTreatmentActive + property color colorInactive : Colors.createTreatmentInactive + + height : 35 + width : _private.diameter + + Rectangle { id: _circle + anchors { + verticalCenter : parent.verticalCenter + left : parent.left + } + height : _private.diameter + width : _private.diameter + radius : _private.diameter + color : _root.active ? _root.colorActive : _root.colorInactive + } + + Text { id: _text + anchors { + top : _circle.bottom + topMargin : 5 + horizontalCenter: _circle.horizontalCenter + } + text : _root.text + color : _root.active ? Colors.textMain : _root.colorInactive + } +} + + Index: sources/gui/qml/components/StepIndicator.qml =================================================================== diff -u --- sources/gui/qml/components/StepIndicator.qml (revision 0) +++ sources/gui/qml/components/StepIndicator.qml (revision eefe8acbe5b10deb379c5e4ceabeaa95d429410e) @@ -0,0 +1,86 @@ +/*! + * + * Copyright (c) 2019-2020 Diality Inc. - All Rights Reserved. + * \copyright + * THIS CODE MAY NOT BE COPIED OR REPRODUCED IN ANY FORM, IN PART OR IN + * WHOLE, WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER. + * + * \file StepIndicator.qml + * \author (last) Behrouz NematiPour + * \date (last) 01-Jan-2021 + * \author (original) Behrouz NematiPour + * \date (original) 01-Jan-2021 + * + */ + +// Qt +import QtQuick 2.12 + +// Project +// Qml imports +import "qrc:/globals" +import "qrc:/components" + +/*! + * \brief StepIndicator + * \details The Step indicator can have list of the steps and will show a bullet for each step with name and a line between each bullet. + * If the currentStepIndex has been set to any value in the range of the 0 to stepNames.length + * all the steps' bullets and the line between them from the beginning up to the currentStepIndex will be activated/highlighted. + */ +Rectangle { id: _root + property var stepNames : [] + property int spacing : 5 + property int spacerLineLength : 120 + + property string currentStepName : "" + readonly property int currentStepIndex : _private.stepNamesTail.indexOf(_root.currentStepName) + 1 + + + + height : Variables.topBarMenuHeight + color : Colors.backgroundMain + + QtObject { id: _private + property string stepNamesHead: "" + property var stepNamesTail: [] + } + + onStepNamesChanged: { + if (_root.stepNames.length > 1) { + // javascript shift() on array will retrurn the first element + // and will update the original array by removing the first element + // that's why on the tail assignment the origianl has been assigned. + _private.stepNamesHead = _root.stepNames.shift() + _private.stepNamesTail = _root.stepNames + } + else { + if (_root.stepNames.length) _private.stepNamesHead = _root.stepNames[0] + else _private.stepNamesHead = "" + _private.stepNamesTail = [] + } + } + + Row { + anchors.centerIn: parent + spacing: _root.spacing + StepBullet { id: _headStepBullet + text : _private.stepNamesHead + active : true + } + Repeater { id: _tailStepsRepeater + model: _private.stepNamesTail + Row { + spacing: _root.spacing + Line { id : spacerLine + anchors.verticalCenter: _nextStepsBullet.verticalCenter + length : _root.spacerLineLength + color : _nextStepsBullet.color + } + StepBullet { id: _nextStepsBullet + text : modelData + active : index < currentStepIndex + } + } + } + } +} Index: sources/gui/qml/components/TopMenuBarCreateTreatment.qml =================================================================== diff -u -rccb91da4becded9a7ad409b758bba96784d9feba -reefe8acbe5b10deb379c5e4ceabeaa95d429410e --- sources/gui/qml/components/TopMenuBarCreateTreatment.qml (.../TopMenuBarCreateTreatment.qml) (revision ccb91da4becded9a7ad409b758bba96784d9feba) +++ sources/gui/qml/components/TopMenuBarCreateTreatment.qml (.../TopMenuBarCreateTreatment.qml) (revision eefe8acbe5b10deb379c5e4ceabeaa95d429410e) @@ -5,176 +5,51 @@ * THIS CODE MAY NOT BE COPIED OR REPRODUCED IN ANY FORM, IN PART OR IN * WHOLE, WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER. * - * \file TopMenuBarCreateTreatment.qml - * \author (last) Peter Lucia - * \date (last) 28-Aug-2020 - * \author (original) Peter Lucia - * \date (original) 03-Aug-2020 + * \file TopMenuBarCreateTreatment.qml + * \author (last) Behrouz NematiPour + * \date (last) 01-Jan-2021 + * \author (original) Peter Lucia + * \date (original) 03-Aug-2020 * */ // Qt import QtQuick 2.12 -import QtQuick.Layouts 1.12 // Project // Qml imports import "qrc:/globals" import "qrc:/components" /*! - * \brief TopMenuBarCreateTreatment - Contains a back button as well - * as the current progress in each of the pre-treatment steps. + * \brief TopMenuBarCreateTreatment - Contains a back button as well + * as the current progress in each of the pre-treatment steps. */ Rectangle { id: _root - height: Variables.topBarMenuHeight - color: Colors.backgroundMain - property var step: "CREATE"; - property int spacing: 5 - signal clickedBack() + property alias stepName : _stepIndicator.currentStepName + height : Variables.topBarMenuHeight + color : Colors.backgroundMain + + signal backClicked() + BackButton { id : _backButton objectName: "_backButton" width: parent.width / 10 anchors.verticalCenter: parent.verticalCenter anchors.top: parent.top anchors.left: parent.left anchors.margins: _root.height / 4 - onClicked: _root.clickedBack() + onClicked: _root.backClicked() } - Rectangle { - color: "transparent" - height: parent.height - width: parent.width - - anchors { - verticalCenter: parent.verticalCenter - horizontalCenter: parent.horizontalCenter - - } - - Row { - anchors.centerIn: parent - spacing: 5 - - CircleWithText { id: _create - text: "CREATE" - state: "active" - } - - Line { id: _confirm_line - length: 120 - color: Colors.createTreatmentInactive - radius: 5 - anchors.verticalCenter: _create.verticalCenter - - states: [ - State { - name: "active" - PropertyChanges { target: _confirm_line; thickness: 3; color: Colors.createTreatmentActive; } - }, - State { - name: "inactive" - PropertyChanges { target: _confirm_line; thickness: 1; color: Colors.createTreatmentInactive; } - } - ] - } - - CircleWithText { id: _confirm - text: "CONFIRM" - } - - Line { id: _priming_line - length: 120 - color: Colors.createTreatmentInactive - radius: 5 - anchors.verticalCenter: _create.verticalCenter - - states: [ - State { - name: "active" - PropertyChanges { target: _priming_line; thickness: 3; color: Colors.createTreatmentActive; } - }, - State { - name: "inactive" - PropertyChanges { target: _priming_line; thickness: 1; color: Colors.createTreatmentInactive; } - } - ] - } - - CircleWithText { id: _prime - text: "PRIME" - } - - Line { id: _begin_line - length: 120 - color: Colors.createTreatmentInactive - radius: 5 - anchors.verticalCenter: _create.verticalCenter - - states: [ - State { - name: "active" - PropertyChanges { target: _begin_line; thickness: 3; color: Colors.createTreatmentActive; } - }, - State { - name: "inactive" - PropertyChanges { target: _begin_line; thickness: 1; color: Colors.createTreatmentInactive; } - } - ] - } - - CircleWithText { id: _begin - text: "BEGIN" - } - } + StepIndicator { id: _stepIndicator + anchors.centerIn: parent + stepNames: [ + Variables.preTreatmentStepLabelCreate , + Variables.preTreatmentStepLabelConfirm , + Variables.preTreatmentStepLabelPriming , + Variables.preTreatmentStepLabelUltrafiltration , + ] } - - states: [ - State { - name: "create" - PropertyChanges { target: _create; state: "active" } - PropertyChanges { target: _confirm; state: "inactive" } - PropertyChanges { target: _confirm_line; state: "inactive" } - PropertyChanges { target: _prime; state: "inactive" } - PropertyChanges { target: _priming_line; state: "inactive" } - PropertyChanges { target: _begin; state: "inactive" } - PropertyChanges { target: _begin_line; state: "inactive" } - }, - State { - name: "confirm" - PropertyChanges { target: _create; state: "active" } - PropertyChanges { target: _confirm; state: "active" } - PropertyChanges { target: _confirm_line; state: "active" } - PropertyChanges { target: _prime; state: "inactive" } - PropertyChanges { target: _priming_line; state: "inactive" } - PropertyChanges { target: _begin; state: "inactive" } - PropertyChanges { target: _begin_line; state: "inactive" } - }, - State { - name: "prime" - PropertyChanges { target: _create; state: "active" } - PropertyChanges { target: _confirm; state: "active" } - PropertyChanges { target: _confirm_line; state: "active" } - PropertyChanges { target: _prime; state: "active" } - PropertyChanges { target: _priming_line; state: "active" } - PropertyChanges { target: _begin; state: "inactive" } - PropertyChanges { target: _begin_line; state: "inactive" } - }, - State { - name: "begin" - PropertyChanges { target: _create; state: "active" } - PropertyChanges { target: _confirm; state: "active" } - PropertyChanges { target: _confirm_line; state: "active" } - PropertyChanges { target: _prime; state: "active" } - PropertyChanges { target: _priming_line; state: "active" } - PropertyChanges { target: _begin; state: "active" } - PropertyChanges { target: _begin_line; state: "active" } - } - - ] - - - } Index: sources/gui/qml/globals/Colors.qml =================================================================== diff -u -r14c541d2b780b0a244bc84860aa565cf8dd7fe4b -reefe8acbe5b10deb379c5e4ceabeaa95d429410e --- sources/gui/qml/globals/Colors.qml (.../Colors.qml) (revision 14c541d2b780b0a244bc84860aa565cf8dd7fe4b) +++ sources/gui/qml/globals/Colors.qml (.../Colors.qml) (revision eefe8acbe5b10deb379c5e4ceabeaa95d429410e) @@ -106,7 +106,7 @@ readonly property color primingReady : "#438FEB" readonly property color createTreatmentActive : "#3d8eef" - readonly property color createTreatmentInactive : "#3e546e" + readonly property color createTreatmentInactive : backgroundRangeRect readonly property color createTreatmentNotReady : "#1f4974" readonly property color createTreatmentReady : "#438FEB" readonly property color createTreatmentTextNotReady : "#507090" Index: sources/gui/qml/globals/Variables.qml =================================================================== diff -u -r50a109da2a76b335793c2b95fa668733fb7df684 -reefe8acbe5b10deb379c5e4ceabeaa95d429410e --- sources/gui/qml/globals/Variables.qml (.../Variables.qml) (revision 50a109da2a76b335793c2b95fa668733fb7df684) +++ sources/gui/qml/globals/Variables.qml (.../Variables.qml) (revision eefe8acbe5b10deb379c5e4ceabeaa95d429410e) @@ -161,6 +161,11 @@ readonly property string notSetVariableText : "__" + readonly property string preTreatmentStepLabelCreate : qsTr("CREATE" ) + readonly property string preTreatmentStepLabelConfirm : qsTr("CONFIRM" ) + readonly property string preTreatmentStepLabelPriming : qsTr("PRIME" ) + readonly property string preTreatmentStepLabelUltrafiltration : qsTr("BEGIN" ) + // Units // - Ultrafiltration readonly property string unitTextUltrafiltrationVolume : qsTr("(L)") Index: sources/gui/qml/pages/treatment/TreatmentBegin.qml =================================================================== diff -u -r50a109da2a76b335793c2b95fa668733fb7df684 -reefe8acbe5b10deb379c5e4ceabeaa95d429410e --- sources/gui/qml/pages/treatment/TreatmentBegin.qml (.../TreatmentBegin.qml) (revision 50a109da2a76b335793c2b95fa668733fb7df684) +++ sources/gui/qml/pages/treatment/TreatmentBegin.qml (.../TreatmentBegin.qml) (revision eefe8acbe5b10deb379c5e4ceabeaa95d429410e) @@ -40,13 +40,13 @@ } TopMenuBarCreateTreatment { id: _topMenuBar - anchors.top: parent.top - anchors.left: parent.left - width: parent.width - onClickedBack: { + stepName : Variables.preTreatmentStepLabelUltrafiltration + anchors.top : parent.top + anchors.left : parent.left + width : parent.width + onBackClicked : { _root.backClicked(); } - state: "begin" } Text { id: _textTitle Index: sources/gui/qml/pages/treatment/TreatmentConfirm.qml =================================================================== diff -u -rccb91da4becded9a7ad409b758bba96784d9feba -reefe8acbe5b10deb379c5e4ceabeaa95d429410e --- sources/gui/qml/pages/treatment/TreatmentConfirm.qml (.../TreatmentConfirm.qml) (revision ccb91da4becded9a7ad409b758bba96784d9feba) +++ sources/gui/qml/pages/treatment/TreatmentConfirm.qml (.../TreatmentConfirm.qml) (revision eefe8acbe5b10deb379c5e4ceabeaa95d429410e) @@ -29,20 +29,20 @@ */ ScreenItem { id: _root objectName: "TreatmentConfirm" - signal clickedBack() - signal clickedConfirm() + signal backClicked() + signal confirmClicked() + TopMenuBarCreateTreatment { id: _topMenuBar - anchors.top: parent.top - anchors.left: parent.left - width: parent.width - onClickedBack: { - _root.clickedBack(); + stepName : Variables.preTreatmentStepLabelConfirm + anchors.top : parent.top + anchors.left : parent.left + width : parent.width + onBackClicked : { + _root.backClicked(); } - state: "confirm" } - Flickable { id: _flickable objectName: "_treatmentConfirmFlickable" anchors.top: _topMenuBar.bottom @@ -87,7 +87,7 @@ anchors.horizontalCenter: parent.horizontalCenter text.text: qsTr("CONFIRM TREATMENT") button.onClicked: { - _root.clickedConfirm() + _root.confirmClicked() } } Index: sources/gui/qml/pages/treatment/TreatmentCreate.qml =================================================================== diff -u -rccb91da4becded9a7ad409b758bba96784d9feba -reefe8acbe5b10deb379c5e4ceabeaa95d429410e --- sources/gui/qml/pages/treatment/TreatmentCreate.qml (.../TreatmentCreate.qml) (revision ccb91da4becded9a7ad409b758bba96784d9feba) +++ sources/gui/qml/pages/treatment/TreatmentCreate.qml (.../TreatmentCreate.qml) (revision eefe8acbe5b10deb379c5e4ceabeaa95d429410e) @@ -28,19 +28,20 @@ */ ScreenItem { id: _root objectName: "TreatmentCreate"; // SquishQt testability - signal clickedBack() - signal clickedContinue() + signal backClicked() + signal continueClicked() function setInteractive(isInteractive) { _flickable.interactive = isInteractive } TopMenuBarCreateTreatment { id: _topMenuBar - anchors.top: parent.top - anchors.left: parent.left - width: parent.width - onClickedBack: { - _root.clickedBack(); + stepName : Variables.preTreatmentStepLabelCreate + anchors.top : parent.top + anchors.left : parent.left + width : parent.width + onBackClicked : { + _root.backClicked(); } } @@ -449,7 +450,7 @@ button.onClicked: { vTreatmentCreate.saveTreatmentProfile = false; if (vTreatmentCreate.continueEnabled) { - _root.clickedContinue() + _root.continueClicked() } } Index: sources/gui/qml/pages/treatment/TreatmentPrime.qml =================================================================== diff -u -r2d3e2f93ac34764f46f90b385fda496d0194f8c9 -reefe8acbe5b10deb379c5e4ceabeaa95d429410e --- sources/gui/qml/pages/treatment/TreatmentPrime.qml (.../TreatmentPrime.qml) (revision 2d3e2f93ac34764f46f90b385fda496d0194f8c9) +++ sources/gui/qml/pages/treatment/TreatmentPrime.qml (.../TreatmentPrime.qml) (revision eefe8acbe5b10deb379c5e4ceabeaa95d429410e) @@ -29,17 +29,17 @@ ScreenItem { id: _root objectName: "_treatmentPrime" - signal clickedBack() - signal clickedContinue() + signal backClicked() + signal continueClicked() TopMenuBarCreateTreatment { id: _topMenuBar - anchors.top: parent.top - anchors.left: parent.left - width: parent.width - onClickedBack: { - _root.clickedBack(); + stepName : Variables.preTreatmentStepLabelPriming + anchors.top : parent.top + anchors.left : parent.left + width : parent.width + onBackClicked : { + _root.backClicked(); } - state: "prime" } Text { id: _titleText @@ -126,7 +126,7 @@ } button.onClicked: { - _root.clickedContinue() + _root.continueClicked() } } Index: sources/gui/qml/pages/treatment/TreatmentStack.qml =================================================================== diff -u -rc2a39432f44596116d8ce9c9930d6575d3bb3983 -reefe8acbe5b10deb379c5e4ceabeaa95d429410e --- sources/gui/qml/pages/treatment/TreatmentStack.qml (.../TreatmentStack.qml) (revision c2a39432f44596116d8ce9c9930d6575d3bb3983) +++ sources/gui/qml/pages/treatment/TreatmentStack.qml (.../TreatmentStack.qml) (revision eefe8acbe5b10deb379c5e4ceabeaa95d429410e) @@ -85,7 +85,7 @@ TreatmentHome { id: _treatmentHome onTreatmentStarted : push( _treatmentStart ) - onTreatmentCreated : /*push( _treatmentPrime ) //*/ vTreatmentCreate.doSelectParameters() + onTreatmentCreated : vTreatmentCreate.doSelectParameters() } TreatmentStart { id: _treatmentStart @@ -113,21 +113,21 @@ } TreatmentCreate { id: _treatmentCreate - onClickedBack : {vTreatmentCreate.doCancelSelectingParameters() } - onClickedContinue : {vTreatmentCreate.doFinishedCreate(); } + onBackClicked : {vTreatmentCreate.doCancelSelectingParameters() } + onContinueClicked : {vTreatmentCreate.doFinishedCreate(); } } - TreatmentConfirm { id: _treatmentConfirm - onClickedBack : {vTreatmentCreate.doCancelConfirmParameters() } - onClickedConfirm : {vTreatmentCreate.doFinishedConfirm(); } + TreatmentConfirm { id: _treatmentConfirm + onBackClicked : {vTreatmentCreate.doCancelConfirmParameters() } + onConfirmClicked : {vTreatmentCreate.doFinishedConfirm(); } } - TreatmentPrime { id: _treatmentPrime - onClickedBack : {vTreatmentCreate.doRequestPop() } - onClickedContinue : {vTreatmentCreate.doFinishedPrime(); } + TreatmentPrime { id: _treatmentPrime + onBackClicked : {vTreatmentCreate.doRequestPop() } + onContinueClicked : {vTreatmentCreate.doFinishedPrime(); } } - TreatmentBegin { id: _treatmentBegin + TreatmentBegin { id: _treatmentBegin onBackClicked : {vTreatmentCreate.doRequestPop() } onStartClicked : {vTreatmentAdjustmentUltrafiltrationInit.doAdjustment(_treatmentBegin.ufVolume) } }