Index: leahi.pro =================================================================== diff -u -r9b81b18319ff46f1e48d5637a6a8938d2f7735c9 -r16aaf5ab7e1c58199754a132d624a470295d3440 --- leahi.pro (.../leahi.pro) (revision 9b81b18319ff46f1e48d5637a6a8938d2f7735c9) +++ leahi.pro (.../leahi.pro) (revision 16aaf5ab7e1c58199754a132d624a470295d3440) @@ -272,7 +272,6 @@ sources/view/fp/data/VFPROPumpData.h \ sources/view/fp/data/VFPRORejectionPercentageData.h \ sources/view/fp/data/VFPTemperatureData.h \ - sources/view/settings/VAdjustRoWaterMode.h \ sources/view/settings/VAdjustmentAdvancedInstitutionalRecord.h \ sources/view/settings/VAdvancedInstitutionalRecord.h \ sources/view/settings/VRoWaterMode.h \ @@ -762,7 +761,6 @@ sources/view/VGeneralEvent.cpp \ sources/device/DeviceView.cpp \ \ # ---------- Views - TD - States Data - sources/view/settings/VAdjustRoWaterMode.cpp \ sources/view/settings/VAdjustmentAdvancedInstitutionalRecord.cpp \ sources/view/settings/VAdvancedInstitutionalRecord.cpp \ sources/view/settings/VRoWaterMode.cpp \ Index: sources/ApplicationController.cpp =================================================================== diff -u -rd17a7a6adf72a6224280548e2341dfce22bf72c7 -r16aaf5ab7e1c58199754a132d624a470295d3440 --- sources/ApplicationController.cpp (.../ApplicationController.cpp) (revision d17a7a6adf72a6224280548e2341dfce22bf72c7) +++ sources/ApplicationController.cpp (.../ApplicationController.cpp) (revision 16aaf5ab7e1c58199754a132d624a470295d3440) @@ -668,8 +668,8 @@ * \details Sends an institutional record request */ void ApplicationController::institutionalRequest() { - InstitutionalRequestData InstitutionalRequestData; - emit didAdjustment(InstitutionalRequestData); + InstitutionalRequestData institutionalRequestData; + emit didAdjustment(institutionalRequestData); LOG_DEBUG("POSTInstitutionalRecordReq Sent"); } @@ -678,12 +678,22 @@ * \details Sends an institutional record request */ void ApplicationController::advancedInstitutionalRequest() { - AdvancedInstitutionalRequestData AdvancedInstitutionalRequestData; - emit didAdjustment(AdvancedInstitutionalRequestData); + AdvancedInstitutionalRequestData advancedInstitutionalRequestData; + emit didAdjustment(advancedInstitutionalRequestData ); LOG_DEBUG("POSTAdvancedInstitutionalRecordReq Sent"); } /*! + * \brief ApplicationController::roWaterModeRequest + * \details Sends an ro water mode record request + */ +void ApplicationController::roWaterModeRequest() { + RoWaterModeRequestData roWaterModeRequestData; + emit didAdjustment(roWaterModeRequestData ); + LOG_DEBUG("POSTRoWaterModeReq Sent"); +} + +/*! * \brief ApplicationController::onstartPOST * \details The POST entry point * - Sends the first async check-in to the HD to let HD know it can start it's POST and UI is ready to communicate. @@ -746,5 +756,6 @@ versionsRequest (); // send HD the version request institutionalRequest (); // send TD the institutional record request advancedInstitutionalRequest (); // send TD the advanced institutional record request - emit didPOSTPass (_post.isDone( )); // GuiController -> GuiView : didPOSTPass(bool) + roWaterModeRequest (); // send RO water mode record request + emit didPOSTPass (_post.isDone( )); // GuiController -> GuiView : didPOSTPass(bool) } Index: sources/ApplicationController.h =================================================================== diff -u -rd17a7a6adf72a6224280548e2341dfce22bf72c7 -r16aaf5ab7e1c58199754a132d624a470295d3440 --- sources/ApplicationController.h (.../ApplicationController.h) (revision d17a7a6adf72a6224280548e2341dfce22bf72c7) +++ sources/ApplicationController.h (.../ApplicationController.h) (revision 16aaf5ab7e1c58199754a132d624a470295d3440) @@ -85,6 +85,7 @@ void versionsRequest(); void institutionalRequest(); void advancedInstitutionalRequest(); + void roWaterModeRequest(); void alarmTrigger (Gui::GuiAlarmID vAlarmID, bool vSend = false, bool vSingle = false); Index: sources/gui/GuiGlobals.cpp =================================================================== diff -u -r9b81b18319ff46f1e48d5637a6a8938d2f7735c9 -r16aaf5ab7e1c58199754a132d624a470295d3440 --- sources/gui/GuiGlobals.cpp (.../GuiGlobals.cpp) (revision 9b81b18319ff46f1e48d5637a6a8938d2f7735c9) +++ sources/gui/GuiGlobals.cpp (.../GuiGlobals.cpp) (revision 16aaf5ab7e1c58199754a132d624a470295d3440) @@ -49,7 +49,6 @@ #include "VDateTime.h" #include "VAdjustmentAlarmVolume.h" #include "VBluetooth.h" -#include "VAdjustRoWaterMode.h" #include "VRoWaterMode.h" #include "VCloudSync.h" #include "VHDUsageInfo.h" Index: sources/gui/qml/components/HeaderBar.qml =================================================================== diff -u -r290835d1a861d8fe7a716d061f0b079d9cfff75a -r16aaf5ab7e1c58199754a132d624a470295d3440 --- sources/gui/qml/components/HeaderBar.qml (.../HeaderBar.qml) (revision 290835d1a861d8fe7a716d061f0b079d9cfff75a) +++ sources/gui/qml/components/HeaderBar.qml (.../HeaderBar.qml) (revision 16aaf5ab7e1c58199754a132d624a470295d3440) @@ -181,6 +181,7 @@ extraSpace : _headerButtonRow.spacing visible : vTDTreatmentStates.txEnd + onPressed : _endTreatmentDialog.open() } IconButton { id : _waterSample Index: sources/gui/qml/dialogs/watersample/WaterSampleDialog.qml =================================================================== diff -u -rb110ee732fe1306669f71d9c17ed4714e1f03ee2 -r16aaf5ab7e1c58199754a132d624a470295d3440 --- sources/gui/qml/dialogs/watersample/WaterSampleDialog.qml (.../WaterSampleDialog.qml) (revision b110ee732fe1306669f71d9c17ed4714e1f03ee2) +++ sources/gui/qml/dialogs/watersample/WaterSampleDialog.qml (.../WaterSampleDialog.qml) (revision 16aaf5ab7e1c58199754a132d624a470295d3440) @@ -26,11 +26,11 @@ height : Variables.dialogHeight clip : true - readonly property bool timeout: vWaterSample.timeout + readonly property bool timeout : vWaterSample.timeout onTimeoutChanged: { if ( _root.timeout ) { - _menu.index = WaterSampleDialog.WaterSample + _menu.index = _WaterSampleDialog.WaterSample _root.open() } } @@ -40,8 +40,8 @@ Dialysate } - WaterSamplePage { id: _waterSample; visible : vRoWaterMode.status ? _menu.index === WaterSampleDialog.WaterSample : false ; } - WaterSampleDialysatePage { id: _dialysateChecks; visible : vRoWaterMode.status ? _menu.index === WaterSampleDialog.Dialysate : true ; } + WaterSamplePage { id: _waterSample; visible : vWaterSampleModel.isROFeatured ? _menu.index === WaterSampleDialog.WaterSample : false ; } + WaterSampleDialysatePage { id: _dialysateChecks; visible : vWaterSampleModel.isROFeatured ? _menu.index === WaterSampleDialog.Dialysate : true ; } MainMenu { id: _menu anchors { @@ -69,7 +69,7 @@ CloseButton { id : _closeButton - visible: vRoWaterMode.status ? _waterSample.isPrimary : true + visible: vWaterSampleModel.isROFeatured ? _waterSample.isPrimary : true onClicked : { _root.close() Index: sources/gui/qml/main.qml =================================================================== diff -u -r9b81b18319ff46f1e48d5637a6a8938d2f7735c9 -r16aaf5ab7e1c58199754a132d624a470295d3440 --- sources/gui/qml/main.qml (.../main.qml) (revision 9b81b18319ff46f1e48d5637a6a8938d2f7735c9) +++ sources/gui/qml/main.qml (.../main.qml) (revision 16aaf5ab7e1c58199754a132d624a470295d3440) @@ -54,7 +54,6 @@ import VDateTime 0.1 import VAdjustmentAlarmVolume 0.1 import VBluetooth 0.1 -import VAdjustRoWaterMode 0.1 import VRoWaterMode 0.1 import VCloudSync 0.1 import VHDUsageInfo 0.1 @@ -205,7 +204,6 @@ VDateTime { id: vDateTime } VAdjustmentAlarmVolume { id: vAdjustmentAlarmVolume } VBluetooth { id: vBluetooth } - VAdjustRoWaterMode { id: vAdjustRoWaterMode } VRoWaterMode { id: vRoWaterMode } VCloudSync { id: vCloudSync } VHDUsageInfo { id: vHDUsageInfo } Index: sources/gui/qml/pages/settings/SettingsInformation.qml =================================================================== diff -u -rb110ee732fe1306669f71d9c17ed4714e1f03ee2 -r16aaf5ab7e1c58199754a132d624a470295d3440 --- sources/gui/qml/pages/settings/SettingsInformation.qml (.../SettingsInformation.qml) (revision b110ee732fe1306669f71d9c17ed4714e1f03ee2) +++ sources/gui/qml/pages/settings/SettingsInformation.qml (.../SettingsInformation.qml) (revision 16aaf5ab7e1c58199754a132d624a470295d3440) @@ -98,7 +98,7 @@ label : [ qsTr("Water Input" )] - initial : [ qsTr("RO Water %1" ).arg(vRoWaterMode.status ? qsTr("Featured") : qsTr("Defeatured")) ] + initial : [ qsTr("RO Water %1" ).arg(vTreatmentRanges.roWaterModeOptions[vRoWaterMode.status]) ] actual : [""] units : [""] Index: sources/gui/qml/pages/settings/SettingsROInput.qml =================================================================== diff -u -rb110ee732fe1306669f71d9c17ed4714e1f03ee2 -r16aaf5ab7e1c58199754a132d624a470295d3440 --- sources/gui/qml/pages/settings/SettingsROInput.qml (.../SettingsROInput.qml) (revision b110ee732fe1306669f71d9c17ed4714e1f03ee2) +++ sources/gui/qml/pages/settings/SettingsROInput.qml (.../SettingsROInput.qml) (revision 16aaf5ab7e1c58199754a132d624a470295d3440) @@ -47,19 +47,19 @@ model : vTreatmentRanges.roWaterModeOptions onActivated: { - vAdjustRoWaterMode.doAdjustment ( _roInputComboBox.currentIndex ) + vRoWaterMode.doAdjustment ( _roInputComboBox.currentIndex ) } } } } - Connections { target: vAdjustRoWaterMode + Connections { target: vRoWaterMode function onAdjustmentTriggered(vValue) { - if ( vAdjustRoWaterMode.adjustment_Accepted ) { + if ( vRoWaterMode.adjustment_Accepted ) { _settingsRoInput.notificationText = "" } else { - _settingsRoInput.notificationText = vAdjustRoWaterMode.adjustment_ReasonText + _settingsRoInput.notificationText = vRoWaterMode.adjustment_ReasonText } } } Index: sources/model/dd/adjustment/settings/MRoWaterModeResponse.cpp =================================================================== diff -u -rb110ee732fe1306669f71d9c17ed4714e1f03ee2 -r16aaf5ab7e1c58199754a132d624a470295d3440 --- sources/model/dd/adjustment/settings/MRoWaterModeResponse.cpp (.../MRoWaterModeResponse.cpp) (revision b110ee732fe1306669f71d9c17ed4714e1f03ee2) +++ sources/model/dd/adjustment/settings/MRoWaterModeResponse.cpp (.../MRoWaterModeResponse.cpp) (revision 16aaf5ab7e1c58199754a132d624a470295d3440) @@ -7,15 +7,15 @@ return { _data.mAccepted.value, _data.mReason .value, - _data.mValue .value, + _data.mStatus .value, }; } bool MRoWaterModeResponse::fromByteArray(const QByteArray &vByteArray, int *vIndex) { int index = 0; // message data start position if ( ! GetValue(vByteArray, index, _data.mAccepted )) goto lError; if ( ! GetValue(vByteArray, index, _data.mReason )) goto lError; - if ( ! GetValue(vByteArray, index, _data.mValue )) goto lError; + if ( ! GetValue(vByteArray, index, _data.mStatus )) goto lError; return true ; @@ -34,6 +34,6 @@ Data data; data.mAccepted = _data.mAccepted.value; data.mReason = _data.mReason .value; - data.mValue = _data.mValue .value; + data.mStatus = _data.mStatus .value; return data; } Index: sources/model/dd/adjustment/settings/MRoWaterModeResponse.h =================================================================== diff -u -rb110ee732fe1306669f71d9c17ed4714e1f03ee2 -r16aaf5ab7e1c58199754a132d624a470295d3440 --- sources/model/dd/adjustment/settings/MRoWaterModeResponse.h (.../MRoWaterModeResponse.h) (revision b110ee732fe1306669f71d9c17ed4714e1f03ee2) +++ sources/model/dd/adjustment/settings/MRoWaterModeResponse.h (.../MRoWaterModeResponse.h) (revision 16aaf5ab7e1c58199754a132d624a470295d3440) @@ -26,7 +26,7 @@ * | || * | #1: (U32) | \ref Data::mAccepted | * | #2: (U32) | \ref Data::mReason | - * | #3: (U32) | \ref Data::mValue | + * | #3: (U32) | \ref Data::mStatus | * \sa Data * *

Logging info

@@ -46,7 +46,7 @@ struct { Types::U32 mAccepted; Types::U32 mReason ; - Types::U32 mValue ; + Types::U32 mStatus ; } _data; public: @@ -57,7 +57,7 @@ struct Data { quint32 mAccepted = 0; /*!< Accepted value of type quint32 extracted out */ quint32 mReason = 0; /*!< Reason value of type quint32 extracted out */ - quint32 mValue = 0; /*!< Value value of type quint32 extracted out */ + quint32 mStatus = 0; /*!< Status value of type quint32 extracted out */ }; MRoWaterModeResponse () { } Index: sources/view/VView.h =================================================================== diff -u -r9b81b18319ff46f1e48d5637a6a8938d2f7735c9 -r16aaf5ab7e1c58199754a132d624a470295d3440 --- sources/view/VView.h (.../VView.h) (revision 9b81b18319ff46f1e48d5637a6a8938d2f7735c9) +++ sources/view/VView.h (.../VView.h) (revision 16aaf5ab7e1c58199754a132d624a470295d3440) @@ -139,7 +139,6 @@ REGISTER_TYPE( VDateTime ) \ REGISTER_TYPE( VAdjustmentAlarmVolume ) \ REGISTER_TYPE( VBluetooth ) \ - REGISTER_TYPE( VAdjustRoWaterMode ) \ REGISTER_TYPE( VRoWaterMode ) \ REGISTER_TYPE( VCloudSync ) \ REGISTER_TYPE( VHDUsageInfo ) \ Index: sources/view/VWaterSampleModel.cpp =================================================================== diff -u -rb110ee732fe1306669f71d9c17ed4714e1f03ee2 -r16aaf5ab7e1c58199754a132d624a470295d3440 --- sources/view/VWaterSampleModel.cpp (.../VWaterSampleModel.cpp) (revision b110ee732fe1306669f71d9c17ed4714e1f03ee2) +++ sources/view/VWaterSampleModel.cpp (.../VWaterSampleModel.cpp) (revision 16aaf5ab7e1c58199754a132d624a470295d3440) @@ -16,12 +16,12 @@ void View::VWaterSampleModel::initModel() { _model.clear(); - _model.insertRow( eWaterSample , {{ eRole_Text, tr("Water Sample") }, { eRole_Visible, _roWaterMode }}); + _model.insertRow( eWaterSample , {{ eRole_Text, tr("Water Sample") }, { eRole_Visible, _isROFeatured }}); _model.insertRow( eDialysateChecks , {{ eRole_Text, tr("Dialysate Checks")}, { eRole_Visible, true }}); } void View::VWaterSampleModel::onActionReceive(const RoWaterModeResponseData &vData) { - roWaterMode ( vData.mValue ); + isROFeatured ( vData.mStatus != eDefeatured ); initModel(); } Index: sources/view/VWaterSampleModel.h =================================================================== diff -u -rb110ee732fe1306669f71d9c17ed4714e1f03ee2 -r16aaf5ab7e1c58199754a132d624a470295d3440 --- sources/view/VWaterSampleModel.h (.../VWaterSampleModel.h) (revision b110ee732fe1306669f71d9c17ed4714e1f03ee2) +++ sources/view/VWaterSampleModel.h (.../VWaterSampleModel.h) (revision 16aaf5ab7e1c58199754a132d624a470295d3440) @@ -34,9 +34,16 @@ eDialysateChecks= 1 } WaterSample; + // TODO Update to use shared FW enums in common.h + enum { + eFeatured = 0, + eFeatueredBoost = 1, + eDefeatured = 2 + } RoMode; + Q_PROPERTY(MListModel* model READ model NOTIFY didModelChange) - PROPERTY ( int , roWaterMode , 0) + PROPERTY ( bool , isROFeatured , true) VIEW_DEC_SLOT(RoWaterModeResponseData ) Fisheye: Tag 16aaf5ab7e1c58199754a132d624a470295d3440 refers to a dead (removed) revision in file `sources/view/settings/VAdjustRoWaterMode.cpp'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 16aaf5ab7e1c58199754a132d624a470295d3440 refers to a dead (removed) revision in file `sources/view/settings/VAdjustRoWaterMode.h'. Fisheye: No comparison available. Pass `N' to diff? Index: sources/view/settings/VRoWaterMode.cpp =================================================================== diff -u -rb110ee732fe1306669f71d9c17ed4714e1f03ee2 -r16aaf5ab7e1c58199754a132d624a470295d3440 --- sources/view/settings/VRoWaterMode.cpp (.../VRoWaterMode.cpp) (revision b110ee732fe1306669f71d9c17ed4714e1f03ee2) +++ sources/view/settings/VRoWaterMode.cpp (.../VRoWaterMode.cpp) (revision 16aaf5ab7e1c58199754a132d624a470295d3440) @@ -12,27 +12,41 @@ void View::VRoWaterMode::initConnections() { ADJUST_VIEW_CONNECTION(RoWaterModeRequestData) ACTION_VIEW_CONNECTION(RoWaterModeResponseData) + ADJUST_VIEW_CONNECTION(AdjustRoWaterModeRequestData) + ACTION_VIEW_CONNECTION(AdjustRoWaterModeResponseData) - connect(&_GuiController, &GuiController::didPOSTPass, this, [=](bool) - { - //POST// - doAdjustment(); - }); } void View::VRoWaterMode::onActionReceive(const RoWaterModeResponseData &vData) { adjustment_Accepted ( vData.mAccepted ); adjustment_Reason ( vData.mReason ); - status ( vData.mValue ); + status ( vData.mStatus ); // *** has to be the last to let the information to be set and then emit the signal *** // *** otherwise will use the Previous values before being set. *** adjustment ( true ); } -void View::VRoWaterMode::doAdjustment() +void View::VRoWaterMode::doRequest() { RoWaterModeRequestData data; emit didAdjustment(data); } + +void View::VRoWaterMode::onActionReceive(const AdjustRoWaterModeResponseData &vData) +{ + adjustment_Accepted ( vData.mAccepted ); + adjustment_Reason ( vData.mReason ); + + // *** has to be the last to let the information to be set and then emit the signal *** + // *** otherwise will use the Previous values before being set. *** + adjustment ( true ); +} + +void View::VRoWaterMode::doAdjustment(int vStatus) +{ + AdjustRoWaterModeRequestData data; + data.mStatus = vStatus; + emit didAdjustment(data); +} Index: sources/view/settings/VRoWaterMode.h =================================================================== diff -u -rb110ee732fe1306669f71d9c17ed4714e1f03ee2 -r16aaf5ab7e1c58199754a132d624a470295d3440 --- sources/view/settings/VRoWaterMode.h (.../VRoWaterMode.h) (revision b110ee732fe1306669f71d9c17ed4714e1f03ee2) +++ sources/view/settings/VRoWaterMode.h (.../VRoWaterMode.h) (revision 16aaf5ab7e1c58199754a132d624a470295d3440) @@ -7,12 +7,13 @@ #include "main.h" // Doxygen : do not remove #include "VAdjustmentResponseBase.h" #include "MRoWaterModeResponse.h" +#include "MAdjustRoWaterModeResponse.h" // namespace namespace View { /*! - * \brief The VAdjustRoWaterMode class + * \brief The VRoWaterMode class * \details View for Model's data representation. */ class VRoWaterMode : public VAdjustmentResponseBase @@ -24,12 +25,14 @@ // has been manually tested that it works perfectly fine TRIGGER ( bool , adjustment , 0) - TRIGGER ( int , status , 0) + PROPERTY( int , status , 0) - VIEW_DEC_CLASS_ADJUSTMENT(VRoWaterMode, RoWaterModeResponseData) + VIEW_DEC_CLASS_ADJUSTMENT(VRoWaterMode, RoWaterModeResponseData ) + VIEW_DEC_SLOT(AdjustRoWaterModeResponseData ) public slots: - void doAdjustment(); + void doRequest(); + void doAdjustment(int vStatus); signals: /*! @@ -38,5 +41,12 @@ * \param vData - data model includes request information */ void didAdjustment(const RoWaterModeRequestData &vData); + + /*! + * \brief didAdjustment + * \details the notification signal to send the user's Request + * \param vData - data model includes request information + */ + void didAdjustment(const AdjustRoWaterModeRequestData &vData); }; }