Index: sources/gui/qml/pages/treatment/TreatmentStack.qml =================================================================== diff -u -r810e4b12507feba688c3ea2ab045040214661298 -r7edcaf054062754370e0abd165f17ca9941b7d07 --- sources/gui/qml/pages/treatment/TreatmentStack.qml (.../TreatmentStack.qml) (revision 810e4b12507feba688c3ea2ab045040214661298) +++ sources/gui/qml/pages/treatment/TreatmentStack.qml (.../TreatmentStack.qml) (revision 7edcaf054062754370e0abd165f17ca9941b7d07) @@ -1,23 +1,26 @@ /*! - * + * * 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 TreatmentStack.qml - * \author (last) Behrouz NemaiPour - * \date (last) 18-Jun-2020 + * \author (last) Behrouz NematiPour + * \date (last) 18-Aug-2020 * \author (original) Behrouz NematiPour * \date (original) 27-Jan-2020 - * + * */ // Qt import QtQuick 2.12 // Project -import VTreatmentRanges 0.1 +import Gui.Actions 0.1 +import VTreatmentRanges 0.1 +import VTreatmentAdjustmentSaline 0.1 +import VHDTreatmentStates 0.1 // Qml imports import "qrc:/globals" @@ -34,8 +37,15 @@ stackView.initialItem : _treatmentHome - VTreatmentRanges { id: vTreatmentRanges } + // Views + VTreatmentRanges { id: vTreatmentRanges } + VTreatmentAdjustmentSaline { id: vTreatmentAdjustmentSaline } + VHDTreatmentStates { id: vHDTreatmentStates + property bool ufPaused : ufState === GuiActions.UF_PAUSED_STATE + property bool txPaused : subMode === GuiActions.TREATMENT_DIALYSIS_STATE + } + // Components MainMenu { id: _treatmentMenu y : -Variables.mainMenuHeight position : MainMenu.Position.Top @@ -63,7 +73,10 @@ _treatmentAdjustmentDuration.open() } onSectionUltrafiltrationClicked: { - if ( vTreatmentAdjustmentUltrafiltrationState.isPaused ) { + if ( + vTreatmentAdjustmentUltrafiltrationState.isPaused || // comes from the treatment adjustment + vHDTreatmentStates.ufPaused // comes from the broadcast Treatment States salineState field + ) { _treatmentAdjustmentUltrafiltrationPaused.open() } else { _treatmentAdjustmentUltrafiltrationStart .open() @@ -217,10 +230,10 @@ } } - Connections { target: vCreateTreatment onShowConfirm : { push(_treatmentConfirm) } onShowPrime : { push(_treatmentPrime) } onShowBegin : { push(_treatmentBegin) } } + }