Index: denali.pro.user =================================================================== diff -u -ra3030123e885fb9f22dea5839c4e988896a257e4 -r76f632ce5a9039ae662d9a52286079b772f8ae7f --- denali.pro.user (.../denali.pro.user) (revision a3030123e885fb9f22dea5839c4e988896a257e4) +++ denali.pro.user (.../denali.pro.user) (revision 76f632ce5a9039ae662d9a52286079b772f8ae7f) @@ -1,6 +1,6 @@ - + EnvironmentId Index: denali.qrc =================================================================== diff -u -r7710fea4486a639caaa3c510add0eac0bcd4ddcc -r76f632ce5a9039ae662d9a52286079b772f8ae7f --- denali.qrc (.../denali.qrc) (revision 7710fea4486a639caaa3c510add0eac0bcd4ddcc) +++ denali.qrc (.../denali.qrc) (revision 76f632ce5a9039ae662d9a52286079b772f8ae7f) @@ -3,7 +3,6 @@ sources/gui/qml/pages/ManagerStack.qml sources/gui/qml/pages/SettingsStack.qml sources/gui/qml/pages/SettingsHome.qml - sources/gui/qml/pages/Diagnostics.qml sources/gui/qml/pages/ManagerHome.qml @@ -25,9 +24,10 @@ resources/images/bell.png resources/images/bell-off.png resources/images/Back.png - resources/images/Pause.png - resources/images/Resume.png + resources/images/PauseDarkBlue.png + resources/images/PauseLightBlue.png resources/images/PauseGray.png + resources/images/Resume.png resources/images/Clock-Minus.png resources/images/Clock-Plus.png resources/images/Wave-Minus.png @@ -42,6 +42,9 @@ resources/images/chevron-down.png resources/images/chevron-up.png resources/images/list.png + resources/images/End.png + resources/images/Accelerate.png + resources/images/Decelerate.png sources/gui/qml/components/MainMenu.qml @@ -140,4 +143,8 @@ sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentUltrafiltrationConfirm.qml sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentPressuresLimits.qml + + sources/gui/qml/pages/postTreatment/PostTreatmentRinseback.qml + sources/gui/qml/pages/postTreatment/PostTreatmentRecirculate.qml + Index: resources/images/Accelerate.png =================================================================== diff -u Binary files differ Index: resources/images/Decelerate.png =================================================================== diff -u Binary files differ Index: resources/images/End.png =================================================================== diff -u Binary files differ Index: resources/images/Pause.png =================================================================== diff -u -r7045fd6002bdeb28e23a7af6a708a852d522ad12 -r76f632ce5a9039ae662d9a52286079b772f8ae7f Binary files differ Index: resources/images/PauseDarkBlue.png =================================================================== diff -u Binary files differ Index: resources/images/PauseLightBlue.png =================================================================== diff -u Binary files differ Index: sources/gui/qml/components/CheckListItem.qml =================================================================== diff -u -r32bc2f04da62ae95a041945b449d2c40465f9308 -r76f632ce5a9039ae662d9a52286079b772f8ae7f --- sources/gui/qml/components/CheckListItem.qml (.../CheckListItem.qml) (revision 32bc2f04da62ae95a041945b449d2c40465f9308) +++ sources/gui/qml/components/CheckListItem.qml (.../CheckListItem.qml) (revision 76f632ce5a9039ae662d9a52286079b772f8ae7f) @@ -20,7 +20,7 @@ anchors.leftMargin: 20 anchors.verticalCenter: _root.verticalCenter text: "Item" - font.pixelSize: Fonts.primingFontSize + font.pixelSize: Fonts.fontPixelPriming color: Colors.textMain } Index: sources/gui/qml/components/ConfirmTreatmentTable.qml =================================================================== diff -u -rccb91da4becded9a7ad409b758bba96784d9feba -r76f632ce5a9039ae662d9a52286079b772f8ae7f --- sources/gui/qml/components/ConfirmTreatmentTable.qml (.../ConfirmTreatmentTable.qml) (revision ccb91da4becded9a7ad409b758bba96784d9feba) +++ sources/gui/qml/components/ConfirmTreatmentTable.qml (.../ConfirmTreatmentTable.qml) (revision 76f632ce5a9039ae662d9a52286079b772f8ae7f) @@ -67,15 +67,15 @@ anchors.leftMargin: 20 text: "New Treatment" color: "white" - font.pixelSize: Fonts.createTreatmentFontSize + font.pixelSize: Fonts.fontPixelCreateTreatment } } Text { id: _prescription objectName: _root.objectName + "_prescription" text: "PRESCRIPTION" - font.pixelSize: Fonts.crTreatmentTableFontSize + font.pixelSize: Fonts.fonstPixelCreateTreatmentTable color: "white" anchors.left: parent.left anchors.top: _header.bottom @@ -86,7 +86,7 @@ id: _operating_parameters objectName: _root.objectName + "_operating_parameters" text: "OPERATING PARAMETERS" - font.pixelSize: Fonts.crTreatmentTableFontSize + font.pixelSize: Fonts.fonstPixelCreateTreatmentTable color: "white" anchors.top: _header.bottom anchors.left: _root.horizontalCenter Index: sources/gui/qml/components/ConfirmTreatmentTableEntry.qml =================================================================== diff -u -rb530345e16e77b072f7cb1f8233410f41b006923 -r76f632ce5a9039ae662d9a52286079b772f8ae7f --- sources/gui/qml/components/ConfirmTreatmentTableEntry.qml (.../ConfirmTreatmentTableEntry.qml) (revision b530345e16e77b072f7cb1f8233410f41b006923) +++ sources/gui/qml/components/ConfirmTreatmentTableEntry.qml (.../ConfirmTreatmentTableEntry.qml) (revision 76f632ce5a9039ae662d9a52286079b772f8ae7f) @@ -51,7 +51,7 @@ text: key anchors.left: parent.left anchors.verticalCenter: _root.verticalCenter - font.pixelSize: Fonts.crTreatmentTableFontSize + font.pixelSize: Fonts.fonstPixelCreateTreatmentTable } Text { @@ -62,6 +62,6 @@ anchors.left: _line.horizontalCenter anchors.verticalCenter: _root.verticalCenter anchors.leftMargin: 3*Variables.createTreatmentMargin - font.pixelSize: Fonts.crTreatmentTableFontSize + font.pixelSize: Fonts.fonstPixelCreateTreatmentTable } } Index: sources/gui/qml/components/StackItem.qml =================================================================== diff -u -r074b32b5cc08f41f2d9ce0d021f2151b76bba5ad -r76f632ce5a9039ae662d9a52286079b772f8ae7f --- sources/gui/qml/components/StackItem.qml (.../StackItem.qml) (revision 074b32b5cc08f41f2d9ce0d021f2151b76bba5ad) +++ sources/gui/qml/components/StackItem.qml (.../StackItem.qml) (revision 76f632ce5a9039ae662d9a52286079b772f8ae7f) @@ -30,16 +30,47 @@ width : Variables.applicationWidth height: Variables.applicationHeight - function pop () { - _stackView.pop() + function info() { + for( var i = 0; i < _stackView.depth; i++ ) { + console.debug("index:", i, _stackView.get(i)) + } } + function back(vScreen) { + if (stackView.find(function(screen) { + return screen === vScreen; + })) { + _stackView.pop(vScreen) + } + else { + _stackView.push(vScreen) + } + info() + } + + function pop (vScreen) { + _stackView.pop(vScreen) + info() + } + function push (vScreen) { - _stackView.push(vScreen) + if ( _stackView.currentItem === vScreen) { + console.debug("same current screen didn't push" , vScreen.name) + } + else { + _stackView.push(vScreen) + } + info() } - function popToItem(item) { - _stackView.pop(item); + function replace(vScreen, vReplaced) { + if (vReplaced === undefined) { + _stackView.replace(_stackView.currentItem, vScreen) + } + else { + _stackView.replace(vReplaced, vScreen) + } + info() } StackView { id : _stackView Index: sources/gui/qml/globals/Fonts.qml =================================================================== diff -u -rccb91da4becded9a7ad409b758bba96784d9feba -r76f632ce5a9039ae662d9a52286079b772f8ae7f --- sources/gui/qml/globals/Fonts.qml (.../Fonts.qml) (revision ccb91da4becded9a7ad409b758bba96784d9feba) +++ sources/gui/qml/globals/Fonts.qml (.../Fonts.qml) (revision 76f632ce5a9039ae662d9a52286079b772f8ae7f) @@ -64,10 +64,9 @@ readonly property int fontPixelUltrafiltrationAdjustmentEditButton : fontPixelUltrafiltrationAdjustmentButtonL readonly property int fontPixelUltrafiltrationAdjustmentNextButton : fontPixelUltrafiltrationAdjustmentButton readonly property int fontPixelUltrafiltrationAdjustmentConfirmButton : fontPixelUltrafiltrationAdjustmentButton - readonly property int fontPixelUltrafiltrationAdjustmentConfirmTitle : 40 readonly property int fontPixelUltrafiltrationAdjustmentEditValue : 46 - readonly property int primingFontSize : 20 - readonly property int createTreatmentFontSize : 30 - readonly property int crTreatmentTableFontSize : 24 + readonly property int fontPixelPriming : 20 + readonly property int fontPixelCreateTreatment : 30 + readonly property int fonstPixelCreateTreatmentTable : 24 } Index: sources/gui/qml/globals/Variables.qml =================================================================== diff -u -r7710fea4486a639caaa3c510add0eac0bcd4ddcc -r76f632ce5a9039ae662d9a52286079b772f8ae7f --- sources/gui/qml/globals/Variables.qml (.../Variables.qml) (revision 7710fea4486a639caaa3c510add0eac0bcd4ddcc) +++ sources/gui/qml/globals/Variables.qml (.../Variables.qml) (revision 76f632ce5a9039ae662d9a52286079b772f8ae7f) @@ -116,6 +116,9 @@ readonly property int settingsOptionWidth : 550 readonly property int settingsOptionHeight : 50 + readonly property int rinsebackIconDiameterDefault : 85 + readonly property int rinsebackIconDiameterResumePause : 110 + // ---------- < PRS > Related Section ---------- // Min/Max readonly property int bloodFlowMin : 100 Fisheye: Tag 76f632ce5a9039ae662d9a52286079b772f8ae7f refers to a dead (removed) revision in file `sources/gui/qml/pages/Diagnostics.qml'. Fisheye: No comparison available. Pass `N' to diff? Index: sources/gui/qml/pages/postTreatment/PostTreatmentRecirculate.qml =================================================================== diff -u --- sources/gui/qml/pages/postTreatment/PostTreatmentRecirculate.qml (revision 0) +++ sources/gui/qml/pages/postTreatment/PostTreatmentRecirculate.qml (revision 76f632ce5a9039ae662d9a52286079b772f8ae7f) @@ -0,0 +1,85 @@ +/*! + * + * 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 PostTreatmentRecirculate.qml + * \author (last) Behrouz NematiPour + * \date (last) 30-Jan-2021 + * \author (original) Behrouz NematiPour + * \date (original) 30-Jan-2021 + * + */ + +// Qt +import QtQuick 2.12 + +// Project +// Qml imports +import "qrc:/globals" +import "qrc:/components" + +/*! + * \brief the parent page of the pretreatment create screens + */ +ScreenItem { id: _root + objectName: "_PostTreatmentRecirculate" + + property alias reasonText : _notification.text + + signal resumeClicked() + signal endClicked() + + Text { id: _title + anchors { + top: parent.top + topMargin: 65 + horizontalCenter: parent.horizontalCenter + } + color: Colors.white + text: qsTr("Recirculate") + font.pixelSize: Fonts.fontPixelTitle + } + + Row { id: _buttonGroup + property int buttonsWidth : 300 + spacing: 50 + + anchors { + bottom : parent.bottom + horizontalCenter: parent.horizontalCenter + rightMargin : spacing + leftMargin : spacing + bottomMargin : spacing + } + + TouchRect { id : _resumeTouchRect + visible : true + button.onPressed: resumeClicked() + text.text : qsTr("RESUME") + width : _buttonGroup.buttonsWidth + borderColor : Colors.white + } + + TouchRect { id : _endTouchRect + visible : true + button.onPressed: endClicked() + text.text : qsTr("END") + width : _buttonGroup.buttonsWidth + borderColor : Colors.white + } + } + + NotificationBar { id: _notification + iconVisible: false + } + + onVisibleChanged: { + _notification.text = "" + if (visible) { + _mainMenu.hidden = true + } + } +} Index: sources/gui/qml/pages/postTreatment/PostTreatmentRinseback.qml =================================================================== diff -u --- sources/gui/qml/pages/postTreatment/PostTreatmentRinseback.qml (revision 0) +++ sources/gui/qml/pages/postTreatment/PostTreatmentRinseback.qml (revision 76f632ce5a9039ae662d9a52286079b772f8ae7f) @@ -0,0 +1,192 @@ +/*! + * + * 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 PostTreatmentRinseback.qml + * \author (last) Behrouz NematiPour + * \date (last) 29-Jan-2021 + * \author (original) Behrouz NematiPour + * \date (original) 29-Jan-2021 + * + */ + +// Qt +import QtQuick 2.12 + +// Project +// Qml imports +import "qrc:/globals" +import "qrc:/components" + +/*! + * \brief the rinseback screen + */ +ScreenItem { id: _root + objectName: "_PostTreatmentRinseback" + + property alias reasonText : _notification.text + + signal pauseClicked () + signal resumeClicked () + signal endClicked () + + signal accelerateClicked () + signal deccelerateClicked () + + Text { id: _title + anchors { + top: parent.top + topMargin: 65 + horizontalCenter: parent.horizontalCenter + } + color: "white" + text: qsTr("Rinseback") + font.pixelSize: Fonts.fontPixelTitle + } + + Image { id: _imageEnd + anchors { + right : _root.right + top : _root.top + rightMargin : 45 + topMargin : 45 + } + + width : Variables.rinsebackIconDiameterDefault + height : Variables.rinsebackIconDiameterDefault + source : "qrc:/images/iRedCrossWCircle" + Text { id: _labelEnd + anchors { + top: parent.bottom + topMargin: 15 + horizontalCenter: parent.horizontalCenter + } + color: "white" + text: qsTr("End") + font.pixelSize: 26 + } + } + + ProgressCircle { id: _circle + diameter: 335 + anchors { + horizontalCenter: parent.horizontalCenter + top : parent.top + topMargin : 175 + } + + minimum : 0 + maximum : 100 + value : 25 + + Text { id: _textVolume + anchors.centerIn: parent + color: "white" + text: 300 + " "+ qsTr(Variables.unitTextFluid) + font.pixelSize: 76 + font.weight: Font.ExtraLight + + } + + Text { id: _labelState + anchors { + top: parent.bottom + topMargin: 20 + horizontalCenter: parent.horizontalCenter + } + color: "white" + text: qsTr("Resume") + font.pixelSize: 23 + } + } + + Row { id: _buttonRow + spacing: 175 + anchors { + horizontalCenter: parent.horizontalCenter + bottom : parent.bottom + bottomMargin : 45 + 45 // + the texts height + } + + Image { id: _imageDecelerate + anchors.verticalCenter: parent.verticalCenter + + width : Variables.rinsebackIconDiameterDefault + height: Variables.rinsebackIconDiameterDefault + source: "qrc:/images/iDecelerate" + } + + Image { id: _imageResume + anchors.verticalCenter: parent.verticalCenter + + visible: false + width : Variables.rinsebackIconDiameterResumePause + height: Variables.rinsebackIconDiameterResumePause + source: "qrc:/images/iResume" + } + + Image { id: _imagePause + anchors.verticalCenter: parent.verticalCenter + + width : Variables.rinsebackIconDiameterResumePause + height: Variables.rinsebackIconDiameterResumePause + source: "qrc:/images/iPauseLightBlue" + } + + Image { id: _imageAccelerate + anchors.verticalCenter: parent.verticalCenter + + width : Variables.rinsebackIconDiameterDefault + height: Variables.rinsebackIconDiameterDefault + source: "qrc:/images/iAccelerate" + } + } + + // A separate row for text created because in design texts are aligned in a line but images are in different size. + Row { id: _labelRow + spacing: 175 + anchors { + horizontalCenter: parent.horizontalCenter + bottom : parent.bottom + bottomMargin : 45 + } + Text { id: _labelDecelerate + color: "white" + text: qsTr("Decelerate") + font.pixelSize: 26 + } + Text { id: _labelResume + visible: false + color: "white" + text: qsTr("Resume") + font.pixelSize: 26 + } + Text { id: _labelPause + color: "white" + text: qsTr("Pause") + font.pixelSize: 26 + } + Text { id: _labelAccelerate + color: "white" + text: qsTr("Accelerate") + font.pixelSize: 26 + } + + } + + + + NotificationBar { id: _notification + iconVisible: false + } + + onVisibleChanged: { + _notification.text = "" + if (visible) { + _mainMenu.hidden = true + } + } +} Index: sources/gui/qml/pages/pretreatment/create/PreTreatmentPrime.qml =================================================================== diff -u -r43b80bc100e5bbc5f940e014cb622b5269a55e6c -r76f632ce5a9039ae662d9a52286079b772f8ae7f --- sources/gui/qml/pages/pretreatment/create/PreTreatmentPrime.qml (.../PreTreatmentPrime.qml) (revision 43b80bc100e5bbc5f940e014cb622b5269a55e6c) +++ sources/gui/qml/pages/pretreatment/create/PreTreatmentPrime.qml (.../PreTreatmentPrime.qml) (revision 76f632ce5a9039ae662d9a52286079b772f8ae7f) @@ -94,7 +94,7 @@ anchors.topMargin: 45 text: qsTr("Priming Complete!") color: vPriming.primingComplete ? Colors.textMain : Colors.transparent - font.pixelSize: Fonts.primingFontSize + font.pixelSize: Fonts.fontPixelPriming } TouchRect { id : _continueRect Index: sources/gui/qml/pages/pretreatment/create/PreTreatmentUltrafiltration.qml =================================================================== diff -u -r356351156a6aa17d079d1102a7414b65ff81b87b -r76f632ce5a9039ae662d9a52286079b772f8ae7f --- sources/gui/qml/pages/pretreatment/create/PreTreatmentUltrafiltration.qml (.../PreTreatmentUltrafiltration.qml) (revision 356351156a6aa17d079d1102a7414b65ff81b87b) +++ sources/gui/qml/pages/pretreatment/create/PreTreatmentUltrafiltration.qml (.../PreTreatmentUltrafiltration.qml) (revision 76f632ce5a9039ae662d9a52286079b772f8ae7f) @@ -56,7 +56,7 @@ color : "white" text : qsTr("Ultrafiltration Volume") + " " + Variables.unitTextUltrafiltrationVolume font { - pixelSize : Fonts.createTreatmentFontSize + pixelSize : Fonts.fontPixelCreateTreatment } anchors { left : _volumeSlider.left @@ -70,7 +70,7 @@ color : "white" text : _root.ufVolume.toFixed(Variables.ultrafiltrationPrecision) font { - pixelSize : Fonts.createTreatmentFontSize + pixelSize : Fonts.fontPixelCreateTreatment } anchors { right : _volumeSlider.right Index: sources/gui/qml/pages/treatment/TreatmentStack.qml =================================================================== diff -u -ra25dee6ed9a8cd343056d92bc3a78617eed66a6f -r76f632ce5a9039ae662d9a52286079b772f8ae7f --- sources/gui/qml/pages/treatment/TreatmentStack.qml (.../TreatmentStack.qml) (revision a25dee6ed9a8cd343056d92bc3a78617eed66a6f) +++ sources/gui/qml/pages/treatment/TreatmentStack.qml (.../TreatmentStack.qml) (revision 76f632ce5a9039ae662d9a52286079b772f8ae7f) @@ -32,6 +32,7 @@ import "qrc:/components" import "qrc:/pages/treatment/adjustments" import "qrc:/pages/pretreatment/create" +import "qrc:/pages/posttreatment" /*! * \brief TreatmentStack is the screen @@ -90,7 +91,7 @@ } TreatmentStart { id: _treatmentStart - onBackClicked : popToItem(_treatmentHome) + onBackClicked : pop( _treatmentHome ) onSectionFlowClicked : { _treatmentAdjustmentFlow.open() } @@ -221,6 +222,9 @@ } } + PostTreatmentRinseback { id: _postTreatmentRinseback } + PostTreatmentRecirculate { id: _postTreatmentRecirculate } + // ---------- Manages Responses ---------- Connections { target: vTreatmentAdjustmentDuration onAdjustmentTriggered : { @@ -325,4 +329,30 @@ onPop : { pop() } onShowTreatmentStart : { push(_treatmentStart) } } + + Connections { target: vHDTreatmentStates + onTxStartChanged: { + console.debug(" ----- onTxStartChanged") + if ( vHDTreatmentStates.txStart ) { + back( _treatmentStart ) + } + } + + onTxRinsebackChanged: { + if ( vHDTreatmentStates.txRinseback ) { + push( _postTreatmentRinseback ) + _treatmentMenu.hidden = true + } + } + + onTxRecirculateChanged: { + if ( vHDTreatmentStates.txRecirculate ) { + // application state by design is navigating always from Rinseback to recirculate + // so always it is rinseback on top which has to be replaced by recirculate + // also we never go back to rinseback from recirculate and will go back to blood priming + replace( _postTreatmentRecirculate ) + _treatmentMenu.hidden = true + } + } + } } Index: sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentUltrafiltrationConfirm.qml =================================================================== diff -u -r50a109da2a76b335793c2b95fa668733fb7df684 -r76f632ce5a9039ae662d9a52286079b772f8ae7f --- sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentUltrafiltrationConfirm.qml (.../TreatmentAdjustmentUltrafiltrationConfirm.qml) (revision 50a109da2a76b335793c2b95fa668733fb7df684) +++ sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentUltrafiltrationConfirm.qml (.../TreatmentAdjustmentUltrafiltrationConfirm.qml) (revision 76f632ce5a9039ae662d9a52286079b772f8ae7f) @@ -64,7 +64,7 @@ TitleText { id : _titleText text: qsTr("To confirm new UF Volume (%1),\nselect a treatment adjustment:") .arg(ultrafiltrationVolume.toFixed(_private.decimalVolume)) - font.pixelSize: Fonts.fontPixelUltrafiltrationAdjustmentConfirmTitle + font.pixelSize: Fonts.fontPixelTitle color: Colors.textMain height: Variables.mainMenuHeight anchors { Index: sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentUltrafiltrationStart.qml =================================================================== diff -u -r50a109da2a76b335793c2b95fa668733fb7df684 -r76f632ce5a9039ae662d9a52286079b772f8ae7f --- sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentUltrafiltrationStart.qml (.../TreatmentAdjustmentUltrafiltrationStart.qml) (revision 50a109da2a76b335793c2b95fa668733fb7df684) +++ sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentUltrafiltrationStart.qml (.../TreatmentAdjustmentUltrafiltrationStart.qml) (revision 76f632ce5a9039ae662d9a52286079b772f8ae7f) @@ -84,7 +84,7 @@ width : Variables.pauseIconDiameter height: Variables.pauseIconDiameter - source: "qrc:/images/iPause" + source: "qrc:/images/iPauseDarkBlue" } text { Index: sources/view/hd/data/VHDTreatmentStatesData.cpp =================================================================== diff -u -r4af6dcfa0281dc27714a26514e82bf3def901b5a -r76f632ce5a9039ae662d9a52286079b772f8ae7f --- sources/view/hd/data/VHDTreatmentStatesData.cpp (.../VHDTreatmentStatesData.cpp) (revision 4af6dcfa0281dc27714a26514e82bf3def901b5a) +++ sources/view/hd/data/VHDTreatmentStatesData.cpp (.../VHDTreatmentStatesData.cpp) (revision 76f632ce5a9039ae662d9a52286079b772f8ae7f) @@ -73,17 +73,16 @@ txStart ( vData.mSubMode == GuiTreatmentStates ::TREATMENT_START_STATE ); txStop ( vData.mSubMode == GuiTreatmentStates ::TREATMENT_STOP_STATE ); txEnd ( vData.mSubMode == GuiTreatmentStates ::TREATMENT_END_STATE ); + // Treatment states - Dialysis txDialysis_Running ( vData.mSubMode == GuiTreatmentStates ::TREATMENT_DIALYSIS_STATE ); txDialysis_End ( vData.mSubMode == GuiTreatmentStates ::TREATMENT_DIALYSIS_END_STATE ); + // Treatment states - Rinse back - txRinseback_Running ( vData.mSubMode == GuiTreatmentStates ::TREATMENT_RINSEBACK_STATE ); - //// TODO: Has been removed // txRinseback_Pause ( vData.mSubMode == GuiTreatmentStates ::TREATMENT_RINSEBACK_PAUSE_STATE ); + txRinseback ( vData.mSubMode == GuiTreatmentStates ::TREATMENT_RINSEBACK_STATE ); + // Treatment states - Recirculate - //// TODO: Has been removed // txRecirculate_Setup ( vData.mSubMode == GuiTreatmentStates ::TREATMENT_RECIRC_SETUP_STATE ); - txRecirculate_Running ( vData.mSubMode == GuiTreatmentStates ::TREATMENT_RECIRC_STATE ); - //// TODO: Has been removed // txRecirculate_Pause ( vData.mSubMode == GuiTreatmentStates ::TREATMENT_RECIRC_PAUSE_STATE ); - //// TODO: Has been removed // txRecirculate_Stop ( vData.mSubMode == GuiTreatmentStates ::TREATMENT_RECIRC_STOP_STATE ); + txRecirculate ( vData.mSubMode == GuiTreatmentStates ::TREATMENT_RECIRC_STATE ); } /*! Index: sources/view/hd/data/VHDTreatmentStatesData.h =================================================================== diff -u -rae1042a0c14d6d27556730183cc2cbe1a00bc0a7 -r76f632ce5a9039ae662d9a52286079b772f8ae7f --- sources/view/hd/data/VHDTreatmentStatesData.h (.../VHDTreatmentStatesData.h) (revision ae1042a0c14d6d27556730183cc2cbe1a00bc0a7) +++ sources/view/hd/data/VHDTreatmentStatesData.h (.../VHDTreatmentStatesData.h) (revision 76f632ce5a9039ae662d9a52286079b772f8ae7f) @@ -96,16 +96,9 @@ PROPERTY( bool , txDialysis_End , false) ///< TREATMENT_DIALYSIS_END_STATE Dialysis has ended. Blood pump slowed. Dialyzer is bypassed. Dialysate is recirculated. User can rinseback // coco end // ---- Treatment states - Rinse back - // coco begin validated: Manually tested - // not used yet since the rinse back and recirculate has not bin implemented yet. - PROPERTY( bool , txRinseback_Running , false) ///< TREATMENT_RINSEBACK_STATE Perform rinseback with saline. Dialyzer bypassed. Dialysate recirculating - PROPERTY( bool , txRinseback_Pause , false) ///< TREATMENT_RINSEBACK_PAUSE_STATE Rinseback paused. Blood pump off. Dialyzer bypassed. Dialysate recirculating + PROPERTY( bool , txRinseback , false) ///< TREATMENT_RINSEBACK_STATE Perform rinseback with saline. Dialyzer bypassed. Dialysate recirculating // ---- Treatment states - Recirculate - PROPERTY( bool , txRecirculate_Setup , false) ///< TREATMENT_RECIRC_SETUP_STATE Rinseback complete. Blood pump off. Blood lines closed. User to disconnect and shunt blood lines - PROPERTY( bool , txRecirculate_Running , false) ///< TREATMENT_RECIRC_STATE Recirculate saline and dialysate while patient disconnected. Blood lines open and shunted. Dialyzer is bypassed - PROPERTY( bool , txRecirculate_Pause , false) ///< TREATMENT_RECIRC_PAUSE_STATE Recirculate paused. Blood pump off. Blood lines closed and shunted. Dialyzer is bypassed - PROPERTY( bool , txRecirculate_Stop , false) ///< TREATMENT_RECIRC_STOP_STATE Recirculate stopped. Blood pump off. Blood lines open. Waiting for patient to unshunt and connect and resume treatment - // coco end + PROPERTY( bool , txRecirculate , false) ///< TREATMENT_RECIRC_STATE Recirculate saline and dialysate while patient disconnected. Blood lines open and shunted. Dialyzer is bypassed // class definition VIEW_DEC_CLASS(VHDTreatmentStates) @@ -117,5 +110,8 @@ VIEW_DEC_SLOT (AdjustHeparinResponseData ) // Heparin Adjustment response message public slots: + +signals: + }; }