Index: denali.pro =================================================================== diff -u -rfef971047be21dd255a497fbf54c170316d617a9 -r604a782b50c9fc749c3bd71485e285c1070f1e01 --- denali.pro (.../denali.pro) (revision fef971047be21dd255a497fbf54c170316d617a9) +++ denali.pro (.../denali.pro) (revision 604a782b50c9fc749c3bd71485e285c1070f1e01) @@ -79,6 +79,7 @@ sources/model/hd/adjustment/MTreatmentAdjustUltrafiltrationEditResponse.h \ sources/model/hd/adjustment/MTreatmentAdjustUltrafiltrationConfirmResponse.h \ sources/model/hd/adjustment/MTreatmentAdjustSalineResponse.h \ + sources/model/hd/adjustment/MTreatmentAdjustPressuresLimitsResponse.h \ \ # ---------- Models - HD - Data sources/model/hd/data/MTreatmentTimeData.h \ sources/model/hd/data/MTreatmentFlowsData.h \ @@ -126,6 +127,7 @@ sources/view/hd/adjustment/VTreatmentAdjustmentUltrafiltrationEdit.h \ sources/view/hd/adjustment/VTreatmentAdjustmentUltrafiltrationConfirm.h \ sources/view/hd/adjustment/VTreatmentAdjustmentSaline.h \ + sources/view/hd/adjustment/VTreatmentAdjustmentPressuresLimits.h \ \ # ---------- Views - HD - Data sources/view/hd/data/VTreatmentTime.h \ sources/view/hd/data/VTreatmentBloodFlow.h \ @@ -183,6 +185,7 @@ sources/model/hd/adjustment/MTreatmentAdjustUltrafiltrationEditResponse.cpp \ sources/model/hd/adjustment/MTreatmentAdjustUltrafiltrationConfirmResponse.cpp \ sources/model/hd/adjustment/MTreatmentAdjustSalineResponse.cpp \ + sources/model/hd/adjustment/MTreatmentAdjustPressuresLimitsResponse.cpp \ \ # ---------- Models - HD - Data sources/model/MHDDebugText.cpp \ sources/model/hd/data/MTreatmentTimeData.cpp \ @@ -230,6 +233,7 @@ sources/view/hd/adjustment/VTreatmentAdjustmentUltrafiltrationEdit.cpp \ sources/view/hd/adjustment/VTreatmentAdjustmentUltrafiltrationState.cpp \ sources/view/hd/adjustment/VTreatmentAdjustmentSaline.cpp \ + sources/view/hd/adjustment/VTreatmentAdjustmentPressuresLimits.cpp \ \ # ---------- Views - HD - Data sources/view/hd/data/VTreatmentTime.cpp \ sources/view/hd/data/VTreatmentBloodFlow.cpp \ Index: denali.pro.user =================================================================== diff -u -r767367e5779764bec1c1857f32eaf3d86089d5d9 -r604a782b50c9fc749c3bd71485e285c1070f1e01 --- denali.pro.user (.../denali.pro.user) (revision 767367e5779764bec1c1857f32eaf3d86089d5d9) +++ denali.pro.user (.../denali.pro.user) (revision 604a782b50c9fc749c3bd71485e285c1070f1e01) @@ -1,6 +1,6 @@ - + EnvironmentId Index: denali.qrc =================================================================== diff -u -r9d8a60eb984003d3f7814cbe507b1b37f519bc80 -r604a782b50c9fc749c3bd71485e285c1070f1e01 --- denali.qrc (.../denali.qrc) (revision 9d8a60eb984003d3f7814cbe507b1b37f519bc80) +++ denali.qrc (.../denali.qrc) (revision 604a782b50c9fc749c3bd71485e285c1070f1e01) @@ -82,7 +82,6 @@ sources/gui/qml/compounds/PressureRangeSlider.qml - qtquickcontrols2.conf sources/gui/qml/main.qml @@ -106,7 +105,7 @@ sources/gui/qml/pages/treatment/sections/TreatmentFlows.qml sources/gui/qml/pages/treatment/sections/TreatmentVitals.qml - sources/gui/qml/pages/treatment/sections/TreatmentPressure.qml + sources/gui/qml/pages/treatment/sections/TreatmentPressuresLimits.qml sources/gui/qml/pages/treatment/sections/TreatmentUltrafiltration.qml sources/gui/qml/pages/treatment/sections/TreatmentFluid.qml sources/gui/qml/pages/treatment/sections/TreatmentTime.qml Index: en_US.udic =================================================================== diff -u -r2c9421bd6da03c7e0bd0bfa1f49fa95c2bd18a95 -r604a782b50c9fc749c3bd71485e285c1070f1e01 --- en_US.udic (.../en_US.udic) (revision 2c9421bd6da03c7e0bd0bfa1f49fa95c2bd18a95) +++ en_US.udic (.../en_US.udic) (revision 604a782b50c9fc749c3bd71485e285c1070f1e01) @@ -7,3 +7,8 @@ invocable bool Initializer +Ack +Src +Dest +HD +Rsp Index: sources/canbus/MessageDispatcher.cpp =================================================================== diff -u -r64d87d540594252e8039ab2595016d98f1e3cc28 -r604a782b50c9fc749c3bd71485e285c1070f1e01 --- sources/canbus/MessageDispatcher.cpp (.../MessageDispatcher.cpp) (revision 64d87d540594252e8039ab2595016d98f1e3cc28) +++ sources/canbus/MessageDispatcher.cpp (.../MessageDispatcher.cpp) (revision 604a782b50c9fc749c3bd71485e285c1070f1e01) @@ -299,6 +299,21 @@ onActionTransmit(GuiActionType::ID_AdjustSalineReq, mData); } +/*! + * \brief MessageDispatcher::onAdjustment + * \details This method transmits the Pressures Limits Adjustment Denali message. + * \param vData - Data model contains treatment Pressures Limits adjustment. + * \return void + */ +void MessageDispatcher::onAdjustment(const AdjustPressuresLimitsRequestData &vData) +{ + QVariantList mData; + mData += vData.mArterialLimitLow ; + mData += vData.mArterialLimitHigh; + mData += vData.mVenousLimitLow ; + mData += vData.mVenousLimitHigh ; + onActionTransmit(GuiActionType::ID_AdjustPressuresLimitsReq, mData); +} /*! * \brief MessageDispatcher::actionTransmit Index: sources/canbus/MessageDispatcher.h =================================================================== diff -u -r2c9421bd6da03c7e0bd0bfa1f49fa95c2bd18a95 -r604a782b50c9fc749c3bd71485e285c1070f1e01 --- sources/canbus/MessageDispatcher.h (.../MessageDispatcher.h) (revision 2c9421bd6da03c7e0bd0bfa1f49fa95c2bd18a95) +++ sources/canbus/MessageDispatcher.h (.../MessageDispatcher.h) (revision 604a782b50c9fc749c3bd71485e285c1070f1e01) @@ -113,6 +113,7 @@ GuiActionType::ID_AdjustUltrafiltrationConfirmReq , GuiActionType::ID_AdjustSalineReq , GuiActionType::ID_AlarmSilenceReq , + GuiActionType::ID_AdjustPressuresLimitsReq , }; public slots: Index: sources/canbus/MessageGlobals.h =================================================================== diff -u -r2c9421bd6da03c7e0bd0bfa1f49fa95c2bd18a95 -r604a782b50c9fc749c3bd71485e285c1070f1e01 --- sources/canbus/MessageGlobals.h (.../MessageGlobals.h) (revision 2c9421bd6da03c7e0bd0bfa1f49fa95c2bd18a95) +++ sources/canbus/MessageGlobals.h (.../MessageGlobals.h) (revision 604a782b50c9fc749c3bd71485e285c1070f1e01) @@ -97,6 +97,10 @@ {Gui::GuiActionType::ID_AdjustUltrafiltrationEditReq , 1 * 4 }, // 1 parameter each 4bytes {Gui::GuiActionType::ID_AdjustUltrafiltrationEditRsp , 8 * 4 }, // 8 parameters each 4bytes + // ---- + {Gui::GuiActionType::ID_AdjustPressuresLimitsReq , 4 * 4 }, // 4 parameter each 4bytes + {Gui::GuiActionType::ID_AdjustPressuresLimitsRsp , 6 * 4 }, // 6 parameters each 4bytes + // --- {Gui::GuiActionType::ID_CreateTreatmentReq , 17 * 4 }, // 17 parameters, each 4 bytes {Gui::GuiActionType::ID_CreateTreatmentRsp , 18 * 4 }, // 18 parameters, each 4 bytes Index: sources/canbus/MessageInterpreter.cpp =================================================================== diff -u -ra6abc05918a15924460d2b9358365b3eeedf1d1c -r604a782b50c9fc749c3bd71485e285c1070f1e01 --- sources/canbus/MessageInterpreter.cpp (.../MessageInterpreter.cpp) (revision a6abc05918a15924460d2b9358365b3eeedf1d1c) +++ sources/canbus/MessageInterpreter.cpp (.../MessageInterpreter.cpp) (revision 604a782b50c9fc749c3bd71485e285c1070f1e01) @@ -248,6 +248,12 @@ LOG_EVENT(AdjustSalineRequestData::toString(vData)); break; + case Gui::GuiActionType::ID_AdjustPressuresLimitsReq: + if ( ! length ) { logInvalidLength(vActionId); return false; } + vPayload = Format::fromVariant(vData); + LOG_EVENT(AdjustPressuresLimitsRequestData::toString(vData)); + break; + case Gui::GuiActionType::ID_AlarmSilenceReq: if ( ! length ) { logInvalidLength(vActionId); return false; } vPayload = Format::fromVariant(vData); @@ -352,6 +358,7 @@ case Gui::GuiActionType::ID_AdjustBloodDialysateRsp : ok = notify(vMessage, vData, Gui::GuiActionType::ID_AdjustBloodDialysateRsp ); break; case Gui::GuiActionType::ID_AdjustSalineRsp : ok = notify(vMessage, vData, Gui::GuiActionType::ID_AdjustSalineRsp ); break; case Gui::GuiActionType::ID_AdjustUltrafiltrationStateRsp : ok = notify(vMessage, vData, Gui::GuiActionType::ID_AdjustUltrafiltrationStateRsp ); break; + case Gui::GuiActionType::ID_AdjustPressuresLimitsRsp : ok = notify(vMessage, vData, Gui::GuiActionType::ID_AdjustPressuresLimitsRsp ); break; // these need to be standard and use notify as well case Gui::GuiActionType::ID_AdjustUltrafiltrationEditRsp : ok = adjustUltrafiltrationEdit (vMessage, vData); break; // TODO : implement notify<>() Index: sources/gui/GuiGlobals.cpp =================================================================== diff -u -r4fab8841b1040c8eaa406713ff9bdc8c65b7b6ac -r604a782b50c9fc749c3bd71485e285c1070f1e01 --- sources/gui/GuiGlobals.cpp (.../GuiGlobals.cpp) (revision 4fab8841b1040c8eaa406713ff9bdc8c65b7b6ac) +++ sources/gui/GuiGlobals.cpp (.../GuiGlobals.cpp) (revision 604a782b50c9fc749c3bd71485e285c1070f1e01) @@ -56,6 +56,7 @@ #include "VTreatmentAdjustmentUltrafiltrationEdit.h" #include "VTreatmentAdjustmentUltrafiltrationConfirm.h" #include "VTreatmentAdjustmentSaline.h" +#include "VTreatmentAdjustmentPressuresLimits.h" namespace Gui { MainView *_viewer = nullptr; Index: sources/gui/GuiGlobals.h =================================================================== diff -u -r2c9421bd6da03c7e0bd0bfa1f49fa95c2bd18a95 -r604a782b50c9fc749c3bd71485e285c1070f1e01 --- sources/gui/GuiGlobals.h (.../GuiGlobals.h) (revision 2c9421bd6da03c7e0bd0bfa1f49fa95c2bd18a95) +++ sources/gui/GuiGlobals.h (.../GuiGlobals.h) (revision 604a782b50c9fc749c3bd71485e285c1070f1e01) @@ -61,70 +61,72 @@ */ enum GuiActionsType_Enum /* : quint16 QML doesn't support enum types */ { - ID_Unknown = 0x0000, - ID_CANBusFaultCount = 0x9909, + ID_Unknown = 0x0000, + ID_CANBusFaultCount = 0x9909, - ID_RawData = 0xFFFE, + ID_RawData = 0xFFFE, - ID_Acknow = 0xFFFF, - ID_AcknowGeneric = 0x0000, //< Generic Acknowledgment is not a unique message ID and inherits its Id from the actual message. Zero is a placeholder + ID_Acknow = 0xFFFF, + ID_AcknowGeneric = 0x0000, //< Generic Acknowledgment is not a unique message ID and inherits its Id from the actual message. Zero is a placeholder - ID_HDDebugText = 0xF1FF, - ID_DGDebugText = 0xF2FF, + ID_HDDebugText = 0xF1FF, + ID_DGDebugText = 0xF2FF, - ID_DGCheckIn = 0x0600, - ID_KeepAlive = 0x0700, + ID_DGCheckIn = 0x0600, + ID_KeepAlive = 0x0700, - ID_PowerOff = 0x0100, - ID_ShuttingDown = 0x0E00, - ID_TreatmentTime = 0x0D00, - ID_BloodFlow = 0x0500, - ID_DialysateInletFlow = 0x0800, - ID_DialysateOutletFlow = 0x0B00, - ID_TreatmentRanges = 0x1A00, // 26 - ID_PressureOcclusion = 0x0900, - ID_TreatmentStates = 0x0F00, // 15 - ID_Saline = 0x2F00, // 47 + ID_PowerOff = 0x0100, + ID_ShuttingDown = 0x0E00, + ID_TreatmentTime = 0x0D00, + ID_BloodFlow = 0x0500, + ID_DialysateInletFlow = 0x0800, + ID_DialysateOutletFlow = 0x0B00, + ID_TreatmentRanges = 0x1A00, // 26 + ID_PressureOcclusion = 0x0900, + ID_TreatmentStates = 0x0F00, // 15 + ID_Saline = 0x2F00, // 47 - ID_AlarmStatus = 0x0200, - ID_AlarmTriggered = 0x0300, - ID_AlarmCleared = 0x0400, - ID_CreateTreatmentReq = 0x3500, // 53 - Not implemented yet on FW side - ID_CreateTreatmentRsp = 0x3600, // 54 - Not implemented yet on FW side + ID_AlarmStatus = 0x0200, + ID_AlarmTriggered = 0x0300, + ID_AlarmCleared = 0x0400, + ID_CreateTreatmentReq = 0x3500, // 53 - Not implemented yet on FW side + ID_CreateTreatmentRsp = 0x3600, // 54 - Not implemented yet on FW side - ID_AlarmSilenceReq = 0x3200, // 50 - Not implemented yet on FW side - ID_AlarmSilenceRsp = 0x0000, // Needs to be removed. + ID_AlarmSilenceReq = 0x3200, // 50 - Not implemented yet on FW side + ID_AlarmSilenceRsp = 0x0000, // Needs to be removed. - ID_HDOperationModeData = 0x2500, // 37 + ID_HDOperationModeData = 0x2500, // 37 - ID_DGROPumpData = 0x1F00, // 31 - ID_DGPressuresData = 0x2000, // 32 - ID_DGDrainPumpData = 0x2400, // 36 - ID_DGOperationModeData = 0x2700, // 39 - ID_DGReservoirData = 0x2800, // 40 - ID_DGValvesStatesData = 0x2A00, // 42 - ID_DGHeatersData = 0x2C00, // 44 - ID_DGLoadCellReadingsData = 0x0C00, // 12 - ID_DGTemperaturesData = 0x2D00, // 45 + ID_DGROPumpData = 0x1F00, // 31 + ID_DGPressuresData = 0x2000, // 32 + ID_DGDrainPumpData = 0x2400, // 36 + ID_DGOperationModeData = 0x2700, // 39 + ID_DGReservoirData = 0x2800, // 40 + ID_DGValvesStatesData = 0x2A00, // 42 + ID_DGHeatersData = 0x2C00, // 44 + ID_DGLoadCellReadingsData = 0x0C00, // 12 + ID_DGTemperaturesData = 0x2D00, // 45 - ID_AdjustBloodDialysateReq = 0x1700, // 23 - ID_AdjustBloodDialysateRsp = 0x1800, // 24 + ID_AdjustBloodDialysateReq = 0x1700, // 23 + ID_AdjustBloodDialysateRsp = 0x1800, // 24 - ID_AdjustUltrafiltrationStateReq = 0x1000, // 16 - ID_AdjustUltrafiltrationStateRsp = 0x4100, // 65 + ID_AdjustUltrafiltrationStateReq = 0x1000, // 16 + ID_AdjustUltrafiltrationStateRsp = 0x4100, // 65 - ID_AdjustUltrafiltrationEditReq = 0x1100, // 17 - ID_AdjustUltrafiltrationEditRsp = 0x1300, // 19 + ID_AdjustUltrafiltrationEditReq = 0x1100, // 17 + ID_AdjustUltrafiltrationEditRsp = 0x1300, // 19 - ID_AdjustUltrafiltrationConfirmReq = 0x1500, // 21 - ID_AdjustUltrafiltrationConfirmRsp = 0x2E00, // 46 + ID_AdjustUltrafiltrationConfirmReq = 0x1500, // 21 + ID_AdjustUltrafiltrationConfirmRsp = 0x2E00, // 46 - ID_AdjustDurationReq = 0x1600, // 22 - ID_AdjustDurationRsp = 0x1B00, // 27 + ID_AdjustDurationReq = 0x1600, // 22 + ID_AdjustDurationRsp = 0x1B00, // 27 - ID_AdjustSalineReq = 0x1200, // 18 - ID_AdjustSalineRsp = 0x1400, // 20 + ID_AdjustSalineReq = 0x1200, // 18 + ID_AdjustSalineRsp = 0x1400, // 20 + ID_AdjustPressuresLimitsReq = 0x4600, // 70 + ID_AdjustPressuresLimitsRsp = 0x4700, // 71 }; enum class GuiActionsData_Enum /*: quint8 QML doesn't support*/ { Index: sources/gui/qml/pages/Diagnostics.qml =================================================================== diff -u -r56e378f7504701b9e9a9dccaf205aef2fd52c58e -r604a782b50c9fc749c3bd71485e285c1070f1e01 --- sources/gui/qml/pages/Diagnostics.qml (.../Diagnostics.qml) (revision 56e378f7504701b9e9a9dccaf205aef2fd52c58e) +++ sources/gui/qml/pages/Diagnostics.qml (.../Diagnostics.qml) (revision 604a782b50c9fc749c3bd71485e285c1070f1e01) @@ -211,11 +211,11 @@ } Repeater { model: [ - vTreatmentPressureOcclusion.pressureocclusion_ArterialPressure .toFixed(2) , - vTreatmentPressureOcclusion.pressureocclusion_VenousPressure .toFixed(2) , - vTreatmentPressureOcclusion.pressureocclusion_BloodPumpOcclusion .toFixed(2) , - vTreatmentPressureOcclusion.pressureocclusion_DialysateInletPumpOcclusion .toFixed(2) , - vTreatmentPressureOcclusion.pressureocclusion_DialysateOutletPumpOcclusion .toFixed(2) + vTreatmentPressureOcclusion.arterialPressure .toFixed(2) , + vTreatmentPressureOcclusion.venousPressure .toFixed(2) , + vTreatmentPressureOcclusion.bloodPumpOcclusion .toFixed(2) , + vTreatmentPressureOcclusion.dialysateInletPumpOcclusion .toFixed(2) , + vTreatmentPressureOcclusion.dialysateOutletPumpOcclusion .toFixed(2) ] Text { text: modelData Index: sources/gui/qml/pages/ManagerHome.qml =================================================================== diff -u -r767367e5779764bec1c1857f32eaf3d86089d5d9 -r604a782b50c9fc749c3bd71485e285c1070f1e01 --- sources/gui/qml/pages/ManagerHome.qml (.../ManagerHome.qml) (revision 767367e5779764bec1c1857f32eaf3d86089d5d9) +++ sources/gui/qml/pages/ManagerHome.qml (.../ManagerHome.qml) (revision 604a782b50c9fc749c3bd71485e285c1070f1e01) @@ -203,11 +203,11 @@ y: row(3) title: qsTr(" Prsr Oc ") model: [ - vTreatmentPressureOcclusion.pressureocclusion_ArterialPressure .toFixed(2) , - vTreatmentPressureOcclusion.pressureocclusion_VenousPressure .toFixed(2) , - vTreatmentPressureOcclusion.pressureocclusion_BloodPumpOcclusion , - vTreatmentPressureOcclusion.pressureocclusion_DialysateInletPumpOcclusion , - vTreatmentPressureOcclusion.pressureocclusion_DialysateOutletPumpOcclusion + vTreatmentPressureOcclusion.arterialPressure .toFixed(2) , + vTreatmentPressureOcclusion.venousPressure .toFixed(2) , + vTreatmentPressureOcclusion.bloodPumpOcclusion , + vTreatmentPressureOcclusion.dialysateInletPumpOcclusion , + vTreatmentPressureOcclusion.dialysateOutletPumpOcclusion ] textObjectName: "_PressureOcclusionData" } Index: sources/gui/qml/pages/treatment/TreatmentStack.qml =================================================================== diff -u -r9d8a60eb984003d3f7814cbe507b1b37f519bc80 -r604a782b50c9fc749c3bd71485e285c1070f1e01 --- sources/gui/qml/pages/treatment/TreatmentStack.qml (.../TreatmentStack.qml) (revision 9d8a60eb984003d3f7814cbe507b1b37f519bc80) +++ sources/gui/qml/pages/treatment/TreatmentStack.qml (.../TreatmentStack.qml) (revision 604a782b50c9fc749c3bd71485e285c1070f1e01) @@ -24,6 +24,7 @@ import VTreatmentAdjustmentUltrafiltrationState 0.1 import VTreatmentAdjustmentUltrafiltrationEdit 0.1 import VTreatmentAdjustmentUltrafiltrationConfirm 0.1 +import VTreatmentAdjustmentPressuresLimits 0.1 // Qml imports import "qrc:/globals" @@ -48,6 +49,7 @@ VTreatmentAdjustmentUltrafiltrationState { id: vTreatmentAdjustmentUltrafiltrationState } VTreatmentAdjustmentUltrafiltrationEdit { id: vTreatmentAdjustmentUltrafiltrationEdit } VTreatmentAdjustmentUltrafiltrationConfirm { id: vTreatmentAdjustmentUltrafiltrationConfirm } + VTreatmentAdjustmentPressuresLimits { id: vTreatmentAdjustmentPressuresLimits } // ultrafiltration state information bar properties readonly property bool isUFPaused : vHDTreatmentStates.ufPaused @@ -141,13 +143,13 @@ arterialPressureLowerBound : -300 arterialPressureUpperBound : +100 arterialPressureMaximum : +600 - arterialPressureValue : 70 + arterialPressureValue : vTreatmentPressureOcclusion.arterialPressure venousPressureMinimum : -100 venousPressureLowerBound : +100 venousPressureUpperBound : +400 venousPressureMaximum : +700 - venousPressureValue : 300 + venousPressureValue : vTreatmentPressureOcclusion.venousPressure } TreatmentAdjustmentDuration { id: _treatmentAdjustmentDuration Index: sources/gui/qml/pages/treatment/TreatmentStart.qml =================================================================== diff -u -r9a0581274e4dc51af6d6f3e4dd932581e8dce445 -r604a782b50c9fc749c3bd71485e285c1070f1e01 --- sources/gui/qml/pages/treatment/TreatmentStart.qml (.../TreatmentStart.qml) (revision 9a0581274e4dc51af6d6f3e4dd932581e8dce445) +++ sources/gui/qml/pages/treatment/TreatmentStart.qml (.../TreatmentStart.qml) (revision 604a782b50c9fc749c3bd71485e285c1070f1e01) @@ -78,7 +78,7 @@ } } Line { x: 0; y: row2LineY; length: lineLength } - TreatmentPressure { id: _pressureTouchArea + TreatmentPressuresLimits { id: _pressuresLimitsTouchArea // TEST : these values are test values. arterialMinimum : -400 arterialLowerBound : -300 Fisheye: Tag 604a782b50c9fc749c3bd71485e285c1070f1e01 refers to a dead (removed) revision in file `sources/gui/qml/pages/treatment/sections/TreatmentPressure.qml'. Fisheye: No comparison available. Pass `N' to diff? Index: sources/gui/qml/pages/treatment/sections/TreatmentPressuresLimits.qml =================================================================== diff -u --- sources/gui/qml/pages/treatment/sections/TreatmentPressuresLimits.qml (revision 0) +++ sources/gui/qml/pages/treatment/sections/TreatmentPressuresLimits.qml (revision 604a782b50c9fc749c3bd71485e285c1070f1e01) @@ -0,0 +1,104 @@ +/*! + * + * 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 TreatmentPressuresLimits.qml + * \author (last) Behrouz NematiPour + * \date (last) 16-Oct-2020 + * \author (original) Behrouz NematiPour + * \date (original) 27-Jan-2020 + * + */ + +// Qt +import QtQuick 2.12 + +// Project + +// Qml imports +import "qrc:/globals" +import "qrc:/components" + +/*! + * \brief Treatment Screen Pressure section + */ +TouchArea { id: _root + property int arterialMinimum : 0 + property int arterialLowerBound : 0 + property int arterialUpperBound : 0 + property int arterialMaximum : 0 + property alias arterilPressure : _arterialRangeBar.value + + property int venousMinimum : 0 + property int venousLowerBound : 0 + property int venousUpperBound : 0 + property int venousMaximum : 0 + property alias venusPressure : _venousRangeBar.value + + clip: false + x : 0 + y : 0 + width : 200 + height : 200 + isTouchable: true + title: qsTr("PRESSURE") + " " + qsTr("(mmHg)") + + RangeBar { id: _arterialRangeBar + x: 0 + y: 80 + width : 175 + height : 15 + rangebar.color: Colors.pressuresArterialBar + markerOutRangeNotify: true + + value : vTreatmentPressureOcclusion.arterialPressure + + minimum : _root.arterialMinimum + lowerBound : _root.arterialLowerBound + upperBound : _root.arterialUpperBound + maximum : _root.arterialMaximum + + Text { id: _arterialText + anchors { + left: parent.left + top: parent.bottom + topMargin: 35 + } + text: qsTr("Arterial") + font.pixelSize: Fonts.fontPixelPresseuresText + color: Colors.pressuresText + } + onClicked: _root.clicked() + } + + RangeBar { id: _venousRangeBar + x: 200 + y: 80 + width : 175 + height : 15 + rangebar.color: Colors.pressuresVenousBar + markerOutRangeNotify: true + + value : vTreatmentPressureOcclusion.venousPressure + + minimum : _root.venousMinimum + lowerBound : _root.venousLowerBound + upperBound : _root.venousUpperBound + maximum : _root.venousMaximum + + Text { id: _venousText + anchors { + left: parent.left + top: parent.bottom + topMargin: 35 + } + text: qsTr("Venous") + font.pixelSize: Fonts.fontPixelPresseuresText + color: Colors.pressuresText + } + onClicked: _root.clicked() + } +} Index: sources/model/MModel.h =================================================================== diff -u -r6cad9b004e904200b71de7431c745795256080df -r604a782b50c9fc749c3bd71485e285c1070f1e01 --- sources/model/MModel.h (.../MModel.h) (revision 6cad9b004e904200b71de7431c745795256080df) +++ sources/model/MModel.h (.../MModel.h) (revision 604a782b50c9fc749c3bd71485e285c1070f1e01) @@ -54,6 +54,7 @@ #include "MTreatmentAdjustUltrafiltrationEditResponse.h" #include "MTreatmentAdjustUltrafiltrationConfirmResponse.h" #include "MTreatmentAdjustSalineResponse.h" +#include "MTreatmentAdjustPressuresLimitsResponse.h" /*! * \page MessageFlow Message interpretation Flow @@ -165,7 +166,6 @@ * 12 - Use it. */ - //--------------------------------------------------------------------------------// //-------- Please add the model type to the lists below to register them ---------// //--------------------------------------------------------------------------------// @@ -210,6 +210,7 @@ REGISTER_METATYPE( AdjustUltrafiltrationEditRequestData ) \ REGISTER_METATYPE( AdjustUltrafiltrationConfirmRequestData ) \ REGISTER_METATYPE( AdjustSalineRequestData ) \ + REGISTER_METATYPE( AdjustPressuresLimitsRequestData ) \ REGISTER_METATYPE( AdjustTreatmentParametersRequestData ) \ /* Response */ \ REGISTER_METATYPE( AdjustBloodDialysateResponseData ) \ @@ -218,6 +219,7 @@ REGISTER_METATYPE( AdjustUltrafiltrationEditResponseData ) \ REGISTER_METATYPE( AdjustUltrafiltrationConfirmResponseData ) \ REGISTER_METATYPE( AdjustSalineResponseData ) \ + REGISTER_METATYPE( AdjustPressuresLimitsResponseData ) \ //===============================================================================// /*! @@ -268,6 +270,7 @@ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, AdjustUltrafiltrationEditResponseData ) \ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, AdjustUltrafiltrationConfirmResponseData ) \ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, AdjustSalineResponseData ) \ + ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, AdjustPressuresLimitsResponseData ) \ // /* Request */ ---------------------------------------------------------// #define ADJUST_TRANSMT_MODEL_BRIDGE_CONNECTIONS(vSOURCE) \ @@ -278,6 +281,7 @@ ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE, AdjustUltrafiltrationEditRequestData ) \ ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE, AdjustUltrafiltrationConfirmRequestData ) \ ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE, AdjustSalineRequestData ) \ + ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE, AdjustPressuresLimitsRequestData ) \ //===============================================================================// /*! @@ -331,8 +335,8 @@ ACTION_RECEIVE_BRIDGE_DEFINITION( AdjustUltrafiltrationEditResponseData ) \ ACTION_RECEIVE_BRIDGE_DEFINITION( AdjustUltrafiltrationConfirmResponseData ) \ ACTION_RECEIVE_BRIDGE_DEFINITION( AdjustSalineResponseData ) \ + ACTION_RECEIVE_BRIDGE_DEFINITION( AdjustPressuresLimitsResponseData ) \ - #define ADJUST_TRANSMT_MODEL_BRIDGE_DEFINITIONS \ /* Request --------------------------------------------------------- */ \ ADJUST_TRANSMT_BRIDGE_DEFINITION( AdjustBloodDialysateRequestData ) \ @@ -341,8 +345,8 @@ ADJUST_TRANSMT_BRIDGE_DEFINITION( AdjustUltrafiltrationEditRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION( AdjustUltrafiltrationConfirmRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION( AdjustSalineRequestData ) \ + ADJUST_TRANSMT_BRIDGE_DEFINITION( AdjustPressuresLimitsRequestData ) \ - #define ADJUST_TRANSMT_MODEL_BRIDGE_DEFINITIONS_NOEMIT \ /* Request ----------------------- NoEmit -------------------------- */ \ ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT( AdjustBloodDialysateRequestData ) \ @@ -351,6 +355,7 @@ ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT( AdjustUltrafiltrationEditRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT( AdjustUltrafiltrationConfirmRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT( AdjustSalineRequestData ) \ + ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT( AdjustPressuresLimitsRequestData ) \ #define ADJUST_TRANSMT_MODEL_BRIDGE_DEFINITIONS_PUBLIC \ /* Request ----------------------- public -------------------------- */ \ @@ -359,7 +364,9 @@ ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC( AdjustUltrafiltrationStateRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC( AdjustUltrafiltrationEditRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC( AdjustUltrafiltrationConfirmRequestData ) \ - ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC( AdjustSalineRequestData ) + ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC( AdjustSalineRequestData ) \ + ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC( AdjustPressuresLimitsRequestData ) \ + //===============================================================================// #define ACTION_RECEIVE_SIGNALS \ /* Received signals */ \ @@ -396,6 +403,8 @@ ACTION_RECEIVE_SIGNAL( AdjustUltrafiltrationEditResponseData ) \ ACTION_RECEIVE_SIGNAL( AdjustUltrafiltrationConfirmResponseData ) \ ACTION_RECEIVE_SIGNAL( AdjustTreatmentParametersResponseData ) \ - ACTION_RECEIVE_SIGNAL( AdjustSalineResponseData ) + ACTION_RECEIVE_SIGNAL( AdjustSalineResponseData ) \ + ACTION_RECEIVE_SIGNAL( AdjustPressuresLimitsResponseData ) \ + //--------------------------------------------------------------------------------// //--------------------------------------------------------------------------------// Index: sources/model/hd/adjustment/MTreatmentAdjustPressuresLimitsResponse.cpp =================================================================== diff -u --- sources/model/hd/adjustment/MTreatmentAdjustPressuresLimitsResponse.cpp (revision 0) +++ sources/model/hd/adjustment/MTreatmentAdjustPressuresLimitsResponse.cpp (revision 604a782b50c9fc749c3bd71485e285c1070f1e01) @@ -0,0 +1,61 @@ +/*! + * + * 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 MTreatmentAdjustPressuresLimitsResponse.cpp + * \author (last) Behrouz NematiPour + * \date (last) 1-Nov-2020 + * \author (original) Behrouz NematiPour + * \date (original) 1-Nov-2020 + * + */ +#include "MTreatmentAdjustPressuresLimitsResponse.h" + +using namespace Model; + +QVariantList MAdjustPressuresLimitsResponse::parameters() const { + return { + _data.mAccepted .value, + _data.mReason .value, + _data.mArterialLimitLow .value, + _data.mArterialLimitHigh .value, + _data.mVenousLimitLow .value, + _data.mVenousLimitHigh .value + }; +} + +bool MAdjustPressuresLimitsResponse::fromByteArray(const QByteArray &vByteArray, int *vIndex) { + int index = 0; // message data start position + if (GetValue(vByteArray, index, _data.mAccepted )) + if (GetValue(vByteArray, index, _data.mReason )) + if (GetValue(vByteArray, index, _data.mArterialLimitLow )) + if (GetValue(vByteArray, index, _data.mArterialLimitHigh )) + if (GetValue(vByteArray, index, _data.mVenousLimitLow )) + if (GetValue(vByteArray, index, _data.mVenousLimitHigh )) + return true ; + 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; } + else { if(vIndex) *vIndex = index; return false; } + else { if(vIndex) *vIndex = index; return false; } +} + +/*! + * \brief MAdjustPressuresLimitsResponse::data + * \details Provides model's Data from the received messages data values + * \return Data + */ +AdjustPressuresLimitsResponseData MAdjustPressuresLimitsResponse::data() const { + Data data; + data.mAccepted = _data.mAccepted .value; + data.mReason = _data.mReason .value; + data.mArterialLimitLow = _data.mArterialLimitLow .value; + data.mArterialLimitHigh = _data.mArterialLimitHigh .value; + data.mVenousLimitLow = _data.mVenousLimitLow .value; + data.mVenousLimitHigh = _data.mVenousLimitHigh .value; + return data; +} Index: sources/model/hd/adjustment/MTreatmentAdjustPressuresLimitsResponse.h =================================================================== diff -u --- sources/model/hd/adjustment/MTreatmentAdjustPressuresLimitsResponse.h (revision 0) +++ sources/model/hd/adjustment/MTreatmentAdjustPressuresLimitsResponse.h (revision 604a782b50c9fc749c3bd71485e285c1070f1e01) @@ -0,0 +1,96 @@ +/*! + * + * 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 MTreatmentAdjustPressuresLimitsResponse.h + * \author (last) Behrouz NematiPour + * \date (last) 1-Nov-2020 + * \author (original) Behrouz NematiPour + * \date (original) 1-Nov-2020 + * + */ +#pragma once + +// Qt +#include + +// Project +#include "MAbstract.h" +#include "types.h" + +// forward declarations +class tst_models; + +namespace Model { + +/*! + * \brief The MAdjustPressuresLimitsResponse class + * \details The pressures limits adjustment response model + * + * | MSG | CAN ID | M.Box | Type | Ack | Src | Dest | Description | + * |:---:|:------:|:-----:|:----:|:---:|:---:|:----:|:----------------------------:| + * | 71 | 0x020 | 6 | Rsp | Y | HD | UI | A/V BP Limit Change Response | + * + * | Payload || + * | || + * | #1:(U32) | \ref Data::mAccepted | + * | #2:(U32) | \ref Data::mReason | + * | #3:(S32) | \ref Data::mArterialLimitLow | + * | #4:(S32) | \ref Data::mArterialLimitHigh | + * | #5:(S32) | \ref Data::mVenousLimitLow | + * | #6:(S32) | \ref Data::mVenousLimitHigh | + * + * \sa Data + * \sa MAdjustPressureLimitsReq : Pressures limits adjustment request + * \sa MPressureOcclusion : Pressure data broadcast + * + *

Logging info

+ * | || + * | || + * | typeText | Event | + * | unitText | HD | + * | infoText | AdjustPressuresLimits | + * + */ +class MAdjustPressuresLimitsResponse : public MAbstract { + + // friends + friend class ::tst_models; + + QVariantList parameters() const override; + + struct { + Types::U32 mAccepted ; + Types::U32 mReason ; + Types::S32 mArterialLimitLow ; + Types::S32 mArterialLimitHigh ; + Types::S32 mVenousLimitLow ; + Types::S32 mVenousLimitHigh ; + } _data; + +public: + + Type_Enum typeText () const override { return Type_Enum::eEvent ; } + Unit_Enum unitText () const override { return Unit_Enum::eHD ; } + QString infoText () const override { return QString("AdjustPressuresLimits") ; } + + struct Data { + bool mAccepted = 0; /*!< Accepted value of type quint32 extracted out */ + quint32 mReason = 0; /*!< Reason value of type quint32 extracted out */ + qint32 mArterialLimitLow = 0; /*!< ArterialLimitLow value of type qint32 extracted out */ + qint32 mArterialLimitHigh = 0; /*!< ArterialLimitHigh value of type qint32 extracted out */ + qint32 mVenousLimitLow = 0; /*!< VenousLimitLow value of type qint32 extracted out */ + qint32 mVenousLimitHigh = 0; /*!< VenousLimitHigh value of type qint32 extracted out */ + }; + + MAdjustPressuresLimitsResponse () { } + + bool fromByteArray (const QByteArray &vByteArray , int *vIndex = nullptr) override; + Data data ( ) const ; +}; +} + +typedef Model::MAdjustPressuresLimitsResponse::Data AdjustPressuresLimitsResponseData; Index: sources/model/hd/adjustment/MTreatmentAdjustRequests.h =================================================================== diff -u -r2c9421bd6da03c7e0bd0bfa1f49fa95c2bd18a95 -r604a782b50c9fc749c3bd71485e285c1070f1e01 --- sources/model/hd/adjustment/MTreatmentAdjustRequests.h (.../MTreatmentAdjustRequests.h) (revision 2c9421bd6da03c7e0bd0bfa1f49fa95c2bd18a95) +++ sources/model/hd/adjustment/MTreatmentAdjustRequests.h (.../MTreatmentAdjustRequests.h) (revision 604a782b50c9fc749c3bd71485e285c1070f1e01) @@ -270,6 +270,47 @@ }; /*! + * \brief The MAdjustPressuresLimitsReq class + * \details The model to request the pressures limits adjustment + * + * | MSG | CAN ID | M.Box | Type | Ack | Src | Dest | Description | + * |:---:|:------:|:-----:|:----:|:---:|:---:|:----:|:---------------------------:| + * | 70 | 0x100 | 9 | Req | Y | UI | HD | A/V BP Limit Change Request | + * + * | Payload || + * | || + * | #1:(S32) | \ref mArterialLimitLow | (mmHg) | + * | #2:(S32) | \ref mArterialLimitHigh | (mmHg) | + * | #3:(S32) | \ref mVenousLimitLow | (mmHg) | + * | #4:(S32) | \ref mVenousLimitHigh | (mmHg) | + * + * \sa MPressureOcclusion : Pressure data broadcast + * \sa MAdjustPressuresResponse : Pressures limit adjustment response + * + */ +class MAdjustPressuresLimitsReq : public MModel { +public: + qint32 mArterialLimitLow = 0; ///< (S32) Arterial Pressure Limit Low (mmHg) + qint32 mArterialLimitHigh = 0; ///< (S32) Arterial Pressure Limit High (mmHg) + qint32 mVenousLimitLow = 0; ///< (S32) Venous Pressure Limit Low (mmHg) + qint32 mVenousLimitHigh = 0; ///< (S32) Venous Pressure Limit High (mmHg) + + // coco begin validated : Has been validated manually. + // This object is used statically for now, kept the logic for later usage. + QString toString() { + return toString + ({ mArterialLimitLow , + mArterialLimitHigh, + mVenousLimitLow , + mVenousLimitHigh }); + } + // coco end + static QString toString(const QVariantList &vParameters) { + return MModel::toString("AdjustPressuresLimits", vParameters); + } +}; + +/*! * \brief The MAlarmSilenceReq class * \details The model to request alarm silent * @@ -305,5 +346,6 @@ typedef Model:: MAdjustUltrafiltrationEditReq AdjustUltrafiltrationEditRequestData; typedef Model::MAdjustUltrafiltrationConfirmReq AdjustUltrafiltrationConfirmRequestData; typedef Model:: MAdjustSalineReq AdjustSalineRequestData; +typedef Model:: MAdjustPressuresLimitsReq AdjustPressuresLimitsRequestData; typedef Model:: MAlarmSilenceReq AlarmSilenceRequestData; Index: sources/view/VView.h =================================================================== diff -u -r4fab8841b1040c8eaa406713ff9bdc8c65b7b6ac -r604a782b50c9fc749c3bd71485e285c1070f1e01 --- sources/view/VView.h (.../VView.h) (revision 4fab8841b1040c8eaa406713ff9bdc8c65b7b6ac) +++ sources/view/VView.h (.../VView.h) (revision 604a782b50c9fc749c3bd71485e285c1070f1e01) @@ -132,5 +132,6 @@ REGISTER_TYPE( VTreatmentAdjustmentUltrafiltrationConfirm ) \ REGISTER_TYPE( VCreateTreatment ) \ REGISTER_TYPE( VTreatmentAdjustmentSaline ) \ + REGISTER_TYPE( VTreatmentAdjustmentPressuresLimits ) \ //--------------------------------------------------------------------------------// Index: sources/view/hd/adjustment/VTreatmentAdjustmentPressuresLimits.cpp =================================================================== diff -u --- sources/view/hd/adjustment/VTreatmentAdjustmentPressuresLimits.cpp (revision 0) +++ sources/view/hd/adjustment/VTreatmentAdjustmentPressuresLimits.cpp (revision 604a782b50c9fc749c3bd71485e285c1070f1e01) @@ -0,0 +1,44 @@ +/*! + * + * 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 VTreatmentAdjustmentPressuresLimits.cpp + * \author (last) Behrouz NematiPour + * \date (last) 1-Nov-2020 + * \author (original) Behrouz NematiPour + * \date (original) 1-Nov-2020 + * + */ +#include "VTreatmentAdjustmentPressuresLimits.h" + +// Project +#include "GuiController.h" + +VIEW_DEF_CLASS_ADJUSTMENT(VTreatmentAdjustmentPressuresLimits, AdjustPressuresLimitsResponseData) +void VTreatmentAdjustmentPressuresLimits::initConnections() { + ACTION_VIEW_CONNECTION(AdjustPressuresLimitsResponseData); + ADJUST_VIEW_CONNECTION( AdjustPressuresLimitsRequestData); +} + +/*! + * \brief VTreatmentAdjustmentPressures::onActionReceive + * \details Model data received message handler. + * When signal received this method is called to update the view properties. + * \param vData - Model data + */ +void VTreatmentAdjustmentPressuresLimits::onActionReceive(const AdjustPressuresLimitsResponseData &vData) +{ + adjustment_Accepted ( vData.mAccepted ); + adjustment_Reason ( vData.mReason ); + arterialLimitLow ( vData.mArterialLimitLow ); + arterialLimitHigh ( vData.mArterialLimitHigh ); + venousLimitLow ( vData.mVenousLimitLow ); + venousLimitHigh ( vData.mVenousLimitHigh ); + + // *** 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 ); +} Index: sources/view/hd/adjustment/VTreatmentAdjustmentPressuresLimits.h =================================================================== diff -u --- sources/view/hd/adjustment/VTreatmentAdjustmentPressuresLimits.h (revision 0) +++ sources/view/hd/adjustment/VTreatmentAdjustmentPressuresLimits.h (revision 604a782b50c9fc749c3bd71485e285c1070f1e01) @@ -0,0 +1,83 @@ +/*! + * + * 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 VTreatmentAdjustmentPressuresLimits.h + * \author (last) Behrouz NematiPour + * \date (last) 1-Nov-2020 + * \author (original) Behrouz NematiPour + * \date (original) 1-Nov-2020 + * + */ +#pragma once + +// Qt +#include + +// Project +#include "main.h" // Doxygen : don't remove +#include "VView.h" +#include "VTreatmentAdjustmentResponseBase.h" + +namespace View { + +/*! + * \brief The VTreatmentAdjustmentPressuresLimits class + * \details View for Model's Data representation. + * + * \sa Model::MAdjustPressuresLimitsResponse + * + */ +class VTreatmentAdjustmentPressuresLimits : public VTreatmentAdjustmentResponseBase +{ + Q_OBJECT + // friends + friend class ::tst_views; + + AdjustPressuresLimitsRequestData _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 pressures limits data + PROPERTY( qint32 , arterialLimitLow , 0) + PROPERTY( qint32 , arterialLimitHigh , 0) + PROPERTY( qint32 , venousLimitLow , 0) + PROPERTY( qint32 , venousLimitHigh , 0) + + VIEW_DEC_CLASS_ADJUSTMENT(VTreatmentAdjustmentPressuresLimits, AdjustPressuresLimitsResponseData) + + // ----- Adjust Pressures Limits +public slots: + /*! + * \brief doAdjustment + * \details the invocable slot to adjust the treatment pressures limits + * \param vArterialLimitLow + * \param vArterialLimitHigh + * \param vVenousLimitLow + * \param vVenousLimitHigh + */ + void doAdjustment( qint32 vArterialLimitLow, qint32 vArterialLimitHigh, qint32 vVenousLimitLow, qint32 vVenousLimitHigh ) { + _data.mArterialLimitLow = vArterialLimitLow ; + _data.mArterialLimitHigh = vArterialLimitHigh; + _data.mVenousLimitLow = vVenousLimitLow ; + _data.mVenousLimitHigh = vVenousLimitHigh ; + emit didAdjustment(_data); + } + +signals: + /*! + * \brief didAdjustment + * \details the notification signal to adjust the pressures limits + * \param vData - data model for the pressures limits adjustment request + */ + void didAdjustment(const AdjustPressuresLimitsRequestData &vData); +}; +} Index: sources/view/hd/data/VTreatmentPressureOcclusion.cpp =================================================================== diff -u -r64d87d540594252e8039ab2595016d98f1e3cc28 -r604a782b50c9fc749c3bd71485e285c1070f1e01 --- sources/view/hd/data/VTreatmentPressureOcclusion.cpp (.../VTreatmentPressureOcclusion.cpp) (revision 64d87d540594252e8039ab2595016d98f1e3cc28) +++ sources/view/hd/data/VTreatmentPressureOcclusion.cpp (.../VTreatmentPressureOcclusion.cpp) (revision 604a782b50c9fc749c3bd71485e285c1070f1e01) @@ -21,9 +21,9 @@ void VTreatmentPressureOcclusion::onActionReceive(const PressureOcclusionData &vData) { - pressureocclusion_ArterialPressure ( vData.mArterialPressure ); - pressureocclusion_VenousPressure ( vData.mVenousPressure ); - pressureocclusion_BloodPumpOcclusion ( vData.mBloodPumpOcclusion ); - pressureocclusion_DialysateInletPumpOcclusion ( vData.mDialysateInletPumpOcclusion ); - pressureocclusion_DialysateOutletPumpOcclusion ( vData.mDialysateOutletPumpOcclusion ); + arterialPressure ( vData.mArterialPressure ); + venousPressure ( vData.mVenousPressure ); + bloodPumpOcclusion ( vData.mBloodPumpOcclusion ); + dialysateInletPumpOcclusion ( vData.mDialysateInletPumpOcclusion ); + dialysateOutletPumpOcclusion ( vData.mDialysateOutletPumpOcclusion ); } Index: sources/view/hd/data/VTreatmentPressureOcclusion.h =================================================================== diff -u -r767367e5779764bec1c1857f32eaf3d86089d5d9 -r604a782b50c9fc749c3bd71485e285c1070f1e01 --- sources/view/hd/data/VTreatmentPressureOcclusion.h (.../VTreatmentPressureOcclusion.h) (revision 767367e5779764bec1c1857f32eaf3d86089d5d9) +++ sources/view/hd/data/VTreatmentPressureOcclusion.h (.../VTreatmentPressureOcclusion.h) (revision 604a782b50c9fc749c3bd71485e285c1070f1e01) @@ -36,13 +36,13 @@ { Q_OBJECT - PROPERTY( float , pressureocclusion_ArterialPressure , 0) - PROPERTY( float , pressureocclusion_VenousPressure , 0) + PROPERTY( float , arterialPressure , 0) + PROPERTY( float , venousPressure , 0) // coco begin validated: These three properties have not been used in GUI. // has been manually tested that it works perfectly fine if used. - PROPERTY( quint32 , pressureocclusion_BloodPumpOcclusion , 0) - PROPERTY( quint32 , pressureocclusion_DialysateInletPumpOcclusion , 0) - PROPERTY( quint32 , pressureocclusion_DialysateOutletPumpOcclusion , 0) + PROPERTY( quint32 , bloodPumpOcclusion , 0) + PROPERTY( quint32 , dialysateInletPumpOcclusion , 0) + PROPERTY( quint32 , dialysateOutletPumpOcclusion , 0) // coco end VIEW_DEC(VTreatmentPressureOcclusion, PressureOcclusionData) };