Index: denali.pro.user =================================================================== diff -u -r526875e8db8cf0c97f5cd8aa90564e41d42f5fde -r4e035c96c971fb8ec19fb030d9120046697b6e71 --- denali.pro.user (.../denali.pro.user) (revision 526875e8db8cf0c97f5cd8aa90564e41d42f5fde) +++ denali.pro.user (.../denali.pro.user) (revision 4e035c96c971fb8ec19fb030d9120046697b6e71) @@ -1,6 +1,6 @@ - + EnvironmentId @@ -1213,7 +1213,7 @@ denali Qt4ProjectManager.Qt4RunConfiguration:/home/denali/Projects/application/denali.pro - -l -q + -l -q -d 3768 false true Index: sources/gui/qml/globals/Variables.qml =================================================================== diff -u -r27cc308ff5113a9386899d3c8f8b29962a8498e1 -r4e035c96c971fb8ec19fb030d9120046697b6e71 --- sources/gui/qml/globals/Variables.qml (.../Variables.qml) (revision 27cc308ff5113a9386899d3c8f8b29962a8498e1) +++ sources/gui/qml/globals/Variables.qml (.../Variables.qml) (revision 4e035c96c971fb8ec19fb030d9120046697b6e71) @@ -222,7 +222,7 @@ readonly property string unitTextDuration : qsTr("min") // - Flows readonly property string unitTextFlowRate : qsTr("mL/min") - readonly property string unitTextDispencingRate : qsTr("mL/hr") + readonly property string unitTextDispensingRate : qsTr("mL/hr") // - Vitals readonly property string unitTextBloodPressure : qsTr("mmHg") readonly property string unitTextHeartBeat : qsTr("BPM" ) Index: sources/gui/qml/pages/pretreatment/create/PreTreatmentCreate.qml =================================================================== diff -u -r27cc308ff5113a9386899d3c8f8b29962a8498e1 -r4e035c96c971fb8ec19fb030d9120046697b6e71 --- sources/gui/qml/pages/pretreatment/create/PreTreatmentCreate.qml (.../PreTreatmentCreate.qml) (revision 27cc308ff5113a9386899d3c8f8b29962a8498e1) +++ sources/gui/qml/pages/pretreatment/create/PreTreatmentCreate.qml (.../PreTreatmentCreate.qml) (revision 4e035c96c971fb8ec19fb030d9120046697b6e71) @@ -113,7 +113,7 @@ objectName : "_heparinDispensingRate" label : qsTr("Heparin Dispensing Rate") flickable : _flickable - unit : Variables.unitTextDispencingRate + unit : Variables.unitTextDispensingRate value : vTreatmentCreate.heparinDispensingRate decimal : Variables.heparinPrecision minimum : vTreatmentCreate.heparinDispensingRateMin Index: sources/gui/qml/pages/treatment/sections/TreatmentHeparin.qml =================================================================== diff -u -r27cc308ff5113a9386899d3c8f8b29962a8498e1 -r4e035c96c971fb8ec19fb030d9120046697b6e71 --- sources/gui/qml/pages/treatment/sections/TreatmentHeparin.qml (.../TreatmentHeparin.qml) (revision 27cc308ff5113a9386899d3c8f8b29962a8498e1) +++ sources/gui/qml/pages/treatment/sections/TreatmentHeparin.qml (.../TreatmentHeparin.qml) (revision 4e035c96c971fb8ec19fb030d9120046697b6e71) @@ -88,7 +88,7 @@ isStopped ? _private.mesgStopped : isCompleted ? _private.mesgCompleted : isEmpty ? _private.mesgEmpty : - isDispensing ? _private.mesgDispencing : + isDispensing ? _private.mesgDispensing : _private.mesgRejectReason } } Index: sources/model/hd/alarm/MAlarmMapping.cpp =================================================================== diff -u -r7e6bd1a0207463711b6b52924315a2c39260c326 -r4e035c96c971fb8ec19fb030d9120046697b6e71 --- sources/model/hd/alarm/MAlarmMapping.cpp (.../MAlarmMapping.cpp) (revision 7e6bd1a0207463711b6b52924315a2c39260c326) +++ sources/model/hd/alarm/MAlarmMapping.cpp (.../MAlarmMapping.cpp) (revision 4e035c96c971fb8ec19fb030d9120046697b6e71) @@ -7,7 +7,7 @@ * * \file MAlarmMapping.cpp * \author (last) Behrouz NematiPour - * \date (last) 16-Feb-2022 + * \date (last) 17-Feb-2022 * \author (original) Behrouz NematiPour * \date (original) 03-May-2021 * Index: sources/storage/TreatmentLog.h =================================================================== diff -u -r27cc308ff5113a9386899d3c8f8b29962a8498e1 -r4e035c96c971fb8ec19fb030d9120046697b6e71 --- sources/storage/TreatmentLog.h (.../TreatmentLog.h) (revision 27cc308ff5113a9386899d3c8f8b29962a8498e1) +++ sources/storage/TreatmentLog.h (.../TreatmentLog.h) (revision 4e035c96c971fb8ec19fb030d9120046697b6e71) @@ -58,7 +58,7 @@ QString _unitTextVolume = tr("L" ); QString _unitTextFluid = tr("mL" ); QString _unitTextHeparinConcentration = tr("IU/mL" ); - QString _unitTextDispencingRate = tr("mL/hr" ); + QString _unitTextDispensingRate = tr("mL/hr" ); QString _unitTextBloodPressure = tr("mmHg" ); struct TxInfo { @@ -178,7 +178,7 @@ "" , // eHeparinType _unitTextHeparinConcentration , // eHeparinConcentration _unitTextFluid , // eHeparinBolusVolume - _unitTextDispencingRate , // eHeparinDispenseRate + _unitTextDispensingRate , // eHeparinDispenseRate _unitTextDurationMin , // eHeparinStop _unitTextFluid , // eHeparinDeliveredVolume "" , // eTreatmentStartDateTime