Index: sources/gui/qml/pages/treatment/sections/TreatmentSaline.qml =================================================================== diff -u -r6496cf52bba53702ce4a1370ebd08fd074a03887 -r41d3980778ddbd9d810169f83b4ad581c59c04e4 --- sources/gui/qml/pages/treatment/sections/TreatmentSaline.qml (.../TreatmentSaline.qml) (revision 6496cf52bba53702ce4a1370ebd08fd074a03887) +++ sources/gui/qml/pages/treatment/sections/TreatmentSaline.qml (.../TreatmentSaline.qml) (revision 41d3980778ddbd9d810169f83b4ad581c59c04e4) @@ -32,17 +32,16 @@ readonly property bool isIdle : vTDTreatmentStates.sbIdle // other that max saline bolus delivered, // if saline started but still is waiting for pump the button is disabled so user won't tap multiple times. - readonly property bool isDisabled : vTDTreatmentStates.sbMaxReached readonly property bool isWaitPump : vTDTreatmentStates.sbWaitPump readonly property string unit : Variables.unitTextFluid property int valueDecimal : Variables.salinePrecision property int valueTarget : vTreatmentSaline.target || vTreatmentAdjustmentSaline.target property int valueCumulative: vTreatmentSaline.cumulative property int valueDelivered : vTreatmentSaline.delivered - property string buttonText : ( isDisabled || isWaitPump ) ? _private.textStart : - isStarted ? _private.textStop : - _private.textStart + property string buttonText : isWaitPump ? _private.textStart : + isStarted ? _private.textStop : + _private.textStart header.title : qsTr("Saline" ) header.showEdit : false @@ -132,13 +131,4 @@ } } } - - // TODO: -// notification { -// visible : true -// text : isDisabled ? _private.mesgDisabled : -// isWaitPump ? _private.mesgWaitForPump : -// _private.mesgRejectReason -// } -// } } Index: sources/view/td/data/treatment/VTDTreatmentStatesData.h =================================================================== diff -u -r43ae56f762e6f3e1416d39e3d16f9103fc597e41 -r41d3980778ddbd9d810169f83b4ad581c59c04e4 --- sources/view/td/data/treatment/VTDTreatmentStatesData.h (.../VTDTreatmentStatesData.h) (revision 43ae56f762e6f3e1416d39e3d16f9103fc597e41) +++ sources/view/td/data/treatment/VTDTreatmentStatesData.h (.../VTDTreatmentStatesData.h) (revision 41d3980778ddbd9d810169f83b4ad581c59c04e4) @@ -74,7 +74,6 @@ PROPERTY( bool , sbIdle , true ) ///< SALINE_BOLUS_STATE_IDLE = 0 # No saline bolus delivery is in progress PROPERTY( bool , sbWaitPump , false) ///< SALINE_BOLUS_STATE_WAIT_FOR_PUMPS_STOP = 1 # Wait for pumps to stop before starting bolus PROPERTY( bool , sbRunning , false) ///< SALINE_BOLUS_STATE_IN_PROGRESS = 2 # A saline bolus delivery is in progress - PROPERTY( bool , sbMaxReached , false) ///< SALINE_BOLUS_STATE_MAX_DELIVERED = 3 # Maximum saline bolus volume reached - no more saline bolus deliveries allowed // ---- Heparin states PROPERTY( bool , hpOff , true ) ///< HEPARIN_STATE_OFF = 0 # No heparin delivery is in progress