Index: denali.pro =================================================================== diff -u -r81999ff346ffc8e3f9c4dd1c948b4b7fc577de2c -r01cdcd9647c07963bf4a1cf1e477755dddb84c6c --- denali.pro (.../denali.pro) (revision 81999ff346ffc8e3f9c4dd1c948b4b7fc577de2c) +++ denali.pro (.../denali.pro) (revision 01cdcd9647c07963bf4a1cf1e477755dddb84c6c) @@ -62,7 +62,6 @@ sources/model/MModel.h \ sources/model/MAbstract.h \ sources/model/MPowerOff.h \ - sources/model/MEndTreatmentResponse.h \ sources/model/MStartTreatmentResponse.h \ sources/model/MTreatmentParametersResp.h \ sources/model/MDGDebugText.h \ @@ -126,7 +125,6 @@ sources/gui/GuiController.h \ \ # ---------- Views ---------- sources/view/VTreatmentCreate.h \ - sources/view/VTreatmentEnd.h \ sources/view/VTreatmentBegin.h \ sources/view/VEventSpy.h \ sources/view/VView.h \ @@ -201,7 +199,6 @@ sources/model/MAbstract.cpp \ sources/model/MPowerOff.cpp \ sources/model/MHDDebugText.cpp \ - sources/model/MEndTreatmentResponse.cpp \ sources/model/MStartTreatmentResponse.cpp \ sources/model/MTreatmentParametersResp.cpp \ sources/model/MDGDebugText.cpp \ @@ -262,7 +259,6 @@ sources/gui/GuiController.cpp \ \ # ---------- Views ---------- sources/view/VTreatmentCreate.cpp \ - sources/view/VTreatmentEnd.cpp \ sources/view/VTreatmentBegin.cpp \ sources/view/VEventSpy.cpp \ sources/view/VPriming.cpp \ Index: denali.pro.user =================================================================== diff -u -r81999ff346ffc8e3f9c4dd1c948b4b7fc577de2c -r01cdcd9647c07963bf4a1cf1e477755dddb84c6c --- denali.pro.user (.../denali.pro.user) (revision 81999ff346ffc8e3f9c4dd1c948b4b7fc577de2c) +++ denali.pro.user (.../denali.pro.user) (revision 01cdcd9647c07963bf4a1cf1e477755dddb84c6c) @@ -1,6 +1,6 @@ - + EnvironmentId Index: sources/canbus/MessageDispatcher.cpp =================================================================== diff -u -r81999ff346ffc8e3f9c4dd1c948b4b7fc577de2c -r01cdcd9647c07963bf4a1cf1e477755dddb84c6c --- sources/canbus/MessageDispatcher.cpp (.../MessageDispatcher.cpp) (revision 81999ff346ffc8e3f9c4dd1c948b4b7fc577de2c) +++ sources/canbus/MessageDispatcher.cpp (.../MessageDispatcher.cpp) (revision 01cdcd9647c07963bf4a1cf1e477755dddb84c6c) @@ -365,20 +365,6 @@ onActionTransmit(GuiActionType::ID_ConfirmTreatmentReq, mData); } -/*! - * \brief MessageDispatcher::onAdjustment - * \details This method transmits the End Treatment request message. - * \param vData - Data model contains the end treatment request - * \return void - */ -void MessageDispatcher::onAdjustment(const EndTreatmentRequestData &vData) -{ - Q_UNUSED(vData) - QVariantList mData; - onActionTransmit(GuiActionType::ID_EndTreatmentReq, mData); -} - - /** * \details This method transmits the Saline Bolus Adjustment Denali message. * \param vData - Data model contains treatment Saline Bolus adjustment state. Index: sources/canbus/MessageGlobals.h =================================================================== diff -u -r81999ff346ffc8e3f9c4dd1c948b4b7fc577de2c -r01cdcd9647c07963bf4a1cf1e477755dddb84c6c --- sources/canbus/MessageGlobals.h (.../MessageGlobals.h) (revision 81999ff346ffc8e3f9c4dd1c948b4b7fc577de2c) +++ sources/canbus/MessageGlobals.h (.../MessageGlobals.h) (revision 01cdcd9647c07963bf4a1cf1e477755dddb84c6c) @@ -87,8 +87,6 @@ {Gui::GuiActionType::ID_StartTreatmentReq , 1 * 4 }, // 1 parameters each 4bytes {Gui::GuiActionType::ID_StartTreatmentRsp , 2 * 4 }, // 2 parameters each 4bytes {Gui::GuiActionType::ID_ConfirmTreatmentReq , 1 * 4 }, // 1 parameters each 4bytes - {Gui::GuiActionType::ID_EndTreatmentReq , 0 }, - {Gui::GuiActionType::ID_EndTreatmentRsp , 0 }, // ---- {Gui::GuiActionType::ID_TreatmentRanges , 6 * 4 }, // 6 parameters each 4bytes Index: sources/canbus/MessageInterpreter.cpp =================================================================== diff -u -r81999ff346ffc8e3f9c4dd1c948b4b7fc577de2c -r01cdcd9647c07963bf4a1cf1e477755dddb84c6c --- sources/canbus/MessageInterpreter.cpp (.../MessageInterpreter.cpp) (revision 81999ff346ffc8e3f9c4dd1c948b4b7fc577de2c) +++ sources/canbus/MessageInterpreter.cpp (.../MessageInterpreter.cpp) (revision 01cdcd9647c07963bf4a1cf1e477755dddb84c6c) @@ -243,7 +243,6 @@ // pre-Treatment case Gui::GuiActionType::ID_StartTreatmentReq : INTERPRET_RECEIVED_MESSAGE(StartTreatmentRequestData ); break; case Gui::GuiActionType::ID_ConfirmTreatmentReq : INTERPRET_RECEIVED_MESSAGE(ConfirmTreatmentRequestData ); break; - case Gui::GuiActionType::ID_EndTreatmentReq : INTERPRET_RECVD_MT_MESSAGE(EndTreatmentRequestData ); break; case Gui::GuiActionType::ID_CreateTreatmentReq : INTERPRET_RECEIVED_MESSAGE(AdjustTreatmentParametersRequestData ); break; // alarms case Gui::GuiActionType::ID_AlarmSilenceReq : INTERPRET_RECEIVED_MESSAGE(AlarmSilenceRequestData ); break; @@ -355,7 +354,6 @@ case Gui::GuiActionType::ID_AdjustUltrafiltrationConfirmRsp : ok = adjustUltrafiltrationConfirm (vMessage, vData); break; // TODO : implement notify<>() case Gui::GuiActionType::ID_StartTreatmentRsp : ok = notify(vMessage, vData, Gui::GuiActionType::ID_StartTreatmentRsp ); break; - case Gui::GuiActionType::ID_EndTreatmentRsp : ok = notify(vMessage, vData, Gui::GuiActionType::ID_EndTreatmentRsp ); break; // Alarms case Gui::GuiActionType::ID_AlarmStatus : ok = notify(vMessage, vData, Gui::GuiActionType::ID_AlarmStatus ); break; Index: sources/gui/GuiGlobals.cpp =================================================================== diff -u -r81999ff346ffc8e3f9c4dd1c948b4b7fc577de2c -r01cdcd9647c07963bf4a1cf1e477755dddb84c6c --- sources/gui/GuiGlobals.cpp (.../GuiGlobals.cpp) (revision 81999ff346ffc8e3f9c4dd1c948b4b7fc577de2c) +++ sources/gui/GuiGlobals.cpp (.../GuiGlobals.cpp) (revision 01cdcd9647c07963bf4a1cf1e477755dddb84c6c) @@ -55,7 +55,6 @@ #include "VTreatmentCreate.h" #include "VPriming.h" #include "VTreatmentBegin.h" -#include "VTreatmentEnd.h" #include "VTreatmentAdjustmentDuration.h" #include "VTreatmentAdjustmentFlows.h" #include "VTreatmentAdjustmentUltrafiltrationInit.h" Index: sources/gui/GuiGlobals.h =================================================================== diff -u -r81999ff346ffc8e3f9c4dd1c948b4b7fc577de2c -r01cdcd9647c07963bf4a1cf1e477755dddb84c6c --- sources/gui/GuiGlobals.h (.../GuiGlobals.h) (revision 81999ff346ffc8e3f9c4dd1c948b4b7fc577de2c) +++ sources/gui/GuiGlobals.h (.../GuiGlobals.h) (revision 01cdcd9647c07963bf4a1cf1e477755dddb84c6c) @@ -107,8 +107,6 @@ ID_StartTreatmentReq = 0x3800, // 56 ID_StartTreatmentRsp = 0x3900, // 57 ID_ConfirmTreatmentReq = 0x3B00, // 59 - ID_EndTreatmentReq = 0x3C00, // 60 - ID_EndTreatmentRsp = 0x3D00, // 61 ID_PrimingData = 0x4300, // 67 // DG Data Messages Index: sources/gui/qml/main.qml =================================================================== diff -u -r81999ff346ffc8e3f9c4dd1c948b4b7fc577de2c -r01cdcd9647c07963bf4a1cf1e477755dddb84c6c --- sources/gui/qml/main.qml (.../main.qml) (revision 81999ff346ffc8e3f9c4dd1c948b4b7fc577de2c) +++ sources/gui/qml/main.qml (.../main.qml) (revision 01cdcd9647c07963bf4a1cf1e477755dddb84c6c) @@ -47,7 +47,6 @@ import VDGValvesStates 0.1 import VPriming 0.1 import VTreatmentBegin 0.1 -import VTreatmentEnd 0.1 import VTreatmentAdjustmentUltrafiltrationInit 0.1 import VTreatmentRanges 0.1 @@ -121,7 +120,6 @@ VTreatmentCreate { id: vTreatmentCreate } VPriming { id: vPriming } VTreatmentBegin { id: vTreatmentBegin } - VTreatmentEnd { id: vTreatmentEnd } VTreatmentAdjustmentUltrafiltrationInit { id: vTreatmentAdjustmentUltrafiltrationInit } VHDTreatmentStates { id: vHDTreatmentStates } Index: sources/gui/qml/pages/SettingsHome.qml =================================================================== diff -u -r14c541d2b780b0a244bc84860aa565cf8dd7fe4b -r01cdcd9647c07963bf4a1cf1e477755dddb84c6c --- sources/gui/qml/pages/SettingsHome.qml (.../SettingsHome.qml) (revision 14c541d2b780b0a244bc84860aa565cf8dd7fe4b) +++ sources/gui/qml/pages/SettingsHome.qml (.../SettingsHome.qml) (revision 01cdcd9647c07963bf4a1cf1e477755dddb84c6c) @@ -63,23 +63,6 @@ _GuiView.doActionTransmit(GuiActions.ID_PowerOff, GuiActions.NoData) } } - - TouchRect { id : _endTreatmentButton - objectName: "_endTreatmentButton" - width: 200 - height: Variables.logoHeight - animated: true - anchors { - top : parent.top - right : _usbButton.left - topMargin : (Variables.headerHeight - Variables.logoHeight) / 2 - rightMargin : (Variables.headerHeight - Variables.logoHeight) / 2 - } - text.text: qsTr("End Treatment") - button.onPressed: { - vTreatmentEnd.doEndTreatmentRequest(); - } - } } /* Index: sources/gui/qml/pages/treatment/TreatmentStack.qml =================================================================== diff -u -r81999ff346ffc8e3f9c4dd1c948b4b7fc577de2c -r01cdcd9647c07963bf4a1cf1e477755dddb84c6c --- sources/gui/qml/pages/treatment/TreatmentStack.qml (.../TreatmentStack.qml) (revision 81999ff346ffc8e3f9c4dd1c948b4b7fc577de2c) +++ sources/gui/qml/pages/treatment/TreatmentStack.qml (.../TreatmentStack.qml) (revision 01cdcd9647c07963bf4a1cf1e477755dddb84c6c) @@ -244,11 +244,33 @@ // ---------- Manages Responses ---------- Connections { target: vTreatmentAdjustmentRinseback onAdjustmentTriggered: { - console.debug(vTreatmentAdjustmentRinseback.text()) - _postTreatmentRinseback.reasonText = vTreatmentAdjustmentRinseback.text(); + // there is only one message to handle all the sub pages of rinseback + // since the rejection reason will be cleared by each trasition + // so it's fine to set all at the same time + // and let them cleared for their own message when each get visible. + _postTreatmentRinsebackInit .reasonText = vTreatmentAdjustmentRinseback.text(); + _postTreatmentRinseback .reasonText = vTreatmentAdjustmentRinseback.text(); + _postTreatmentRinsebackComplete .reasonText = vTreatmentAdjustmentRinseback.text(); } } + Connections { target: vTreatmentAdjustmentRecirculate + onAdjustmentTriggered: { + // there is only one message to handle all the sub pages of rinseback + // since the rejection reason will be cleared by each trasition + // so it's fine to set all at the same time + // and let them cleared for their own message when each get visible. + _postTreatmentRecirculate .reasonText = vTreatmentAdjustmentRecirculate.text(); + _postTreatmentReconnect .reasonText = vTreatmentAdjustmentRecirculate.text(); + } + } + + Connections { target: vTreatmentAdjustmentEnd + onAdjustmentTriggered: { + _postTreatmentEnd.reasonText = vTreatmentAdjustmentEnd.text(); + } + } + Connections { target: vTreatmentAdjustmentDuration onAdjustmentTriggered : { if ( vTreatmentAdjustmentDuration.adjustment_Accepted ) { Fisheye: Tag 01cdcd9647c07963bf4a1cf1e477755dddb84c6c refers to a dead (removed) revision in file `sources/model/MEndTreatmentResponse.cpp'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 01cdcd9647c07963bf4a1cf1e477755dddb84c6c refers to a dead (removed) revision in file `sources/model/MEndTreatmentResponse.h'. Fisheye: No comparison available. Pass `N' to diff? Index: sources/model/MModel.h =================================================================== diff -u -r81999ff346ffc8e3f9c4dd1c948b4b7fc577de2c -r01cdcd9647c07963bf4a1cf1e477755dddb84c6c --- sources/model/MModel.h (.../MModel.h) (revision 81999ff346ffc8e3f9c4dd1c948b4b7fc577de2c) +++ sources/model/MModel.h (.../MModel.h) (revision 01cdcd9647c07963bf4a1cf1e477755dddb84c6c) @@ -66,7 +66,6 @@ #include "MTreatmentAdjustPressuresLimitsResponse.h" #include "MPrimingData.h" #include "MStartTreatmentResponse.h" -#include "MEndTreatmentResponse.h" /*! * \page MessageFlow Message interpretation Flow @@ -226,7 +225,6 @@ /* Request */ \ REGISTER_METATYPE( StartTreatmentRequestData ) \ REGISTER_METATYPE( ConfirmTreatmentRequestData ) \ - REGISTER_METATYPE( EndTreatmentRequestData ) \ \ REGISTER_METATYPE( AlarmSilenceRequestData ) \ REGISTER_METATYPE( AlarmUserActionRequestData ) \ @@ -248,7 +246,6 @@ REGISTER_METATYPE( AdjustTreatmentParametersRequestData ) \ /* Response */ \ REGISTER_METATYPE( StartTreatmentResponseData ) \ - REGISTER_METATYPE( EndTreatmentResponseData ) \ \ REGISTER_METATYPE( AdjustBloodDialysateResponseData ) \ REGISTER_METATYPE( AdjustDurationResponseData ) \ @@ -322,7 +319,6 @@ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, AdjustUltrafiltrationEditResponseData ) \ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, AdjustUltrafiltrationConfirmResponseData ) \ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, StartTreatmentResponseData ) \ - ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, EndTreatmentResponseData ) \ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, AdjustSalineResponseData ) \ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, AdjustHeparinResponseData ) \ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, AdjustRinsebackResponseData ) \ @@ -342,7 +338,6 @@ ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE, AdjustUltrafiltrationConfirmRequestData ) \ ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE, StartTreatmentRequestData ) \ ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE, ConfirmTreatmentRequestData ) \ - ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE, EndTreatmentRequestData ) \ ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE, AdjustSalineRequestData ) \ ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE, AdjustHeparinRequestData ) \ ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE, AdjustRinsebackRequestData ) \ @@ -418,7 +413,6 @@ ACTION_RECEIVE_BRIDGE_DEFINITION( AdjustUltrafiltrationEditResponseData ) \ ACTION_RECEIVE_BRIDGE_DEFINITION( AdjustUltrafiltrationConfirmResponseData ) \ ACTION_RECEIVE_BRIDGE_DEFINITION( StartTreatmentResponseData ) \ - ACTION_RECEIVE_BRIDGE_DEFINITION( EndTreatmentResponseData ) \ ACTION_RECEIVE_BRIDGE_DEFINITION( AdjustSalineResponseData ) \ ACTION_RECEIVE_BRIDGE_DEFINITION( AdjustHeparinResponseData ) \ ACTION_RECEIVE_BRIDGE_DEFINITION( AdjustRinsebackResponseData ) \ @@ -437,7 +431,6 @@ ADJUST_TRANSMT_BRIDGE_DEFINITION( AdjustUltrafiltrationConfirmRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION( StartTreatmentRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION( ConfirmTreatmentRequestData ) \ - ADJUST_TRANSMT_BRIDGE_DEFINITION( EndTreatmentRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION( AdjustSalineRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION( AdjustHeparinRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION( AdjustRinsebackRequestData ) \ @@ -462,7 +455,6 @@ ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT( AdjustUltrafiltrationConfirmRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT( StartTreatmentRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT( ConfirmTreatmentRequestData ) \ - ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT( EndTreatmentRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT( AdjustSalineRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT( AdjustHeparinRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT( AdjustRinsebackRequestData ) \ @@ -493,7 +485,6 @@ ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC( AdjustTreatmentEndRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC( StartTreatmentRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC( ConfirmTreatmentRequestData ) \ - ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC( EndTreatmentRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC( AdjustTreatmentParametersRequestData ) \ \ ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC( AlarmSilenceRequestData ) \ @@ -540,7 +531,6 @@ ACTION_RECEIVE_SIGNAL( PrimingData ) \ /* Response */ \ ACTION_RECEIVE_SIGNAL( StartTreatmentResponseData ) \ - ACTION_RECEIVE_SIGNAL( EndTreatmentResponseData ) \ \ ACTION_RECEIVE_SIGNAL( AdjustBloodDialysateResponseData ) \ ACTION_RECEIVE_SIGNAL( AdjustDurationResponseData ) \ Index: sources/model/hd/adjustment/MTreatmentAdjustRequests.h =================================================================== diff -u -r81999ff346ffc8e3f9c4dd1c948b4b7fc577de2c -r01cdcd9647c07963bf4a1cf1e477755dddb84c6c --- sources/model/hd/adjustment/MTreatmentAdjustRequests.h (.../MTreatmentAdjustRequests.h) (revision 81999ff346ffc8e3f9c4dd1c948b4b7fc577de2c) +++ sources/model/hd/adjustment/MTreatmentAdjustRequests.h (.../MTreatmentAdjustRequests.h) (revision 01cdcd9647c07963bf4a1cf1e477755dddb84c6c) @@ -609,33 +609,6 @@ }; /*! - * \brief The MEndTreatmentReq class - * \details The model to request an end to treatment - * - * | MSG | CAN ID | M.Box | Type | Ack | Src | Dest | Description | - * |:---:|:------:|:-----:|:----:|:---:|:---:|:----:|:-------------------------:| - * | 60 | 0x100 | 9 | Req | Y | UI | HD | End Treatment Request | - * - * | Payload || - * | || - * | N/A || - * - */ -class MEndTreatmentReq : public MModel { -public: - - // coco begin validated : Has been validated manually. - // This object is used statically for now, kept the logic for later usage. - QString toString() { - return toString({}); - } - // coco end - static QString toString(const QVariantList &vParameters) { - return MModel::toString("EndTreatment", vParameters); - } -}; - -/*! * \brief The MAdjustTreatmentParametersReq class * \details The model used to request treatment parameters validation * @@ -731,7 +704,6 @@ typedef Model:: MAdjustPressuresLimitsReq AdjustPressuresLimitsRequestData; typedef Model:: MStartTreatmentReq StartTreatmentRequestData; typedef Model:: MConfirmTreatmentReq ConfirmTreatmentRequestData; -typedef Model:: MEndTreatmentReq EndTreatmentRequestData; typedef Model:: MAdjustTreatmentParametersReq AdjustTreatmentParametersRequestData; // Alarms typedef Model:: MAlarmSilenceReq AlarmSilenceRequestData; Fisheye: Tag 01cdcd9647c07963bf4a1cf1e477755dddb84c6c refers to a dead (removed) revision in file `sources/view/VTreatmentEnd.cpp'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 01cdcd9647c07963bf4a1cf1e477755dddb84c6c refers to a dead (removed) revision in file `sources/view/VTreatmentEnd.h'. Fisheye: No comparison available. Pass `N' to diff? Index: sources/view/VView.h =================================================================== diff -u -r81999ff346ffc8e3f9c4dd1c948b4b7fc577de2c -r01cdcd9647c07963bf4a1cf1e477755dddb84c6c --- sources/view/VView.h (.../VView.h) (revision 81999ff346ffc8e3f9c4dd1c948b4b7fc577de2c) +++ sources/view/VView.h (.../VView.h) (revision 01cdcd9647c07963bf4a1cf1e477755dddb84c6c) @@ -144,6 +144,5 @@ REGISTER_TYPE( VTreatmentCreate ) \ REGISTER_TYPE( VPriming ) \ REGISTER_TYPE( VTreatmentBegin ) \ - REGISTER_TYPE( VTreatmentEnd ) \ //--------------------------------------------------------------------------------//