Index: sources/gui/GuiGlobals.h =================================================================== diff -u -r923377d29fe730c0e2209386479a61b1e8ee1097 -r5da5607e1e0cff6b984ce40c4f328d47b386ba28 --- sources/gui/GuiGlobals.h (.../GuiGlobals.h) (revision 923377d29fe730c0e2209386479a61b1e8ee1097) +++ sources/gui/GuiGlobals.h (.../GuiGlobals.h) (revision 5da5607e1e0cff6b984ce40c4f328d47b386ba28) @@ -430,8 +430,6 @@ // Treatment End typedef GuiActions::Treatment_End_States GuiTreatmentEndStates; typedef GuiActions::Requested_Treatment_End_User_Actions GuiTreatmentEndCommands; - // Isolated UF - typedef GuiActions::UF_States GuiUfStates; // Treatment Stop typedef GuiActions::Treatment_Paused_States GuiTreatmentPausedStates; // Pre-Treatment SubMode Index: sources/gui/qml/pages/treatment/sections/TreatmentUltrafiltration.qml =================================================================== diff -u -re36852d9548379bd861d4b0838761d2aa5243dad -r5da5607e1e0cff6b984ce40c4f328d47b386ba28 --- sources/gui/qml/pages/treatment/sections/TreatmentUltrafiltration.qml (.../TreatmentUltrafiltration.qml) (revision e36852d9548379bd861d4b0838761d2aa5243dad) +++ sources/gui/qml/pages/treatment/sections/TreatmentUltrafiltration.qml (.../TreatmentUltrafiltration.qml) (revision 5da5607e1e0cff6b984ce40c4f328d47b386ba28) @@ -35,24 +35,6 @@ readonly property int bottomTextFontSize : 60 readonly property bool isUfCompleted : value >= maximum - property string ufButtonText : _root.isUfCompleted ? qsTr("Target Goal Achieved") : - isTreatmentPaused ? qsTr("Ultrafiltration Paused") : - vTDTreatmentStates.txDialysis ? "" : - isUFPaused ? qsTr("Isolated UF Paused") : - isUFRunning ? qsTr("Isolated UF in Progress") : - "" - - property color ufButtonColor : _root.isUfCompleted ? Colors.mainTreatmentGreen : - isUFRunning ? Colors.mainTreatmentIsoBlue : - isTreatmentPaused || isUFPaused ? Colors.mainTreatmentOrange : - Colors.mainTreatmentOrange - - property string ufVolumeDescriptionText : isTreatmentPaused || vTDTreatmentStates.txDialysis ? "" : - isUFRunning || isUFPaused ? qsTr("Isolated UF") : - "" - - property string ufVolumeDescriptionText : "" // TODO: add logic for qsTr("Isolated UF") and qsTr("Isolated + Target UF") - header.title: qsTr("Ultrafiltration") + " (" + qsTr("UF") + ")" contentArea.anchors.topMargin: Variables.defaultMargin @@ -77,9 +59,7 @@ bottomText : vTreatmentUltrafiltration.setVolume.toFixed(Variables.ultrafiltrationPrecision) bottomTextFont.pixelSize: bottomTextFontSize bottomTextFont.weight : Font.Normal - showCenterText : true leftAlign : true - centerText : _root.ufVolumeDescriptionText unitText : Variables.unitVolume } @@ -163,38 +143,6 @@ } } - Rectangle { id: _isolatedUFRect - anchors { - top : header.bottom - topMargin : Variables.defaultMargin - right : parent.right - rightMargin : Variables.defaultMargin * 2 - } - - width : 250 - height : 60 - radius : height - color : Colors.backgroundMain - visible : _root.ufButtonText !== "" - - NotificationBarSmall { id: _isolatedUFText - anchors.centerIn: parent - - height : 25 - color : "transparent" - - imageDiameter : 25 - imageVisible : ( isTreatmentPaused || isUFPaused ) && ! isUfCompleted - - imageSource : "qrc:/images/iPauseOrange" - text : _root.ufButtonText - textColor : _root.ufButtonColor - textfontSize : 20 - textfontWeight : Font.Medium - - } - } - // TODO // notification { // visible : true Index: sources/view/td/data/treatment/VTDTreatmentStatesData.cpp =================================================================== diff -u -r923377d29fe730c0e2209386479a61b1e8ee1097 -r5da5607e1e0cff6b984ce40c4f328d47b386ba28 --- sources/view/td/data/treatment/VTDTreatmentStatesData.cpp (.../VTDTreatmentStatesData.cpp) (revision 923377d29fe730c0e2209386479a61b1e8ee1097) +++ sources/view/td/data/treatment/VTDTreatmentStatesData.cpp (.../VTDTreatmentStatesData.cpp) (revision 5da5607e1e0cff6b984ce40c4f328d47b386ba28) @@ -196,19 +196,6 @@ } txEnd ( mTreatmentEnd ); - // Isolated UF states - bool mIsolatedUF = vData.mSubMode == GuiTreatmentStates ::TREATMENT_ISO_UF_STATE ; - if ( mIsolatedUF ) { - ENUM_CHECK_O( GuiUfStates, vData.mIsolatedUFState ) { - ENUM_CHECK ( GuiUfStates, UF_START_STATE ) - ENUM_CHECK ( GuiUfStates, UF_PAUSED_STATE ) - ENUM_CHECK ( GuiUfStates, UF_RUNNING_STATE ) - ENUM_CHECK_C( GuiUfStates, NUM_OF_UF_STATES ) } - ENUM_READ ( GuiUfStates, UF_PAUSED_STATE , ufPaused ); - ENUM_READ ( GuiUfStates, UF_RUNNING_STATE , ufRunning ); - } - txIsolatedUf ( mIsolatedUF ); - // Treatment Stop states bool mTreatmentStop = vData.mSubMode == GuiTreatmentStates ::TREATMENT_PAUSED_STATE ; if ( mTreatmentStop ) { Index: sources/view/td/data/treatment/VTDTreatmentStatesData.h =================================================================== diff -u -r923377d29fe730c0e2209386479a61b1e8ee1097 -r5da5607e1e0cff6b984ce40c4f328d47b386ba28 --- sources/view/td/data/treatment/VTDTreatmentStatesData.h (.../VTDTreatmentStatesData.h) (revision 923377d29fe730c0e2209386479a61b1e8ee1097) +++ sources/view/td/data/treatment/VTDTreatmentStatesData.h (.../VTDTreatmentStatesData.h) (revision 5da5607e1e0cff6b984ce40c4f328d47b386ba28) @@ -65,7 +65,6 @@ PROPERTY( bool , txRinseback , false) ///< TREATMENT_RINSEBACK_STATE = 4 # Perform rinseback with saline. Dialyzer bypassed. Dialysate recirculating PROPERTY( bool , txRecirculate , false) ///< TREATMENT_RECIRC_STATE = 5 # Recirculate saline and dialysate while patient disconnected. Blood lines open and shunted. Dialyzer is bypassed PROPERTY( bool , txEnd , false) ///< TREATMENT_END_STATE = 6 # Dialysis has ended. Blood pump slowed. Dialyzer is bypassed. Dialysate is recirculated. User can rinseback - PROPERTY( bool , txIsolatedUf , false) ///< TREATMENT_ISO_UF_STATE = 7 # Dialysis Isolated UF // ---- Ultrafiltration states PROPERTY( bool , ufPaused , false) ///< UF_PAUSED_STATE = 1 # Paused state of the ultrafiltration state machine