Index: denali.pro.user =================================================================== diff -u -r96854524927f212c24b9e4a253baeff2e672228f -r725cf5096e9664a0b6b1c4e4e902d1673bd976a9 --- denali.pro.user (.../denali.pro.user) (revision 96854524927f212c24b9e4a253baeff2e672228f) +++ denali.pro.user (.../denali.pro.user) (revision 725cf5096e9664a0b6b1c4e4e902d1673bd976a9) @@ -1,6 +1,6 @@ - + EnvironmentId Index: sources/gui/qml/components/StepBullet.qml =================================================================== diff -u -reefe8acbe5b10deb379c5e4ceabeaa95d429410e -r725cf5096e9664a0b6b1c4e4e902d1673bd976a9 --- sources/gui/qml/components/StepBullet.qml (.../StepBullet.qml) (revision eefe8acbe5b10deb379c5e4ceabeaa95d429410e) +++ sources/gui/qml/components/StepBullet.qml (.../StepBullet.qml) (revision 725cf5096e9664a0b6b1c4e4e902d1673bd976a9) @@ -26,18 +26,19 @@ * \brief A filled circle with text below it, used to build a step-by-step progress indicator */ Item { id: _root + readonly property color color : _circle.border.color + property string text : "" + property bool complete : false + property bool current : false + property color colorComplete : Colors.borderButton + property color colorInComplete : Colors.borderDisableButton + QtObject { id: _private - readonly property real diameter : _root.active ? 15 : 10 + readonly property real diameter : 15 + } - 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 @@ -49,7 +50,9 @@ height : _private.diameter width : _private.diameter radius : _private.diameter - color : _root.active ? _root.colorActive : _root.colorInactive + color : _root.current ? Colors.transparent : _root.complete ? _root.colorComplete : Colors.transparent + border.color: _root.current ? colorComplete : _root.complete ? _root.colorComplete : _root.colorInComplete + border.width: 2 } Text { id: _text @@ -59,7 +62,7 @@ horizontalCenter: _circle.horizontalCenter } text : _root.text - color : _root.active ? Colors.textMain : _root.colorInactive + color : _root.current ? Colors.textMain : _root.complete ? Colors.textMain : _root.colorInComplete } } Index: sources/gui/qml/components/StepIndicator.qml =================================================================== diff -u -reefe8acbe5b10deb379c5e4ceabeaa95d429410e -r725cf5096e9664a0b6b1c4e4e902d1673bd976a9 --- sources/gui/qml/components/StepIndicator.qml (.../StepIndicator.qml) (revision eefe8acbe5b10deb379c5e4ceabeaa95d429410e) +++ sources/gui/qml/components/StepIndicator.qml (.../StepIndicator.qml) (revision 725cf5096e9664a0b6b1c4e4e902d1673bd976a9) @@ -30,45 +30,48 @@ Rectangle { id: _root property var stepNames : [] property int spacing : 5 - property int spacerLineLength : 120 + property int spacerLineLength : 100 - property string currentStepName : "" - readonly property int currentStepIndex : _private.stepNamesTail.indexOf(_root.currentStepName) + 1 + property int currentStepIndex : 0 + height : Variables.topBarMenuHeight color : Colors.backgroundMain QtObject { id: _private - property string stepNamesHead: "" - property var stepNamesTail: [] + property string stepNamesFirst: "" + property var stepNamesRest : [] } onStepNamesChanged: { - if (_root.stepNames.length > 1) { - // javascript shift() on array will retrurn the first element + console.debug(_root.stepNames) + if ( _root.stepNames.length > 1 ) { + // javascript shift() on array will return 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 + // that's why on the stepNamesRest assignment the origianl has been assigned. + let mStepNames = _root.stepNames + _private.stepNamesFirst = mStepNames.shift() + _private.stepNamesRest = mStepNames } else { - if (_root.stepNames.length) _private.stepNamesHead = _root.stepNames[0] - else _private.stepNamesHead = "" - _private.stepNamesTail = [] + if (_root.stepNames.length) _private.stepNamesFirst = _root.stepNames[0] + else _private.stepNamesFirst = "" + _private.stepNamesRest = [] } } Row { anchors.centerIn: parent spacing: _root.spacing StepBullet { id: _headStepBullet - text : _private.stepNamesHead - active : true + text : _private.stepNamesFirst + complete: currentStepIndex > 0 + current : currentStepIndex == 0 } Repeater { id: _tailStepsRepeater - model: _private.stepNamesTail + model: _private.stepNamesRest Row { spacing: _root.spacing Line { id : spacerLine @@ -78,7 +81,8 @@ } StepBullet { id: _nextStepsBullet text : modelData - active : index < currentStepIndex + complete: currentStepIndex > 0 && index < currentStepIndex - 1 // first index is used for the head/first bullet + current : currentStepIndex > 0 && index == currentStepIndex - 1 // first index is used for the head/first bullet } } } Index: sources/gui/qml/components/TitleBarCreateTreatment.qml =================================================================== diff -u -ra25dee6ed9a8cd343056d92bc3a78617eed66a6f -r725cf5096e9664a0b6b1c4e4e902d1673bd976a9 --- sources/gui/qml/components/TitleBarCreateTreatment.qml (.../TitleBarCreateTreatment.qml) (revision a25dee6ed9a8cd343056d92bc3a78617eed66a6f) +++ sources/gui/qml/components/TitleBarCreateTreatment.qml (.../TitleBarCreateTreatment.qml) (revision 725cf5096e9664a0b6b1c4e4e902d1673bd976a9) @@ -26,7 +26,7 @@ * as the current progress in each of the pre-treatment steps. */ Rectangle { id: _root - property alias stepName : _stepIndicator.currentStepName + property alias stepIndex : _stepIndicator.currentStepIndex height : Variables.topBarMenuHeight color : Colors.backgroundMain Index: sources/gui/qml/pages/pretreatment/PreTreatmentBase.qml =================================================================== diff -u -rc15ce613e372838316d42c40a86953e6f0aa05d3 -r725cf5096e9664a0b6b1c4e4e902d1673bd976a9 --- sources/gui/qml/pages/pretreatment/PreTreatmentBase.qml (.../PreTreatmentBase.qml) (revision c15ce613e372838316d42c40a86953e6f0aa05d3) +++ sources/gui/qml/pages/pretreatment/PreTreatmentBase.qml (.../PreTreatmentBase.qml) (revision 725cf5096e9664a0b6b1c4e4e902d1673bd976a9) @@ -33,7 +33,7 @@ signal backClicked () TitleBarCreateTreatment { id: _titleBar - stepName : "" + stepIndex: 0 anchors.top : parent.top anchors.horizontalCenter : parent.horizontalCenter width : parent.width Index: sources/gui/qml/pages/pretreatment/PreTreatmentCreateStack.qml =================================================================== diff -u -rc15ce613e372838316d42c40a86953e6f0aa05d3 -r725cf5096e9664a0b6b1c4e4e902d1673bd976a9 --- sources/gui/qml/pages/pretreatment/PreTreatmentCreateStack.qml (.../PreTreatmentCreateStack.qml) (revision c15ce613e372838316d42c40a86953e6f0aa05d3) +++ sources/gui/qml/pages/pretreatment/PreTreatmentCreateStack.qml (.../PreTreatmentCreateStack.qml) (revision 725cf5096e9664a0b6b1c4e4e902d1673bd976a9) @@ -36,7 +36,7 @@ PreTreatmentConfirm { id: _pretreatmentConfirm onBackClicked : {vTreatmentCreate.doCancelConfirmParameters() } - onConfirmClicked : {vTreatmentCreate.doFinishedConfirm(); } + onConfirmClicked : {vTreatmentCreate.doFinishedConfirm() } } Connections { target: vHDOperationMode Index: sources/gui/qml/pages/pretreatment/create/PreTreatmentConfirm.qml =================================================================== diff -u -r73091a6f5717c0fc88e236c06c618ad361f30a3c -r725cf5096e9664a0b6b1c4e4e902d1673bd976a9 --- sources/gui/qml/pages/pretreatment/create/PreTreatmentConfirm.qml (.../PreTreatmentConfirm.qml) (revision 73091a6f5717c0fc88e236c06c618ad361f30a3c) +++ sources/gui/qml/pages/pretreatment/create/PreTreatmentConfirm.qml (.../PreTreatmentConfirm.qml) (revision 725cf5096e9664a0b6b1c4e4e902d1673bd976a9) @@ -32,7 +32,7 @@ signal confirmClicked() - header.stepName: Variables.preTreatmentStepLabelConfirm + header.stepIndex: 1 Flickable { id: _flickable objectName: "_PreTreatmentConfirmFlickable" Index: sources/gui/qml/pages/pretreatment/create/PreTreatmentCreate.qml =================================================================== diff -u -r73091a6f5717c0fc88e236c06c618ad361f30a3c -r725cf5096e9664a0b6b1c4e4e902d1673bd976a9 --- sources/gui/qml/pages/pretreatment/create/PreTreatmentCreate.qml (.../PreTreatmentCreate.qml) (revision 73091a6f5717c0fc88e236c06c618ad361f30a3c) +++ sources/gui/qml/pages/pretreatment/create/PreTreatmentCreate.qml (.../PreTreatmentCreate.qml) (revision 725cf5096e9664a0b6b1c4e4e902d1673bd976a9) @@ -36,7 +36,7 @@ _flickable.interactive = isInteractive } - header.stepName : Variables.preTreatmentStepLabelCreate + header.stepIndex: 0 Flickable { id: _flickable objectName: "TreatmentCreateFlickable" Index: sources/gui/qml/pages/pretreatment/prime/PreTreatmentPrime.qml =================================================================== diff -u -r73091a6f5717c0fc88e236c06c618ad361f30a3c -r725cf5096e9664a0b6b1c4e4e902d1673bd976a9 --- sources/gui/qml/pages/pretreatment/prime/PreTreatmentPrime.qml (.../PreTreatmentPrime.qml) (revision 73091a6f5717c0fc88e236c06c618ad361f30a3c) +++ sources/gui/qml/pages/pretreatment/prime/PreTreatmentPrime.qml (.../PreTreatmentPrime.qml) (revision 725cf5096e9664a0b6b1c4e4e902d1673bd976a9) @@ -31,7 +31,7 @@ signal continueClicked() - header.stepName : Variables.preTreatmentStepLabelPriming + header.stepIndex: 2 onVisibleChanged: { if (visible) { Index: sources/gui/qml/pages/pretreatment/prime/PreTreatmentUltrafiltration.qml =================================================================== diff -u -r73091a6f5717c0fc88e236c06c618ad361f30a3c -r725cf5096e9664a0b6b1c4e4e902d1673bd976a9 --- sources/gui/qml/pages/pretreatment/prime/PreTreatmentUltrafiltration.qml (.../PreTreatmentUltrafiltration.qml) (revision 73091a6f5717c0fc88e236c06c618ad361f30a3c) +++ sources/gui/qml/pages/pretreatment/prime/PreTreatmentUltrafiltration.qml (.../PreTreatmentUltrafiltration.qml) (revision 725cf5096e9664a0b6b1c4e4e902d1673bd976a9) @@ -38,7 +38,7 @@ property real maximum : 8.000 } - header.stepName : Variables.preTreatmentStepLabelUltrafiltration + header.stepIndex: 3 Text { id: _textTitle visible : true Index: sources/model/MModel.h =================================================================== diff -u -r96854524927f212c24b9e4a253baeff2e672228f -r725cf5096e9664a0b6b1c4e4e902d1673bd976a9 --- sources/model/MModel.h (.../MModel.h) (revision 96854524927f212c24b9e4a253baeff2e672228f) +++ sources/model/MModel.h (.../MModel.h) (revision 725cf5096e9664a0b6b1c4e4e902d1673bd976a9) @@ -372,7 +372,6 @@ ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE, AdjustTreatmentEndRequestData ) \ ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE, AdjustPressuresLimitsRequestData ) \ ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE, AdjustTreatmentParametersRequestData ) \ - ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE, AdjustSalineRequestData ) \ ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE, AdjustVersionsRequestData ) \ \ ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE, AlarmSilenceRequestData ) \