Index: denali.pro =================================================================== diff -u -rb61d8a3e01fef66eee8095c9cddf835d9bb32b66 -rc241fc1d31be3e4958582dff94de8189f5bbba67 --- denali.pro (.../denali.pro) (revision b61d8a3e01fef66eee8095c9cddf835d9bb32b66) +++ denali.pro (.../denali.pro) (revision c241fc1d31be3e4958582dff94de8189f5bbba67) @@ -278,11 +278,8 @@ VER_MINOR="\\\"${minorVersion}\\\"" \ VER_MICRO="\\\"${microVersion}\\\"" \ VER_REVIS="\\\"${buildNumber}\\\"" \ - VER_MAJOR_DEV=\\\"0\\\" \ - VER_MINOR_DEV=\\\"0\\\" \ - VER_MICRO_DEV=\\\"0\\\" \ VER_REVIS_DEV=\\\"$$system( date "+%m%d%H%M" )\\\" \ - VER_APPLY=\\\"$$system( touch -m main.cpp )\\\" \ + VER_APPLY=\\\"$$system( touch -m main.cpp )\\\" \ VER_BRANCH=\\\"$$system( git rev-parse --abbrev-ref HEAD )\\\" CodeCoverage { Index: denali.pro.user =================================================================== diff -u -rfef971047be21dd255a497fbf54c170316d617a9 -rc241fc1d31be3e4958582dff94de8189f5bbba67 --- denali.pro.user (.../denali.pro.user) (revision fef971047be21dd255a497fbf54c170316d617a9) +++ denali.pro.user (.../denali.pro.user) (revision c241fc1d31be3e4958582dff94de8189f5bbba67) @@ -1,6 +1,6 @@ - + EnvironmentId @@ -89,7 +89,7 @@ Desktop Qt 5.12.5 GCC 64bit Desktop Qt 5.12.5 GCC 64bit qt.qt5.5125.gcc_64_kit - 0 + 9 0 0 @@ -1176,7 +1176,7 @@ false true - /home/denali/Projects/tmp/build/denali-Desktop_Qt_5_12_5_GCC_64bit-Debug + /home/denali/Projects/tmp/build/unittest/tst_views 1 @@ -1187,7 +1187,7 @@ Qt 5.12.5 (iMX8) Qt 5.12.5 (iMX8) {5d6458ef-f917-4aef-a092-c77bbe106149} - 1 + 0 0 0 Index: sources/gui/GuiGlobals.h =================================================================== diff -u -rb61d8a3e01fef66eee8095c9cddf835d9bb32b66 -rc241fc1d31be3e4958582dff94de8189f5bbba67 --- sources/gui/GuiGlobals.h (.../GuiGlobals.h) (revision b61d8a3e01fef66eee8095c9cddf835d9bb32b66) +++ sources/gui/GuiGlobals.h (.../GuiGlobals.h) (revision c241fc1d31be3e4958582dff94de8189f5bbba67) @@ -6,8 +6,8 @@ * WHOLE, WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER. * * \file GuiGlobals.h - * \author (last) Peter Lucia - * \date (last) 15-Oct-2020 + * \author (last) Behrouz NematiPour + * \date (last) 16-Oct-2020 * \author (original) Behrouz NematiPour * \date (original) 26-Aug-2020 * @@ -148,12 +148,6 @@ Timeout = 0x01, }; - enum Saline_States { // FW currently doesn't have enum for Saline Bolus when provided better to be replaced. - SALINE_STOP_STATE = 0, ///< Saline is not delivered - SALINE_START_STATE , ///< Saline being Delivered - SALINE_DISABLE_STATE , ///< Saline cumulative volume delivery has reached the maximum - }; - Q_ENUM(GuiActionsType_Enum) Q_ENUM(GuiActionsData_Enum) @@ -169,7 +163,7 @@ Q_ENUM(UF_Adjustments) Q_ENUM(Treatment_States) Q_ENUM(UF_States) - Q_ENUM(Saline_States) + Q_ENUM(Saline_Bolus_States) #include "DGDefs.h" Q_ENUM(DG_Op_Modes) @@ -188,9 +182,9 @@ typedef GuiActions::DG_Op_Modes GuiDGOpModes; typedef GuiActions::UF_Adjustments GuiUFAdjustment; - typedef GuiActions::Treatment_States GuiTreatment_States; + typedef GuiActions::Treatment_States GuiTreatmentStates; typedef GuiActions::UF_States GuiUFStates; - typedef GuiActions::Saline_States GuiSalineStates; + typedef GuiActions::Saline_Bolus_States GuiSalineStates; void registerTypes(); void registerQmlTypes(); Index: sources/gui/qml/pages/treatment/TreatmentStack.qml =================================================================== diff -u -r0583a63307936f09e184dfe16acca25f9e3fd81c -rc241fc1d31be3e4958582dff94de8189f5bbba67 --- sources/gui/qml/pages/treatment/TreatmentStack.qml (.../TreatmentStack.qml) (revision 0583a63307936f09e184dfe16acca25f9e3fd81c) +++ sources/gui/qml/pages/treatment/TreatmentStack.qml (.../TreatmentStack.qml) (revision c241fc1d31be3e4958582dff94de8189f5bbba67) @@ -6,8 +6,8 @@ * WHOLE, WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER. * * \file TreatmentStack.qml - * \author (last) Peter Lucia - * \date (last) 02-Sep-2020 + * \author (last) Behrouz NematiPour + * \date (last) 16-Oct-2020 * \author (original) Behrouz NematiPour * \date (original) 27-Jan-2020 * @@ -42,7 +42,7 @@ VTreatmentAdjustmentSaline { id: vTreatmentAdjustmentSaline } VHDTreatmentStates { id: vHDTreatmentStates property bool ufPaused : ufState === GuiActions.UF_PAUSED_STATE - property bool txPaused : subMode === GuiActions.TREATMENT_DIALYSIS_STATE + property bool txPaused : subMode !== GuiActions.TREATMENT_DIALYSIS_STATE } // Components Index: sources/model/MModel.h =================================================================== diff -u -rb61d8a3e01fef66eee8095c9cddf835d9bb32b66 -rc241fc1d31be3e4958582dff94de8189f5bbba67 --- sources/model/MModel.h (.../MModel.h) (revision b61d8a3e01fef66eee8095c9cddf835d9bb32b66) +++ sources/model/MModel.h (.../MModel.h) (revision c241fc1d31be3e4958582dff94de8189f5bbba67) @@ -6,8 +6,8 @@ * WHOLE, WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER. * * \file MModel.h - * \author (last) Peter Lucia - * \date (last) 15-Oct-2020 + * \author (last) Behrouz NematiPour + * \date (last) 16-Oct-2020 * \author (original) Behrouz NemaiPour * \date (original) 02-Jul-2020 * Index: sources/model/hd/adjustment/MTreatmentAdjustRequests.h =================================================================== diff -u -r0583a63307936f09e184dfe16acca25f9e3fd81c -rc241fc1d31be3e4958582dff94de8189f5bbba67 --- sources/model/hd/adjustment/MTreatmentAdjustRequests.h (.../MTreatmentAdjustRequests.h) (revision 0583a63307936f09e184dfe16acca25f9e3fd81c) +++ sources/model/hd/adjustment/MTreatmentAdjustRequests.h (.../MTreatmentAdjustRequests.h) (revision c241fc1d31be3e4958582dff94de8189f5bbba67) @@ -7,7 +7,7 @@ * * \file MTreatmentAdjustRequests.h * \author (last) Behrouz NematiPour - * \date (last) 25-Sep-2020 + * \date (last) 16-Oct-2020 * \author (original) Behrouz NemaiPour * \date (original) 02-Jul-2020 * Index: sources/model/hd/alarm/MAlarmStatusData.h =================================================================== diff -u -rb61d8a3e01fef66eee8095c9cddf835d9bb32b66 -rc241fc1d31be3e4958582dff94de8189f5bbba67 --- sources/model/hd/alarm/MAlarmStatusData.h (.../MAlarmStatusData.h) (revision b61d8a3e01fef66eee8095c9cddf835d9bb32b66) +++ sources/model/hd/alarm/MAlarmStatusData.h (.../MAlarmStatusData.h) (revision c241fc1d31be3e4958582dff94de8189f5bbba67) @@ -7,7 +7,7 @@ * * \file MAlarmStatusData.h * \author (last) Behrouz NematiPour - * \date (last) 25-Sep-2020 + * \date (last) 16-Oct-2020 * \author (original) Behrouz NemaiPour * \date (original) 02-Jul-2020 *