Index: sources/gui/qml/pages/treatment/TreatmentHome.qml =================================================================== diff -u -r07121b02499a4c929c5b5e8bd804a67539574c1b -re7a26aa8823fdabbfb21fe75ea9a581c7d0513b4 --- sources/gui/qml/pages/treatment/TreatmentHome.qml (.../TreatmentHome.qml) (revision 07121b02499a4c929c5b5e8bd804a67539574c1b) +++ sources/gui/qml/pages/treatment/TreatmentHome.qml (.../TreatmentHome.qml) (revision e7a26aa8823fdabbfb21fe75ea9a581c7d0513b4) @@ -115,7 +115,7 @@ objectName : "treatmentFlows" width : cellWidth * 4 height : cellHeight - header.setEditActive: ! isTreatmentEnd // LEAHI-PRS-376 + header.setEditActive: ! isTreatmentEnd && ! isIsoTreatment // LEAHI-PRS-376 editEnabled : ! _lockDialog.isLocked onEditClicked : sectionFlowClicked() onLockClicked : { Index: sources/gui/qml/pages/treatment/TreatmentStack.qml =================================================================== diff -u -r3bbcc27ab7584e84e87a9d005c14a6e04188d0c0 -re7a26aa8823fdabbfb21fe75ea9a581c7d0513b4 --- sources/gui/qml/pages/treatment/TreatmentStack.qml (.../TreatmentStack.qml) (revision 3bbcc27ab7584e84e87a9d005c14a6e04188d0c0) +++ sources/gui/qml/pages/treatment/TreatmentStack.qml (.../TreatmentStack.qml) (revision e7a26aa8823fdabbfb21fe75ea9a581c7d0513b4) @@ -56,6 +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 isIsoTreatment : vTDTreatmentStates.txIsolatedUF property int headerMenuIndex : _headerBar.headerMenuIndex Index: sources/gui/qml/pages/treatment/sections/TreatmentFlows.qml =================================================================== diff -u -ra5287e9029c8e81a149f933cc23add8b511aa559 -re7a26aa8823fdabbfb21fe75ea9a581c7d0513b4 --- sources/gui/qml/pages/treatment/sections/TreatmentFlows.qml (.../TreatmentFlows.qml) (revision a5287e9029c8e81a149f933cc23add8b511aa559) +++ sources/gui/qml/pages/treatment/sections/TreatmentFlows.qml (.../TreatmentFlows.qml) (revision e7a26aa8823fdabbfb21fe75ea9a581c7d0513b4) @@ -69,7 +69,7 @@ maximum : vTreatmentRanges.dialysateFlowRateMax step : vTreatmentRanges.dialysateFlowRateRes unitText : Variables.unitTextFlowRate - buttonsEnabled : isTreatmentEnd ? false : editEnabled // LEAHI-PRS-376 + buttonsEnabled : isTreatmentEnd || isIsoTreatment ? false : editEnabled // LEAHI-PRS-376 extraText : ! vDDGenDialysate.isDialGood ? qsTr("Bypass") : "" canOff : true @@ -90,7 +90,7 @@ maximum : vTreatmentRanges.dialysateTempMax step : vTreatmentRanges.dialysateTempRes unitText : Variables.unitTextTemperature - buttonsEnabled : isTreatmentEnd ? false : editEnabled // LEAHI-PRS-376 + buttonsEnabled : isTreatmentEnd || isIsoTreatment ? false : editEnabled // LEAHI-PRS-376 onIncrement : function(newValue) { vTreatmentAdjustmentDialysateTemperature.doAdjustment(newValue) } onDecrement : function(newValue) { vTreatmentAdjustmentDialysateTemperature.doAdjustment(newValue) } Index: sources/gui/qml/pages/treatment/sections/TreatmentHDFComponent.qml =================================================================== diff -u -r600b6707b102919d981f3b1d18611834e23eae60 -re7a26aa8823fdabbfb21fe75ea9a581c7d0513b4 --- sources/gui/qml/pages/treatment/sections/TreatmentHDFComponent.qml (.../TreatmentHDFComponent.qml) (revision 600b6707b102919d981f3b1d18611834e23eae60) +++ sources/gui/qml/pages/treatment/sections/TreatmentHDFComponent.qml (.../TreatmentHDFComponent.qml) (revision e7a26aa8823fdabbfb21fe75ea9a581c7d0513b4) @@ -21,10 +21,11 @@ import "qrc:/pages/treatment" TreatmentSection { id: _root - color : Colors.panelBackgroundColor - header.color : Colors.heparinSectionHeader - enableDropShadow: false - header.title : qsTr("Hemodiafiltration") + " (" + qsTr("HDF") + ")" + color : Colors.panelBackgroundColor + header.color : Colors.heparinSectionHeader + enableDropShadow : false + header.title : qsTr("Hemodiafiltration") + " (" + qsTr("HDF") + ")" + header.editEnabled : ! isIsoTreatment // LEAHI-PRS-459 contentArea.anchors { topMargin : Variables.defaultMargin @@ -191,6 +192,7 @@ } isDefault: true + enabled : ! isIsoTreatment // LEAHI-PRS-459 anchors { bottom : parent.bottom @@ -237,6 +239,8 @@ } checked : true // TODO height : Variables.contentHeight + active : ! isIsoTreatment // LEAHI-PRS-459 + enabled : active onClicked: { print (("Auto Sub Switch set to %1").arg(_autoSubSwitch.checked ? "On" : "Off")) Index: sources/gui/qml/pages/treatment/sections/TreatmentTime.qml =================================================================== diff -u -r3bbcc27ab7584e84e87a9d005c14a6e04188d0c0 -re7a26aa8823fdabbfb21fe75ea9a581c7d0513b4 --- sources/gui/qml/pages/treatment/sections/TreatmentTime.qml (.../TreatmentTime.qml) (revision 3bbcc27ab7584e84e87a9d005c14a6e04188d0c0) +++ sources/gui/qml/pages/treatment/sections/TreatmentTime.qml (.../TreatmentTime.qml) (revision e7a26aa8823fdabbfb21fe75ea9a581c7d0513b4) @@ -42,7 +42,6 @@ property bool isHDTreatment : vTreatmentCreate.treatmentModality === 0 property bool isHDFTreatment: vTreatmentCreate.treatmentModality === 1 - property bool isIsoTreatment: vTDTreatmentStates.txIsolatedUF property string notificationText: isComplete ? qsTr("Treatment Complete") : isPaused ? qsTr("Treatment Paused") : @@ -59,7 +58,7 @@ isIsoTreatment ? Colors.statusTextActive : "" - property bool editEnabled : ! isTreatmentEnd // LEAHI-PRS-376 + property bool editEnabled : ! isTreatmentEnd && ! isIsoTreatment // LEAHI-PRS-376 ** LEAHI-PRS-459 color : "transparent" width : _circle.width Index: sources/gui/qml/pages/treatment/sections/TreatmentUltrafiltration.qml =================================================================== diff -u -r3bbcc27ab7584e84e87a9d005c14a6e04188d0c0 -re7a26aa8823fdabbfb21fe75ea9a581c7d0513b4 --- sources/gui/qml/pages/treatment/sections/TreatmentUltrafiltration.qml (.../TreatmentUltrafiltration.qml) (revision 3bbcc27ab7584e84e87a9d005c14a6e04188d0c0) +++ sources/gui/qml/pages/treatment/sections/TreatmentUltrafiltration.qml (.../TreatmentUltrafiltration.qml) (revision e7a26aa8823fdabbfb21fe75ea9a581c7d0513b4) @@ -34,19 +34,18 @@ 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 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") : + 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 : + readonly property color statusColor : isUfCompleted ? Colors.statusTextComplete : paused ? Colors.statusPaused : running ? isIsolatedUf ? Colors.statusActive : Colors.transparent : Colors.transparent header.showPauseResume : true @@ -81,7 +80,9 @@ leftAlign : true unitText : Variables.unitVolume showCenterText : true - centerText : _root.isIsolatedUf ? qsTr("Isolated UF") : "" + centerText : _root.isIsolatedUf ? qsTr("Isolated UF") : + vTreatmentIsolatedUF.volumeDelivered > 0 ? qsTr("Isolated UF + Target UF") : + "" } LabelValue { id: _ufRate @@ -175,7 +176,7 @@ topMargin : Variables.defaultMargin * 2.5 right : parent.right } - text : qsTr("Volume Removed") + text : qsTr("UF Volume Removed") color : Colors.textTextRectLabel font.pixelSize : 20 font.weight : Font.Medium Index: sources/view/hd/data/pretreatment/VPreTreatmentStatesData.cpp =================================================================== diff -u -r64d551143d898bf2ce79cb564e5a3389eb9be91e -re7a26aa8823fdabbfb21fe75ea9a581c7d0513b4 --- sources/view/hd/data/pretreatment/VPreTreatmentStatesData.cpp (.../VPreTreatmentStatesData.cpp) (revision 64d551143d898bf2ce79cb564e5a3389eb9be91e) +++ sources/view/hd/data/pretreatment/VPreTreatmentStatesData.cpp (.../VPreTreatmentStatesData.cpp) (revision e7a26aa8823fdabbfb21fe75ea9a581c7d0513b4) @@ -28,52 +28,12 @@ void VPreTreatmentStates::onActionReceive(const PreTreatmentStatesData &vData) { subMode ( vData.mSubMode ); - waterSampleState ( vData.mWaterSampleState ); - selfTestConsumablesState( vData.mSelfTestConsumablesState ); - selfTestNoCartridgeState( vData.mSelfTestNoCartridgeState ); installationState ( vData.mInstallationState ); selfTestDryState ( vData.mSelfTestDryState ); primeState ( vData.mPrimeState ); recirculateState ( vData.mRecirculateState ); patientConnectionState ( vData.mPatientConnectionState ); - wetSelfTestsState ( vData.mWetSelfTestsState ); - preTreatmentRsrvrState ( vData.mPreTreatmentRsrvrState ); - // water sample state - bool mWaterSample = vData.mSubMode == GuiPreTreatmentStates ::TD_PRE_TREATMENT_WATER_SAMPLE_STATE ; - if ( mWaterSample ) { - waterSample_setup ( vData.mWaterSampleState == GuiPreTreatmentWaterSampleStates ::SAMPLE_WATER_SETUP_STATE ); - waterSample_running ( vData.mWaterSampleState == GuiPreTreatmentWaterSampleStates ::SAMPLE_WATER_STATE ); - } - waterSample( mWaterSample ); // it's the main even so moved last to have all the sub-states updated prior to. - - // Self tests consumables state - bool mSelfTestConsumables = vData.mSubMode == GuiPreTreatmentStates ::TD_PRE_TREATMENT_SELF_TEST_CONSUMABLE_STATE ; - if ( mSelfTestConsumables ) { - selfTestConsumables_install ( vData.mSelfTestConsumablesState == GuiPreTreatmentSelfTestConsumablesStates ::CONSUMABLE_SELF_TESTS_INSTALL_STATE ); - selfTestConsumables_prime ( vData.mSelfTestConsumablesState == GuiPreTreatmentSelfTestConsumablesStates ::CONSUMABLE_SELF_TESTS_PRIME_STATE ); - selfTestConsumables_biCarbPump ( vData.mSelfTestConsumablesState == GuiPreTreatmentSelfTestConsumablesStates ::CONSUMABLE_SELF_TESTS_BICARB_PUMP_CHECK_STATE ); - selfTestConsumables_acidPump ( vData.mSelfTestConsumablesState == GuiPreTreatmentSelfTestConsumablesStates ::CONSUMABLE_SELF_TESTS_ACID_PUMP_CHECK_STATE ); - selfTestConsumables_complete ( vData.mSelfTestConsumablesState == GuiPreTreatmentSelfTestConsumablesStates ::CONSUMABLE_SELF_TESTS_COMPLETE_STATE ); - } - selfTestConsumables(mSelfTestConsumables); // it's the main even so moved last to have all the sub-states updated prior to. - - - // Self tests with no cartridge state - bool mSelfTestNoCartridge = vData.mSubMode == GuiPreTreatmentStates ::TD_PRE_TREATMENT_SELF_TEST_NO_CART_STATE ; - if ( mSelfTestNoCartridge ) { - selfTestNoCartridge_waitDoorClose ( vData.mSelfTestNoCartridgeState == GuiPreTreatmentSelfTestNoCartridgeStates ::NO_CART_SELF_TESTS_WAIT_FOR_DOOR_CLOSE_STATE ); - selfTestNoCartridge_pressureCheck ( vData.mSelfTestNoCartridgeState == GuiPreTreatmentSelfTestNoCartridgeStates ::NO_CART_SELF_TESTS_PRESSURE_CHECKS_STATE ); - selfTestNoCartridge_homeValves ( vData.mSelfTestNoCartridgeState == GuiPreTreatmentSelfTestNoCartridgeStates ::NO_CART_SELF_TESTS_HOME_VALVES_STATE ); - selfTestNoCartridge_homeSyringePump ( vData.mSelfTestNoCartridgeState == GuiPreTreatmentSelfTestNoCartridgeStates ::NO_CART_SELF_TESTS_HOME_SYRINGE_PUMP_STATE ); - selfTestNoCartridge_pumps ( vData.mSelfTestNoCartridgeState == GuiPreTreatmentSelfTestNoCartridgeStates ::NO_CART_SELF_TESTS_PUMPS_STATE ); - selfTestNoCartridge_homeIdle ( vData.mSelfTestNoCartridgeState == GuiPreTreatmentSelfTestNoCartridgeStates ::NO_CART_SELF_TESTS_HOME_IDLE_STATE ); - selfTestNoCartridge_stopped ( vData.mSelfTestNoCartridgeState == GuiPreTreatmentSelfTestNoCartridgeStates ::NO_CART_SELF_TESTS_STOPPED_STATE ); - selfTestNoCartridge_complete ( vData.mSelfTestNoCartridgeState == GuiPreTreatmentSelfTestNoCartridgeStates ::NO_CART_SELF_TESTS_COMPLETE_STATE ); - } - selfTestNoCartridge(mSelfTestNoCartridge); // it's the main even so moved last to have all the sub-states updated prior to. - - // Consumable and cartridge installation state bool mInstallation = vData.mSubMode == GuiPreTreatmentStates ::TD_PRE_TREATMENT_TUBING_SET_INSTALL_STATE ; if ( mInstallation ) { @@ -82,7 +42,6 @@ } installation(mInstallation); // it's the main even so moved last to have all the sub-states updated prior to. - // Self tests dry state bool mSelfTestDry = vData.mSubMode == GuiPreTreatmentStates ::TD_PRE_TREATMENT_SELF_TEST_DRY_STATE ; if ( mSelfTestDry ) { Index: sources/view/hd/data/pretreatment/VPreTreatmentStatesData.h =================================================================== diff -u -rc3fb36648391c5b7738adfd0062ad2ac0b8e4749 -re7a26aa8823fdabbfb21fe75ea9a581c7d0513b4 --- sources/view/hd/data/pretreatment/VPreTreatmentStatesData.h (.../VPreTreatmentStatesData.h) (revision c3fb36648391c5b7738adfd0062ad2ac0b8e4749) +++ sources/view/hd/data/pretreatment/VPreTreatmentStatesData.h (.../VPreTreatmentStatesData.h) (revision e7a26aa8823fdabbfb21fe75ea9a581c7d0513b4) @@ -41,19 +41,13 @@ TRIGGER ( bool , state , false ) // changes in case any message received. PROPERTY( quint8 , subMode , 0 ) ///< HD_PRE_TREATMENT_WATER_SAMPLE_STATE , Water sample state - PROPERTY( quint8 , waterSampleState , 0 ) ///< HD_PRE_TREATMENT_WATER_SAMPLE_STATE , Water sample state - PROPERTY( quint8 , selfTestConsumablesState , 0 ) ///< HD_PRE_TREATMENT_SELF_TEST_CONSUMABLE_STATE, , Consumable self-tests state - PROPERTY( quint8 , selfTestNoCartridgeState , 0 ) ///< HD_PRE_TREATMENT_SELF_TEST_NO_CART_STATE , Self tests with no cartridge state PROPERTY( quint8 , installationState , 0 ) ///< HD_PRE_TREATMENT_CART_INSTALL_STATE , Consumable and cartridge installation state PROPERTY( quint8 , selfTestDryState , 0 ) ///< HD_PRE_TREATMENT_SELF_TEST_DRY_STATE , Self tests dry state PROPERTY( quint8 , primeState , 0 ) ///< HD_PRE_TREATMENT_PRIME_STATE , Prime blood and dialysate circuits and run wet self-tests state PROPERTY( quint8 , recirculateState , 0 ) ///< HD_PRE_TREATMENT_RECIRCULATE_STATE , Re-circulate blood and dialysate circuits state PROPERTY( quint8 , patientConnectionState , 0 ) ///< HD_PRE_TREATMENT_PATIENT_CONNECTION_STATE , Patient connection state - PROPERTY( quint8 , wetSelfTestsState , 0 ) ///< ??? , ??? - PROPERTY( quint8 , preTreatmentRsrvrState , 0 ) ///< ??? , ??? // Start pre-treatment mode state - PROPERTY( bool , waterSample , false ) ///< HD_PRE_TREATMENT_WATER_SAMPLE_STATE , Water sample state PROPERTY( bool , selfTestConsumables , false ) ///< HD_PRE_TREATMENT_SELF_TEST_CONSUMABLE_STATE, , Consumable self-tests state PROPERTY( bool , selfTestNoCartridge , false ) ///< HD_PRE_TREATMENT_SELF_TEST_NO_CART_STATE , Self tests with no cartridge state PROPERTY( bool , installation , false ) ///< HD_PRE_TREATMENT_CART_INSTALL_STATE , Consumable and cartridge installation state @@ -62,26 +56,7 @@ PROPERTY( bool , recirculate , false ) ///< HD_PRE_TREATMENT_RECIRCULATE_STATE , Re-circulate blood and dialysate circuits state PROPERTY( bool , patientConnection , false ) ///< HD_PRE_TREATMENT_PATIENT_CONNECTION_STATE , Patient connection state - // Water sample state - PROPERTY( bool , waterSample_setup , false ) ///< SAMPLE_WATER_SETUP_STATE , Sample water setup state of the sample water sub-mode state machine - PROPERTY( bool , waterSample_running , false ) ///< SAMPLE_WATER_STATE , Sample water state of the sample water sub-mode state machine - // Self tests consumables state - PROPERTY( bool , selfTestConsumables_install , false ) ///< CONSUMABLE_SELF_TESTS_INSTALL_STATE , Consumable self-tests install state - STATE ( bool , selfTestConsumables_prime , false ) ///< CONSUMABLE_SELF_PRIME_STATE , Consumable self-tests prime concentrate lines state - STATE ( bool , selfTestConsumables_biCarbPump , false ) ///< CONSUMABLE_SELF_TESTS_BICARB_PUMP_CHECK_STATE , Consumable self-tests bicarbonate concentrate pump check state - STATE ( bool , selfTestConsumables_acidPump , false ) ///< CONSUMABLE_SELF_TESTS_ACID_PUMP_CHECK_STATE , Consumable self-tests acid concentrate pump check state - STATE ( bool , selfTestConsumables_complete , false ) ///< CONSUMABLE_SELF_TESTS_COMPLETE_STATE , Consumable self-tests complete state - - PROPERTY( bool , selfTestNoCartridge_waitDoorClose , false ) ///< NO_CART_SELF_TESTS_WAIT_FOR_DOOR_CLOSE_STATE , Wait for door to be closed before running self-tests. - PROPERTY( bool , selfTestNoCartridge_pressureCheck , false ) ///< NO_CART_SELF_TESTS_PRESSURE_CHECKS_STATE , No cartridge pressure sensors self-test state - PROPERTY( bool , selfTestNoCartridge_homeValves , false ) ///< NO_CART_SELF_TESTS_HOME_VALVES_STATE , No cartridge home valves state - PROPERTY( bool , selfTestNoCartridge_homeSyringePump , false ) ///< NO_CART_SELF_TESTS_HOME_SYRINGE_PUMP_STATE , No cartridge home syringe pump state - PROPERTY( bool , selfTestNoCartridge_pumps , false ) ///< NO_CART_SELF_TESTS_PUMPS_STATE , No cartridge self-test for blood pump, dialysate in pump, dialysate out pump state. - PROPERTY( bool , selfTestNoCartridge_homeIdle , false ) ///< NO_CART_SELF_TESTS_HOME_IDLE_STATE , Wait for valves and pumps finish homing state. - PROPERTY( bool , selfTestNoCartridge_stopped , false ) ///< NO_CART_SELF_TESTS_STOPPED_STATE , No cart self-test stopped state. - PROPERTY( bool , selfTestNoCartridge_complete , false ) ///< NO_CART_SELF_TESTS_COMPLETE_STATE , No cartridge self-test complete state. - // Consumable and cartridge installation state // There is not state(enum) for this and it is always 0 for now. but will be used to notify UI about being in this state. PROPERTY( bool , installation_start , false ) ///< Consumable and cartridge installation state