Index: sources/ApplicationController.cpp =================================================================== diff -u -r64484a210332da6b2dcf3f0a23cb6c59f4caaf98 -rd17a7a6adf72a6224280548e2341dfce22bf72c7 --- sources/ApplicationController.cpp (.../ApplicationController.cpp) (revision 64484a210332da6b2dcf3f0a23cb6c59f4caaf98) +++ sources/ApplicationController.cpp (.../ApplicationController.cpp) (revision d17a7a6adf72a6224280548e2341dfce22bf72c7) @@ -105,6 +105,8 @@ this , SLOT(onMainTimerTimeout())); // From GUI + connect(&_GuiController , SIGNAL(didActionTransmit(GuiActionType, const QVariantList &)), + this , SLOT( onActionTransmit(GuiActionType, const QVariantList &))); connect(&_GuiController , SIGNAL(didQuitApplication()), this , SLOT( onQuitApplication())); connect(&_GuiController , SIGNAL(didTreatmentRangesDone(bool)), @@ -205,6 +207,17 @@ } /*! +* \brief Process the requested action +* \details Processes the requested action +* \param vAction - User requested Action +* \param vData - Action data to be transmitted. +*/ +void ApplicationController::onActionTransmit(GuiActionType vAction, const QVariantList &vData) +{ + emit didActionTransmit(vAction, vData); +} + +/*! * \brief An action has been confirmed * \details GUI requested an action. * In response HD confirmed the action. @@ -352,8 +365,7 @@ else { mData += static_cast(GuiActionData::NoData); } -// TODO ask behrouz what this method does ************************ -// onActionTransmit(GuiActionType::ID_TDCheckIn, mData); + onActionTransmit(GuiActionType::ID_TDCheckIn, mData); #endif } Index: sources/ApplicationController.h =================================================================== diff -u -r64484a210332da6b2dcf3f0a23cb6c59f4caaf98 -rd17a7a6adf72a6224280548e2341dfce22bf72c7 --- sources/ApplicationController.h (.../ApplicationController.h) (revision 64484a210332da6b2dcf3f0a23cb6c59f4caaf98) +++ sources/ApplicationController.h (.../ApplicationController.h) (revision d17a7a6adf72a6224280548e2341dfce22bf72c7) @@ -90,6 +90,7 @@ private slots: // Should be private for thread safety and is connected internally. void onActionReceive (GuiActionType vAction, const QVariantList &vData); // UI <= TD/DD + void onActionTransmit(GuiActionType vAction, const QVariantList &vData); // UI => TD/DD void onMainTimerTimeout(); Index: sources/gui/qml/PowerItem.qml =================================================================== diff -u -raa2a5931f6ba6087d1f0afb300da9494ed4951c5 -rd17a7a6adf72a6224280548e2341dfce22bf72c7 --- sources/gui/qml/PowerItem.qml (.../PowerItem.qml) (revision aa2a5931f6ba6087d1f0afb300da9494ed4951c5) +++ sources/gui/qml/PowerItem.qml (.../PowerItem.qml) (revision d17a7a6adf72a6224280548e2341dfce22bf72c7) @@ -42,7 +42,6 @@ messageText : vConfirm.message confirmText : vConfirm.confirm cancelText : vConfirm.cancel -// confirmVisible : ! vConfirm.isReject notificationText: vConfirm.adjustment_ReasonText autoClose : false Index: sources/gui/qml/pages/settings/SettingsStack.qml =================================================================== diff -u -r16028b057650dab9f5a2f27eaba5c9618c29dd9a -rd17a7a6adf72a6224280548e2341dfce22bf72c7 --- sources/gui/qml/pages/settings/SettingsStack.qml (.../SettingsStack.qml) (revision 16028b057650dab9f5a2f27eaba5c9618c29dd9a) +++ sources/gui/qml/pages/settings/SettingsStack.qml (.../SettingsStack.qml) (revision d17a7a6adf72a6224280548e2341dfce22bf72c7) @@ -172,6 +172,7 @@ _root.currentItem = vIndex vDevice.status = "" switch (vIndex) { + case SettingsStack.Information: vAdjustmentVersions .doAdjustment() vAdjustmentServiceDates .doAdjustment() Index: sources/model/MModel.h =================================================================== diff -u -re07cde120d7476c4add90c4f86cf55af9ea830de -rd17a7a6adf72a6224280548e2341dfce22bf72c7 --- sources/model/MModel.h (.../MModel.h) (revision e07cde120d7476c4add90c4f86cf55af9ea830de) +++ sources/model/MModel.h (.../MModel.h) (revision d17a7a6adf72a6224280548e2341dfce22bf72c7) @@ -28,7 +28,6 @@ #include "MAlarmCleared.h" #include "MAlarmActiveList.h" #include "MAdjustHDAlarmVolumeResponse.h" - #include "MDuetConfirmTDi.h" // POST Index: sources/model/hd/adjustment/treatment/MTreatmentAdjustRequests.h =================================================================== diff -u -r5ed84841f5852381b2e36328c0aeca7bc97b9c03 -rd17a7a6adf72a6224280548e2341dfce22bf72c7 --- sources/model/hd/adjustment/treatment/MTreatmentAdjustRequests.h (.../MTreatmentAdjustRequests.h) (revision 5ed84841f5852381b2e36328c0aeca7bc97b9c03) +++ sources/model/hd/adjustment/treatment/MTreatmentAdjustRequests.h (.../MTreatmentAdjustRequests.h) (revision d17a7a6adf72a6224280548e2341dfce22bf72c7) @@ -808,7 +808,6 @@ typedef Model:: MAdjustBloodPrimeReq AdjustBloodPrimeRequestData; typedef Model:: MAdjustPressuresLimitsReq AdjustPressuresLimitsRequestData; typedef Model:: MAdjustPressuresWideningReq AdjustPressuresWideningRequestData; - typedef Model:: MAdjustBolusVolumeReq AdjustBolusVolumeRequestData; // Alarms typedef Model:: MAlarmSilenceReq AlarmSilenceRequestData;