Index: sources/gui/qml/pages/treatment/TreatmentStack.qml =================================================================== diff -u -rb5c4054a8cb175e43928bb0c4b08171e92065c82 -r3bbcc27ab7584e84e87a9d005c14a6e04188d0c0 --- sources/gui/qml/pages/treatment/TreatmentStack.qml (.../TreatmentStack.qml) (revision b5c4054a8cb175e43928bb0c4b08171e92065c82) +++ sources/gui/qml/pages/treatment/TreatmentStack.qml (.../TreatmentStack.qml) (revision 3bbcc27ab7584e84e87a9d005c14a6e04188d0c0) @@ -56,7 +56,7 @@ readonly property bool isTreatmentPaused : vTDTreatmentStates.txStop readonly property bool isSBInProgress : ( vTDTreatmentStates.sbRunning || vTDTreatmentStates.sbWaitPump ) readonly property bool isTreatmentEnd : vTDTreatmentStates.txEnd - readonly property bool isIsolatedUf : vTDTreatmentStates.txIsolatedUF + property int headerMenuIndex : _headerBar.headerMenuIndex onHeaderMenuIndexChanged: { Index: sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentUltrafiltrationStack.qml =================================================================== diff -u -r38677167535b480612809a53d824b86e11b2e5f9 -r3bbcc27ab7584e84e87a9d005c14a6e04188d0c0 --- sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentUltrafiltrationStack.qml (.../TreatmentAdjustmentUltrafiltrationStack.qml) (revision 38677167535b480612809a53d824b86e11b2e5f9) +++ sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentUltrafiltrationStack.qml (.../TreatmentAdjustmentUltrafiltrationStack.qml) (revision 3bbcc27ab7584e84e87a9d005c14a6e04188d0c0) @@ -29,7 +29,8 @@ objectName: "_TreatmentAdjustmentUltrafiltration" // ultrafiltration state information bar properties - readonly property bool isUFPaused: vTreatmentUltrafiltration.ufPaused + readonly property bool isIsolatedUf: vTDTreatmentStates.txIsolatedUF + readonly property bool isUFPaused : isIsolatedUf ? vTDTreatmentStates.isoUfPaused : vTreatmentUltrafiltration.ufPaused closeVisible : true confirmVisible : false @@ -42,7 +43,7 @@ information { visible : true && information.text && ! notification.visible imageSource : isUFPaused ? "qrc:/images/iPauseOrange" : "" - text : isUFPaused ? qsTr("Ultrafiltration Paused") : "" + text : isUFPaused ? isIsolatedUf ? qsTr("Isolated Ultrafiltration Paused") : qsTr("Ultrafiltration Paused") : "" color : Colors.ufNotificationBarBg textColor : Colors.ufVolumeGoalText textfontSize : Fonts.fontPixelUltrafiltrationAdjustmentNotification Index: sources/gui/qml/pages/treatment/sections/TreatmentTime.qml =================================================================== diff -u -rb5c4054a8cb175e43928bb0c4b08171e92065c82 -r3bbcc27ab7584e84e87a9d005c14a6e04188d0c0 --- sources/gui/qml/pages/treatment/sections/TreatmentTime.qml (.../TreatmentTime.qml) (revision b5c4054a8cb175e43928bb0c4b08171e92065c82) +++ sources/gui/qml/pages/treatment/sections/TreatmentTime.qml (.../TreatmentTime.qml) (revision 3bbcc27ab7584e84e87a9d005c14a6e04188d0c0) @@ -42,14 +42,14 @@ property bool isHDTreatment : vTreatmentCreate.treatmentModality === 0 property bool isHDFTreatment: vTreatmentCreate.treatmentModality === 1 - property bool isIsoTreatment: vTreatmentCreate.treatmentModality === 2 + property bool isIsoTreatment: vTDTreatmentStates.txIsolatedUF property string notificationText: isComplete ? qsTr("Treatment Complete") : isPaused ? qsTr("Treatment Paused") : + isIsoTreatment ? qsTr("Isolated UF Time") : isHDTreatment ? qsTr("HD Mode") : isHDFTreatment ? ("%1\n%2").arg(qsTr("HDF Mode")) .arg(vTreatmentRanges.hdfTreatmentModeOptions[vTreatmentCreate.hdfTreatmentMode]) : - isIsoTreatment ? qsTr("Isolated UF Mode") : "" property color notificationColor: isComplete ? Colors.statusComplete : Index: sources/gui/qml/pages/treatment/sections/TreatmentUltrafiltration.qml =================================================================== diff -u -rac81e21684bfb1c72b8ef86bfeda04e174e5066e -r3bbcc27ab7584e84e87a9d005c14a6e04188d0c0 --- sources/gui/qml/pages/treatment/sections/TreatmentUltrafiltration.qml (.../TreatmentUltrafiltration.qml) (revision ac81e21684bfb1c72b8ef86bfeda04e174e5066e) +++ sources/gui/qml/pages/treatment/sections/TreatmentUltrafiltration.qml (.../TreatmentUltrafiltration.qml) (revision 3bbcc27ab7584e84e87a9d005c14a6e04188d0c0) @@ -28,23 +28,27 @@ */ TreatmentSection { id: _root + readonly property bool isIsolatedUf: vTDTreatmentStates.txIsolatedUF + readonly property real minimum : vTreatmentRanges.treatmentRanges_Ultrafiltration_Volume_Min - readonly property real maximum : vTreatmentUltrafiltration.setVolume - readonly property real value : vTreatmentUltrafiltration.volumeRemoved - readonly property real paused : vTreatmentUltrafiltration.ufPaused - readonly property real running : vTreatmentUltrafiltration.ufRunning + readonly property real maximum : isIsolatedUf ? vTreatmentIsolatedUF.setVolume : vTreatmentUltrafiltration.setVolume + readonly property real value : isIsolatedUf ? vTreatmentIsolatedUF.volumeDelivered : vTreatmentUltrafiltration.volumeRemoved + readonly property real rate : isIsolatedUf ? vTreatmentIsolatedUF.rate : vTreatmentUltrafiltration.targetRate + readonly property real paused : isIsolatedUf ? vTDTreatmentStates.isoUfPaused : vTreatmentUltrafiltration.ufPaused + readonly property real running : isIsolatedUf ? vTDTreatmentStates.isoUfRunning : vTreatmentUltrafiltration.ufRunning + readonly property int topTextFontSize : 25 readonly property int bottomTextFontSize : 60 readonly property bool isUfCompleted : value >= maximum && maximum > 0 - readonly property string statusText : isUfCompleted ? qsTr ("Ultrafiltration Complete") : - paused ? qsTr ("Ultrafiltration Paused") : - running ? "" : "" + readonly property string statusText : isUfCompleted ? qsTr ("Ultrafiltration Complete") : + paused ? isIsolatedUf ? qsTr ("Isolated UF Paused") : qsTr ("Ultrafiltration Paused") : + running ? isIsolatedUf ? qsTr ("Isolated UF in Progress") : "" : "" - readonly property color statusColor : isUfCompleted ? Colors.statusTextComplete : - paused ? Colors.statusPaused : - running ? Colors.transparent : Colors.transparent + readonly property color statusColor : isUfCompleted ? Colors.statusTextComplete : + paused ? Colors.statusPaused : + running ? isIsolatedUf ? Colors.statusActive : Colors.transparent : Colors.transparent header.showPauseResume : true header.isPaused : _root.paused header.title : qsTr("Ultrafiltration") + " (" + qsTr("UF") + ")" @@ -71,12 +75,13 @@ topTextFont.pixelSize : topTextFontSize topTextFont.weight : Font.Medium - bottomText : vTreatmentUltrafiltration.setVolume.toFixed(Variables.ultrafiltrationPrecision) + bottomText : _root.maximum.toFixed(Variables.ultrafiltrationPrecision) bottomTextFont.pixelSize: bottomTextFontSize bottomTextFont.weight : Font.Normal leftAlign : true unitText : Variables.unitVolume showCenterText : true + centerText : _root.isIsolatedUf ? qsTr("Isolated UF") : "" } LabelValue { id: _ufRate @@ -88,7 +93,7 @@ topTextFont.weight : Font.Medium bottomText : isTreatmentEnd || _root.isUfCompleted ? qsTr("OFF") : - vTreatmentUltrafiltration.targetRate.toFixed(Variables.ultrafiltrationPrecision) + _root.rate.toFixed(Variables.ultrafiltrationPrecision) bottomTextFont.pixelSize: bottomTextFontSize bottomTextFont.weight : Font.Normal bottomTextColor : _root.paused ? Colors.statusTextPaused : Colors.textTextRectLabel Index: sources/view/td/data/treatment/VTDTreatmentStatesData.cpp =================================================================== diff -u -rb5c4054a8cb175e43928bb0c4b08171e92065c82 -r3bbcc27ab7584e84e87a9d005c14a6e04188d0c0 --- sources/view/td/data/treatment/VTDTreatmentStatesData.cpp (.../VTDTreatmentStatesData.cpp) (revision b5c4054a8cb175e43928bb0c4b08171e92065c82) +++ sources/view/td/data/treatment/VTDTreatmentStatesData.cpp (.../VTDTreatmentStatesData.cpp) (revision 3bbcc27ab7584e84e87a9d005c14a6e04188d0c0) @@ -57,11 +57,29 @@ void VTDTreatmentStates::onActionReceive(const TreatmentStatesData &vData) { subMode ( vData.mSubMode ); - ufState ( vData.mIsolatedUFState ); + isoUfState ( vData.mIsolatedUFState ); salineState ( vData.mSalineState ); - // Ultrafiltration states + // Isolated Ultrafiltration states + bool mIsoUf = vData.mSubMode == GuiTreatmentStates ::TREATMENT_ISO_UF_STATE ; + /// *********** UPDATE FOR REAL STATES ******************** + isoUfRunning(_isoUfState==0); + isoUfPaused (_isoUfState==1); + ///****************** END UPDATE FOR REAL STATES ********* +// if ( mIsoUf ) { +// ENUM_CHECK_O( GuiDialysisState, vData.mIsolatedUFState ) { +// ENUM_CHECK ( GuiDialysisState, DIALYSIS_UF_STATE ) +// ENUM_CHECK ( GuiDialysisState, DIALYSIS_UF_PAUSED_STATE ) +// ENUM_CHECK ( GuiDialysisState, DIALYSIS_UF_FLUID_BOLUS_STATE ) +// ENUM_CHECK_C( GuiDialysisState, NUM_OF_DIALYSIS_STATES ) } +// ENUM_READ ( GuiDialysisState, DIALYSIS_UF_STATE , dyUltrafiltration ); +// ENUM_READ ( GuiDialysisState, DIALYSIS_UF_PAUSED_STATE , dyUltrafiltrationPaused ); +// ENUM_READ ( GuiDialysisState, DIALYSIS_UF_FLUID_BOLUS_STATE , dyFluidBolus ); +// } + txIsolatedUF ( mIsoUf ); // it's the main dialysis event so moved last to have all the sub-dialysis-states updated prior to. + + // Saline Bolus states ENUM_CHECK_O( GuiSalineStates, vData.mSalineState ) { ENUM_CHECK ( GuiSalineStates, FLUID_BOLUS_IDLE_STATE ) Index: sources/view/td/data/treatment/VTDTreatmentStatesData.h =================================================================== diff -u -re7ddd5bebe2e455e77337b485d17ccf1d26c395d -r3bbcc27ab7584e84e87a9d005c14a6e04188d0c0 --- sources/view/td/data/treatment/VTDTreatmentStatesData.h (.../VTDTreatmentStatesData.h) (revision e7ddd5bebe2e455e77337b485d17ccf1d26c395d) +++ sources/view/td/data/treatment/VTDTreatmentStatesData.h (.../VTDTreatmentStatesData.h) (revision 3bbcc27ab7584e84e87a9d005c14a6e04188d0c0) @@ -42,7 +42,7 @@ // This property should not be used in QML since it need exposed enum // exposed enum usage in QML is not suggested since QML will not error out on any issue PROPERTY( quint32, subMode , 0) - PROPERTY( quint32, ufState , 0) + PROPERTY( quint32, isoUfState , 0) PROPERTY( quint32, salineState , 0) // these groups of properties are mutually exclusive @@ -65,11 +65,11 @@ 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_END_STATE = 7 # Isolated UF mode + PROPERTY( bool , txIsolatedUF , false) ///< TREATMENT_ISO_UF_STATE = 7 # Isolated UF mode - // ---- Ultrafiltration states - PROPERTY( bool , ufPaused , false) ///< UF_PAUSED_STATE = 1 # Paused state of the ultrafiltration state machine - PROPERTY( bool , ufRunning , false) ///< UF_RUNNING_STATE = 2 # Running state of the ultrafiltration state machine + // ---- Isolated Ultrafiltration states + PROPERTY( bool , isoUfRunning , false) ///< ISOLATED_UF_RUNNING_STATE = 0 # Running state of the ultrafiltration state machine + PROPERTY( bool , isoUfPaused , false) ///< ISOLATED_UF_PAUSED_STATE = 1 # Paused state of the ultrafiltration state machine // ---- Saline Bolus states PROPERTY( bool , sbIdle , true ) ///< SALINE_BOLUS_STATE_IDLE = 0 # No saline bolus delivery is in progress