Index: sources/gui/qml/pages/treatment/TreatmentHome.qml =================================================================== diff -u -re571ca6e203b492a3a2fa53776574d532573eac1 -rd7890a46b5dde1f5b2b0e3976df2c1b0e4808068 --- sources/gui/qml/pages/treatment/TreatmentHome.qml (.../TreatmentHome.qml) (revision e571ca6e203b492a3a2fa53776574d532573eac1) +++ sources/gui/qml/pages/treatment/TreatmentHome.qml (.../TreatmentHome.qml) (revision d7890a46b5dde1f5b2b0e3976df2c1b0e4808068) @@ -70,15 +70,15 @@ } Line { x: 0; y: Variables.screenGridRow2LineY; length: Variables.screenGridLineLength } TreatmentPressures { id: _pressuresTouchArea - arterialMinimum : vTreatmentRanges.arterialPressureMonitorMin - arterialLowerBound : vTreatmentAdjustmentPressuresLimits.adjustment_Accepted ? vTreatmentAdjustmentPressuresLimits.arterialLimitLow : vTreatmentRanges.arterialPressureLimitLowMin - arterialUpperBound : vTreatmentAdjustmentPressuresLimits.adjustment_Accepted ? vTreatmentAdjustmentPressuresLimits.arterialLimitHigh : vTreatmentRanges.arterialPressureLimitHighMax + arterialMinimum : vTreatmentRanges.arterialPressureMonitorMin + arterialLowerBound : vTreatmentRanges.arterialPressureLimitLowerBound + arterialUpperBound : vTreatmentRanges.arterialPressureLimitUpperBound - arterialMaximum : vTreatmentRanges.arterialPressureMonitorMax - venousMinimum : vTreatmentRanges.venousPressureMonitorMin - venousLowerBound : vTreatmentAdjustmentPressuresLimits.adjustment_Accepted ? vTreatmentAdjustmentPressuresLimits. venousLimitLow : vTreatmentRanges.venousPressureLimitLowMin - venousUpperBound : vTreatmentAdjustmentPressuresLimits.adjustment_Accepted ? vTreatmentAdjustmentPressuresLimits. venousLimitHigh : vTreatmentRanges.venousPressureLimitHighMax - venousMaximum : vTreatmentRanges.venousPressureMonitorMax + arterialMaximum : vTreatmentRanges.arterialPressureMonitorMax + venousMinimum : vTreatmentRanges.venousPressureMonitorMin + venousLowerBound : vTreatmentRanges.venousPressureLimitLowerBound + venousUpperBound : vTreatmentRanges.venousPressureLimitUpperBound + venousMaximum : vTreatmentRanges.venousPressureMonitorMax arterialPressure : vTreatmentPressureOcclusion.arterialPressure venousPressure : vTreatmentPressureOcclusion.venousPressure Index: sources/view/hd/data/VTreatmentRanges.cpp =================================================================== diff -u -rc9f8f8cf3c6c37fc6460d8675c62c9442c4d4263 -rd7890a46b5dde1f5b2b0e3976df2c1b0e4808068 --- sources/view/hd/data/VTreatmentRanges.cpp (.../VTreatmentRanges.cpp) (revision c9f8f8cf3c6c37fc6460d8675c62c9442c4d4263) +++ sources/view/hd/data/VTreatmentRanges.cpp (.../VTreatmentRanges.cpp) (revision d7890a46b5dde1f5b2b0e3976df2c1b0e4808068) @@ -24,6 +24,7 @@ void VTreatmentRanges::initConnections() { ACTION_VIEW_CONNECTION(TreatmentRangesData); + ACTION_VIEW_CONNECTION(AdjustPressuresLimitsResponseData); ACTION_VIEW_CONNECTION(SettingsData); } @@ -38,6 +39,21 @@ } /*! + * \brief VTreatmentRanges::onActionReceive + * \details Model data received message handler. + * When signal received this method is called to update the view properties. + * \param vData - Model data + */ +void View::VTreatmentRanges::onActionReceive(const AdjustPressuresLimitsResponseData &vData) +{ + // Set pressure bounds with adjusted values + arterialPressureLimitLowerBound ( vData.mArterialLimitLow ); + arterialPressureLimitUpperBound ( vData.mArterialLimitHigh ); + venousPressureLimitLowerBound ( vData.mVenousLimitLow ); + venousPressureLimitUpperBound ( vData.mVenousLimitHigh ); +} + +/*! * \brief VTreatmentCreate::onSettingsDone * \details fills the items below, read from the settings file, when the reading is notified done by ApplicationController. * acidConcentrateOptions @@ -136,4 +152,11 @@ FROMVARIANT ( rinsebackFlowRateMax , "Rinseback Flow Rate Ranges" , "Rinseback_Flow_Rate_Max" , UInt ); FROMVARIANT ( rinsebackFlowRateRes , "Rinseback Flow Rate Ranges" , "Rinseback_Flow_Rate_Res" , UInt ); FROMVARIANT ( rinsebackFlowRateDef , "Rinseback Flow Rate Ranges" , "Rinseback_Flow_Rate_Def" , UInt ); + + // Set the pressure bounds with default values + //DEBUG : qDebug()<< "Default values " << _arterialPressureLimitLowMin << " "<< _arterialPressureLimitHighMax << " " << _venousPressureLimitLowMin << " " << _venousPressureLimitHighMax ; + arterialPressureLimitLowerBound ( _arterialPressureLimitLowMin ); + arterialPressureLimitUpperBound ( _arterialPressureLimitHighMax ); + venousPressureLimitLowerBound ( _venousPressureLimitLowMin ); + venousPressureLimitUpperBound ( _venousPressureLimitHighMax ); } Index: sources/view/hd/data/VTreatmentRanges.h =================================================================== diff -u -rc9f8f8cf3c6c37fc6460d8675c62c9442c4d4263 -rd7890a46b5dde1f5b2b0e3976df2c1b0e4808068 --- sources/view/hd/data/VTreatmentRanges.h (.../VTreatmentRanges.h) (revision c9f8f8cf3c6c37fc6460d8675c62c9442c4d4263) +++ sources/view/hd/data/VTreatmentRanges.h (.../VTreatmentRanges.h) (revision d7890a46b5dde1f5b2b0e3976df2c1b0e4808068) @@ -21,6 +21,7 @@ #include "main.h" // Doxygen : do not remove #include "VView.h" #include "MTreatmentRangesData.h" +#include "MTreatmentAdjustPressuresLimitsResponse.h" #include "MSettings.h" // namespace namespace View { @@ -66,12 +67,19 @@ RANGESET( quint32 , bloodPressureMeasureInterval , 0) RANGESET( quint32 , rinsebackFlowRate , 0) + // Ranges used in QML to display + READONLY( qint32 , arterialPressureLimitLowerBound , 0) + READONLY( qint32 , arterialPressureLimitUpperBound , 0) + READONLY( qint32 , venousPressureLimitLowerBound , 0) + READONLY( qint32 , venousPressureLimitUpperBound , 0) + // monitoring ranges RANGESET( qint32 , arterialPressureMonitor , 0) RANGESET( qint32 , venousPressureMonitor , 0) VIEW_DEC_CLASS(VTreatmentRanges) VIEW_DEC_SLOT(TreatmentRangesData) + VIEW_DEC_SLOT(AdjustPressuresLimitsResponseData) VIEW_DEC_SLOT(SettingsData) };