Index: denali.pro =================================================================== diff -u -rf160ef9c259a75e8d6120ad962cda648e8f7a9b3 -r5734e6289c18ec3cfe4749de8e3a6043f98dbcff --- denali.pro (.../denali.pro) (revision f160ef9c259a75e8d6120ad962cda648e8f7a9b3) +++ denali.pro (.../denali.pro) (revision 5734e6289c18ec3cfe4749de8e3a6043f98dbcff) @@ -75,11 +75,11 @@ sources/view/vtreatmentadjustmentduration.h \ sources/view/vtreatmentadjustmentflows.h \ sources/view/vtreatmentadjustmentresponsebase.h \ - sources/view/vtreatmentadjustmentultrafiltration.h \ + sources/view/vtreatmentadjustmentultrafiltrationconfirm.h \ + sources/view/vtreatmentadjustmentultrafiltrationedit.h \ + sources/view/vtreatmentadjustmentultrafiltrationstate.h \ sources/view/vtreatmentpressureocclusion.h \ sources/view/vtreatmentranges.h \ - sources/view/vtreatmentultrafiltrationconfirm.h \ - sources/view/vtreatmentultrafiltrationstate.h \ sources/view/vview.h \ sources/view/vpoweroff.h \ sources/view/vtreatmentbloodflow.h \ @@ -129,16 +129,16 @@ sources/view/vtreatmentadjustmentduration.cpp \ sources/view/vtreatmentadjustmentflows.cpp \ sources/view/vtreatmentadjustmentresponsebase.cpp \ - sources/view/vtreatmentadjustmentultrafiltration.cpp \ + sources/view/vtreatmentadjustmentultrafiltrationconfirm.cpp \ + sources/view/vtreatmentadjustmentultrafiltrationedit.cpp \ + sources/view/vtreatmentadjustmentultrafiltrationstate.cpp \ sources/view/vtreatmentbloodflow.cpp \ sources/view/vtreatmentdialysateflow.cpp \ sources/view/vtreatmentpressureocclusion.cpp \ sources/view/vtreatmentranges.cpp \ sources/view/vtreatmentultrafiltration.cpp \ sources/view/vtreatmenttime.cpp \ sources/view/valarmstatus.cpp \ - sources/view/vtreatmentultrafiltrationconfirm.cpp \ - sources/view/vtreatmentultrafiltrationstate.cpp \ sources/storage/filehandler.cpp \ sources/storage/logger.cpp \ sources/storage/storageglobals.cpp \ Index: sources/canbus/messageinterpreter.cpp =================================================================== diff -u -r6616f7b9b88efffa42ab605833d296afb76d3cb1 -r5734e6289c18ec3cfe4749de8e3a6043f98dbcff --- sources/canbus/messageinterpreter.cpp (.../messageinterpreter.cpp) (revision 6616f7b9b88efffa42ab605833d296afb76d3cb1) +++ sources/canbus/messageinterpreter.cpp (.../messageinterpreter.cpp) (revision 5734e6289c18ec3cfe4749de8e3a6043f98dbcff) @@ -759,7 +759,7 @@ if ( ! isType (vMessage, Gui::GuiActionType::AdjustUltrafiltrationStateReq) ) return ok; if ( ! isPayloadLenValid(vMessage, Gui::GuiActionType::AcknowGeneric ) ) return ok; - Model::MUltrafiltrationStateResponse mData; + Model::MAdjustUltrafiltrationStateResponse mData; ok = mData.fromByteArray(vMessage.data); LOG_DATUM(mData.toString()); Index: sources/gui/guiglobals.cpp =================================================================== diff -u -r524fee2471717bf627eae41c6a599c9b5f4fbe55 -r5734e6289c18ec3cfe4749de8e3a6043f98dbcff --- sources/gui/guiglobals.cpp (.../guiglobals.cpp) (revision 524fee2471717bf627eae41c6a599c9b5f4fbe55) +++ sources/gui/guiglobals.cpp (.../guiglobals.cpp) (revision 5734e6289c18ec3cfe4749de8e3a6043f98dbcff) @@ -27,7 +27,7 @@ #include "vtreatmentbloodflow.h" #include "vtreatmentdialysateflow.h" #include "vtreatmentultrafiltration.h" -#include "vtreatmentultrafiltrationstate.h" +#include "vtreatmentadjustmentultrafiltrationstate.h" #include "vtreatmentpressureocclusion.h" #include "vtreatmenttime.h" #include "vtreatmentranges.h" @@ -36,8 +36,8 @@ #include "vtreatmentadjustmentduration.h" #include "vtreatmentadjustmentflows.h" -#include "vtreatmentadjustmentultrafiltration.h" -#include "vtreatmentultrafiltrationconfirm.h" +#include "vtreatmentadjustmentultrafiltrationedit.h" +#include "vtreatmentadjustmentultrafiltrationconfirm.h" namespace Gui { Index: sources/gui/qml/main.qml =================================================================== diff -u -rf160ef9c259a75e8d6120ad962cda648e8f7a9b3 -r5734e6289c18ec3cfe4749de8e3a6043f98dbcff --- sources/gui/qml/main.qml (.../main.qml) (revision f160ef9c259a75e8d6120ad962cda648e8f7a9b3) +++ sources/gui/qml/main.qml (.../main.qml) (revision 5734e6289c18ec3cfe4749de8e3a6043f98dbcff) @@ -22,18 +22,18 @@ // TODO : When Testing data on Setting screen is removed // This needs to be moved into the TreatmentFlows.qml -import VTreatmentBloodFlow 0.1; -import VTreatmentDialysateFlow 0.1; -import VTreatmentUltrafiltration 0.1; -import VTreatmentUltrafiltrationState 0.1; -import VTreatmentTime 0.1; -import VAlarmStatus 0.1; -import VPowerOff 0.1; +import VTreatmentBloodFlow 0.1; +import VTreatmentDialysateFlow 0.1; +import VTreatmentUltrafiltration 0.1; +import VTreatmentTime 0.1; +import VAlarmStatus 0.1; +import VPowerOff 0.1; -import VTreatmentAdjustmentDuration 0.1; -import VTreatmentAdjustmentFlows 0.1; -import VTreatmentAdjustmentUltrafiltration 0.1; -import VTreatmentUltrafiltrationConfirm 0.1; +import VTreatmentAdjustmentDuration 0.1; +import VTreatmentAdjustmentFlows 0.1; +import VTreatmentAdjustmentUltrafiltrationState 0.1; +import VTreatmentAdjustmentUltrafiltrationEdit 0.1; +import VTreatmentAdjustmentUltrafiltrationConfirm 0.1; // Qml imports import "qrc:/globals" @@ -68,11 +68,11 @@ // TODO : When Testing data on Setting screen is removed // This needs to be moved into the Treatment______.qml - VTreatmentAdjustmentDuration { id: vTreatmentAdjustmentDuration } - VTreatmentAdjustmentFlows { id: vTreatmentAdjustmentFlows } - VTreatmentUltrafiltrationState { id: vTreatmentUltrafiltrationState } - VTreatmentAdjustmentUltrafiltration { id: vTreatmentAdjustmentUltrafiltration } - VTreatmentUltrafiltrationConfirm { id: vTreatmentUltrafiltrationConfirm } + VTreatmentAdjustmentDuration { id: vTreatmentAdjustmentDuration } + VTreatmentAdjustmentFlows { id: vTreatmentAdjustmentFlows } + VTreatmentAdjustmentUltrafiltrationState { id: vTreatmentAdjustmentUltrafiltrationState } + VTreatmentAdjustmentUltrafiltrationEdit { id: vTreatmentAdjustmentUltrafiltrationEdit } + VTreatmentAdjustmentUltrafiltrationConfirm { id: vTreatmentAdjustmentUltrafiltrationConfirm } VTreatmentBloodFlow { id: vTreatmentBloodFlow } VTreatmentDialysateFlow { id: vTreatmentDialysateFlow } Index: sources/gui/qml/pages/treatment/TreatmentStack.qml =================================================================== diff -u -r6616f7b9b88efffa42ab605833d296afb76d3cb1 -r5734e6289c18ec3cfe4749de8e3a6043f98dbcff --- sources/gui/qml/pages/treatment/TreatmentStack.qml (.../TreatmentStack.qml) (revision 6616f7b9b88efffa42ab605833d296afb76d3cb1) +++ sources/gui/qml/pages/treatment/TreatmentStack.qml (.../TreatmentStack.qml) (revision 5734e6289c18ec3cfe4749de8e3a6043f98dbcff) @@ -59,7 +59,7 @@ _treatmentAdjustmentDuration.open() } onSectionUltrafiltrationClicked: { - if ( vTreatmentUltrafiltrationState.isPaused ) { + if ( vTreatmentAdjustmentUltrafiltrationState.isPaused ) { _treatmentAdjustmentUltrafiltrationPaused.open() } else { _treatmentAdjustmentUltrafiltrationStart .open() @@ -87,7 +87,7 @@ // send pause to HD and wait. // if accepted close() // not accepted show error in notification - vTreatmentUltrafiltrationState.doPause() + vTreatmentAdjustmentUltrafiltrationState.doPause() } } @@ -102,7 +102,7 @@ // send resume to HD and wait. // if accepted close() // not accepted show error in notification - vTreatmentUltrafiltrationState.doResume() + vTreatmentAdjustmentUltrafiltrationState.doResume() } } @@ -115,7 +115,7 @@ // send Volume to HD and wait. // if accepted close() // not accepted show error in notification - vTreatmentAdjustmentUltrafiltration.doAdjustment(vVolume) + vTreatmentAdjustmentUltrafiltrationEdit.doAdjustment(vVolume) } } @@ -125,10 +125,10 @@ _treatmentAdjustmentUltrafiltrationEdit.open () } onConfirmRateClicked : { - vTreatmentUltrafiltrationConfirm.doOptionRate(vVolume) + vTreatmentAdjustmentUltrafiltrationConfirm.doOptionRate(vVolume) } onConfirmDurationClicked: { - vTreatmentUltrafiltrationConfirm.doOptionDuration(vVolume) + vTreatmentAdjustmentUltrafiltrationConfirm.doOptionDuration(vVolume) } } @@ -145,53 +145,53 @@ } } - Connections { target: vTreatmentUltrafiltrationState + Connections { target: vTreatmentAdjustmentUltrafiltrationState onAdjustmentTriggered : { - if ( vTreatmentUltrafiltrationState.adjustment_Accepted ) { - if ( vTreatmentUltrafiltrationState.isPaused ) { + if ( vTreatmentAdjustmentUltrafiltrationState.adjustment_Accepted ) { + if ( vTreatmentAdjustmentUltrafiltrationState.isPaused ) { _treatmentAdjustmentUltrafiltrationStart .close() _treatmentAdjustmentUltrafiltrationPaused.open () } else { _treatmentAdjustmentUltrafiltrationPaused.close() } } else { - if ( vTreatmentUltrafiltrationState.isPaused ) { - _treatmentAdjustmentUltrafiltrationPaused.notification.text = vTreatmentUltrafiltrationState.text() + if ( vTreatmentAdjustmentUltrafiltrationState.isPaused ) { + _treatmentAdjustmentUltrafiltrationPaused.notification.text = vTreatmentAdjustmentUltrafiltrationState.text() } else { - _treatmentAdjustmentUltrafiltrationStart .notification.text = vTreatmentUltrafiltrationState.text() + _treatmentAdjustmentUltrafiltrationStart .notification.text = vTreatmentAdjustmentUltrafiltrationState.text() } } } } - Connections { target: vTreatmentAdjustmentUltrafiltration + Connections { target: vTreatmentAdjustmentUltrafiltrationEdit onAdjustmentTriggered : { - if (vTreatmentAdjustmentUltrafiltration.adjustment_Accepted) { - _treatmentAdjustmentUltrafiltrationConfirm.ultrafiltrationVolume = vTreatmentAdjustmentUltrafiltration.volume - _treatmentAdjustmentUltrafiltrationConfirm.treatmentDuration = vTreatmentAdjustmentUltrafiltration.duration - _treatmentAdjustmentUltrafiltrationConfirm.treatmentDurationDiff = vTreatmentAdjustmentUltrafiltration.durationDiff - _treatmentAdjustmentUltrafiltrationConfirm.ultrafiltrationRate = vTreatmentAdjustmentUltrafiltration.rate - _treatmentAdjustmentUltrafiltrationConfirm.ultrafiltrationRateDiff = vTreatmentAdjustmentUltrafiltration.rateDiff - _treatmentAdjustmentUltrafiltrationConfirm.ultrafiltrationRateOld = vTreatmentAdjustmentUltrafiltration.rateOld + if (vTreatmentAdjustmentUltrafiltrationEdit.adjustment_Accepted) { + _treatmentAdjustmentUltrafiltrationConfirm.ultrafiltrationVolume = vTreatmentAdjustmentUltrafiltrationEdit.volume + _treatmentAdjustmentUltrafiltrationConfirm.treatmentDuration = vTreatmentAdjustmentUltrafiltrationEdit.duration + _treatmentAdjustmentUltrafiltrationConfirm.treatmentDurationDiff = vTreatmentAdjustmentUltrafiltrationEdit.durationDiff + _treatmentAdjustmentUltrafiltrationConfirm.ultrafiltrationRate = vTreatmentAdjustmentUltrafiltrationEdit.rate + _treatmentAdjustmentUltrafiltrationConfirm.ultrafiltrationRateDiff = vTreatmentAdjustmentUltrafiltrationEdit.rateDiff + _treatmentAdjustmentUltrafiltrationConfirm.ultrafiltrationRateOld = vTreatmentAdjustmentUltrafiltrationEdit.rateOld _treatmentAdjustmentUltrafiltrationEdit .close() _treatmentAdjustmentUltrafiltrationConfirm.reset() _treatmentAdjustmentUltrafiltrationConfirm.open () } else { - _treatmentAdjustmentUltrafiltrationEdit.notification.text = vTreatmentAdjustmentUltrafiltration.text() + _treatmentAdjustmentUltrafiltrationEdit.notification.text = vTreatmentAdjustmentUltrafiltrationEdit.text() } } } - Connections { target: vTreatmentUltrafiltrationConfirm + Connections { target: vTreatmentAdjustmentUltrafiltrationConfirm onAdjustmentTriggered : { - if (vTreatmentUltrafiltrationConfirm.adjustment_Accepted) { + if (vTreatmentAdjustmentUltrafiltrationConfirm.adjustment_Accepted) { // HD resumes the ultrafiltration and no need to recall the doPause just update the state - vTreatmentUltrafiltrationState.isPaused = false - vTreatmentUltrafiltration.maximum = vTreatmentUltrafiltrationConfirm.volume + vTreatmentAdjustmentUltrafiltrationState.isPaused = false + vTreatmentUltrafiltration.maximum = vTreatmentAdjustmentUltrafiltrationConfirm.volume _treatmentAdjustmentUltrafiltrationConfirm.close() } else { - _treatmentAdjustmentUltrafiltrationConfirm.notification.text = vTreatmentUltrafiltrationConfirm.text() + _treatmentAdjustmentUltrafiltrationConfirm.notification.text = vTreatmentAdjustmentUltrafiltrationConfirm.text() } } }} Index: sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentDuration.qml =================================================================== diff -u -r6616f7b9b88efffa42ab605833d296afb76d3cb1 -r5734e6289c18ec3cfe4749de8e3a6043f98dbcff --- sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentDuration.qml (.../TreatmentAdjustmentDuration.qml) (revision 6616f7b9b88efffa42ab605833d296afb76d3cb1) +++ sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentDuration.qml (.../TreatmentAdjustmentDuration.qml) (revision 5734e6289c18ec3cfe4749de8e3a6043f98dbcff) @@ -26,7 +26,7 @@ * To adjust the treatment duration */ TreatmentAdjustmentBase { id: _root - readonly property alias durationValue : _durationSlider.value + /* -- */ property alias durationValue : _durationSlider.value readonly property alias durationMinimum : _durationSlider.minimum readonly property alias durationMaximum : _durationSlider.maximum readonly property alias durationStep : _durationSlider.step Index: sources/gui/qml/pages/treatment/sections/TreatmentUltrafiltration.qml =================================================================== diff -u -rf160ef9c259a75e8d6120ad962cda648e8f7a9b3 -r5734e6289c18ec3cfe4749de8e3a6043f98dbcff --- sources/gui/qml/pages/treatment/sections/TreatmentUltrafiltration.qml (.../TreatmentUltrafiltration.qml) (revision f160ef9c259a75e8d6120ad962cda648e8f7a9b3) +++ sources/gui/qml/pages/treatment/sections/TreatmentUltrafiltration.qml (.../TreatmentUltrafiltration.qml) (revision 5734e6289c18ec3cfe4749de8e3a6043f98dbcff) @@ -45,7 +45,7 @@ title : qsTr("ULTRAFILTRATION VOLUME") + " " + ultrafiltrationVolumeUnit notification { imageSource: "qrc:/images/iPauseGray" - text : vTreatmentUltrafiltrationState.isPaused ? qsTr("Ultrafiltration Paused") : "" + text : vTreatmentAdjustmentUltrafiltrationState.isPaused ? qsTr("Ultrafiltration Paused") : "" } ProgressBarEx { id: _progressbarex @@ -63,6 +63,6 @@ value : _private.value valueEx : 0 - marker.color :vTreatmentUltrafiltrationState.isPaused ? "dimgray" : Colors.rangeMarker + marker.color : vTreatmentAdjustmentUltrafiltrationState.isPaused ? "dimgray" : Colors.rangeMarker } } Index: sources/model/mtreatmentadjustultrafiltrationconfirmresponse.h =================================================================== diff -u -r6616f7b9b88efffa42ab605833d296afb76d3cb1 -r5734e6289c18ec3cfe4749de8e3a6043f98dbcff --- sources/model/mtreatmentadjustultrafiltrationconfirmresponse.h (.../mtreatmentadjustultrafiltrationconfirmresponse.h) (revision 6616f7b9b88efffa42ab605833d296afb76d3cb1) +++ sources/model/mtreatmentadjustultrafiltrationconfirmresponse.h (.../mtreatmentadjustultrafiltrationconfirmresponse.h) (revision 5734e6289c18ec3cfe4749de8e3a6043f98dbcff) @@ -24,9 +24,6 @@ namespace Model { -// -------------------------------------------------------------------------------- -// Adjust Ultrafiltration Confirm Response -// -------------------------------------------------------------------------------- class MAdjustUltrafiltrationConfirmResponse { // friends Index: sources/model/mtreatmentadjustultrafiltrationeditresponse.h =================================================================== diff -u -r6616f7b9b88efffa42ab605833d296afb76d3cb1 -r5734e6289c18ec3cfe4749de8e3a6043f98dbcff --- sources/model/mtreatmentadjustultrafiltrationeditresponse.h (.../mtreatmentadjustultrafiltrationeditresponse.h) (revision 6616f7b9b88efffa42ab605833d296afb76d3cb1) +++ sources/model/mtreatmentadjustultrafiltrationeditresponse.h (.../mtreatmentadjustultrafiltrationeditresponse.h) (revision 5734e6289c18ec3cfe4749de8e3a6043f98dbcff) @@ -25,9 +25,6 @@ namespace Model { -// -------------------------------------------------------------------------------- -// Adjust Ultrafiltration Edit Response -// -------------------------------------------------------------------------------- class MAdjustUltrafiltrationEditResponse : public MAdjustUltrafiltrationConfirmResponse { Index: sources/model/mtreatmentadjustultrafiltrationstateresponse.cpp =================================================================== diff -u -r03de7d132838c54a23862809357c42102b6dab99 -r5734e6289c18ec3cfe4749de8e3a6043f98dbcff --- sources/model/mtreatmentadjustultrafiltrationstateresponse.cpp (.../mtreatmentadjustultrafiltrationstateresponse.cpp) (revision 03de7d132838c54a23862809357c42102b6dab99) +++ sources/model/mtreatmentadjustultrafiltrationstateresponse.cpp (.../mtreatmentadjustultrafiltrationstateresponse.cpp) (revision 5734e6289c18ec3cfe4749de8e3a6043f98dbcff) @@ -15,23 +15,23 @@ using namespace Model; -QString MUltrafiltrationStateResponse::toString() const { +QString MAdjustUltrafiltrationStateResponse::toString() const { return QString(stringPrefix + "(%1)") .arg(_data.mAccepted.value); } -void MUltrafiltrationStateResponse::toVariantList(QVariantList &vData) const { +void MAdjustUltrafiltrationStateResponse::toVariantList(QVariantList &vData) const { vData += _data.mAccepted.value; } -bool MUltrafiltrationStateResponse::fromByteArray(const QByteArray &vByteArray, int *vIndex) { +bool MAdjustUltrafiltrationStateResponse::fromByteArray(const QByteArray &vByteArray, int *vIndex) { int index = 0; // message data start position if (GetValue(vByteArray, index, _data.mAccepted)) return true ; else { if(vIndex) *vIndex = index; return false; } } -AdjustUltrafiltrationStateResponseData MUltrafiltrationStateResponse::data() const { +AdjustUltrafiltrationStateResponseData MAdjustUltrafiltrationStateResponse::data() const { Data data; data.mAccepted = _data.mAccepted.value; return data; Index: sources/model/mtreatmentadjustultrafiltrationstateresponse.h =================================================================== diff -u -r03de7d132838c54a23862809357c42102b6dab99 -r5734e6289c18ec3cfe4749de8e3a6043f98dbcff --- sources/model/mtreatmentadjustultrafiltrationstateresponse.h (.../mtreatmentadjustultrafiltrationstateresponse.h) (revision 03de7d132838c54a23862809357c42102b6dab99) +++ sources/model/mtreatmentadjustultrafiltrationstateresponse.h (.../mtreatmentadjustultrafiltrationstateresponse.h) (revision 5734e6289c18ec3cfe4749de8e3a6043f98dbcff) @@ -24,7 +24,7 @@ namespace Model { -class MUltrafiltrationStateResponse { +class MAdjustUltrafiltrationStateResponse { // friends friend class ::tst_models; @@ -41,7 +41,7 @@ } _data; public: - MUltrafiltrationStateResponse() { } + MAdjustUltrafiltrationStateResponse() { } QString toString ( ) const ; void toVariantList ( QVariantList &vData ) const ; @@ -52,4 +52,4 @@ } -typedef Model::MUltrafiltrationStateResponse::Data AdjustUltrafiltrationStateResponseData; +typedef Model::MAdjustUltrafiltrationStateResponse::Data AdjustUltrafiltrationStateResponseData; Fisheye: Tag 5734e6289c18ec3cfe4749de8e3a6043f98dbcff refers to a dead (removed) revision in file `sources/view/vtreatmentadjustmentultrafiltration.cpp'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 5734e6289c18ec3cfe4749de8e3a6043f98dbcff refers to a dead (removed) revision in file `sources/view/vtreatmentadjustmentultrafiltration.h'. Fisheye: No comparison available. Pass `N' to diff? Index: sources/view/vtreatmentadjustmentultrafiltrationconfirm.cpp =================================================================== diff -u --- sources/view/vtreatmentadjustmentultrafiltrationconfirm.cpp (revision 0) +++ sources/view/vtreatmentadjustmentultrafiltrationconfirm.cpp (revision 5734e6289c18ec3cfe4749de8e3a6043f98dbcff) @@ -0,0 +1,52 @@ +/*! + * + * Copyright (c) 2019-2020 Diality Inc. - All Rights Reserved. + * \copyright + * THIS CODE MAY NOT BE COPIED OR REPRODUCED IN ANY FORM, + * IN PART OR IN WHOLE, + * WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER. + * + * \file vtreatmentadjustmentultrafiltrationconfirm.cpp + * \date 6/1/2020 + * \author Behrouz NematiPour + * + */ +#include "vtreatmentadjustmentultrafiltrationconfirm.h" + +// Project +#include "guicontroller.h" + +VIEW_DEF_CLASS_ADJUSTMENT(VTreatmentAdjustmentUltrafiltrationConfirm, AdjustUltrafiltrationConfirmResponseData) + +void VTreatmentAdjustmentUltrafiltrationConfirm::initConnections() { + ACTION_VIEW_CONNECTION(AdjustUltrafiltrationConfirmResponseData); + ADJUST_VIEW_CONNECTION( AdjustUltrafiltrationConfirmRequestData); +} + +void VTreatmentAdjustmentUltrafiltrationConfirm::onActionReceive(const AdjustUltrafiltrationConfirmResponseData &vData) +{ + adjustment_Accepted ( vData.mAccepted ); + adjustment_Reason ( vData.mReason ); + + volume ( vData.mVolume / 1000 ); // mL => L + duration ( vData.mDuration ); + rate ( vData.mRate ); + + // *** has to be the last to let the information to be set and then emit the signal *** + // *** otherwise will use the previous values before being set. *** + adjustment ( true ); +} + +void View::VTreatmentAdjustmentUltrafiltrationConfirm::doOptionRate(float vVolume) +{ + _data.volume = vVolume; + _data.option = AdjustUltrafiltrationConfirmRequestData::eRate; + emit didAdjustment(_data); +} + +void View::VTreatmentAdjustmentUltrafiltrationConfirm::doOptionDuration(float vVolume) +{ + _data.volume = vVolume; + _data.option = AdjustUltrafiltrationConfirmRequestData::eDuration; + emit didAdjustment(_data); +} Index: sources/view/vtreatmentadjustmentultrafiltrationconfirm.h =================================================================== diff -u --- sources/view/vtreatmentadjustmentultrafiltrationconfirm.h (revision 0) +++ sources/view/vtreatmentadjustmentultrafiltrationconfirm.h (revision 5734e6289c18ec3cfe4749de8e3a6043f98dbcff) @@ -0,0 +1,54 @@ +/*! + * + * Copyright (c) 2019-2020 Diality Inc. - All Rights Reserved. + * \copyright + * THIS CODE MAY NOT BE COPIED OR REPRODUCED IN ANY FORM, + * IN PART OR IN WHOLE, + * WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER. + * + * \file vtreatmentadjustmentultrafiltrationconfirm.h + * \date 6/1/2020 + * \author Behrouz NematiPour + * + */ +#pragma once + +#include + +// Project +#include "vtreatmentadjustmentresponsebase.h" + +namespace View { + +class VTreatmentAdjustmentUltrafiltrationConfirm : public VTreatmentAdjustmentResponseBase +{ + Q_OBJECT + + // friends + friend class ::tst_views; + + AdjustUltrafiltrationConfirmRequestData _data; + + // coco begin validated: + // The property adjustment_Triggered has to be always true + // and to always trigger the change event to work as a notifier for GUI + // has been manually tested that it works perfectly fine + TRIGGER( bool , adjustment , 0) + // coco end + + // Treatment Ultrafiltration data + PROPERTY( float , volume , 0) + PROPERTY( quint32 , duration , 0) + PROPERTY( float , rate , 0) + + VIEW_DEC_CLASS_ADJUSTMENT(VTreatmentAdjustmentUltrafiltrationConfirm, AdjustUltrafiltrationConfirmResponseData) + +public slots: + void doOptionRate (float vVolume); + void doOptionDuration(float vVolume); + +signals: + void didAdjustment(const AdjustUltrafiltrationConfirmRequestData &vData); +}; + +} Index: sources/view/vtreatmentadjustmentultrafiltrationedit.cpp =================================================================== diff -u --- sources/view/vtreatmentadjustmentultrafiltrationedit.cpp (revision 0) +++ sources/view/vtreatmentadjustmentultrafiltrationedit.cpp (revision 5734e6289c18ec3cfe4749de8e3a6043f98dbcff) @@ -0,0 +1,46 @@ +/*! + * + * Copyright (c) 2019-2020 Diality Inc. - All Rights Reserved. + * \copyright + * THIS CODE MAY NOT BE COPIED OR REPRODUCED IN ANY FORM, + * IN PART OR IN WHOLE, + * WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER. + * + * \file VTreatmentAdjustmentUltrafiltrationedit.cpp + * \date 5/20/2020 + * \author Behrouz NematiPour + * + */ +#include "vtreatmentadjustmentultrafiltrationedit.h" + +// Project +#include "guicontroller.h" + +VIEW_DEF_CLASS_ADJUSTMENT(VTreatmentAdjustmentUltrafiltrationEdit, AdjustUltrafiltrationEditResponseData) + +void VTreatmentAdjustmentUltrafiltrationEdit::initConnections() { + ACTION_VIEW_CONNECTION(AdjustUltrafiltrationEditResponseData); + ADJUST_VIEW_CONNECTION( AdjustUltrafiltrationEditRequestData); +} + +void VTreatmentAdjustmentUltrafiltrationEdit::onActionReceive(const AdjustUltrafiltrationEditResponseData &vData) +{ + adjustment_Accepted ( vData.mAccepted ); + adjustment_Reason ( vData.mReason ); + + volume ( vData.mVolume / 1000 ); // mL => L + duration ( vData.mDuration ); + durationDiff ( vData.mDurationDiff ); + rate ( vData.mRate ); + rateDiff ( vData.mRateDiff ); + rateOld ( vData.mRateOld ); + + // *** has to be the last to let the information to be set and then emit the signal *** + // *** otherwise will use the previous values before being set. *** + adjustment ( true ); +} + +void View::VTreatmentAdjustmentUltrafiltrationEdit::doAdjustment(float vVolume) { + _data.volume = vVolume * 1000; // L => mL + emit didAdjustment(_data); +} Index: sources/view/vtreatmentadjustmentultrafiltrationedit.h =================================================================== diff -u --- sources/view/vtreatmentadjustmentultrafiltrationedit.h (revision 0) +++ sources/view/vtreatmentadjustmentultrafiltrationedit.h (revision 5734e6289c18ec3cfe4749de8e3a6043f98dbcff) @@ -0,0 +1,56 @@ +/*! + * + * Copyright (c) 2019-2020 Diality Inc. - All Rights Reserved. + * \copyright + * THIS CODE MAY NOT BE COPIED OR REPRODUCED IN ANY FORM, + * IN PART OR IN WHOLE, + * WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER. + * + * \file VTreatmentAdjustmentUltrafiltrationedit.h + * \date 5/20/2020 + * \author Behrouz NematiPour + * + */ +#pragma once + +#include + +// Project +#include "vtreatmentadjustmentresponsebase.h" + +namespace View { + +class VTreatmentAdjustmentUltrafiltrationEdit : public VTreatmentAdjustmentResponseBase +{ + Q_OBJECT + + // friends + friend class ::tst_views; + + AdjustUltrafiltrationEditRequestData _data; + + // coco begin validated: + // The property adjustment_Triggered has to be always true + // and to always trigger the change event to work as a notifier for GUI + // has been manually tested that it works perfectly fine + TRIGGER( bool , adjustment , 0) + // coco end + + // Treatment Ultrafiltration data + PROPERTY( float , volume , 0) + PROPERTY( quint32 , duration , 0) + PROPERTY( qint32 , durationDiff , 0) + PROPERTY( float , rate , 0) + PROPERTY( float , rateDiff , 0) + PROPERTY( float , rateOld , 0) + + VIEW_DEC_CLASS_ADJUSTMENT(VTreatmentAdjustmentUltrafiltrationEdit, AdjustUltrafiltrationEditResponseData) + +// ----------- Adjust Ultrafiltration +public slots: + void doAdjustment(float vVolume); +signals: + void didAdjustment(const AdjustUltrafiltrationEditRequestData &vData); +}; + +} Index: sources/view/vtreatmentadjustmentultrafiltrationstate.cpp =================================================================== diff -u --- sources/view/vtreatmentadjustmentultrafiltrationstate.cpp (revision 0) +++ sources/view/vtreatmentadjustmentultrafiltrationstate.cpp (revision 5734e6289c18ec3cfe4749de8e3a6043f98dbcff) @@ -0,0 +1,78 @@ +/*! + * + * Copyright (c) 2019-2020 Diality Inc. - All Rights Reserved. + * \copyright + * THIS CODE MAY NOT BE COPIED OR REPRODUCED IN ANY FORM, + * IN PART OR IN WHOLE, + * WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER. + * + * \file vtreatmentadjustmentultrafiltrationstate.cpp + * \date 5/20/2020 + * \author Behrouz NematiPour + * + */ +#include "vtreatmentadjustmentultrafiltrationstate.h" + +// Project +#include "guicontroller.h" + +VIEW_DEF_CLASS_ADJUSTMENT(VTreatmentAdjustmentUltrafiltrationState, AdjustUltrafiltrationStateResponseData) + +void VTreatmentAdjustmentUltrafiltrationState::initConnections() { + ACTION_VIEW_CONNECTION(AdjustUltrafiltrationStateResponseData); + ADJUST_VIEW_CONNECTION( AdjustUltrafiltrationStateRequestData); +} + +void VTreatmentAdjustmentUltrafiltrationState::onActionReceive(const AdjustUltrafiltrationStateResponseData &vData) +{ + adjustment_Accepted ( vData.mAccepted ); + if (adjustment_Accepted()) { + // the response doesn't have the state so the requested state which has been accepted is used. + isPaused ( _data.requestedState == AdjustUltrafiltrationStateRequestData::ePaused ); + } + + // *** has to be the last to let the information to be set and then emit the signal *** + // *** otherwise will use the previous values before being set. *** + adjustment ( true ); +} + +void View::VTreatmentAdjustmentUltrafiltrationState::doPause() +{ + _data.requestedState = AdjustUltrafiltrationStateRequestData::ePaused; + emit didAdjustment(_data); +} + +void View::VTreatmentAdjustmentUltrafiltrationState::doResume() +{ + _data.requestedState = AdjustUltrafiltrationStateRequestData::eRunning; + emit didAdjustment(_data); +} + +/*! + * \brief View::VTreatmentAdjustmentUltrafiltrationState::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::VTreatmentAdjustmentUltrafiltrationState::text() +{ + // if there is a reason (passed) it will be used + QString mText = VTreatmentAdjustmentResponseBase::text(); + if (! mText.isEmpty()) return mText; + // otherwise a general message will be created/passed. + if (! adjustment_Accepted()) { + switch (_data.requestedState) { + case AdjustUltrafiltrationStateRequestData::eRunning: + mText = tr("Unable to Resume Ultrafiltration or already running"); + break; + + case AdjustUltrafiltrationStateRequestData::ePaused: + mText = tr("Unable to Pause Ultrafiltration or already paused"); + break; + + default: + break; + } + } + return mText; +} Index: sources/view/vtreatmentadjustmentultrafiltrationstate.h =================================================================== diff -u --- sources/view/vtreatmentadjustmentultrafiltrationstate.h (revision 0) +++ sources/view/vtreatmentadjustmentultrafiltrationstate.h (revision 5734e6289c18ec3cfe4749de8e3a6043f98dbcff) @@ -0,0 +1,54 @@ +/*! + * + * Copyright (c) 2019-2020 Diality Inc. - All Rights Reserved. + * \copyright + * THIS CODE MAY NOT BE COPIED OR REPRODUCED IN ANY FORM, + * IN PART OR IN WHOLE, + * WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER. + * + * \file vtreatmentadjustmentultrafiltrationstate.h + * \date 5/20/2020 + * \author Behrouz NematiPour + * + */ +#pragma once + +#include + +// Project +#include "vtreatmentadjustmentresponsebase.h" + +namespace View { + +class VTreatmentAdjustmentUltrafiltrationState : public VTreatmentAdjustmentResponseBase +{ + Q_OBJECT + + // friends + friend class ::tst_views; + + AdjustUltrafiltrationStateRequestData _data; + + // coco begin validated: + // The property adjustment_Triggered has to be always true + // and to always trigger the change event to work as a notifier for GUI + // has been manually tested that it works perfectly fine + TRIGGER( bool , adjustment , 0) + // coco end + + PROPERTY( bool , isPaused , false) + + VIEW_DEC_CLASS_ADJUSTMENT(VTreatmentAdjustmentUltrafiltrationState, AdjustUltrafiltrationStateResponseData) + + +// ---------- Puase Ultrafiltration +public slots: + void doPause (); + void doResume(); + QString text(); + +signals: + void didAdjustment(const AdjustUltrafiltrationStateRequestData &vData); +}; + +} Fisheye: Tag 5734e6289c18ec3cfe4749de8e3a6043f98dbcff refers to a dead (removed) revision in file `sources/view/vtreatmentultrafiltrationconfirm.cpp'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 5734e6289c18ec3cfe4749de8e3a6043f98dbcff refers to a dead (removed) revision in file `sources/view/vtreatmentultrafiltrationconfirm.h'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 5734e6289c18ec3cfe4749de8e3a6043f98dbcff refers to a dead (removed) revision in file `sources/view/vtreatmentultrafiltrationstate.cpp'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 5734e6289c18ec3cfe4749de8e3a6043f98dbcff refers to a dead (removed) revision in file `sources/view/vtreatmentultrafiltrationstate.h'. Fisheye: No comparison available. Pass `N' to diff? Index: sources/view/vview.h =================================================================== diff -u -rf160ef9c259a75e8d6120ad962cda648e8f7a9b3 -r5734e6289c18ec3cfe4749de8e3a6043f98dbcff --- sources/view/vview.h (.../vview.h) (revision f160ef9c259a75e8d6120ad962cda648e8f7a9b3) +++ sources/view/vview.h (.../vview.h) (revision 5734e6289c18ec3cfe4749de8e3a6043f98dbcff) @@ -89,21 +89,21 @@ //--------- Please add the view type to the lists below to register them ---------// //--------------------------------------------------------------------------------// //--------------------------------------------------------------------------------// -#define REGISTER_VIEW_TYPES \ - using namespace View; \ - REGISTER_TYPE( VTreatmentBloodFlow ) \ - REGISTER_TYPE( VTreatmentDialysateFlow ) \ - REGISTER_TYPE( VTreatmentUltrafiltration ) \ - REGISTER_TYPE( VTreatmentUltrafiltrationState ) \ - REGISTER_TYPE( VTreatmentPressureOcclusion ) \ - REGISTER_TYPE( VTreatmentTime ) \ - REGISTER_TYPE( VTreatmentRanges ) \ - REGISTER_TYPE( VAlarmStatus ) \ - REGISTER_TYPE( VPowerOff ) \ - REGISTER_TYPE( VTreatmentAdjustmentDuration ) \ - REGISTER_TYPE( VTreatmentAdjustmentFlows ) \ - REGISTER_TYPE( VTreatmentAdjustmentUltrafiltration ) \ - REGISTER_TYPE( VTreatmentUltrafiltrationConfirm ) +#define REGISTER_VIEW_TYPES \ + using namespace View; \ + REGISTER_TYPE( VTreatmentBloodFlow ) \ + REGISTER_TYPE( VTreatmentDialysateFlow ) \ + REGISTER_TYPE( VTreatmentUltrafiltration ) \ + REGISTER_TYPE( VTreatmentAdjustmentUltrafiltrationState ) \ + REGISTER_TYPE( VTreatmentPressureOcclusion ) \ + REGISTER_TYPE( VTreatmentTime ) \ + REGISTER_TYPE( VTreatmentRanges ) \ + REGISTER_TYPE( VAlarmStatus ) \ + REGISTER_TYPE( VPowerOff ) \ + REGISTER_TYPE( VTreatmentAdjustmentDuration ) \ + REGISTER_TYPE( VTreatmentAdjustmentFlows ) \ + REGISTER_TYPE( VTreatmentAdjustmentUltrafiltrationEdit ) \ + REGISTER_TYPE( VTreatmentAdjustmentUltrafiltrationConfirm ) //--------------------------------------------------------------------------------//