Index: Todos =================================================================== diff -u --- Todos (revision 0) +++ Todos (revision a09afcb23e479527eb2263474003b63955cd0e99) @@ -0,0 +1,8 @@ +/* + Ultrafiltration : + // TODO : 1 - The Ultrafiltration State change shall have the rejection reason like other responses. + // TODO : 2 - Change mL => L (UI/HD/Messaging) + // TODO : 3 - HD Ultrafiltration Adjustment may need to give rate on duration option selection. + // It means there should be a rate value that is the rate if user wants to choose the duration option. + +*/ Index: denali.pro =================================================================== diff -u -ra159e12630645a9a35fb0a5585cc7b639cfe6aa6 -ra09afcb23e479527eb2263474003b63955cd0e99 --- denali.pro (.../denali.pro) (revision a159e12630645a9a35fb0a5585cc7b639cfe6aa6) +++ denali.pro (.../denali.pro) (revision a09afcb23e479527eb2263474003b63955cd0e99) @@ -283,3 +283,6 @@ qnx: target.path = /tmp/$${TARGET}/bin else: unix:!android: target.path = /opt/$${TARGET}/bin !isEmpty(target.path): INSTALLS += target + +DISTFILES += \ + Todos Index: denali.pro.user =================================================================== diff -u -reb19475a6bf4ed7f6a16bc07eefc7813496620ef -ra09afcb23e479527eb2263474003b63955cd0e99 --- denali.pro.user (.../denali.pro.user) (revision eb19475a6bf4ed7f6a16bc07eefc7813496620ef) +++ denali.pro.user (.../denali.pro.user) (revision a09afcb23e479527eb2263474003b63955cd0e99) @@ -1,6 +1,6 @@ - + EnvironmentId Index: sources/gui/qml/components/ImageClock.qml =================================================================== diff -u -r670f257c9b88d3e5506eccaad111bec914102a72 -ra09afcb23e479527eb2263474003b63955cd0e99 --- sources/gui/qml/components/ImageClock.qml (.../ImageClock.qml) (revision 670f257c9b88d3e5506eccaad111bec914102a72) +++ sources/gui/qml/components/ImageClock.qml (.../ImageClock.qml) (revision a09afcb23e479527eb2263474003b63955cd0e99) @@ -29,11 +29,6 @@ width : 118 * scale // constant image size height : 112 * scale // constant image size clip : false - anchors { - right : parent.right - bottom : parent.bottom - margins : 28 - } Image { id: _image anchors.fill: parent Index: sources/gui/qml/components/ImageWave.qml =================================================================== diff -u -r670f257c9b88d3e5506eccaad111bec914102a72 -ra09afcb23e479527eb2263474003b63955cd0e99 --- sources/gui/qml/components/ImageWave.qml (.../ImageWave.qml) (revision 670f257c9b88d3e5506eccaad111bec914102a72) +++ sources/gui/qml/components/ImageWave.qml (.../ImageWave.qml) (revision a09afcb23e479527eb2263474003b63955cd0e99) @@ -30,12 +30,6 @@ height : 90 * scale // constant image size clip : false - anchors { - right : parent.right - bottom : parent.bottom - margins : 28 - } - Image { id: _image anchors.fill: parent width : parent.width Index: sources/gui/qml/components/UltrafiltrationButton.qml =================================================================== diff -u -r670f257c9b88d3e5506eccaad111bec914102a72 -ra09afcb23e479527eb2263474003b63955cd0e99 --- sources/gui/qml/components/UltrafiltrationButton.qml (.../UltrafiltrationButton.qml) (revision 670f257c9b88d3e5506eccaad111bec914102a72) +++ sources/gui/qml/components/UltrafiltrationButton.qml (.../UltrafiltrationButton.qml) (revision a09afcb23e479527eb2263474003b63955cd0e99) @@ -33,12 +33,18 @@ property string title : "" property string description : "" + property string valueText : "" + property color textColor : "white" property int buttonType : UltrafiltrationButton.ButtonType.UltrafiltrationRate property bool isIncrease : true property bool selected : false property bool disabled : false + readonly property int leftMargin : 35 + readonly property int rightMargin : 28 + + signal clicked() width : Variables.ultrafiltrationAdjustmtenOptionWidth @@ -73,20 +79,43 @@ top : parent.top topMargin : 85 left : parent.left - leftMargin: 35 + leftMargin: leftMargin } } ImageWave { id: _diffImageWave visible : buttonType === UltrafiltrationButton.ButtonType.UltrafiltrationRate - isIncrease : true + isIncrease : _root.isIncrease + anchors { + right : _root.right + bottom : _root.bottom + margins : _root.rightMargin + } } ImageClock { id: _diffImageClock visible : buttonType === UltrafiltrationButton.ButtonType.TreatmentDuration - isIncrease : true + isIncrease : _root.isIncrease + anchors { + right : _root.right + bottom : _root.bottom + margins : _root.rightMargin + } } + Text { id: _textValue + visible : !disabled + text : valueText + font.pixelSize: 26 + color : disabled ? Colors.textDisableButton : Colors.textValueUltrafiltrationButtonFg + anchors { + left : _root.left + bottom : _root.bottom + leftMargin : _root. leftMargin + bottomMargin: _root.rightMargin + } + } + MouseArea { id: _mouseArea anchors.fill: parent onClicked: { Index: sources/gui/qml/globals/Colors.qml =================================================================== diff -u -r670f257c9b88d3e5506eccaad111bec914102a72 -ra09afcb23e479527eb2263474003b63955cd0e99 --- sources/gui/qml/globals/Colors.qml (.../Colors.qml) (revision 670f257c9b88d3e5506eccaad111bec914102a72) +++ sources/gui/qml/globals/Colors.qml (.../Colors.qml) (revision a09afcb23e479527eb2263474003b63955cd0e99) @@ -32,6 +32,7 @@ readonly property color backgroundSlider : "#195187" readonly property color backgroundUltrafiltrationButton : "#31568F" + readonly property color textValueUltrafiltrationButtonFg: "#98aec2" readonly property color backgroundRangeRect : "#3e546e" Index: sources/gui/qml/pages/treatment/TreatmentStack.qml =================================================================== diff -u -rb789046c096cfdddb39adcd3d5be1e129769aac6 -ra09afcb23e479527eb2263474003b63955cd0e99 --- sources/gui/qml/pages/treatment/TreatmentStack.qml (.../TreatmentStack.qml) (revision b789046c096cfdddb39adcd3d5be1e129769aac6) +++ sources/gui/qml/pages/treatment/TreatmentStack.qml (.../TreatmentStack.qml) (revision a09afcb23e479527eb2263474003b63955cd0e99) @@ -132,7 +132,6 @@ // manage the Pause Resume response Connections { target: vTreatmentUltrafiltrationState onAdjustmentTriggered: { - console.debug(vTreatmentUltrafiltrationState.adjustment_Accepted , vTreatmentUltrafiltrationState.isPaused) if ( vTreatmentUltrafiltrationState.adjustment_Accepted ) { if ( vTreatmentUltrafiltrationState.isPaused ) { _treatmentAdjustmentUltrafiltrationStart .close() @@ -141,7 +140,11 @@ _treatmentAdjustmentUltrafiltrationPaused.close() } } else { - // Alert / Notification ?! + if ( vTreatmentUltrafiltrationState.isPaused ) { + _treatmentAdjustmentUltrafiltrationPaused.notification.text = vTreatmentUltrafiltrationState.text() + } else { + _treatmentAdjustmentUltrafiltrationStart .notification.text = vTreatmentUltrafiltrationState.text() + } } } } @@ -155,8 +158,19 @@ vTreatmentAdjustmentUltrafiltration.rate , vTreatmentAdjustmentUltrafiltration.rateDiff ) - _treatmentAdjustmentUltrafiltrationEdit .close() - _treatmentAdjustmentUltrafiltrationConfirm.open() + if (vTreatmentAdjustmentUltrafiltration.adjustment_Accepted) { + _treatmentAdjustmentUltrafiltrationEdit .close() + + _treatmentAdjustmentUltrafiltrationConfirm.ultrafiltrationVolume = 1000 * vTreatmentAdjustmentUltrafiltration.volume .toFixed(3) + _treatmentAdjustmentUltrafiltrationConfirm.treatmentDuration = vTreatmentAdjustmentUltrafiltration.duration + _treatmentAdjustmentUltrafiltrationConfirm.treatmentDurationDiff = vTreatmentAdjustmentUltrafiltration.durationDiff + _treatmentAdjustmentUltrafiltrationConfirm.ultrafiltrationRate = 1000 * vTreatmentAdjustmentUltrafiltration.rate .toFixed(3) + _treatmentAdjustmentUltrafiltrationConfirm.ultrafiltrationRateDiff = 1000 * vTreatmentAdjustmentUltrafiltration.rateDiff .toFixed(3) + + _treatmentAdjustmentUltrafiltrationConfirm.open() + } else { + _treatmentAdjustmentUltrafiltrationEdit.notification.text = vTreatmentAdjustmentUltrafiltration.text() + } } } } Index: sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentBase.qml =================================================================== diff -u -reb19475a6bf4ed7f6a16bc07eefc7813496620ef -ra09afcb23e479527eb2263474003b63955cd0e99 --- sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentBase.qml (.../TreatmentAdjustmentBase.qml) (revision eb19475a6bf4ed7f6a16bc07eefc7813496620ef) +++ sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentBase.qml (.../TreatmentAdjustmentBase.qml) (revision a09afcb23e479527eb2263474003b63955cd0e99) @@ -32,6 +32,7 @@ property bool closeVisible: true property bool confirmVisible: true property bool backVisible: false + property bool pausedVisibile: false signal closeClicked() signal confirmClicked() @@ -72,4 +73,10 @@ onClicked : closeClicked() } } + + NotificationBar { id: _pausedNotification + visible : pausedVisibile && !notification.visible + text : qsTr("Ultrafiltration is paused.") + imageSource: "qrc:/images/iPauseGray" + } } Index: sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentUltrafiltrationConfirm.qml =================================================================== diff -u -r670f257c9b88d3e5506eccaad111bec914102a72 -ra09afcb23e479527eb2263474003b63955cd0e99 --- sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentUltrafiltrationConfirm.qml (.../TreatmentAdjustmentUltrafiltrationConfirm.qml) (revision 670f257c9b88d3e5506eccaad111bec914102a72) +++ sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentUltrafiltrationConfirm.qml (.../TreatmentAdjustmentUltrafiltrationConfirm.qml) (revision a09afcb23e479527eb2263474003b63955cd0e99) @@ -28,18 +28,23 @@ */ TreatmentAdjustmentBase { id: _root + property int ultrafiltrationVolume : 0 + property int ultrafiltrationRate : 0 + property int ultrafiltrationRateDiff : 0 + property string ultrafiltrationRateUnit : qsTr("mL/min") + property int treatmentDuration : 0 + property int treatmentDurationDiff : 0 + property string treatmentDurationUnit : qsTr("min") + closeVisible : false confirmVisible : false backVisible : true + pausedVisibile : true titleText : qsTr("ULTRAFILTRATION VOLUME") + " " + qsTr("(mL)") - notification { - text: qsTr("Ultrafiltration is paused.") - imageSource: "qrc:/images/iPauseGray" - } TitleText { id : _titleText - text: qsTr("To confirm new UF Volume (%1),\nselect a treatment adjustment:").arg(5200) + text: qsTr("To confirm new UF Volume (%1),\nselect a treatment adjustment:").arg(ultrafiltrationVolume) font.pixelSize: Fonts.fontPixelUltrafiltrationAdjustmentConfirmTitle color: Colors.textMain height: Variables.mainMenuHeight @@ -78,9 +83,14 @@ } UltrafiltrationButton { id: _rateAdjustmentButton title : qsTr("%1 UF Rate") - description : qsTr("The rate %1, so the treatment\nduration remains the same.") + description : qsTr("The rate %3 by %1 %2, so\nthe treatment duration remains the same.") + .arg(Math.abs(ultrafiltrationRateDiff)) + .arg(ultrafiltrationRateUnit) buttonType : UltrafiltrationButton.ButtonType.UltrafiltrationRate - isIncrease : true + isIncrease : ultrafiltrationRateDiff > 0 + valueText : qsTr( "UF Rate : %1 %2") + .arg(ultrafiltrationRate ) + .arg(ultrafiltrationRateUnit) onClicked : { _durationAdjustmentButton.selected = false selected = true @@ -89,14 +99,17 @@ UltrafiltrationButton { id: _durationAdjustmentButton title : qsTr("%1 Treatment Duration") - description : qsTr("Rate remains, but treatment\nduration %2 by %1 minutes.").arg(30) + description : qsTr("Rate remains, but treatment\nduration %2 by %1 minutes.").arg(Math.abs(treatmentDurationDiff)) buttonType: UltrafiltrationButton.ButtonType.TreatmentDuration - isIncrease: false + isIncrease: treatmentDurationDiff > 0 + valueText : qsTr("Duration : %1 %2") + .arg(treatmentDuration ) + .arg(treatmentDurationUnit) onClicked : { _rateAdjustmentButton.selected = false selected = true } - disabled: true + disabled: treatmentDuration + treatmentDurationDiff == 0 } } Index: sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentUltrafiltrationEdit.qml =================================================================== diff -u -reb19475a6bf4ed7f6a16bc07eefc7813496620ef -ra09afcb23e479527eb2263474003b63955cd0e99 --- sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentUltrafiltrationEdit.qml (.../TreatmentAdjustmentUltrafiltrationEdit.qml) (revision eb19475a6bf4ed7f6a16bc07eefc7813496620ef) +++ sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentUltrafiltrationEdit.qml (.../TreatmentAdjustmentUltrafiltrationEdit.qml) (revision a09afcb23e479527eb2263474003b63955cd0e99) @@ -27,17 +27,16 @@ */ TreatmentAdjustmentBase { id: _root + readonly property alias value : _adjustmentSlider.value + signal nextClicked(int vVolume) closeVisible : false confirmVisible : false backVisible : true + pausedVisibile : true titleText : qsTr("ULTRAFILTRATION VOLUME") + " " + qsTr("(mL)") - notification { - text: qsTr("Ultrafiltration is paused.") - imageSource: "qrc:/images/iPauseGray" - } ProgressBarEx { id: _rangeProgressBar width : Variables.ultrafiltrationProgressbarWidth @@ -51,7 +50,6 @@ maximum : 8000 progressEx.maxText.visible: false value : vTreatmentUltrafiltration.ultrafiltration_MeasUFVol.toFixed(2); - valueEx : _adjustmentSlider.value } Slider { id: _adjustmentSlider @@ -77,9 +75,9 @@ } Text { id: _textMaximum - visible : true + visible : true color : "white" - text : _adjustmentSlider.value + text : _root.value font { pixelSize : Fonts.fontPixelUltrafiltrationAdjustmentEditValue } @@ -101,13 +99,13 @@ backgroundColor: Colors.backgroundButtonSelect - text { + text { text: qsTr("NEXT") font { weight : Font .DemiBold pixelSize: Fonts.fontPixelUltrafiltrationAdjustmentNextButton } } - onClicked: nextClicked( _adjustmentSlider.value ) + onClicked: nextClicked( _root.value ) } } Index: sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentUltrafiltrationPaused.qml =================================================================== diff -u -reb19475a6bf4ed7f6a16bc07eefc7813496620ef -ra09afcb23e479527eb2263474003b63955cd0e99 --- sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentUltrafiltrationPaused.qml (.../TreatmentAdjustmentUltrafiltrationPaused.qml) (revision eb19475a6bf4ed7f6a16bc07eefc7813496620ef) +++ sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentUltrafiltrationPaused.qml (.../TreatmentAdjustmentUltrafiltrationPaused.qml) (revision a09afcb23e479527eb2263474003b63955cd0e99) @@ -31,11 +31,9 @@ signal resumeClicked() confirmVisible: false + pausedVisibile: true + titleText : qsTr("ULTRAFILTRATION VOLUME") + " " + qsTr("(mL)") - notification { - text: qsTr("Ultrafiltration is paused.") - imageSource: "qrc:/images/iPauseGray" - } ProgressBarEx { id: _progressbarex width : Variables.ultrafiltrationProgressbarWidth @@ -48,6 +46,7 @@ minimum : vTreatmentRanges.treatmentRanges_Ultrafiltration_Volume_Min.toFixed(2) //maximum : vTreatmentRanges.treatmentRanges_Ultrafiltration_Volume_Max.toFixed(2) // TODO : min/max should come from pre-treatment prescription parameters which we don't have now (2020/05/12) + // FIXME : UF Volume unit consistency. we need to be consistent about ultrafiltration unit maximum : vTreatmentAdjustmentDuration.adjustment ? vTreatmentAdjustmentDuration.ultrafiltration * 1000 : 600 // a constant Volume value for 1h treatment value : vTreatmentUltrafiltration.ultrafiltration_MeasUFVol.toFixed(2); valueEx : 0 Index: sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentUltrafiltrationStart.qml =================================================================== diff -u -reb19475a6bf4ed7f6a16bc07eefc7813496620ef -ra09afcb23e479527eb2263474003b63955cd0e99 --- sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentUltrafiltrationStart.qml (.../TreatmentAdjustmentUltrafiltrationStart.qml) (revision eb19475a6bf4ed7f6a16bc07eefc7813496620ef) +++ sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentUltrafiltrationStart.qml (.../TreatmentAdjustmentUltrafiltrationStart.qml) (revision a09afcb23e479527eb2263474003b63955cd0e99) @@ -42,6 +42,7 @@ minimum : vTreatmentRanges.treatmentRanges_Ultrafiltration_Volume_Min.toFixed(2) //maximum : vTreatmentRanges.treatmentRanges_Ultrafiltration_Volume_Max.toFixed(2) // TODO : min/max should come from pre-treatment prescription parameters which we don't have now (2020/05/12) + // FIXME : UF Volume unit consistency. we need to be consistent about ultrafiltration unit maximum : vTreatmentAdjustmentDuration.adjustment ? vTreatmentAdjustmentDuration.ultrafiltration * 1000 : 600 // a constant Volume value for 1h treatment value : vTreatmentUltrafiltration.ultrafiltration_MeasUFVol.toFixed(2); valueEx : 0 Index: sources/gui/qml/pages/treatment/sections/TreatmentPressure.qml =================================================================== diff -u -ra159e12630645a9a35fb0a5585cc7b639cfe6aa6 -ra09afcb23e479527eb2263474003b63955cd0e99 --- sources/gui/qml/pages/treatment/sections/TreatmentPressure.qml (.../TreatmentPressure.qml) (revision a159e12630645a9a35fb0a5585cc7b639cfe6aa6) +++ sources/gui/qml/pages/treatment/sections/TreatmentPressure.qml (.../TreatmentPressure.qml) (revision a09afcb23e479527eb2263474003b63955cd0e99) @@ -26,6 +26,8 @@ * \brief Treatment Screen Pressure section */ TouchArea { id: _root + + // TEST : these values are test values. property int arterialMinimum : -400 property int arterialLowerBound : -300 property int arterialUpperBound : 100 @@ -85,7 +87,6 @@ value : vTreatmentPressureOcclusion.pressureocclusion_VenousPressure - // TEST : simulation code minimum : _root.venousMinimum lowerBound : _root.venousLowerBound upperBound : _root.venousUpperBound Index: sources/gui/qml/pages/treatment/sections/TreatmentUltrafiltration.qml =================================================================== diff -u -reb19475a6bf4ed7f6a16bc07eefc7813496620ef -ra09afcb23e479527eb2263474003b63955cd0e99 --- sources/gui/qml/pages/treatment/sections/TreatmentUltrafiltration.qml (.../TreatmentUltrafiltration.qml) (revision eb19475a6bf4ed7f6a16bc07eefc7813496620ef) +++ sources/gui/qml/pages/treatment/sections/TreatmentUltrafiltration.qml (.../TreatmentUltrafiltration.qml) (revision a09afcb23e479527eb2263474003b63955cd0e99) @@ -41,7 +41,7 @@ Connections { target: vTreatmentAdjustmentDuration onAdjustmentTriggered: { - // FIXME : HD units should be consistent(mL or L) but here is Litre + // FIXME : UF Volume unit consistency. we need to be consistent about ultrafiltration unit _progressbarex.maximum = vTreatmentAdjustmentDuration.ultrafiltration * 1000 } } @@ -59,6 +59,7 @@ value : vTreatmentUltrafiltration.ultrafiltration_MeasUFVol.toFixed(2); // TODO : min/max should come from pre-treatment prescription parameters which we don't have now (2020/05/12) + // FIXME : UF Volume unit consistency. we need to be consistent about ultrafiltration unit maximum : vTreatmentAdjustmentDuration.adjustment ? vTreatmentAdjustmentDuration.ultrafiltration * 1000 : 600 // a constant Volume value for 1h treatment marker.color :vTreatmentUltrafiltrationState.isPaused ? "dimgray" : Colors.rangeMarker } Index: sources/view/vtreatmentadjustmentsresponse.cpp =================================================================== diff -u -r016578b44e879b89bd42dda7763ed50e67d7e64c -ra09afcb23e479527eb2263474003b63955cd0e99 --- sources/view/vtreatmentadjustmentsresponse.cpp (.../vtreatmentadjustmentsresponse.cpp) (revision 016578b44e879b89bd42dda7763ed50e67d7e64c) +++ sources/view/vtreatmentadjustmentsresponse.cpp (.../vtreatmentadjustmentsresponse.cpp) (revision a09afcb23e479527eb2263474003b63955cd0e99) @@ -40,7 +40,7 @@ /*! * \brief View::VTreatmentAdjustmentsResponse::text - * \details The slot to ge the Reasin Description + * \details The slot to ge the Reason Description * \return Reason description as string */ QString View::VTreatmentAdjustmentsResponse::text() Index: sources/view/vtreatmentadjustmentsresponse.h =================================================================== diff -u -r016578b44e879b89bd42dda7763ed50e67d7e64c -ra09afcb23e479527eb2263474003b63955cd0e99 --- sources/view/vtreatmentadjustmentsresponse.h (.../vtreatmentadjustmentsresponse.h) (revision 016578b44e879b89bd42dda7763ed50e67d7e64c) +++ sources/view/vtreatmentadjustmentsresponse.h (.../vtreatmentadjustmentsresponse.h) (revision a09afcb23e479527eb2263474003b63955cd0e99) @@ -50,8 +50,7 @@ private: QString reasonText (GuiRequestReasons vEnum); -public slots: +protected slots: QString text(); - }; } Index: sources/view/vtreatmentultrafiltrationstate.cpp =================================================================== diff -u -ra159e12630645a9a35fb0a5585cc7b639cfe6aa6 -ra09afcb23e479527eb2263474003b63955cd0e99 --- sources/view/vtreatmentultrafiltrationstate.cpp (.../vtreatmentultrafiltrationstate.cpp) (revision a159e12630645a9a35fb0a5585cc7b639cfe6aa6) +++ sources/view/vtreatmentultrafiltrationstate.cpp (.../vtreatmentultrafiltrationstate.cpp) (revision a09afcb23e479527eb2263474003b63955cd0e99) @@ -49,3 +49,28 @@ _requestedState = GuiActionData::Resume; emit didUltrafiltrationStateRequest(static_cast(_requestedState)); } + +/*! + * \brief View::VTreatmentUltrafiltrationState::text + * \details The slot to ge the Reason Description + * \return Reason description as string + * \note The ultrafiltration state (Resume/Pause) change has no returned reason code and it's only bool. + */ +QString View::VTreatmentUltrafiltrationState::text() +{ + QString mText = VTreatmentAdjustmentsResponse::text(); + if (! mText.isEmpty()) return mText; + if (! adjustment_Accepted()) { + switch (_requestedState) { + case GuiActionData::Resume: + mText = tr("Unable to Resume Ultrafiltration or already running"); + break; + case GuiActionData::Pause: + mText = tr("Unable to Pause Ultrafiltration or already paused"); + break; + default: + break; + } + } + return mText; +} Index: sources/view/vtreatmentultrafiltrationstate.h =================================================================== diff -u -ra159e12630645a9a35fb0a5585cc7b639cfe6aa6 -ra09afcb23e479527eb2263474003b63955cd0e99 --- sources/view/vtreatmentultrafiltrationstate.h (.../vtreatmentultrafiltrationstate.h) (revision a159e12630645a9a35fb0a5585cc7b639cfe6aa6) +++ sources/view/vtreatmentultrafiltrationstate.h (.../vtreatmentultrafiltrationstate.h) (revision a09afcb23e479527eb2263474003b63955cd0e99) @@ -45,6 +45,8 @@ public slots: void doPause (); void doResume(); + QString text(); + signals: void didUltrafiltrationStateRequest(quint32 vState); };