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();