Index: denali.pro.user =================================================================== diff -u -r54b6ca60bd6dbd679bb759a110675eee1de8872a -r093155324dda47cba65693b72a2d1b0290d0c29a --- denali.pro.user (.../denali.pro.user) (revision 54b6ca60bd6dbd679bb759a110675eee1de8872a) +++ denali.pro.user (.../denali.pro.user) (revision 093155324dda47cba65693b72a2d1b0290d0c29a) @@ -1,6 +1,6 @@ - + EnvironmentId Index: resources/images/Logo d-Qt-mod1.png =================================================================== diff -u -r108450c58851ff7c48c4607494b8cdae59952908 -r093155324dda47cba65693b72a2d1b0290d0c29a Binary files differ Index: sources/bluetooth/BluetoothInterface.cpp =================================================================== diff -u -r27331dcb133e4d400eef25d5595c3b277e79504c -r093155324dda47cba65693b72a2d1b0290d0c29a --- sources/bluetooth/BluetoothInterface.cpp (.../BluetoothInterface.cpp) (revision 27331dcb133e4d400eef25d5595c3b277e79504c) +++ sources/bluetooth/BluetoothInterface.cpp (.../BluetoothInterface.cpp) (revision 093155324dda47cba65693b72a2d1b0290d0c29a) @@ -1113,7 +1113,7 @@ * \param vDiastolic - Diastolic Viral value * \param vPulseRate - Pulse Rate Viral value */ -void BluetoothInterface::mimic( quint16 vSystolic , +void BluetoothInterface::mimic(quint16 vSystolic , quint16 vDiastolic , quint16 vPulseRate ) { MUIBloodPressure model(vSystolic , Index: sources/bluetooth/BluetoothInterface.h =================================================================== diff -u -r27331dcb133e4d400eef25d5595c3b277e79504c -r093155324dda47cba65693b72a2d1b0290d0c29a --- sources/bluetooth/BluetoothInterface.h (.../BluetoothInterface.h) (revision 27331dcb133e4d400eef25d5595c3b277e79504c) +++ sources/bluetooth/BluetoothInterface.h (.../BluetoothInterface.h) (revision 093155324dda47cba65693b72a2d1b0290d0c29a) @@ -78,9 +78,9 @@ public: bool isValid( ) const { return _isValid ; } void valid(bool vValid) { _isValid = vValid; } - void mimic(const quint16 vSystolic , - const quint16 vDiastolic , - const quint16 vPulseRate ); + void mimic(quint16 vSystolic , + quint16 vDiastolic , + quint16 vPulseRate ); protected: void timerEvent(QTimerEvent *event) override; Index: sources/gui/qml/pages/pretreatment/create/PreTreatmentCreate.qml =================================================================== diff -u -r54b6ca60bd6dbd679bb759a110675eee1de8872a -r093155324dda47cba65693b72a2d1b0290d0c29a --- sources/gui/qml/pages/pretreatment/create/PreTreatmentCreate.qml (.../PreTreatmentCreate.qml) (revision 54b6ca60bd6dbd679bb759a110675eee1de8872a) +++ sources/gui/qml/pages/pretreatment/create/PreTreatmentCreate.qml (.../PreTreatmentCreate.qml) (revision 093155324dda47cba65693b72a2d1b0290d0c29a) @@ -226,10 +226,6 @@ let slider = _arterialPressureLimits let color = Colors.textDisableButton if ( slider.minAdjusted && slider.maxAdjusted ) { - // if ( ! slider.valid ) { - // color = Colors.createTreatmentInvalidParam - // return - // } color = Colors.textMain } return color @@ -278,12 +274,10 @@ upperTextHorizontalCenter : true minText.visible : true - // minText.font.pixelSize : Fonts.fontPixelFluidText minText.font.bold : false minVerticalEdgeVisible : false maxText.visible : true - // maxText.font.pixelSize : Fonts.fontPixelFluidText maxText.font.bold : false maxVerticalEdgeVisible : false @@ -318,10 +312,6 @@ let slider = _venousPressureLimits let color = Colors.textDisableButton if ( slider.minAdjusted && slider.maxAdjusted ) { - // if ( ! slider.valid ) { - // color = Colors.createTreatmentInvalidParam - // return - // } color = Colors.textMain } return color @@ -370,12 +360,10 @@ upperTextHorizontalCenter : true minText.visible : true - // minText.font.pixelSize : Fonts.fontPixelFluidText minText.font.bold : false minVerticalEdgeVisible : false maxText.visible : true - // maxText.font.pixelSize : Fonts.fontPixelFluidText maxText.font.bold : false maxVerticalEdgeVisible : false Index: sources/model/hd/alarm/MAlarmMapping.cpp =================================================================== diff -u -r93ad311a34d2ce33fd4ca11edcfbb48e0b8cdd00 -r093155324dda47cba65693b72a2d1b0290d0c29a --- sources/model/hd/alarm/MAlarmMapping.cpp (.../MAlarmMapping.cpp) (revision 93ad311a34d2ce33fd4ca11edcfbb48e0b8cdd00) +++ sources/model/hd/alarm/MAlarmMapping.cpp (.../MAlarmMapping.cpp) (revision 093155324dda47cba65693b72a2d1b0290d0c29a) @@ -7,7 +7,7 @@ * * \file MAlarmMapping.cpp * \author (last) Behrouz NematiPour - * \date (last) 19-Jan-2022 + * \date (last) 01-Feb-2022 * \author (original) Behrouz NematiPour * \date (original) 03-May-2021 *