Index: denali.pro =================================================================== diff -u -ra09afcb23e479527eb2263474003b63955cd0e99 -r03de7d132838c54a23862809357c42102b6dab99 --- denali.pro (.../denali.pro) (revision a09afcb23e479527eb2263474003b63955cd0e99) +++ denali.pro (.../denali.pro) (revision 03de7d132838c54a23862809357c42102b6dab99) @@ -44,9 +44,9 @@ sources/model/mtreatmentadjustblooddialysateresponse.h \ sources/model/mtreatmentadjustdurationresponse.h \ sources/model/mtreatmentadjustultrafiltrationresponse.h \ + sources/model/mtreatmentadjustultrafiltrationstateresponse.h \ sources/model/mtreatmentpressureocclusion.h \ sources/model/mtreatmentranges.h \ - sources/model/mtreatmentultrafiltrationstate.h \ sources/threads.h \ sources/applicationcontroller.h \ sources/applicationpost.h \ @@ -97,9 +97,9 @@ sources/model/mtreatmentadjustblooddialysateresponse.cpp \ sources/model/mtreatmentadjustdurationresponse.cpp \ sources/model/mtreatmentadjustultrafiltrationresponse.cpp \ + sources/model/mtreatmentadjustultrafiltrationstateresponse.cpp \ sources/model/mtreatmentpressureocclusion.cpp \ sources/model/mtreatmentranges.cpp \ - sources/model/mtreatmentultrafiltrationstate.cpp \ sources/threads.cpp \ sources/applicationcontroller.cpp \ sources/applicationpost.cpp \ Index: denali.pro.user =================================================================== diff -u -ra09afcb23e479527eb2263474003b63955cd0e99 -r03de7d132838c54a23862809357c42102b6dab99 --- denali.pro.user (.../denali.pro.user) (revision a09afcb23e479527eb2263474003b63955cd0e99) +++ denali.pro.user (.../denali.pro.user) (revision 03de7d132838c54a23862809357c42102b6dab99) @@ -1,6 +1,6 @@ - + EnvironmentId Index: sources/applicationcontroller.cpp =================================================================== diff -u -rb789046c096cfdddb39adcd3d5be1e129769aac6 -r03de7d132838c54a23862809357c42102b6dab99 --- sources/applicationcontroller.cpp (.../applicationcontroller.cpp) (revision b789046c096cfdddb39adcd3d5be1e129769aac6) +++ sources/applicationcontroller.cpp (.../applicationcontroller.cpp) (revision 03de7d132838c54a23862809357c42102b6dab99) @@ -111,17 +111,17 @@ connect(&_Logger , SIGNAL(didExport()), this , SLOT( onExport())); - connect(&_GuiController , SIGNAL(didAdjustment(quint32, quint32)), - this , SLOT( onAdjustment(quint32, quint32))); + connect(&_GuiController , SIGNAL(didAdjustment(const AdjustBloodDialysateRequestData &)), + this , SLOT( onAdjustment(const AdjustBloodDialysateRequestData &))); - connect(&_GuiController , SIGNAL(didAdjustment(quint32)), - this , SLOT( onAdjustment(quint32))); + connect(&_GuiController , SIGNAL(didAdjustment(const AdjustDurationRequestData &)), + this , SLOT( onAdjustment(const AdjustDurationRequestData &))); - connect(&_GuiController , SIGNAL(didAdjustment(const MAdjustUltrafiltrationReq &)), - this , SLOT( onAdjustment(const MAdjustUltrafiltrationReq &))); + connect(&_GuiController , SIGNAL(didAdjustment(const AdjustUltrafiltrationRequestData &)), + this , SLOT( onAdjustment(const AdjustUltrafiltrationRequestData &))); - connect(&_GuiController , SIGNAL(didUltrafiltrationStateRequest(quint32)), - this , SLOT( onUltrafiltrationStateRequest(quint32))); + connect(&_GuiController , SIGNAL(didAdjustment(const AdjustUltrafiltrationStateRequestData &)), + this , SLOT( onAdjustment(const AdjustUltrafiltrationStateRequestData &))); ACTION_RECEIVE_MODEL_BRIDGE_CONNECTIONS(_MessageDispatcher) } @@ -260,42 +260,48 @@ /*! * \brief ApplicationController::onAdjustment * \details This method transmits the Blood/Dialysate Adjustment Denali message. - * \param vBloodFlow - Blood Flow Rate - * \param vDialysateFlow - Dialysate Flow Rate + * \param vData - Data model contains Blood Flow Rate + and Dialysate Flow Rate * \return void */ -void ApplicationController::onAdjustment(quint32 vBloodFlow, quint32 vDialysateFlow) +void ApplicationController::onAdjustment(const AdjustBloodDialysateRequestData &vData) { QVariantList mData; - mData += vBloodFlow; - mData += vDialysateFlow; + mData += vData.bloodFlow; + mData += vData.dialysateFlow; onActionTransmit(GuiActionType::AdjustBloodDialysateReq, mData); } /*! * \brief ApplicationController::onAdjustment - * \details This method transmits the Blood/Dialysate Adjustment Denali message. - * \param vDuration - Treatment duration adjustment value in minuts + * \details This method transmits the treatment duration Adjustment Denali message. + * \param vData - Data model contains treatment duration adjustment value in minuts * \return void */ -void ApplicationController::onAdjustment(quint32 vDuration) +void ApplicationController::onAdjustment(const AdjustDurationRequestData &vData) { QVariantList mData; - mData += vDuration; + mData += vData.duratoin; onActionTransmit(GuiActionType::AdjustDurationReq, mData); } -void ApplicationController::onAdjustment(const MAdjustUltrafiltrationReq &vData) +/*! + * \brief ApplicationController::onAdjustment + * \details This method transmits the Ultrafiltration Adjustment Denali message. + * \param vData - Data model contains treatment ultrafiltration adjustment volume + * \return void + */ +void ApplicationController::onAdjustment(const AdjustUltrafiltrationRequestData &vData) { QVariantList mData; mData += vData.volume; onActionTransmit(GuiActionType::AdjustUltrafiltrationReq, mData); } -void ApplicationController::onUltrafiltrationStateRequest(quint32 vState) +void ApplicationController::onAdjustment(const AdjustUltrafiltrationStateRequestData &vDate) { QVariantList mData; - mData += vState; + mData += vDate.requestedState; onActionTransmit(GuiActionType::UltrafiltrationState, mData); } Index: sources/applicationcontroller.h =================================================================== diff -u -rb789046c096cfdddb39adcd3d5be1e129769aac6 -r03de7d132838c54a23862809357c42102b6dab99 --- sources/applicationcontroller.h (.../applicationcontroller.h) (revision b789046c096cfdddb39adcd3d5be1e129769aac6) +++ sources/applicationcontroller.h (.../applicationcontroller.h) (revision 03de7d132838c54a23862809357c42102b6dab99) @@ -78,12 +78,11 @@ void onExportLog (); void onExport (); - void onAdjustment(quint32 vBloodFlow, quint32 vDialysateFlow); - void onAdjustment(quint32 vDuration); - void onAdjustment(const MAdjustUltrafiltrationReq &vData); + void onAdjustment(const AdjustBloodDialysateRequestData &vData); + void onAdjustment(const AdjustDurationRequestData &vData); + void onAdjustment(const AdjustUltrafiltrationRequestData &vData); + void onAdjustment(const AdjustUltrafiltrationStateRequestData &vData); - void onUltrafiltrationStateRequest(quint32 vState); - ACTION_RECEIVE_MODEL_BRIDGE_DEFINITIONS signals: Index: sources/canbus/messageglobals.h =================================================================== diff -u -rb789046c096cfdddb39adcd3d5be1e129769aac6 -r03de7d132838c54a23862809357c42102b6dab99 --- sources/canbus/messageglobals.h (.../messageglobals.h) (revision b789046c096cfdddb39adcd3d5be1e129769aac6) +++ sources/canbus/messageglobals.h (.../messageglobals.h) (revision 03de7d132838c54a23862809357c42102b6dab99) @@ -68,6 +68,7 @@ // ---- {Gui::GuiActionType::AdjustUltrafiltrationReq , 1 * 4 }, // 1 parameters each 4bytes + {Gui::GuiActionType::AdjustUltrafiltrationRsp , 7 * 4 }, // 7 parameters each 4bytes // ---- {Gui::GuiActionType::UltrafiltrationState , 1 * 4 }, // 1 parameters each 4bytes Index: sources/canbus/messageinterpreter.cpp =================================================================== diff -u -rb789046c096cfdddb39adcd3d5be1e129769aac6 -r03de7d132838c54a23862809357c42102b6dab99 --- sources/canbus/messageinterpreter.cpp (.../messageinterpreter.cpp) (revision b789046c096cfdddb39adcd3d5be1e129769aac6) +++ sources/canbus/messageinterpreter.cpp (.../messageinterpreter.cpp) (revision 03de7d132838c54a23862809357c42102b6dab99) @@ -40,9 +40,13 @@ bool MessageInterpreter::isPayloadLenValid(const Message &vMessage, Gui::GuiActionType vType) const { + QString mActionIdHexString = Format::toHexString(vMessage.actionId); + if ( ! payloadLen.contains(vType) ) { + LOG_ERROR(tr("Undefined data length for Message ID (HD) '%1'").arg(mActionIdHexString)); + return false; + } if ( vMessage.data.length() < payloadLen[vType] ) { - QString mActionIdHexString = Format::toHexString(vMessage.actionId); - LOG_ERROR(tr("Incorrect data for Message ID (HD) '%1'").arg(mActionIdHexString)); + LOG_ERROR(tr("Incorrect data length for Message ID (HD) '%1'").arg(mActionIdHexString)); return false; } return true; @@ -772,7 +776,7 @@ if ( ! isType (vMessage, Gui::GuiActionType::UltrafiltrationState) ) return ok; if ( ! isPayloadLenValid(vMessage, Gui::GuiActionType::AcknowGeneric ) ) return ok; - Model::MTreatmentUltrafiltrationState mData; + Model::MUltrafiltrationStateResponse mData; ok = mData.fromByteArray(vMessage.data); LOG_DATUM(mData.toString()); Index: sources/gui/guicontroller.h =================================================================== diff -u -rb789046c096cfdddb39adcd3d5be1e129769aac6 -r03de7d132838c54a23862809357c42102b6dab99 --- sources/gui/guicontroller.h (.../guicontroller.h) (revision b789046c096cfdddb39adcd3d5be1e129769aac6) +++ sources/gui/guicontroller.h (.../guicontroller.h) (revision 03de7d132838c54a23862809357c42102b6dab99) @@ -81,32 +81,18 @@ void didExport (); //// ----- Adjust Blood/Dialysate Flows -public slots: - void doAdjustment(quint32 vBloodFlow, quint32 vDialysateFlow) { - emit didAdjustment( vBloodFlow, vDialysateFlow);} -signals: - void didAdjustment(quint32 vBloodFlow, quint32 vDialysateFlow); - +public slots: void doAdjustment(const AdjustBloodDialysateRequestData &vData) { emit didAdjustment(vData); } +signals: void didAdjustment(const AdjustBloodDialysateRequestData &vData); //// ----- Adjust Duration -public slots: - void doAdjustment(quint32 vDuration) { - emit didAdjustment( vDuration);} -signals: - void didAdjustment(quint32 vDuration); - +public slots: void doAdjustment(const AdjustDurationRequestData &vData) { emit didAdjustment(vData);} +signals: void didAdjustment(const AdjustDurationRequestData &vData); //// ----- Adjust Duration -public slots: - void doAdjustment(const MAdjustUltrafiltrationReq &vData) { - emit didAdjustment( vData);} -signals: - void didAdjustment(const MAdjustUltrafiltrationReq &vData); +public slots: void doAdjustment(const AdjustUltrafiltrationRequestData &vData) { emit didAdjustment(vData);} +signals: void didAdjustment(const AdjustUltrafiltrationRequestData &vData); -//// ----- Pause Ultrafiltration -public slots: - void doUltrafiltrationStateRequest(quint32 vState) { - emit didUltrafiltrationStateRequest( vState);} -signals: - void didUltrafiltrationStateRequest(quint32 vState); +//// ----- Ultrafiltration State Modification +public slots: void doAdjustment(const AdjustUltrafiltrationStateRequestData &vData) { emit didAdjustment(vData);} +signals: void didAdjustment(const AdjustUltrafiltrationStateRequestData &vData); }; Index: sources/gui/guiglobals.h =================================================================== diff -u -rb789046c096cfdddb39adcd3d5be1e129769aac6 -r03de7d132838c54a23862809357c42102b6dab99 --- sources/gui/guiglobals.h (.../guiglobals.h) (revision b789046c096cfdddb39adcd3d5be1e129769aac6) +++ sources/gui/guiglobals.h (.../guiglobals.h) (revision 03de7d132838c54a23862809357c42102b6dab99) @@ -86,10 +86,6 @@ Accepted = 0x01, Rejected = 0x02, - // Ultrafiltration State - Pause = 0x00, - Resume = 0x01, - // Power-Off Data // HD=>UI : should be handled in receive Timeout = 0x01, }; Index: sources/gui/qml/components/UltrafiltrationButton.qml =================================================================== diff -u -ra09afcb23e479527eb2263474003b63955cd0e99 -r03de7d132838c54a23862809357c42102b6dab99 --- sources/gui/qml/components/UltrafiltrationButton.qml (.../UltrafiltrationButton.qml) (revision a09afcb23e479527eb2263474003b63955cd0e99) +++ sources/gui/qml/components/UltrafiltrationButton.qml (.../UltrafiltrationButton.qml) (revision 03de7d132838c54a23862809357c42102b6dab99) @@ -51,7 +51,11 @@ height : Variables.ultrafiltrationAdjustmtenOptionHeight clip : true - color : disabled ? "transparent" : Colors.backgroundUltrafiltrationButton + color : disabled ? + "transparent" : + selected ? + Qt.lighter(Colors.backgroundUltrafiltrationButton, 1.1) : // little lighter to distinguish selection + Colors.backgroundUltrafiltrationButton radius : 12 border { width: 2 Index: sources/gui/qml/pages/treatment/TreatmentStack.qml =================================================================== diff -u -ra09afcb23e479527eb2263474003b63955cd0e99 -r03de7d132838c54a23862809357c42102b6dab99 --- sources/gui/qml/pages/treatment/TreatmentStack.qml (.../TreatmentStack.qml) (revision a09afcb23e479527eb2263474003b63955cd0e99) +++ sources/gui/qml/pages/treatment/TreatmentStack.qml (.../TreatmentStack.qml) (revision 03de7d132838c54a23862809357c42102b6dab99) @@ -156,7 +156,8 @@ vTreatmentAdjustmentUltrafiltration.duration , vTreatmentAdjustmentUltrafiltration.durationDiff , vTreatmentAdjustmentUltrafiltration.rate , - vTreatmentAdjustmentUltrafiltration.rateDiff + vTreatmentAdjustmentUltrafiltration.rateDiff , + vTreatmentAdjustmentUltrafiltration.rateCurr ) if (vTreatmentAdjustmentUltrafiltration.adjustment_Accepted) { _treatmentAdjustmentUltrafiltrationEdit .close() @@ -166,6 +167,7 @@ _treatmentAdjustmentUltrafiltrationConfirm.treatmentDurationDiff = vTreatmentAdjustmentUltrafiltration.durationDiff _treatmentAdjustmentUltrafiltrationConfirm.ultrafiltrationRate = 1000 * vTreatmentAdjustmentUltrafiltration.rate .toFixed(3) _treatmentAdjustmentUltrafiltrationConfirm.ultrafiltrationRateDiff = 1000 * vTreatmentAdjustmentUltrafiltration.rateDiff .toFixed(3) + _treatmentAdjustmentUltrafiltrationConfirm.ultrafiltrationRateCurr = 1000 * vTreatmentAdjustmentUltrafiltration.rateCurr .toFixed(3) _treatmentAdjustmentUltrafiltrationConfirm.open() } else { Index: sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentUltrafiltrationConfirm.qml =================================================================== diff -u -ra09afcb23e479527eb2263474003b63955cd0e99 -r03de7d132838c54a23862809357c42102b6dab99 --- sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentUltrafiltrationConfirm.qml (.../TreatmentAdjustmentUltrafiltrationConfirm.qml) (revision a09afcb23e479527eb2263474003b63955cd0e99) +++ sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentUltrafiltrationConfirm.qml (.../TreatmentAdjustmentUltrafiltrationConfirm.qml) (revision 03de7d132838c54a23862809357c42102b6dab99) @@ -31,6 +31,7 @@ property int ultrafiltrationVolume : 0 property int ultrafiltrationRate : 0 property int ultrafiltrationRateDiff : 0 + property int ultrafiltrationRateCurr : 0 property string ultrafiltrationRateUnit : qsTr("mL/min") property int treatmentDuration : 0 property int treatmentDurationDiff : 0 @@ -99,12 +100,13 @@ UltrafiltrationButton { id: _durationAdjustmentButton title : qsTr("%1 Treatment Duration") - description : qsTr("Rate remains, but treatment\nduration %2 by %1 minutes.").arg(Math.abs(treatmentDurationDiff)) + description : qsTr("Rate remains, but treatment\nduration %2 by %1 minutes.") + .arg(Math.abs(treatmentDurationDiff)) buttonType: UltrafiltrationButton.ButtonType.TreatmentDuration isIncrease: treatmentDurationDiff > 0 - valueText : qsTr("Duration : %1 %2") - .arg(treatmentDuration ) - .arg(treatmentDurationUnit) + valueText : qsTr( "UF Rate : %1 %2") + .arg(ultrafiltrationRateCurr) + .arg(ultrafiltrationRateUnit) onClicked : { _rateAdjustmentButton.selected = false selected = true Index: sources/model/mmodel.h =================================================================== diff -u -reb19475a6bf4ed7f6a16bc07eefc7813496620ef -r03de7d132838c54a23862809357c42102b6dab99 --- sources/model/mmodel.h (.../mmodel.h) (revision eb19475a6bf4ed7f6a16bc07eefc7813496620ef) +++ sources/model/mmodel.h (.../mmodel.h) (revision 03de7d132838c54a23862809357c42102b6dab99) @@ -26,7 +26,7 @@ #include "mtreatmentranges.h" #include "mtreatmentadjustblooddialysateresponse.h" #include "mtreatmentadjustdurationresponse.h" -#include "mtreatmentultrafiltrationstate.h" +#include "mtreatmentadjustultrafiltrationstateresponse.h" #include "mtreatmentadjustultrafiltrationresponse.h" /*! @@ -106,85 +106,125 @@ * */ +/*! + * Simple request models + * These are models to send the request for the doAdjustmet + * The the only reason thy have been defined to help overloadding the adjusmtent methods + * Otherwise the parameters are so tiny models. + */ +namespace Model { + +class MAdjustBloodDialysateReq { +public: + quint32 bloodFlow = 0; + quint32 dialysateFlow = 0; +}; + +class MAdjustDurationReq { +public: + quint32 duratoin = 0; +}; + +class MAdjustUltrafiltrationStateReq { +public: + enum State{ + ePaused = 0, + eRunning = 1, + }; + State requestedState = ePaused; // the requested state. Initially it's running => paused. +}; + class MAdjustUltrafiltrationReq { public: float volume = 0; }; +} + + +typedef Model:: MAdjustBloodDialysateReq AdjustBloodDialysateRequestData; +typedef Model:: MAdjustDurationReq AdjustDurationRequestData; +typedef Model::MAdjustUltrafiltrationStateReq AdjustUltrafiltrationStateRequestData; +typedef Model:: MAdjustUltrafiltrationReq AdjustUltrafiltrationRequestData; + //--------------------------------------------------------------------------------// //-------- Please add the model type to the lists below to register them ---------// //--------------------------------------------------------------------------------// #define REGISTER_MODEL_METATYPES \ - REGISTER_METATYPE( BloodFlowData ) \ - REGISTER_METATYPE( DialysateFlowData ) \ - REGISTER_METATYPE( OutletFlowData ) \ - REGISTER_METATYPE( TreatmentTimeData ) \ - REGISTER_METATYPE( PressureOcclusionData ) \ - REGISTER_METATYPE( AlarmStatusData ) \ - REGISTER_METATYPE( AlarmStatusFlag ) \ - REGISTER_METATYPE( PowerOffData ) \ - REGISTER_METATYPE( TreatmentRangesData ) \ - REGISTER_METATYPE( TreatmentUltrafiltrationStateData ) \ - REGISTER_METATYPE( AdjustBloodDialysateResponseData ) \ - REGISTER_METATYPE( AdjustDurationResponseData ) \ - REGISTER_METATYPE( AdjustUltrafiltrationResponseData ) \ - REGISTER_METATYPE( MAdjustUltrafiltrationReq ) + REGISTER_METATYPE( BloodFlowData ) \ + REGISTER_METATYPE( DialysateFlowData ) \ + REGISTER_METATYPE( OutletFlowData ) \ + REGISTER_METATYPE( TreatmentTimeData ) \ + REGISTER_METATYPE( PressureOcclusionData ) \ + REGISTER_METATYPE( AlarmStatusData ) \ + REGISTER_METATYPE( AlarmStatusFlag ) \ + REGISTER_METATYPE( PowerOffData ) \ + REGISTER_METATYPE( TreatmentRangesData ) \ + REGISTER_METATYPE( AdjustUltrafiltrationStateResponseData ) \ + REGISTER_METATYPE( AdjustBloodDialysateResponseData ) \ + REGISTER_METATYPE( AdjustDurationResponseData ) \ + REGISTER_METATYPE( AdjustUltrafiltrationResponseData ) \ + REGISTER_METATYPE( AdjustUltrafiltrationStateRequestData ) \ + REGISTER_METATYPE( AdjustBloodDialysateRequestData ) \ + REGISTER_METATYPE( AdjustDurationRequestData ) \ + REGISTER_METATYPE( AdjustUltrafiltrationRequestData ) + //--------------------------------------------------------------------------------// #define ACTION_RECEIVE_MODEL_BRIDGE_CONNECTIONS(vSOURCE) \ - ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, BloodFlowData ) \ - ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, DialysateFlowData ) \ - ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, OutletFlowData ) \ - ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, TreatmentTimeData ) \ - ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, PressureOcclusionData ) \ - ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, AlarmStatusData ) \ - ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, PowerOffData ) \ - ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, TreatmentRangesData ) \ - ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, TreatmentUltrafiltrationStateData ) \ - ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, AdjustBloodDialysateResponseData ) \ - ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, AdjustDurationResponseData ) \ - ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, AdjustUltrafiltrationResponseData ) + ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, BloodFlowData ) \ + ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, DialysateFlowData ) \ + ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, OutletFlowData ) \ + ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, TreatmentTimeData ) \ + ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, PressureOcclusionData ) \ + ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, AlarmStatusData ) \ + ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, PowerOffData ) \ + ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, TreatmentRangesData ) \ + ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, AdjustUltrafiltrationStateResponseData ) \ + ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, AdjustBloodDialysateResponseData ) \ + ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, AdjustDurationResponseData ) \ + ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, AdjustUltrafiltrationResponseData ) //--------------------------------------------------------------------------------// #define ACTION_RECEIVE_MODEL_BRIDGE_DEFINITIONS \ - ACTION_RECEIVE_BRIDGE_DEFINITION( BloodFlowData ) \ - ACTION_RECEIVE_BRIDGE_DEFINITION( DialysateFlowData ) \ - ACTION_RECEIVE_BRIDGE_DEFINITION( OutletFlowData ) \ - ACTION_RECEIVE_BRIDGE_DEFINITION( TreatmentTimeData ) \ - ACTION_RECEIVE_BRIDGE_DEFINITION( PressureOcclusionData ) \ - ACTION_RECEIVE_BRIDGE_DEFINITION( AlarmStatusData ) \ - ACTION_RECEIVE_BRIDGE_DEFINITION( PowerOffData ) \ - ACTION_RECEIVE_BRIDGE_DEFINITION( TreatmentRangesData ) \ - ACTION_RECEIVE_BRIDGE_DEFINITION( TreatmentUltrafiltrationStateData ) \ - ACTION_RECEIVE_BRIDGE_DEFINITION( AdjustBloodDialysateResponseData ) \ - ACTION_RECEIVE_BRIDGE_DEFINITION( AdjustDurationResponseData ) \ - ACTION_RECEIVE_BRIDGE_DEFINITION( AdjustUltrafiltrationResponseData ) + ACTION_RECEIVE_BRIDGE_DEFINITION( BloodFlowData ) \ + ACTION_RECEIVE_BRIDGE_DEFINITION( DialysateFlowData ) \ + ACTION_RECEIVE_BRIDGE_DEFINITION( OutletFlowData ) \ + ACTION_RECEIVE_BRIDGE_DEFINITION( TreatmentTimeData ) \ + ACTION_RECEIVE_BRIDGE_DEFINITION( PressureOcclusionData ) \ + ACTION_RECEIVE_BRIDGE_DEFINITION( AlarmStatusData ) \ + ACTION_RECEIVE_BRIDGE_DEFINITION( PowerOffData ) \ + ACTION_RECEIVE_BRIDGE_DEFINITION( TreatmentRangesData ) \ + ACTION_RECEIVE_BRIDGE_DEFINITION( AdjustUltrafiltrationStateResponseData ) \ + ACTION_RECEIVE_BRIDGE_DEFINITION( AdjustBloodDialysateResponseData ) \ + ACTION_RECEIVE_BRIDGE_DEFINITION( AdjustDurationResponseData ) \ + ACTION_RECEIVE_BRIDGE_DEFINITION( AdjustUltrafiltrationResponseData ) //--------------------------------------------------------------------------------// #define ACTION_RECEIVE_INTERPRETER_CONNECTIONS \ - ACTION_RECEIVE_BRIDGE_CONNECTION(_interpreter, BloodFlowData ) \ - ACTION_RECEIVE_BRIDGE_CONNECTION(_interpreter, DialysateFlowData ) \ - ACTION_RECEIVE_BRIDGE_CONNECTION(_interpreter, OutletFlowData ) \ - ACTION_RECEIVE_BRIDGE_CONNECTION(_interpreter, TreatmentTimeData ) \ - ACTION_RECEIVE_BRIDGE_CONNECTION(_interpreter, PressureOcclusionData ) \ - ACTION_RECEIVE_BRIDGE_CONNECTION(_interpreter, AlarmStatusData ) \ - ACTION_RECEIVE_BRIDGE_CONNECTION(_interpreter, PowerOffData ) \ - ACTION_RECEIVE_BRIDGE_CONNECTION(_interpreter, TreatmentRangesData ) \ - ACTION_RECEIVE_BRIDGE_CONNECTION(_interpreter,TreatmentUltrafiltrationStateData ) \ - ACTION_RECEIVE_BRIDGE_CONNECTION(_interpreter, AdjustBloodDialysateResponseData ) \ - ACTION_RECEIVE_BRIDGE_CONNECTION(_interpreter, AdjustDurationResponseData ) \ - ACTION_RECEIVE_BRIDGE_CONNECTION(_interpreter,AdjustUltrafiltrationResponseData ) + ACTION_RECEIVE_BRIDGE_CONNECTION(_interpreter, BloodFlowData ) \ + ACTION_RECEIVE_BRIDGE_CONNECTION(_interpreter, DialysateFlowData ) \ + ACTION_RECEIVE_BRIDGE_CONNECTION(_interpreter, OutletFlowData ) \ + ACTION_RECEIVE_BRIDGE_CONNECTION(_interpreter, TreatmentTimeData ) \ + ACTION_RECEIVE_BRIDGE_CONNECTION(_interpreter, PressureOcclusionData ) \ + ACTION_RECEIVE_BRIDGE_CONNECTION(_interpreter, AlarmStatusData ) \ + ACTION_RECEIVE_BRIDGE_CONNECTION(_interpreter, PowerOffData ) \ + ACTION_RECEIVE_BRIDGE_CONNECTION(_interpreter, TreatmentRangesData ) \ + ACTION_RECEIVE_BRIDGE_CONNECTION(_interpreter, AdjustUltrafiltrationStateResponseData ) \ + ACTION_RECEIVE_BRIDGE_CONNECTION(_interpreter, AdjustBloodDialysateResponseData ) \ + ACTION_RECEIVE_BRIDGE_CONNECTION(_interpreter, AdjustDurationResponseData ) \ + ACTION_RECEIVE_BRIDGE_CONNECTION(_interpreter, AdjustUltrafiltrationResponseData ) //--------------------------------------------------------------------------------// #define ACTION_RECEIVE_SIGNALS \ - ACTION_RECEIVE_SIGNAL( BloodFlowData ) \ - ACTION_RECEIVE_SIGNAL( DialysateFlowData ) \ - ACTION_RECEIVE_SIGNAL( OutletFlowData ) \ - ACTION_RECEIVE_SIGNAL( TreatmentTimeData ) \ - ACTION_RECEIVE_SIGNAL( PressureOcclusionData ) \ - ACTION_RECEIVE_SIGNAL( AlarmStatusData ) \ - ACTION_RECEIVE_SIGNAL( PowerOffData ) \ - ACTION_RECEIVE_SIGNAL( TreatmentRangesData ) \ - ACTION_RECEIVE_SIGNAL( TreatmentUltrafiltrationStateData ) \ - ACTION_RECEIVE_SIGNAL( AdjustBloodDialysateResponseData ) \ - ACTION_RECEIVE_SIGNAL( AdjustDurationResponseData ) \ - ACTION_RECEIVE_SIGNAL( AdjustUltrafiltrationResponseData ) + ACTION_RECEIVE_SIGNAL( BloodFlowData ) \ + ACTION_RECEIVE_SIGNAL( DialysateFlowData ) \ + ACTION_RECEIVE_SIGNAL( OutletFlowData ) \ + ACTION_RECEIVE_SIGNAL( TreatmentTimeData ) \ + ACTION_RECEIVE_SIGNAL( PressureOcclusionData ) \ + ACTION_RECEIVE_SIGNAL( AlarmStatusData ) \ + ACTION_RECEIVE_SIGNAL( PowerOffData ) \ + ACTION_RECEIVE_SIGNAL( TreatmentRangesData ) \ + ACTION_RECEIVE_SIGNAL( AdjustUltrafiltrationStateResponseData ) \ + ACTION_RECEIVE_SIGNAL( AdjustBloodDialysateResponseData ) \ + ACTION_RECEIVE_SIGNAL( AdjustDurationResponseData ) \ + ACTION_RECEIVE_SIGNAL( AdjustUltrafiltrationResponseData ) //--------------------------------------------------------------------------------// //--------------------------------------------------------------------------------// Index: sources/model/mtreatmentadjustultrafiltrationresponse.cpp =================================================================== diff -u -ra159e12630645a9a35fb0a5585cc7b639cfe6aa6 -r03de7d132838c54a23862809357c42102b6dab99 --- sources/model/mtreatmentadjustultrafiltrationresponse.cpp (.../mtreatmentadjustultrafiltrationresponse.cpp) (revision a159e12630645a9a35fb0a5585cc7b639cfe6aa6) +++ sources/model/mtreatmentadjustultrafiltrationresponse.cpp (.../mtreatmentadjustultrafiltrationresponse.cpp) (revision 03de7d132838c54a23862809357c42102b6dab99) @@ -16,14 +16,16 @@ using namespace Model; QString MAdjustUltrafiltrationResponse::toString() const { - return QString(stringPrefix + "(%1, %2, %3, %4, %5, %6, %7)") + return QString(stringPrefix + "(%1, %2, %3, %4, %5, %6, %7, %8)") .arg(_data.mAccepted .value) .arg(_data.mReason .value) .arg(_data.mVolume .value) .arg(_data.mDuration .value) .arg(_data.mDurationDiff.value) .arg(_data.mRate .value) - .arg(_data.mRateDiff .value); + .arg(_data.mRateDiff .value) + .arg(_data.mRateCurr .value) + ; } void MAdjustUltrafiltrationResponse::toVariantList(QVariantList &vData) const { @@ -34,6 +36,7 @@ vData += _data.mDurationDiff.value; vData += _data.mRate .value; vData += _data.mRateDiff .value; + vData += _data.mRateCurr .value; } bool MAdjustUltrafiltrationResponse::fromByteArray(const QByteArray &vByteArray, int *vIndex) { @@ -45,6 +48,7 @@ if (GetValue(vByteArray, index, _data.mDurationDiff )) if (GetValue(vByteArray, index, _data.mRate )) if (GetValue(vByteArray, index, _data.mRateDiff )) + if (GetValue(vByteArray, index, _data.mRateCurr )) return true ; else { if(vIndex) *vIndex = index; return false; } else { if(vIndex) *vIndex = index; return false; } @@ -53,6 +57,7 @@ else { if(vIndex) *vIndex = index; return false; } else { if(vIndex) *vIndex = index; return false; } else { if(vIndex) *vIndex = index; return false; } + else { if(vIndex) *vIndex = index; return false; } } AdjustUltrafiltrationResponseData MAdjustUltrafiltrationResponse::data() const { @@ -64,5 +69,6 @@ data.mDurationDiff = _data.mDurationDiff.value; data.mRate = _data.mRate .value; data.mRateDiff = _data.mRateDiff .value; + data.mRateCurr = _data.mRateCurr .value; return data; } Index: sources/model/mtreatmentadjustultrafiltrationresponse.h =================================================================== diff -u -ra159e12630645a9a35fb0a5585cc7b639cfe6aa6 -r03de7d132838c54a23862809357c42102b6dab99 --- sources/model/mtreatmentadjustultrafiltrationresponse.h (.../mtreatmentadjustultrafiltrationresponse.h) (revision a159e12630645a9a35fb0a5585cc7b639cfe6aa6) +++ sources/model/mtreatmentadjustultrafiltrationresponse.h (.../mtreatmentadjustultrafiltrationresponse.h) (revision 03de7d132838c54a23862809357c42102b6dab99) @@ -40,6 +40,7 @@ quint32 mDurationDiff= 0; /*!< durationDiff value of type quint32 extracted out */ float mRate = 0; /*!< rate value of type float extracted out */ float mRateDiff = 0; /*!< rateDiff value of type float extracted out */ + float mRateCurr = 0; /*!< rateCurr value of type float extracted out */ }; private: @@ -52,6 +53,7 @@ Types::U32 mDurationDiff ; Types::F32 mRate ; Types::F32 mRateDiff ; + Types::F32 mRateCurr ; } _data; public: Index: sources/model/mtreatmentadjustultrafiltrationstateresponse.cpp =================================================================== diff -u --- sources/model/mtreatmentadjustultrafiltrationstateresponse.cpp (revision 0) +++ sources/model/mtreatmentadjustultrafiltrationstateresponse.cpp (revision 03de7d132838c54a23862809357c42102b6dab99) @@ -0,0 +1,38 @@ +/*! + * + * 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 mtreatmentadjustultrafiltrationstateresponse.cpp + * \date 5/20/2020 + * \author Behrouz NematiPour + * + */ +#include "mtreatmentadjustultrafiltrationstateresponse.h" + +using namespace Model; + +QString MUltrafiltrationStateResponse::toString() const { + return QString(stringPrefix + "(%1)") + .arg(_data.mAccepted.value); +} + +void MUltrafiltrationStateResponse::toVariantList(QVariantList &vData) const { + vData += _data.mAccepted.value; +} + +bool MUltrafiltrationStateResponse::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 { + Data data; + data.mAccepted = _data.mAccepted.value; + return data; +} Index: sources/model/mtreatmentadjustultrafiltrationstateresponse.h =================================================================== diff -u --- sources/model/mtreatmentadjustultrafiltrationstateresponse.h (revision 0) +++ sources/model/mtreatmentadjustultrafiltrationstateresponse.h (revision 03de7d132838c54a23862809357c42102b6dab99) @@ -0,0 +1,55 @@ +/*! + * + * 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 mtreatmentadjustultrafiltrationstateresponse.h + * \date 5/20/2020 + * \author Behrouz NematiPour + * + */ +#pragma once + +// Qt +#include + +// Project +#include "types.h" + +// forward declarations +class tst_models; + +namespace Model { + +class MUltrafiltrationStateResponse { + + // friends + friend class ::tst_models; + +public: + QString stringPrefix = "Ultrafiltration State"; + struct Data { + bool mAccepted = 0; /*!< Accepted value of type quint32 extracted out */ + }; + +private: + struct { + Types::U08 mAccepted ; // this is a responce to AcknowGeneral which has a data of 1 byte for the accpted/rejected. + } _data; + +public: + MUltrafiltrationStateResponse() { } + + QString toString ( ) const ; + void toVariantList ( QVariantList &vData ) const ; + bool fromByteArray (const QByteArray &vByteArray , int *vIndex = nullptr); + + Data data() const; +}; + +} + +typedef Model::MUltrafiltrationStateResponse::Data AdjustUltrafiltrationStateResponseData; Fisheye: Tag 03de7d132838c54a23862809357c42102b6dab99 refers to a dead (removed) revision in file `sources/model/mtreatmentultrafiltrationstate.cpp'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 03de7d132838c54a23862809357c42102b6dab99 refers to a dead (removed) revision in file `sources/model/mtreatmentultrafiltrationstate.h'. Fisheye: No comparison available. Pass `N' to diff? Index: sources/view/vtreatmentadjustmentduration.cpp =================================================================== diff -u -ra159e12630645a9a35fb0a5585cc7b639cfe6aa6 -r03de7d132838c54a23862809357c42102b6dab99 --- sources/view/vtreatmentadjustmentduration.cpp (.../vtreatmentadjustmentduration.cpp) (revision a159e12630645a9a35fb0a5585cc7b639cfe6aa6) +++ sources/view/vtreatmentadjustmentduration.cpp (.../vtreatmentadjustmentduration.cpp) (revision 03de7d132838c54a23862809357c42102b6dab99) @@ -22,8 +22,8 @@ ACTION_RECEIVE_BRIDGE_CONNECTION(Gui::_GuiController, AdjustDurationResponseData); - connect(this , SIGNAL(didAdjustment(quint32)), - &_GuiController, SLOT( doAdjustment(quint32))); + connect(this , SIGNAL(didAdjustment(AdjustDurationRequestData)), + &_GuiController, SLOT( doAdjustment(AdjustDurationRequestData))); } void VTreatmentAdjustmentDuration::onActionReceive(const AdjustDurationResponseData &vData) Index: sources/view/vtreatmentadjustmentduration.h =================================================================== diff -u -ra159e12630645a9a35fb0a5585cc7b639cfe6aa6 -r03de7d132838c54a23862809357c42102b6dab99 --- sources/view/vtreatmentadjustmentduration.h (.../vtreatmentadjustmentduration.h) (revision a159e12630645a9a35fb0a5585cc7b639cfe6aa6) +++ sources/view/vtreatmentadjustmentduration.h (.../vtreatmentadjustmentduration.h) (revision 03de7d132838c54a23862809357c42102b6dab99) @@ -27,6 +27,8 @@ // friends friend class ::tst_views; + AdjustDurationRequestData _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 @@ -42,11 +44,12 @@ public slots: // ----- Adjust Duration - void doAdjustment(quint32 vDuratoin) { - emit didAdjustment( vDuratoin); + void doAdjustment(quint32 vDuration) { + _data.duratoin = vDuration; + emit didAdjustment(_data); } signals: - void didAdjustment(quint32 vDuration); + void didAdjustment(const AdjustDurationRequestData &vData); }; } Index: sources/view/vtreatmentadjustmentflows.cpp =================================================================== diff -u -ra159e12630645a9a35fb0a5585cc7b639cfe6aa6 -r03de7d132838c54a23862809357c42102b6dab99 --- sources/view/vtreatmentadjustmentflows.cpp (.../vtreatmentadjustmentflows.cpp) (revision a159e12630645a9a35fb0a5585cc7b639cfe6aa6) +++ sources/view/vtreatmentadjustmentflows.cpp (.../vtreatmentadjustmentflows.cpp) (revision 03de7d132838c54a23862809357c42102b6dab99) @@ -21,8 +21,8 @@ ACTION_RECEIVE_BRIDGE_CONNECTION(Gui::_GuiController, AdjustBloodDialysateResponseData); //ACTION_TRANSMT_BRIDGE_CONNECTION // ----- Adjust Blood/Dialysate Flows - connect(this , SIGNAL(didAdjustment(quint32, quint32)), - &_GuiController, SLOT( doAdjustment(quint32, quint32))); + connect(this , SIGNAL(didAdjustment(const AdjustBloodDialysateRequestData &)), + &_GuiController, SLOT( doAdjustment(const AdjustBloodDialysateRequestData &))); } void VTreatmentAdjustmentFlows::onActionReceive(const AdjustBloodDialysateResponseData &vData) Index: sources/view/vtreatmentadjustmentflows.h =================================================================== diff -u -ra159e12630645a9a35fb0a5585cc7b639cfe6aa6 -r03de7d132838c54a23862809357c42102b6dab99 --- sources/view/vtreatmentadjustmentflows.h (.../vtreatmentadjustmentflows.h) (revision a159e12630645a9a35fb0a5585cc7b639cfe6aa6) +++ sources/view/vtreatmentadjustmentflows.h (.../vtreatmentadjustmentflows.h) (revision 03de7d132838c54a23862809357c42102b6dab99) @@ -27,6 +27,8 @@ // friends friend class ::tst_views; + AdjustBloodDialysateRequestData _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 @@ -43,10 +45,12 @@ public slots: // ----- Adjust Blood/Dialysate Flows void doAdjustment(quint32 vBloodFlow, quint32 vDialysateFlow) { - emit didAdjustment( vBloodFlow, vDialysateFlow); + _data. bloodFlow = vBloodFlow; + _data.dialysateFlow = vDialysateFlow; + emit didAdjustment(_data); } signals: - void didAdjustment(quint32 vBloodFlow, quint32 vDialysateFlow); + void didAdjustment(const AdjustBloodDialysateRequestData &vData); }; Index: sources/view/vtreatmentadjustmentultrafiltration.cpp =================================================================== diff -u -rb789046c096cfdddb39adcd3d5be1e129769aac6 -r03de7d132838c54a23862809357c42102b6dab99 --- sources/view/vtreatmentadjustmentultrafiltration.cpp (.../vtreatmentadjustmentultrafiltration.cpp) (revision b789046c096cfdddb39adcd3d5be1e129769aac6) +++ sources/view/vtreatmentadjustmentultrafiltration.cpp (.../vtreatmentadjustmentultrafiltration.cpp) (revision 03de7d132838c54a23862809357c42102b6dab99) @@ -22,8 +22,8 @@ ACTION_RECEIVE_BRIDGE_CONNECTION(Gui::_GuiController, AdjustUltrafiltrationResponseData); - connect(this , SIGNAL(didAdjustment(const MAdjustUltrafiltrationReq &)), - &_GuiController, SLOT( doAdjustment(const MAdjustUltrafiltrationReq &))); + connect(this , SIGNAL(didAdjustment(const AdjustUltrafiltrationRequestData &)), + &_GuiController, SLOT( doAdjustment(const AdjustUltrafiltrationRequestData &))); } void VTreatmentAdjustmentUltrafiltration::onActionReceive(const AdjustUltrafiltrationResponseData &vData) @@ -36,6 +36,7 @@ durationDiff ( vData.mDurationDiff ); rate ( vData.mRate ); rateDiff ( vData.mRateDiff ); + rateCurr ( vData.mRateCurr ); // *** 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. *** Index: sources/view/vtreatmentadjustmentultrafiltration.h =================================================================== diff -u -reb19475a6bf4ed7f6a16bc07eefc7813496620ef -r03de7d132838c54a23862809357c42102b6dab99 --- sources/view/vtreatmentadjustmentultrafiltration.h (.../vtreatmentadjustmentultrafiltration.h) (revision eb19475a6bf4ed7f6a16bc07eefc7813496620ef) +++ sources/view/vtreatmentadjustmentultrafiltration.h (.../vtreatmentadjustmentultrafiltration.h) (revision 03de7d132838c54a23862809357c42102b6dab99) @@ -27,6 +27,8 @@ // friends friend class ::tst_views; + AdjustUltrafiltrationRequestData _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 @@ -40,18 +42,18 @@ PROPERTY( quint32 , durationDiff , 0) PROPERTY( float , rate , 0) PROPERTY( float , rateDiff , 0) + PROPERTY( float , rateCurr , 0) VIEW_DEC_CLASS_ADJUSTMENT(VTreatmentAdjustmentUltrafiltration, AdjustUltrafiltrationResponseData) // ----------- Adjust Ultrafiltration public slots: void doAdjustment(float vVolume) { - MAdjustUltrafiltrationReq data; - data.volume = vVolume; - emit didAdjustment(data); + _data.volume = vVolume; + emit didAdjustment(_data); } signals: - void didAdjustment(const MAdjustUltrafiltrationReq &vData); + void didAdjustment(const AdjustUltrafiltrationRequestData &vData); }; } Index: sources/view/vtreatmentultrafiltrationstate.cpp =================================================================== diff -u -ra09afcb23e479527eb2263474003b63955cd0e99 -r03de7d132838c54a23862809357c42102b6dab99 --- sources/view/vtreatmentultrafiltrationstate.cpp (.../vtreatmentultrafiltrationstate.cpp) (revision a09afcb23e479527eb2263474003b63955cd0e99) +++ sources/view/vtreatmentultrafiltrationstate.cpp (.../vtreatmentultrafiltrationstate.cpp) (revision 03de7d132838c54a23862809357c42102b6dab99) @@ -16,21 +16,22 @@ // Project #include "guicontroller.h" -VIEW_DEF_CLASS_ADJUSTMENT(VTreatmentUltrafiltrationState, TreatmentUltrafiltrationStateData) +VIEW_DEF_CLASS_ADJUSTMENT(VTreatmentUltrafiltrationState, AdjustUltrafiltrationStateResponseData) void VTreatmentUltrafiltrationState::initConnections() { - ACTION_RECEIVE_BRIDGE_CONNECTION(Gui::_GuiController, TreatmentUltrafiltrationStateData); + ACTION_RECEIVE_BRIDGE_CONNECTION(Gui::_GuiController, AdjustUltrafiltrationStateResponseData); - connect(this , SIGNAL(didUltrafiltrationStateRequest(quint32)), - &_GuiController, SLOT( doUltrafiltrationStateRequest(quint32))); + connect(this , SIGNAL(didAdjustment(const AdjustUltrafiltrationStateRequestData &)), + &_GuiController, SLOT( doAdjustment(const AdjustUltrafiltrationStateRequestData &))); } -void VTreatmentUltrafiltrationState::onActionReceive(const TreatmentUltrafiltrationStateData &vData) +void VTreatmentUltrafiltrationState::onActionReceive(const AdjustUltrafiltrationStateResponseData &vData) { - adjustment_Accepted ( vData.mAccepted ); + adjustment_Accepted ( vData.mAccepted ); if (adjustment_Accepted()) { - isPaused ( _requestedState == GuiActionData::Pause); + // 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 *** @@ -40,14 +41,14 @@ void View::VTreatmentUltrafiltrationState::doPause() { - _requestedState = GuiActionData::Pause; - emit didUltrafiltrationStateRequest(static_cast(_requestedState)); + _data.requestedState = AdjustUltrafiltrationStateRequestData::ePaused; + emit didAdjustment(_data); } void View::VTreatmentUltrafiltrationState::doResume() { - _requestedState = GuiActionData::Resume; - emit didUltrafiltrationStateRequest(static_cast(_requestedState)); + _data.requestedState = AdjustUltrafiltrationStateRequestData::eRunning; + emit didAdjustment(_data); } /*! @@ -58,16 +59,20 @@ */ QString View::VTreatmentUltrafiltrationState::text() { + // if there is a reason (passed) it will be used QString mText = VTreatmentAdjustmentsResponse::text(); if (! mText.isEmpty()) return mText; + // otherwise a general message will be created/passed. if (! adjustment_Accepted()) { - switch (_requestedState) { - case GuiActionData::Resume: + switch (_data.requestedState) { + case AdjustUltrafiltrationStateRequestData::eRunning: mText = tr("Unable to Resume Ultrafiltration or already running"); break; - case GuiActionData::Pause: + + case AdjustUltrafiltrationStateRequestData::ePaused: mText = tr("Unable to Pause Ultrafiltration or already paused"); break; + default: break; } Index: sources/view/vtreatmentultrafiltrationstate.h =================================================================== diff -u -ra09afcb23e479527eb2263474003b63955cd0e99 -r03de7d132838c54a23862809357c42102b6dab99 --- sources/view/vtreatmentultrafiltrationstate.h (.../vtreatmentultrafiltrationstate.h) (revision a09afcb23e479527eb2263474003b63955cd0e99) +++ sources/view/vtreatmentultrafiltrationstate.h (.../vtreatmentultrafiltrationstate.h) (revision 03de7d132838c54a23862809357c42102b6dab99) @@ -27,7 +27,7 @@ // friends friend class ::tst_views; - GuiActionData _requestedState = GuiActionData::NoData; + AdjustUltrafiltrationStateRequestData _data; // coco begin validated: // The property adjustment_Triggered has to be always true @@ -38,7 +38,7 @@ PROPERTY( bool , isPaused , false) - VIEW_DEC_CLASS_ADJUSTMENT(VTreatmentUltrafiltrationState, TreatmentUltrafiltrationStateData) + VIEW_DEC_CLASS_ADJUSTMENT(VTreatmentUltrafiltrationState, AdjustUltrafiltrationStateResponseData) // ---------- Puase Ultrafiltration @@ -48,7 +48,7 @@ QString text(); signals: - void didUltrafiltrationStateRequest(quint32 vState); + void didAdjustment(const AdjustUltrafiltrationStateRequestData &vData); }; }