Index: denali.pro.user =================================================================== diff -u -rff8553ddbd24f3b7e4727e78bc74c13e8eb7eeb5 -r1aa53e9869f4c27d53dd9052271ca38befbe22e9 --- denali.pro.user (.../denali.pro.user) (revision ff8553ddbd24f3b7e4727e78bc74c13e8eb7eeb5) +++ denali.pro.user (.../denali.pro.user) (revision 1aa53e9869f4c27d53dd9052271ca38befbe22e9) @@ -1,6 +1,6 @@ - + EnvironmentId @@ -104,7 +104,7 @@ false false - true + false true @@ -156,7 +156,7 @@ qmake QtProjectManager.QMakeBuildStep - true + false false false @@ -1214,7 +1214,7 @@ denali Qt4ProjectManager.Qt4RunConfiguration:/home/denali/Projects/application/denali.pro - -q -m + -q -u -l 3768 false true Index: main.cpp =================================================================== diff -u -rcc1e9d6d55c816f3fcd626dc6948cca24da283b3 -r1aa53e9869f4c27d53dd9052271ca38befbe22e9 --- main.cpp (.../main.cpp) (revision cc1e9d6d55c816f3fcd626dc6948cca24da283b3) +++ main.cpp (.../main.cpp) (revision 1aa53e9869f4c27d53dd9052271ca38befbe22e9) @@ -79,6 +79,7 @@ bool gDisableUnhandledReport = false ; bool gDisableTimeout = false ; +bool gConsoleoutLogs = false ; bool gConsoleoutFrameInterface = false ; bool gConsoleoutCanInterface = false ; @@ -89,19 +90,26 @@ * Denali * * Options: - * -h, --help Displays this help. - * -v, --version Displays version information. - * -c, --canOut Show the Can Frame Output - * -m, --msgOut Show the Message Output - * -0, --enable-keep-awake Enable send low priority, empty message on - * the CANBus just to keep UI board CAN driver - * awake - * -i, --fake-interval Test fake message interval(ms) - * -f, --fake-message Test fake message data - * will use default sequenced long fake message - * if set to 00(default) - * will used only if correct integer value - * assigned for interval option + * -h, --help Displays this help. + * -v, --version Displays version information. + * -c, --canOut Show the Can Frame Output + * -m, --msgOut Show the Message Output + * -l, --logOut Show the Logs Output + * -0, --enable-keep-awake Enable send low priority, empty message on + * the CANBus just to keep UI board CAN driver + * awake + * -i, --fake-interval Test fake message interval(ms) + * -f, --fake-message Test fake message data + * will use default sequenced long fake message + * if set to 00(default) + * will used only if correct integer value + * assigned for interval option + * -b, --fake-message-seq-at-begin Test fake message sequence at the beginning + * of the frame + * -u, --disable-unhandled-report Disable unhandled messages report as an + * error in the log + * -q, --disable-timeout Disables HD communication timeout + * * \endverbatim */ /*! @@ -127,6 +135,12 @@ QCoreApplication::translate("main", "Show the Message Output")); parser.addOption(optionConsoleoutFrameInterface); + // --- -m : msgOut + QCommandLineOption optionConsoleoutLogs( + QStringList() << "l" << "logOut", + QCoreApplication::translate("main", "Show the Logs Output")); + parser.addOption(optionConsoleoutLogs); + // --- -0 : enable-keep-awake (the fast mode) QCommandLineOption optionSendEmptyKeepAwake(QStringList() << "0" << "enable-keep-awake", QCoreApplication::translate("main", "Enable send low priority, empty message on the CANBus just to keep UI board CAN driver awake")); @@ -144,13 +158,13 @@ QStringList() << "f" << "fake-message", QCoreApplication::translate("main", "Test fake message data\n" "will use default sequenced long fake message if set to 00(default)\n" - "will used only if correct intger value assigned for interval option"), + "will used only if correct integer value assigned for interval option"), QCoreApplication::translate("main", "data")); parser.addOption(optionFakeData); - // --- -b : fake-message-seq-atbegin + // --- -b : fake-message-seq-at-begin QCommandLineOption optionFakeSeqAtBegin( - QStringList() << "b" << "fake-message-seq-atbegin", + QStringList() << "b" << "fake-message-seq-at-begin", QCoreApplication::translate("main", "Test fake message sequence at the beginning of the frame")); parser.addOption(optionFakeSeqAtBegin); @@ -169,6 +183,7 @@ gConsoleoutCanInterface = parser.isSet(optionConsoleoutCanInterface ); gConsoleoutFrameInterface = parser.isSet(optionConsoleoutFrameInterface ); + gConsoleoutLogs = parser.isSet(optionConsoleoutLogs ); gDisableUnhandledReport = parser.isSet(optionDisableUnhandledReport ); gDisableTimeout = parser.isSet(optionDisableTimeout ); @@ -280,8 +295,11 @@ Threads::registerTypes(); //! - Initializing Logger - _Logger.init(Threads::_Logger_Thread); + if(_Logger.init(Threads::_Logger_Thread)) { + _Logger.enableConsoleOut(gConsoleoutLogs); + } + LOG_EVENT("UI," + QObject::tr("Application %1 Started,%2") .arg(app.applicationName ()) .arg(app.applicationVersion()) Index: sources/gui/qml/globals/Variables.qml =================================================================== diff -u -rff8553ddbd24f3b7e4727e78bc74c13e8eb7eeb5 -r1aa53e9869f4c27d53dd9052271ca38befbe22e9 --- sources/gui/qml/globals/Variables.qml (.../Variables.qml) (revision ff8553ddbd24f3b7e4727e78bc74c13e8eb7eeb5) +++ sources/gui/qml/globals/Variables.qml (.../Variables.qml) (revision 1aa53e9869f4c27d53dd9052271ca38befbe22e9) @@ -110,6 +110,37 @@ readonly property int dialysateFlowResolution : 50 readonly property int durationResolution : 15 // PRS346 + // Inline Blood Pressures + // - Artrial + // - Artrial - Entire pressure value range + readonly property int arterialValueMin : -400; // PRS362 const + readonly property int arterialValueMax : +600; // PRS362 const + // - Artrial - Adjust pressure limit range and manufacturing default - Low + readonly property int arterialLimitLowMin : -300; // PRS354 const + // ref to Model // arterialLimitLowMin : -300; // PRS354 default \ref MAdjustPressuresLimitsReq + readonly property int arterialLimitLowMax : +200; // PRS354 const + // - Artrial - Adjust pressure limit range and manufacturing default - High + readonly property int arterialLimitHighMin : -300; // PRS355 const + // ref to Model // arterialLimitHighMin : +100; // PRS355 default \ref MAdjustPressuresLimitsReq + readonly property int arterialLimitHighMax : +200; // PRS355 const + // - Artrial - Adjust pressure limit resolution + readonly property int arterialLimitStep : +10; // PRS354,PRS355 // has to be the same since it's on the same line + + // - Venous + // - Venous - Entire pressure value range + readonly property int venousValueMin : -100; // PRS361 const + readonly property int venousValueMax : +700; // PRS361 const + // - Venous - Adjust pressure limit range and manufacturing default - Low + readonly property int venousLimitLowMin : -100; // PRS356 const + // ref to Model // venousLimitLowDef : -100; // PRS356 default \ref MAdjustPressuresLimitsReq + readonly property int venousLimitLowMax : +600; // PRS356 const + // - Venous - Adjust pressure limit range and manufacturing default - High + readonly property int venousLimitHighMin : +100; // PRS357 const + // ref to Model // venousLimitHighDef : +400; // PRS357 default \ref MAdjustPressuresLimitsReq + readonly property int venousLimitHighMax : +600; // PRS357 const + // - Venous - Adjust pressure limit resolution + readonly property int venousLimitStep : +10; // PRS356,PRS357 // has to be the same since it's on the same line + // Units // - Ultrafiltration readonly property string unitTextUltrafiltrationVolume : qsTr("(L)") Index: sources/gui/qml/pages/treatment/TreatmentStack.qml =================================================================== diff -u -rff8553ddbd24f3b7e4727e78bc74c13e8eb7eeb5 -r1aa53e9869f4c27d53dd9052271ca38befbe22e9 --- sources/gui/qml/pages/treatment/TreatmentStack.qml (.../TreatmentStack.qml) (revision ff8553ddbd24f3b7e4727e78bc74c13e8eb7eeb5) +++ sources/gui/qml/pages/treatment/TreatmentStack.qml (.../TreatmentStack.qml) (revision 1aa53e9869f4c27d53dd9052271ca38befbe22e9) @@ -143,18 +143,21 @@ venousPressureUpperBound ) - arterialPressureMinimum : vTreatmentAdjustmentPressuresLimits.arterialLimitMin + arterialPressureMinimum : Variables.arterialValueMin arterialPressureLowerBound : vTreatmentAdjustmentPressuresLimits.arterialLimitLow arterialPressureUpperBound : vTreatmentAdjustmentPressuresLimits.arterialLimitHigh - arterialPressureMaximum : vTreatmentAdjustmentPressuresLimits.arterialLimitMax + arterialPressureMaximum : Variables.arterialValueMax - venousPressureMinimum : vTreatmentAdjustmentPressuresLimits.venousLimitMin + venousPressureMinimum : Variables.venousValueMin venousPressureLowerBound : vTreatmentAdjustmentPressuresLimits.venousLimitLow venousPressureUpperBound : vTreatmentAdjustmentPressuresLimits.venousLimitHigh - venousPressureMaximum : vTreatmentAdjustmentPressuresLimits.venousLimitMax + venousPressureMaximum : Variables.venousValueMax + arterialPressureStep : Variables.arterialLimitStep arterialPressureValue : vTreatmentPressureOcclusion.arterialPressure - venousPressureValue : vTreatmentPressureOcclusion.venousPressure + + venousPressureStep : Variables.venousLimitStep + venousPressureValue : vTreatmentPressureOcclusion.venousPressure } TreatmentAdjustmentDuration { id: _treatmentAdjustmentDuration @@ -278,9 +281,19 @@ Connections { target: vTreatmentAdjustmentPressuresLimits onAdjustmentTriggered : { - if (vTreatmentAdjustmentUltrafiltrationConfirm.adjustment_Accepted) { + // values have to be update even when rejected HD is reverting back the values. + // if accepted will be updated for later [may need refresh later] + _treatmentAdjustmentPressuresLimits.arterialPressureLowerBound = vTreatmentAdjustmentPressuresLimits.arterialLimitLow + _treatmentAdjustmentPressuresLimits.arterialPressureUpperBound = vTreatmentAdjustmentPressuresLimits.arterialLimitHigh + _treatmentAdjustmentPressuresLimits.venousPressureLowerBound = vTreatmentAdjustmentPressuresLimits.venousLimitLow + _treatmentAdjustmentPressuresLimits.venousPressureUpperBound = vTreatmentAdjustmentPressuresLimits.venousLimitHigh + + if (vTreatmentAdjustmentPressuresLimits.adjustment_Accepted) { _treatmentAdjustmentPressuresLimits.close() } + else { + _treatmentAdjustmentPressuresLimits.notification.text = vTreatmentAdjustmentPressuresLimits.text() + } } } Index: sources/gui/qml/pages/treatment/TreatmentStart.qml =================================================================== diff -u -rff8553ddbd24f3b7e4727e78bc74c13e8eb7eeb5 -r1aa53e9869f4c27d53dd9052271ca38befbe22e9 --- sources/gui/qml/pages/treatment/TreatmentStart.qml (.../TreatmentStart.qml) (revision ff8553ddbd24f3b7e4727e78bc74c13e8eb7eeb5) +++ sources/gui/qml/pages/treatment/TreatmentStart.qml (.../TreatmentStart.qml) (revision 1aa53e9869f4c27d53dd9052271ca38befbe22e9) @@ -79,15 +79,15 @@ } Line { x: 0; y: row2LineY; length: lineLength } TreatmentPressures { id: _pressuresTouchArea - arterialMinimum : vTreatmentAdjustmentPressuresLimits.arterialLimitMin + arterialMinimum : Variables.arterialValueMin arterialLowerBound : vTreatmentAdjustmentPressuresLimits.arterialLimitLow arterialUpperBound : vTreatmentAdjustmentPressuresLimits.arterialLimitHigh - arterialMaximum : vTreatmentAdjustmentPressuresLimits.arterialLimitMax + arterialMaximum : Variables.arterialValueMax - venousMinimum : vTreatmentAdjustmentPressuresLimits.venousLimitMin + venousMinimum : Variables.venousValueMin venousLowerBound : vTreatmentAdjustmentPressuresLimits.venousLimitLow venousUpperBound : vTreatmentAdjustmentPressuresLimits.venousLimitHigh - venousMaximum : vTreatmentAdjustmentPressuresLimits.venousLimitMax + venousMaximum : Variables.venousValueMax arterilPressure : vTreatmentPressureOcclusion.arterialPressure venousPressure : vTreatmentPressureOcclusion.venousPressure Index: sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentPressuresLimits.qml =================================================================== diff -u -rff8553ddbd24f3b7e4727e78bc74c13e8eb7eeb5 -r1aa53e9869f4c27d53dd9052271ca38befbe22e9 --- sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentPressuresLimits.qml (.../TreatmentAdjustmentPressuresLimits.qml) (revision ff8553ddbd24f3b7e4727e78bc74c13e8eb7eeb5) +++ sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentPressuresLimits.qml (.../TreatmentAdjustmentPressuresLimits.qml) (revision 1aa53e9869f4c27d53dd9052271ca38befbe22e9) @@ -48,40 +48,6 @@ titleText: qsTr("PRESSURES") - //// Note : The slider values are not bound and will be set by user freely - //// and will be used to be sent for adjustment - //// if accepted will not changed and - //// if rejected then will be reset to the values passed by adjustment response - //// - //// reset the flow values to the current flow values - //// function currentFlows() { - //// _bloodFlowSlider.value = vTreatmentBloodFlow. bloodFlow_FlowSetPoint - //// _dialysateFlowSlider.value = vTreatmentDialysateFlow.dialysateFlow_FlowSetPoint - //// } - //// - //// // reset the flow values to the values of the adjustment response - //// function resetFlows() { - //// _bloodFlowSlider.value = vTreatmentAdjustmentFlows. bloodFlow_FlowSetPoint - //// _dialysateFlowSlider.value = vTreatmentAdjustmentFlows.dialysateFlow_FlowSetPoint - //// } - //// - //// onAboutToShow: { - //// // TODO : When Testing data on Setting screen is removed - //// // This needs to be moved into the Treatment______.qml - //// currentFlows() - //// } - //// - //// Connections { target: vTreatmentAdjustmentFlows - //// onAdjustmentTriggered: { - //// if ( vTreatmentAdjustmentFlows.adjustment_Accepted ) { - //// accept() - //// } else { - //// resetFlows() - //// notification.text = vTreatmentAdjustmentFlows.text() - //// } - //// } - //// } - Column { id : _pressuresColumn spacing: 100 anchors.centerIn: parent @@ -90,8 +56,9 @@ anchors.horizontalCenter: parent.horizontalCenter progressColor : Colors.pressuresArterialBar - minimumMargin : 0 - maximumMargin : 25 + minimumMargin : Math.abs(Variables.arterialValueMin - Variables.arterialLimitLowMin ) + maximumMargin : Math.abs(Variables.arterialValueMax - Variables.arterialLimitHighMax) + step: arterialPressureStep } Line { @@ -105,8 +72,9 @@ anchors.horizontalCenter: parent.horizontalCenter progressColor : Colors.pressuresVenousBar - minimumMargin : 50 - maximumMargin : 75 + minimumMargin : Math.abs(Variables.venousValueMin - Variables.venousLimitLowMin ) + maximumMargin : Math.abs(Variables.venousValueMax - Variables.venousLimitHighMax) + step: venousPressureStep } } } Index: sources/main.h =================================================================== diff -u -r4fab8841b1040c8eaa406713ff9bdc8c65b7b6ac -r1aa53e9869f4c27d53dd9052271ca38befbe22e9 --- sources/main.h (.../main.h) (revision 4fab8841b1040c8eaa406713ff9bdc8c65b7b6ac) +++ sources/main.h (.../main.h) (revision 1aa53e9869f4c27d53dd9052271ca38befbe22e9) @@ -127,7 +127,23 @@ PROPERTY_BASE( vTYPE , vVARIABLE , vDEFVALUE , Triggered) \ TRIGGER_SLOT( vTYPE , vVARIABLE) //--------------------------------------------------------------------------------// +#define CONSTANT( vTYPE , vVARIABLE , vDEFVALUE ) \ + /*! \brief Qt Constant Property declaration + \details The Qt Property definition by Q_PROPERTY documentation. + */\ + Q_PROPERTY( vTYPE vVARIABLE \ + READ vVARIABLE \ + CONSTANT) \ + protected: \ + /*! \brief Property getter + \details The property getter which reads the private variable + \return current value + */\ + vTYPE vVARIABLE () const { \ + return vDEFVALUE ; \ + } //--------------------------------------------------------------------------------// +//--------------------------------------------------------------------------------// #define ACTION_VIEW_CONNECTION(vTYPE) \ connect(&_GuiController, SIGNAL(didActionReceive(const vTYPE &)), \ this, SLOT( onActionReceive(const vTYPE &))); Index: sources/model/hd/adjustment/MTreatmentAdjustRequests.h =================================================================== diff -u -rff8553ddbd24f3b7e4727e78bc74c13e8eb7eeb5 -r1aa53e9869f4c27d53dd9052271ca38befbe22e9 --- sources/model/hd/adjustment/MTreatmentAdjustRequests.h (.../MTreatmentAdjustRequests.h) (revision ff8553ddbd24f3b7e4727e78bc74c13e8eb7eeb5) +++ sources/model/hd/adjustment/MTreatmentAdjustRequests.h (.../MTreatmentAdjustRequests.h) (revision 1aa53e9869f4c27d53dd9052271ca38befbe22e9) @@ -289,40 +289,26 @@ */ class MAdjustPressuresLimitsReq : public MModel { - static const qint32 _arterialLimitMin = -300; // constant by PRS354 - static const qint32 _arterialLimitLow = -300; // default by PRS354 - static const qint32 _arterialLimitHigh = +100; // default by PRS355 - static const qint32 _arterialLimitMax = +200; // constant by PRS354 +public: + static const qint32 ArterialLimitLowDef = -300; // PRS354 manufacturing default + static const qint32 ArterialLimitHighDef = +100; // PRS355 manufacturing default + static const qint32 VenousLimitLowDef = -100; // PRS356 manufacturing default + static const qint32 VenousLimitHighDef = +400; // PRS357 manufacturing default - static const qint32 _venousLimitMin = -100; // constant by PRS356 - static const qint32 _venousLimitLow = -100; // default by PRS356 - static const qint32 _venousLimitHigh = +400; // default by PRS357 - static const qint32 _venousLimitMax = +600; // constant by PRS356 - public: - qint32 mArterialLimitMin = _arterialLimitMin ; ///< (S32) Arterial Pressure Limit Min (mmHg) - qint32 mArterialLimitLow = _arterialLimitLow ; ///< (S32) Arterial Pressure Limit Low (mmHg) - qint32 mArterialLimitHigh = _arterialLimitHigh; ///< (S32) Arterial Pressure Limit High (mmHg) - qint32 mArterialLimitMax = _arterialLimitMax ; ///< (S32) Arterial Pressure Limit Max (mmHg) + qint32 mArterialLimitLow = ArterialLimitLowDef ; ///< (S32) Arterial Pressure Limit Low (mmHg) + qint32 mArterialLimitHigh = ArterialLimitHighDef; ///< (S32) Arterial Pressure Limit High (mmHg) + qint32 mVenousLimitLow = VenousLimitLowDef ; ///< (S32) Venous Pressure Limit Low (mmHg) + qint32 mVenousLimitHigh = VenousLimitHighDef ; ///< (S32) Venous Pressure Limit High (mmHg) - qint32 mVenousLimitMin = _venousLimitMin ; ///< (S32) Venous Pressure Limit Min (mmHg) - qint32 mVenousLimitLow = _venousLimitLow ; ///< (S32) Venous Pressure Limit Low (mmHg) - qint32 mVenousLimitHigh = _venousLimitHigh ; ///< (S32) Venous Pressure Limit High (mmHg) - qint32 mVenousLimitMax = _venousLimitMax ; ///< (S32) Venous Pressure Limit Max (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 - ({ mArterialLimitMin , - mArterialLimitLow , + ({ mArterialLimitLow , mArterialLimitHigh , - mArterialLimitMax , - - mVenousLimitMin , mVenousLimitLow , - mVenousLimitHigh , - mVenousLimitMax + mVenousLimitHigh }); } // coco end Index: sources/storage/Logger.cpp =================================================================== diff -u -rcc1e9d6d55c816f3fcd626dc6948cca24da283b3 -r1aa53e9869f4c27d53dd9052271ca38befbe22e9 --- sources/storage/Logger.cpp (.../Logger.cpp) (revision cc1e9d6d55c816f3fcd626dc6948cca24da283b3) +++ sources/storage/Logger.cpp (.../Logger.cpp) (revision 1aa53e9869f4c27d53dd9052271ca38befbe22e9) @@ -269,11 +269,7 @@ logPathName = _logPathNames[eLogDebug]; _logFileName = logPathName + fileName; FileHandler::write(_logFileName, mContent + "\r\n", true); - if (vLogType == eLogDebug) { -#ifdef QT_DEBUG - //mContent.prepend("\033[1;31m --- @ --- \033[0m"); - mContent.prepend(" @ "); -#endif + if (_enableConsoleOut) { qDebug().noquote() << mContent; } } @@ -421,3 +417,20 @@ } } // coco end + +/*! + * \brief Logger::enableConsoleOut + * \details Enables or Disables the console output and logs the status + * \param vEnabled - Enable console output if true + */ +void Logger::enableConsoleOut(bool vEnabled) { + // coco begin validated: This code meant to be used only for debugging and tested manually + if (_enableConsoleOut == vEnabled) return; + _enableConsoleOut = vEnabled; + if (_enableConsoleOut) { + LOG_DEBUG("Console out Logging enabled"); + } else { + LOG_DEBUG("Console out Logging disabled"); + } +} +// coco end Index: sources/storage/Logger.h =================================================================== diff -u -rcc1e9d6d55c816f3fcd626dc6948cca24da283b3 -r1aa53e9869f4c27d53dd9052271ca38befbe22e9 --- sources/storage/Logger.h (.../Logger.h) (revision cc1e9d6d55c816f3fcd626dc6948cca24da283b3) +++ sources/storage/Logger.h (.../Logger.h) (revision 1aa53e9869f4c27d53dd9052271ca38befbe22e9) @@ -122,17 +122,22 @@ const char *_dateFormat = "yyyy_MM_dd"; const char *_timeFormat = "HH:mm:ss"; - const char *_dateSeparator = "_"; // used in filename + const char *_dateSeparator = "_"; // used in filename const char *_separator = ","; - QString _logFileName = ""; + bool _enableConsoleOut = false; + QString _logFileName = ""; + QFutureWatcher _exportLogsWatcher; QFutureWatcher _removeLogsWatcher; QThread *_thread = nullptr; bool _init = false; +public: + void enableConsoleOut(bool vEnabled); + public slots: bool init(); bool init(QThread &vThread); Index: sources/view/hd/adjustment/VTreatmentAdjustmentPressuresLimits.cpp =================================================================== diff -u -r604a782b50c9fc749c3bd71485e285c1070f1e01 -r1aa53e9869f4c27d53dd9052271ca38befbe22e9 --- sources/view/hd/adjustment/VTreatmentAdjustmentPressuresLimits.cpp (.../VTreatmentAdjustmentPressuresLimits.cpp) (revision 604a782b50c9fc749c3bd71485e285c1070f1e01) +++ sources/view/hd/adjustment/VTreatmentAdjustmentPressuresLimits.cpp (.../VTreatmentAdjustmentPressuresLimits.cpp) (revision 1aa53e9869f4c27d53dd9052271ca38befbe22e9) @@ -33,11 +33,13 @@ { 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 -rff8553ddbd24f3b7e4727e78bc74c13e8eb7eeb5 -r1aa53e9869f4c27d53dd9052271ca38befbe22e9 --- sources/view/hd/adjustment/VTreatmentAdjustmentPressuresLimits.h (.../VTreatmentAdjustmentPressuresLimits.h) (revision ff8553ddbd24f3b7e4727e78bc74c13e8eb7eeb5) +++ sources/view/hd/adjustment/VTreatmentAdjustmentPressuresLimits.h (.../VTreatmentAdjustmentPressuresLimits.h) (revision 1aa53e9869f4c27d53dd9052271ca38befbe22e9) @@ -47,17 +47,16 @@ // coco end // Treatment pressures limits data - PROPERTY( qint32 , arterialLimitMin , _data.mArterialLimitMin ) // constant by PRS354 - PROPERTY( qint32 , arterialLimitLow , _data.mArterialLimitLow ) // default by PRS354 - PROPERTY( qint32 , arterialLimitHigh , _data.mArterialLimitHigh ) // default by PRS355 - PROPERTY( qint32 , arterialLimitMax , _data.mArterialLimitMax ) // constant by PRS354 + PROPERTY( qint32 , arterialLimitLow , _data.ArterialLimitLowDef ) + PROPERTY( qint32 , arterialLimitHigh , _data.ArterialLimitHighDef ) + PROPERTY( qint32 , venousLimitLow , _data.VenousLimitLowDef ) + PROPERTY( qint32 , venousLimitHigh , _data.VenousLimitHighDef ) - PROPERTY( qint32 , venousLimitMin , _data.mVenousLimitMin ) // constant by PRS356 - PROPERTY( qint32 , venousLimitLow , _data.mVenousLimitLow ) // default by PRS356 - PROPERTY( qint32 , venousLimitHigh , _data.mVenousLimitHigh ) // default by PRS357 - PROPERTY( qint32 , venousLimitMax , _data.mVenousLimitMax ) // constant by PRS356 + CONSTANT( qint32 , arterialLimitLowDef , _data.ArterialLimitLowDef ) // default by PRS354 + CONSTANT( qint32 , arterialLimitHighDef , _data.ArterialLimitHighDef ) // default by PRS355 + CONSTANT( qint32 , venousLimitLowDef , _data.VenousLimitLowDef ) // default by PRS356 + CONSTANT( qint32 , venousLimitHighDef , _data.VenousLimitHighDef ) // default by PRS357 - VIEW_DEC_CLASS_ADJUSTMENT(VTreatmentAdjustmentPressuresLimits, AdjustPressuresLimitsResponseData) // ----- Adjust Pressures Limits @@ -70,10 +69,10 @@ * \param vVenousLimitLow * \param vVenousLimitHigh */ - void doAdjustment( qint32 vArterialLimitLow , - qint32 vArterialLimitHigh, - qint32 vVenousLimitLow , - qint32 vVenousLimitHigh ) { + void doAdjustment( qint32 vArterialLimitLow , + qint32 vArterialLimitHigh , + qint32 vVenousLimitLow , + qint32 vVenousLimitHigh ) { _data.mArterialLimitLow = vArterialLimitLow ; _data.mArterialLimitHigh = vArterialLimitHigh; _data.mVenousLimitLow = vVenousLimitLow ;