Index: sources/gui/qml/components/GridSelection.qml =================================================================== diff -u -rc9f8f8cf3c6c37fc6460d8675c62c9442c4d4263 -rcc8ee87091a1f5d69136f6e5508f57014c05d02d --- sources/gui/qml/components/GridSelection.qml (.../GridSelection.qml) (revision c9f8f8cf3c6c37fc6460d8675c62c9442c4d4263) +++ sources/gui/qml/components/GridSelection.qml (.../GridSelection.qml) (revision cc8ee87091a1f5d69136f6e5508f57014c05d02d) @@ -34,6 +34,7 @@ property int optionHeight : Variables.gridSelectionButtonHeight property int optionWidth : Variables.gridSelectionButtonWidth property alias title : _title.text + property alias titleColor : _title.color property var labels : [] property bool active : false Index: sources/gui/qml/pages/pretreatment/create/PreTreatmentCreate.qml =================================================================== diff -u -r150b5087898dbfbd1947e7842fed2a20f4286a82 -rcc8ee87091a1f5d69136f6e5508f57014c05d02d --- sources/gui/qml/pages/pretreatment/create/PreTreatmentCreate.qml (.../PreTreatmentCreate.qml) (revision 150b5087898dbfbd1947e7842fed2a20f4286a82) +++ sources/gui/qml/pages/pretreatment/create/PreTreatmentCreate.qml (.../PreTreatmentCreate.qml) (revision cc8ee87091a1f5d69136f6e5508f57014c05d02d) @@ -61,6 +61,12 @@ function onHeparinBolusVolumeRejectReasonChanged() { _flickable.setFlickableFocus(! _heparinBolusVolume.valid, _heparinBolusVolume.y )} function onHeparinStopTimeRejectReasonChanged() { _flickable.setFlickableFocus(! _heparinStopTime.valid, _heparinStopTime.y )} function onSalineBolusVolumeRejectReasonChanged() { _flickable.setFlickableFocus(! _salineBolus.valid, _salineBolus.y )} + + function onHeparinTypeRejectReasonChanged() { _flickable.setFlickableFocus(! _heparinType.valid, _heparinType.y )} + function onAcidConcentrateRejectReasonChanged() { _flickable.setFlickableFocus(! _acidConcentrate.valid, _acidConcentrate.y )} + function onBicarbonateConcentrateRejectReasonChanged() { _flickable.setFlickableFocus(! _bicarbonateConcentrate.valid, _bicarbonateConcentrate.y )} + function onDialyzerTypeRejectReasonChanged() { _flickable.setFlickableFocus(! _dialyzerType.valid, _dialyzerType.y )} + function onDialysateTempRejectReasonChanged() { _flickable.setFlickableFocus(! _dialysateTemperature.valid, _dialysateTemperature.y )} function onVenousPressureLimitLowRejectReasonChanged() { _flickable.setFlickableFocus(! _venousPressureLimits.lowerBoundValid, _venousPressureLimits.y )} function onVenousPressureLimitHighRejectReasonChanged() { _flickable.setFlickableFocus(! _venousPressureLimits.upperBoundValid, _venousPressureLimits.y )} @@ -418,27 +424,31 @@ GridSelection { id : _heparinType objectName : "_heparinTypeRect" title : qsTr("Heparin Type") + titleColor : !vTreatmentCreate.heparinTypeRejectReason ? Colors.textMain : Colors.createTreatmentInvalidParam labels : vTreatmentRanges.heparinTypeOptions onClicked :{vTreatmentCreate.heparinType = curIndex ; vTreatmentCreate.heparinTypeSet = true; } } GridSelection { id : _acidConcentrate objectName : "_acidConcentrateRect" title : qsTr("Acid Concentrate") + titleColor : !vTreatmentCreate.acidConcentrateRejectReason ? Colors.textMain : Colors.createTreatmentInvalidParam labels : vTreatmentRanges.acidConcentrateOptions onClicked :{vTreatmentCreate.acidConcentrate = curIndex ; vTreatmentCreate.acidConcentrateSet = true; } } GridSelection { id : _bicarbonateConcentrate objectName : "_bicarbonateConcentrateRect" title : qsTr("Bicarbonate Concentrate") + titleColor : !vTreatmentCreate.bicarbonateConcentrateRejectReason ? Colors.textMain : Colors.createTreatmentInvalidParam labels : vTreatmentRanges.bicarbonateConcentrateOptions onClicked :{vTreatmentCreate.bicarbonateConcentrate = curIndex ; vTreatmentCreate.bicarbonateConcentrateSet = true; } } GridSelection { id : _dialyzerType objectName : "_dialyzerTypeRect" title : qsTr("Dialyzer Type") + titleColor : !vTreatmentCreate.dialyzerTypeRejectReason ? Colors.textMain : Colors.createTreatmentInvalidParam labels : vTreatmentRanges.dialyzerTypeOptions onClicked :{vTreatmentCreate.dialyzerType = curIndex ; vTreatmentCreate.dialyzerTypeSet = true; } } Index: sources/model/hd/alarm/MAlarmMapping.cpp =================================================================== diff -u -r6a839546d4969b335dcfae786c566a26980aa55a -rcc8ee87091a1f5d69136f6e5508f57014c05d02d --- sources/model/hd/alarm/MAlarmMapping.cpp (.../MAlarmMapping.cpp) (revision 6a839546d4969b335dcfae786c566a26980aa55a) +++ sources/model/hd/alarm/MAlarmMapping.cpp (.../MAlarmMapping.cpp) (revision cc8ee87091a1f5d69136f6e5508f57014c05d02d) @@ -7,7 +7,7 @@ * * \file MAlarmMapping.cpp * \author (last) Behrouz NematiPour - * \date (last) 21-Mar-2023 + * \date (last) 30-Mar-2023 * \author (original) Behrouz NematiPour * \date (original) 03-May-2021 * Index: sources/view/VTreatmentCreate.cpp =================================================================== diff -u -r6712a4779cf81ad4d16ca070c7accb5c8de45fdd -rcc8ee87091a1f5d69136f6e5508f57014c05d02d --- sources/view/VTreatmentCreate.cpp (.../VTreatmentCreate.cpp) (revision 6712a4779cf81ad4d16ca070c7accb5c8de45fdd) +++ sources/view/VTreatmentCreate.cpp (.../VTreatmentCreate.cpp) (revision cc8ee87091a1f5d69136f6e5508f57014c05d02d) @@ -115,6 +115,12 @@ heparinBolusVolumeRejectReason (data.heparinBolusVolume ); heparinStopTimeRejectReason (data.heparinStopTime ); salineBolusVolumeRejectReason (data.salineBolus ); + + heparinTypeRejectReason (data.heparinType ); + acidConcentrateRejectReason (data.acidConcentrate ); + bicarbonateConcentrateRejectReason (data.bicarbonateConcentrate ); + dialyzerTypeRejectReason (data.dialyzerType ); + dialysateTempRejectReason (data.dialysateTemp ); arterialPressureLimitLowRejectReason (data.arterialPressureLimitLow ); arterialPressureLimitHighRejectReason (data.arterialPressureLimitHigh ); Index: sources/view/VTreatmentCreate.h =================================================================== diff -u -r6712a4779cf81ad4d16ca070c7accb5c8de45fdd -rcc8ee87091a1f5d69136f6e5508f57014c05d02d --- sources/view/VTreatmentCreate.h (.../VTreatmentCreate.h) (revision 6712a4779cf81ad4d16ca070c7accb5c8de45fdd) +++ sources/view/VTreatmentCreate.h (.../VTreatmentCreate.h) (revision cc8ee87091a1f5d69136f6e5508f57014c05d02d) @@ -105,6 +105,12 @@ TRIGGER (quint32 , heparinBolusVolumeRejectReason , 0 ) TRIGGER (quint32 , heparinStopTimeRejectReason , 0 ) TRIGGER (quint32 , salineBolusVolumeRejectReason , 0 ) + + TRIGGER(quint32 , heparinTypeRejectReason , 0 ) + TRIGGER(quint32 , acidConcentrateRejectReason , 0 ) + TRIGGER(quint32 , bicarbonateConcentrateRejectReason , 0 ) + TRIGGER(quint32 , dialyzerTypeRejectReason , 0 ) + TRIGGER (quint32 , dialysateTempRejectReason , 0 ) TRIGGER (quint32 , arterialPressureLimitLowRejectReason , 0 ) TRIGGER (quint32 , arterialPressureLimitHighRejectReason , 0 )