Index: denali.pro.user =================================================================== diff -u -rc6cfb5043fc9c29cc039e36915368bcd3a63baa6 -rf688ed9f1c64a2603a6d10fbb090b257a43e1f6f --- denali.pro.user (.../denali.pro.user) (revision c6cfb5043fc9c29cc039e36915368bcd3a63baa6) +++ denali.pro.user (.../denali.pro.user) (revision f688ed9f1c64a2603a6d10fbb090b257a43e1f6f) @@ -1,6 +1,6 @@ - + EnvironmentId Index: en_US.udic =================================================================== diff -u -r821bf955d0ba7e028bccfee7c04ca77cf80a0bd4 -rf688ed9f1c64a2603a6d10fbb090b257a43e1f6f --- en_US.udic (.../en_US.udic) (revision 821bf955d0ba7e028bccfee7c04ca77cf80a0bd4) +++ en_US.udic (.../en_US.udic) (revision f688ed9f1c64a2603a6d10fbb090b257a43e1f6f) @@ -36,3 +36,6 @@ Pre initializer conf +Acknow +Gui +MSettings Index: sources/ApplicationController.cpp =================================================================== diff -u -r821bf955d0ba7e028bccfee7c04ca77cf80a0bd4 -rf688ed9f1c64a2603a6d10fbb090b257a43e1f6f --- sources/ApplicationController.cpp (.../ApplicationController.cpp) (revision 821bf955d0ba7e028bccfee7c04ca77cf80a0bd4) +++ sources/ApplicationController.cpp (.../ApplicationController.cpp) (revision f688ed9f1c64a2603a6d10fbb090b257a43e1f6f) @@ -128,9 +128,10 @@ // Settings - move to application thread connect(this, SIGNAL(didSettingsInit()), this, SLOT( onSettingsInit())); - connect(&_settingsWatcher, SIGNAL(finished ()), - this , SIGNAL(didSettingsUpdate())); + connect(&_settingsWatcher, SIGNAL(finished ()), + this , SLOT(onSettingsUpdate())); + // ---- Signal/Slots ADJUST_TRANSMT_MODEL_BRIDGE_CONNECTIONS(_GuiController ) ACTION_RECEIVE_MODEL_BRIDGE_CONNECTIONS(_MessageDispatcher) @@ -459,8 +460,6 @@ */ void ApplicationController::initSettings() { - PRINT_THREAD_NAME // Main Thread - // this emit guaranties that the slot will be called in the application thread // also the signal is private so it will be used internally only. emit didSettingsInit({}); @@ -474,17 +473,25 @@ */ void ApplicationController::onSettingsInit() { - PRINT_THREAD_NAME - - // has been used here to create the object in the thread that Settings is leaving in, + // That is enough to call to the I function here to create the object in the thread that Settings is leaving in, // which currently is Application_Thread, since the Settings is created in that thread. - Q_UNUSED(_SettingModel) + _SettingModel; QFuture mFuture = QtConcurrent::run(this, &ApplicationController::settingsInit); _settingsWatcher.setFuture(mFuture); } /*! + * \brief onSettingsUpdate + * \details when the Settings reads the .conf files and fills the MSettings emits this finished signal + * then this slot is called to notify the GuiController about the settings that being ready. + */ +void ApplicationController::onSettingsUpdate() +{ + onActionReceive(SettingsData()); +} + +/*! * \brief ApplicationController::settingsInit * \details The Settings read function is called in this method. * This callback function for the QCuncurrnent run. Index: sources/ApplicationController.h =================================================================== diff -u -r821bf955d0ba7e028bccfee7c04ca77cf80a0bd4 -rf688ed9f1c64a2603a6d10fbb090b257a43e1f6f --- sources/ApplicationController.h (.../ApplicationController.h) (revision 821bf955d0ba7e028bccfee7c04ca77cf80a0bd4) +++ sources/ApplicationController.h (.../ApplicationController.h) (revision f688ed9f1c64a2603a6d10fbb090b257a43e1f6f) @@ -100,6 +100,7 @@ void onFailedTransmit(Sequence seq); void onSettingsInit(); + void onSettingsUpdate(); signals: void didActionReceive (GuiActionType vAction, const QVariantList &vData); // UI <= HD/DG @@ -116,12 +117,6 @@ void didExport (); /*! - * \brief didSettingsUpdate - * \details when the Settings reads the .conf files and fills the MSettings emits this signal - * this signal can be used buy the other object that need to access the MSettings to let them know data is ready. - */ - void didSettingsUpdate(); - /*! * \brief didSettingsInit - private signal to start initializing settings * \details This signal used internally to make the read task of the settings happen in Application_Thread * It's because no thread assigned to Settings itself, since this class will be used only once Index: sources/gui/GuiGlobals.cpp =================================================================== diff -u -r821bf955d0ba7e028bccfee7c04ca77cf80a0bd4 -rf688ed9f1c64a2603a6d10fbb090b257a43e1f6f --- sources/gui/GuiGlobals.cpp (.../GuiGlobals.cpp) (revision 821bf955d0ba7e028bccfee7c04ca77cf80a0bd4) +++ sources/gui/GuiGlobals.cpp (.../GuiGlobals.cpp) (revision f688ed9f1c64a2603a6d10fbb090b257a43e1f6f) @@ -23,7 +23,6 @@ #include "VEventSpy.h" // Project -#include "MModel.h" #include "VView.h" #include "VSettings.h" Index: sources/gui/GuiGlobals.h =================================================================== diff -u -r695e95aa2ec5e6e1c395567449ac0f671ecd61ed -rf688ed9f1c64a2603a6d10fbb090b257a43e1f6f --- sources/gui/GuiGlobals.h (.../GuiGlobals.h) (revision 695e95aa2ec5e6e1c395567449ac0f671ecd61ed) +++ sources/gui/GuiGlobals.h (.../GuiGlobals.h) (revision f688ed9f1c64a2603a6d10fbb090b257a43e1f6f) @@ -327,6 +327,32 @@ // Pre-Treatment Recirculate typedef GuiActions::HD_Pre_Treatment_Recirc_States GuiPreTreatmentRecirculateStates; + /*! + * \brief enumString + * \details converts the enum index to it's code defined text + * \note the enum has to be defined in the Qt metadata by Q_ENUM + * \note the passed vEnum has to be in the type of enum and if not has to be cast by static_cast< ENUM >( VALUE ) + * \param vEnum - the enum to get the name of it + * \param vUndefined - the string format to be used to return if enum is undefined and the number itself is going to be returned. + * \return name of the enum as string or a formatted text by vUndefined containing the enum index number. + */ + template + QString enumString(const T_ENUM &vEnum, const char *vUndefined = nullptr) { + const QMetaObject *mo = qt_getEnumMetaObject(vEnum); + int enumIdx = mo->indexOfEnumerator(qt_getEnumName(vEnum)); + const char *key = mo->enumerator(enumIdx).valueToKey(vEnum); + if (key) { + return qPrintable(key); + } + else { + QString undefined; + if ( vUndefined ) { + undefined = vUndefined; + if (undefined.trimmed().isEmpty()) undefined = "UNDEFINED [%1]"; + } + return undefined.arg(vEnum); + } + } void registerTypes(); Index: sources/gui/qml/components/StepIndicator.qml =================================================================== diff -u -rdb2238dcf17941be6a3c587b55a3ef06b94cee96 -rf688ed9f1c64a2603a6d10fbb090b257a43e1f6f --- sources/gui/qml/components/StepIndicator.qml (.../StepIndicator.qml) (revision db2238dcf17941be6a3c587b55a3ef06b94cee96) +++ sources/gui/qml/components/StepIndicator.qml (.../StepIndicator.qml) (revision f688ed9f1c64a2603a6d10fbb090b257a43e1f6f) @@ -36,7 +36,6 @@ property int spacerLineLength : vertical ? 5 : 75 property int currentStepIndex : 0 - height : _gridSteps.height // Variables.topBarMenuHeight color : Colors.backgroundMain @@ -46,18 +45,25 @@ function setupModel(names) { if ( names.length > 1 ) { for (let i = 0; i < names.length; i++) { - if (i === 0) + if (i === 0) { stepNamesFirst = names[i] - else + } + else { stepNamesRest[i-1] = names[i] + } } } else { if (names.length) stepNamesFirst = names[0] else stepNamesFirst = "" stepNamesRest = [] } - // DEBUG: console.debug(_root.stepNames, stepNamesFirst, stepNamesRest) + ///////////////////////////////////////////////// + // it is so odd that when the stepNamesRest set by settings the change event is not called + // so it has been called manually. I couldn't find why, and needs more investigation. + // The good point is the binding of the model (_tailStepsRepeater.model) is called once. + ///////////////////////////////////////////////// + if (stepNamesRest.length) stepNamesRestChanged() } } @@ -81,6 +87,7 @@ } Repeater { id: _tailStepsRepeater model: _private.stepNamesRest + // DEBUG : onModelChanged: console.debug(" 88888 ", _root.stepNames) Grid { id: _gridStepsRest rows : _root.vertical ? 0 : 1 columns : _root.vertical ? 1 : 0 Index: sources/gui/qml/pages/pretreatment/PreTreatmentBase.qml =================================================================== diff -u -rc6cfb5043fc9c29cc039e36915368bcd3a63baa6 -rf688ed9f1c64a2603a6d10fbb090b257a43e1f6f --- sources/gui/qml/pages/pretreatment/PreTreatmentBase.qml (.../PreTreatmentBase.qml) (revision c6cfb5043fc9c29cc039e36915368bcd3a63baa6) +++ sources/gui/qml/pages/pretreatment/PreTreatmentBase.qml (.../PreTreatmentBase.qml) (revision f688ed9f1c64a2603a6d10fbb090b257a43e1f6f) @@ -164,7 +164,7 @@ onSettingsChanged : { if ( instructionBased ) { var group = vSettings.groupFormat.arg(header.stepNames[stackStepIndex]).arg(title.text) - // DEBUG : console.debug(" ----- ", group) + // DEBUG : console.debug(" 00000 ", group) if ( vSettings.settings[group] !== undefined ) { _root.instructionlocation = vSettings.settings[group].location _root.instructionStepNames = vSettings.settings[group].keys Index: sources/gui/qml/pages/pretreatment/PreTreatmentDisposablesStack.qml =================================================================== diff -u -r821bf955d0ba7e028bccfee7c04ca77cf80a0bd4 -rf688ed9f1c64a2603a6d10fbb090b257a43e1f6f --- sources/gui/qml/pages/pretreatment/PreTreatmentDisposablesStack.qml (.../PreTreatmentDisposablesStack.qml) (revision 821bf955d0ba7e028bccfee7c04ca77cf80a0bd4) +++ sources/gui/qml/pages/pretreatment/PreTreatmentDisposablesStack.qml (.../PreTreatmentDisposablesStack.qml) (revision f688ed9f1c64a2603a6d10fbb090b257a43e1f6f) @@ -50,13 +50,21 @@ } PreTreatmentBase { id: _preTreatmentDisposablesCartridgeConnetion + function page_confirm() { + if( vTreatmentCreate.heparinBolusVolume ) { + page( _preTreatmentDisposablesHeparinSyringe ) + } else { + page( _preTreatmentDisposablesSalineBag ) + } + } + title.text : qsTr("Cartridge Connection") header.backVisible : true header.confirmVisible : true header.confirmText.text : qsTr("NEXT") instructionBased : true onBackClicked : { page( _preTreatmentDisposablesCartridgeInstallation )} - onConfirmClicked : { page( _preTreatmentDisposablesHeparinSyringe )} + onConfirmClicked : { page_confirm( )} } PreTreatmentBase { id: _preTreatmentDisposablesHeparinSyringe @@ -70,12 +78,20 @@ } PreTreatmentBase { id: _preTreatmentDisposablesSalineBag + function page_back() { + if( vTreatmentCreate.heparinBolusVolume ) { + page( _preTreatmentDisposablesHeparinSyringe ) + } else { + page( _preTreatmentDisposablesCartridgeConnetion ) + } + } + title.text : qsTr("Saline Bag") header.backVisible : true header.confirmVisible : true header.confirmText.text : qsTr("CONFIRM") instructionBased : true - onBackClicked : { page( _preTreatmentDisposablesHeparinSyringe )} + onBackClicked : { page_back( )} onConfirmClicked : { vPreTreatmentAdjustmentDisposablesConfirm.doConfirm()} } Index: sources/main.h =================================================================== diff -u -r821bf955d0ba7e028bccfee7c04ca77cf80a0bd4 -rf688ed9f1c64a2603a6d10fbb090b257a43e1f6f --- sources/main.h (.../main.h) (revision 821bf955d0ba7e028bccfee7c04ca77cf80a0bd4) +++ sources/main.h (.../main.h) (revision f688ed9f1c64a2603a6d10fbb090b257a43e1f6f) @@ -5,11 +5,11 @@ * THIS CODE MAY NOT BE COPIED OR REPRODUCED IN ANY FORM, IN PART OR IN * WHOLE, WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER. * - * \file main.h - * \author (last) Peter Lucia - * \date (last) 15-Oct-2020 - * \author (original) Behrouz NematiPour - * \date (original) 28-Oct-2019 + * \file main.h + * \author (last) Behrouz NematiPour + * \date (last) 31-Mar-2021 + * \author (original) Behrouz NematiPour + * \date (original) 28-Oct-2019 * */ #pragma once Index: sources/model/MModel.h =================================================================== diff -u -r695e95aa2ec5e6e1c395567449ac0f671ecd61ed -rf688ed9f1c64a2603a6d10fbb090b257a43e1f6f --- sources/model/MModel.h (.../MModel.h) (revision 695e95aa2ec5e6e1c395567449ac0f671ecd61ed) +++ sources/model/MModel.h (.../MModel.h) (revision f688ed9f1c64a2603a6d10fbb090b257a43e1f6f) @@ -17,6 +17,7 @@ #include "main.h" // models +#include "MSettings.h" #include "MAdjustPowerOff.h" #include "MAlarmStatusData.h" #include "MAlarmTriggered.h" @@ -206,6 +207,7 @@ */ #define REGISTER_MODEL_METATYPES \ \ + REGISTER_METATYPE( SettingsData ) \ REGISTER_METATYPE( HDOperationModeData ) \ REGISTER_METATYPE( PreTreatmentStatesData ) \ REGISTER_METATYPE( TreatmentStatesData ) \ @@ -322,6 +324,7 @@ */ #define ACTION_RECEIVE_MODEL_BRIDGE_CONNECTIONS(vSOURCE) \ \ + ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, SettingsData ) \ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, HDOperationModeData ) \ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, PreTreatmentStatesData ) \ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, TreatmentStatesData ) \ @@ -442,6 +445,7 @@ */ #define ACTION_RECEIVE_MODEL_BRIDGE_DEFINITIONS \ \ + ACTION_RECEIVE_BRIDGE_DEFINITION( SettingsData ) \ ACTION_RECEIVE_BRIDGE_DEFINITION( HDOperationModeData ) \ ACTION_RECEIVE_BRIDGE_DEFINITION( PreTreatmentStatesData ) \ ACTION_RECEIVE_BRIDGE_DEFINITION( TreatmentStatesData ) \ @@ -617,6 +621,7 @@ #define ACTION_RECEIVE_SIGNALS \ /* Received signals */ \ /* NO RESPONSE message model here */ \ + ACTION_RECEIVE_SIGNAL( SettingsData ) \ ACTION_RECEIVE_SIGNAL( HDOperationModeData ) \ ACTION_RECEIVE_SIGNAL( PreTreatmentStatesData ) \ ACTION_RECEIVE_SIGNAL( TreatmentStatesData ) \ Index: sources/model/settings/MSettings.h =================================================================== diff -u -r821bf955d0ba7e028bccfee7c04ca77cf80a0bd4 -rf688ed9f1c64a2603a6d10fbb090b257a43e1f6f --- sources/model/settings/MSettings.h (.../MSettings.h) (revision 821bf955d0ba7e028bccfee7c04ca77cf80a0bd4) +++ sources/model/settings/MSettings.h (.../MSettings.h) (revision f688ed9f1c64a2603a6d10fbb090b257a43e1f6f) @@ -55,3 +55,5 @@ }; } + +typedef struct{} SettingsData; // it has literally been defined to be used for overloading Index: sources/storage/Settings.cpp =================================================================== diff -u -r821bf955d0ba7e028bccfee7c04ca77cf80a0bd4 -rf688ed9f1c64a2603a6d10fbb090b257a43e1f6f --- sources/storage/Settings.cpp (.../Settings.cpp) (revision 821bf955d0ba7e028bccfee7c04ca77cf80a0bd4) +++ sources/storage/Settings.cpp (.../Settings.cpp) (revision f688ed9f1c64a2603a6d10fbb090b257a43e1f6f) @@ -44,7 +44,6 @@ */ int Settings::read() { - PRINT_THREAD_NAME QStringList fileFilter = QStringList() << QString("*.%1").arg(_settingsExt); QFileInfoList settingFiles = FileHandler::find (Storage::Settings_Path_Name, fileFilter); QStringList settingFolders = FileHandler::subFolders(Storage::Settings_Path_Name); Index: sources/view/VPowerOff.h =================================================================== diff -u -r64d87d540594252e8039ab2595016d98f1e3cc28 -rf688ed9f1c64a2603a6d10fbb090b257a43e1f6f --- sources/view/VPowerOff.h (.../VPowerOff.h) (revision 64d87d540594252e8039ab2595016d98f1e3cc28) +++ sources/view/VPowerOff.h (.../VPowerOff.h) (revision f688ed9f1c64a2603a6d10fbb090b257a43e1f6f) @@ -19,8 +19,8 @@ // Project #include "main.h" // Doxygen : don't remove -#include "MModel.h" #include "VView.h" +#include "MAdjustPowerOff.h" // namespace namespace View { Index: sources/view/VTreatmentCreate.cpp =================================================================== diff -u -r7cc15ae5968205b241a08ca4646f283b8bf97b03 -rf688ed9f1c64a2603a6d10fbb090b257a43e1f6f --- sources/view/VTreatmentCreate.cpp (.../VTreatmentCreate.cpp) (revision 7cc15ae5968205b241a08ca4646f283b8bf97b03) +++ sources/view/VTreatmentCreate.cpp (.../VTreatmentCreate.cpp) (revision f688ed9f1c64a2603a6d10fbb090b257a43e1f6f) @@ -135,13 +135,7 @@ */ QString VTreatmentCreate::enumToString(GuiRequestReasons vEnum) { - const QMetaObject *mo = qt_getEnumMetaObject(vEnum); - int enumIdx = mo->indexOfEnumerator(qt_getEnumName(vEnum)); - QString mText = mo->enumerator(enumIdx).valueToKey(vEnum); - if ( ! mText.isEmpty() ) { - return mText; - } - return QString("[%1] Unknown Rejection Reason").arg(vEnum); + return Gui::enumString(vEnum, "[%1] Unknown Rejection Reason"); } /** Index: sources/view/dg/data/VDGAccelerometerData.h =================================================================== diff -u -r93b6bd48e2aec1fca4f2b5b79dcefffa49e9ce16 -rf688ed9f1c64a2603a6d10fbb090b257a43e1f6f --- sources/view/dg/data/VDGAccelerometerData.h (.../VDGAccelerometerData.h) (revision 93b6bd48e2aec1fca4f2b5b79dcefffa49e9ce16) +++ sources/view/dg/data/VDGAccelerometerData.h (.../VDGAccelerometerData.h) (revision f688ed9f1c64a2603a6d10fbb090b257a43e1f6f) @@ -18,8 +18,9 @@ #include // Project -#include "MModel.h" +#include "main.h" // Doxygen : don't remove #include "VView.h" +#include "MDGAccelerometerData.h" // namespace namespace View { Index: sources/view/dg/data/VDGDrainPumpData.h =================================================================== diff -u -r93b6bd48e2aec1fca4f2b5b79dcefffa49e9ce16 -rf688ed9f1c64a2603a6d10fbb090b257a43e1f6f --- sources/view/dg/data/VDGDrainPumpData.h (.../VDGDrainPumpData.h) (revision 93b6bd48e2aec1fca4f2b5b79dcefffa49e9ce16) +++ sources/view/dg/data/VDGDrainPumpData.h (.../VDGDrainPumpData.h) (revision f688ed9f1c64a2603a6d10fbb090b257a43e1f6f) @@ -19,8 +19,8 @@ // Project #include "main.h" // Doxygen : don't remove -#include "MModel.h" #include "VView.h" +#include "MDGDrainPumpData.h" // namespace namespace View { Index: sources/view/dg/data/VDGFilterFlushData.h =================================================================== diff -u -r96854524927f212c24b9e4a253baeff2e672228f -rf688ed9f1c64a2603a6d10fbb090b257a43e1f6f --- sources/view/dg/data/VDGFilterFlushData.h (.../VDGFilterFlushData.h) (revision 96854524927f212c24b9e4a253baeff2e672228f) +++ sources/view/dg/data/VDGFilterFlushData.h (.../VDGFilterFlushData.h) (revision f688ed9f1c64a2603a6d10fbb090b257a43e1f6f) @@ -19,8 +19,8 @@ // Project #include "main.h" // Doxygen : don't remove -#include "MModel.h" #include "VView.h" +#include "MDGFilterFlushData.h" // namespace namespace View { Index: sources/view/dg/data/VDGHeatersData.h =================================================================== diff -u -r6cad9b004e904200b71de7431c745795256080df -rf688ed9f1c64a2603a6d10fbb090b257a43e1f6f --- sources/view/dg/data/VDGHeatersData.h (.../VDGHeatersData.h) (revision 6cad9b004e904200b71de7431c745795256080df) +++ sources/view/dg/data/VDGHeatersData.h (.../VDGHeatersData.h) (revision f688ed9f1c64a2603a6d10fbb090b257a43e1f6f) @@ -19,8 +19,8 @@ // Project #include "main.h" // Doxygen : don't remove -#include "MModel.h" #include "VView.h" +#include "MDGHeatersData.h" // namespace namespace View { Index: sources/view/dg/data/VDGLoadCellReadingsData.h =================================================================== diff -u -r6cad9b004e904200b71de7431c745795256080df -rf688ed9f1c64a2603a6d10fbb090b257a43e1f6f --- sources/view/dg/data/VDGLoadCellReadingsData.h (.../VDGLoadCellReadingsData.h) (revision 6cad9b004e904200b71de7431c745795256080df) +++ sources/view/dg/data/VDGLoadCellReadingsData.h (.../VDGLoadCellReadingsData.h) (revision f688ed9f1c64a2603a6d10fbb090b257a43e1f6f) @@ -19,8 +19,8 @@ // Project #include "main.h" // Doxygen : don't remove -#include "MModel.h" #include "VView.h" +#include "MDGLoadCellReadingsData.h" // namespace namespace View { Index: sources/view/dg/data/VDGOperationModeData.cpp =================================================================== diff -u -r6cad9b004e904200b71de7431c745795256080df -rf688ed9f1c64a2603a6d10fbb090b257a43e1f6f --- sources/view/dg/data/VDGOperationModeData.cpp (.../VDGOperationModeData.cpp) (revision 6cad9b004e904200b71de7431c745795256080df) +++ sources/view/dg/data/VDGOperationModeData.cpp (.../VDGOperationModeData.cpp) (revision f688ed9f1c64a2603a6d10fbb090b257a43e1f6f) @@ -24,22 +24,8 @@ opMode ( vData.mOpMode ); } -QString VDGOperationMode::opModeText(GuiDGOpModes vEnum) -{ - // TEST : this code is the place holder for the alarms description mapping - // since it is another feature - // it returns the enum name for now - const QMetaObject *mo = qt_getEnumMetaObject(vEnum); - int enumIdx = mo->indexOfEnumerator(qt_getEnumName(vEnum)); - const char *key = mo->enumerator(enumIdx).valueToKey(vEnum); - if (key) - return qPrintable(key); - else - return QString("UNDEFINED [%1]").arg(vEnum); -} - QString View::VDGOperationMode::text() { - QString text = opModeText(static_cast(opMode())); + QString text = Gui::enumString(static_cast(opMode())); return text; } Index: sources/view/dg/data/VDGOperationModeData.h =================================================================== diff -u -r6cad9b004e904200b71de7431c745795256080df -rf688ed9f1c64a2603a6d10fbb090b257a43e1f6f --- sources/view/dg/data/VDGOperationModeData.h (.../VDGOperationModeData.h) (revision 6cad9b004e904200b71de7431c745795256080df) +++ sources/view/dg/data/VDGOperationModeData.h (.../VDGOperationModeData.h) (revision f688ed9f1c64a2603a6d10fbb090b257a43e1f6f) @@ -19,8 +19,8 @@ // Project #include "main.h" // Doxygen : don't remove -#include "MModel.h" #include "VView.h" +#include "MDGOperationModeData.h" #include "GuiGlobals.h" // namespace @@ -44,9 +44,6 @@ VIEW_DEC(VDGOperationMode, DGOperationModeData) -private: - QString opModeText(GuiDGOpModes vEnum); - public slots: QString text(); }; Index: sources/view/dg/data/VDGPressuresData.h =================================================================== diff -u -r6cad9b004e904200b71de7431c745795256080df -rf688ed9f1c64a2603a6d10fbb090b257a43e1f6f --- sources/view/dg/data/VDGPressuresData.h (.../VDGPressuresData.h) (revision 6cad9b004e904200b71de7431c745795256080df) +++ sources/view/dg/data/VDGPressuresData.h (.../VDGPressuresData.h) (revision f688ed9f1c64a2603a6d10fbb090b257a43e1f6f) @@ -19,8 +19,8 @@ // Project #include "main.h" // Doxygen : don't remove -#include "MModel.h" #include "VView.h" +#include "MDGPressuresData.h" // namespace namespace View { Index: sources/view/dg/data/VDGROPumpData.h =================================================================== diff -u -r93b6bd48e2aec1fca4f2b5b79dcefffa49e9ce16 -rf688ed9f1c64a2603a6d10fbb090b257a43e1f6f --- sources/view/dg/data/VDGROPumpData.h (.../VDGROPumpData.h) (revision 93b6bd48e2aec1fca4f2b5b79dcefffa49e9ce16) +++ sources/view/dg/data/VDGROPumpData.h (.../VDGROPumpData.h) (revision f688ed9f1c64a2603a6d10fbb090b257a43e1f6f) @@ -19,8 +19,8 @@ // Project #include "main.h" // Doxygen : don't remove -#include "MModel.h" #include "VView.h" +#include "MDGROPumpData.h" // namespace namespace View { Index: sources/view/dg/data/VDGReservoirData.h =================================================================== diff -u -r6cad9b004e904200b71de7431c745795256080df -rf688ed9f1c64a2603a6d10fbb090b257a43e1f6f --- sources/view/dg/data/VDGReservoirData.h (.../VDGReservoirData.h) (revision 6cad9b004e904200b71de7431c745795256080df) +++ sources/view/dg/data/VDGReservoirData.h (.../VDGReservoirData.h) (revision f688ed9f1c64a2603a6d10fbb090b257a43e1f6f) @@ -19,8 +19,8 @@ // Project #include "main.h" // Doxygen : don't remove -#include "MModel.h" #include "VView.h" +#include "MDGReservoirData.h" // namespace namespace View { Index: sources/view/dg/data/VDGTemperaturesData.h =================================================================== diff -u -r6cad9b004e904200b71de7431c745795256080df -rf688ed9f1c64a2603a6d10fbb090b257a43e1f6f --- sources/view/dg/data/VDGTemperaturesData.h (.../VDGTemperaturesData.h) (revision 6cad9b004e904200b71de7431c745795256080df) +++ sources/view/dg/data/VDGTemperaturesData.h (.../VDGTemperaturesData.h) (revision f688ed9f1c64a2603a6d10fbb090b257a43e1f6f) @@ -19,8 +19,8 @@ // Project #include "main.h" // Doxygen : don't remove -#include "MModel.h" #include "VView.h" +#include "MDGTemperaturesData.h" // namespace namespace View { Index: sources/view/dg/data/VDGValvesStatesData.h =================================================================== diff -u -r6cad9b004e904200b71de7431c745795256080df -rf688ed9f1c64a2603a6d10fbb090b257a43e1f6f --- sources/view/dg/data/VDGValvesStatesData.h (.../VDGValvesStatesData.h) (revision 6cad9b004e904200b71de7431c745795256080df) +++ sources/view/dg/data/VDGValvesStatesData.h (.../VDGValvesStatesData.h) (revision f688ed9f1c64a2603a6d10fbb090b257a43e1f6f) @@ -19,8 +19,8 @@ // Project #include "main.h" // Doxygen : don't remove -#include "MModel.h" #include "VView.h" +#include "MDGValvesStatesData.h" // namespace namespace View { Index: sources/view/hd/adjustment/VPreTreatmentAdjustmentConsumablesConfirm.h =================================================================== diff -u -r695e95aa2ec5e6e1c395567449ac0f671ecd61ed -rf688ed9f1c64a2603a6d10fbb090b257a43e1f6f --- sources/view/hd/adjustment/VPreTreatmentAdjustmentConsumablesConfirm.h (.../VPreTreatmentAdjustmentConsumablesConfirm.h) (revision 695e95aa2ec5e6e1c395567449ac0f671ecd61ed) +++ sources/view/hd/adjustment/VPreTreatmentAdjustmentConsumablesConfirm.h (.../VPreTreatmentAdjustmentConsumablesConfirm.h) (revision f688ed9f1c64a2603a6d10fbb090b257a43e1f6f) @@ -18,7 +18,6 @@ // Project #include "main.h" // Doxygen : don't remove -#include "VView.h" #include "VTreatmentAdjustmentResponseBase.h" namespace View { Index: sources/view/hd/adjustment/VPreTreatmentAdjustmentDisposablesConfirm.h =================================================================== diff -u -r695e95aa2ec5e6e1c395567449ac0f671ecd61ed -rf688ed9f1c64a2603a6d10fbb090b257a43e1f6f --- sources/view/hd/adjustment/VPreTreatmentAdjustmentDisposablesConfirm.h (.../VPreTreatmentAdjustmentDisposablesConfirm.h) (revision 695e95aa2ec5e6e1c395567449ac0f671ecd61ed) +++ sources/view/hd/adjustment/VPreTreatmentAdjustmentDisposablesConfirm.h (.../VPreTreatmentAdjustmentDisposablesConfirm.h) (revision f688ed9f1c64a2603a6d10fbb090b257a43e1f6f) @@ -18,7 +18,6 @@ // Project #include "main.h" // Doxygen : don't remove -#include "VView.h" #include "VTreatmentAdjustmentResponseBase.h" namespace View { Index: sources/view/hd/adjustment/VPreTreatmentAdjustmentDisposablesPrime.h =================================================================== diff -u -r695e95aa2ec5e6e1c395567449ac0f671ecd61ed -rf688ed9f1c64a2603a6d10fbb090b257a43e1f6f --- sources/view/hd/adjustment/VPreTreatmentAdjustmentDisposablesPrime.h (.../VPreTreatmentAdjustmentDisposablesPrime.h) (revision 695e95aa2ec5e6e1c395567449ac0f671ecd61ed) +++ sources/view/hd/adjustment/VPreTreatmentAdjustmentDisposablesPrime.h (.../VPreTreatmentAdjustmentDisposablesPrime.h) (revision f688ed9f1c64a2603a6d10fbb090b257a43e1f6f) @@ -18,8 +18,8 @@ // Project #include "main.h" // Doxygen : don't remove -#include "VView.h" #include "VTreatmentAdjustmentResponseBase.h" +#include "MPreTreatmentAdjustDisposablesPrimeResponse.h" namespace View { Index: sources/view/hd/adjustment/VPreTreatmentAdjustmentInitTreatment.h =================================================================== diff -u -r695e95aa2ec5e6e1c395567449ac0f671ecd61ed -rf688ed9f1c64a2603a6d10fbb090b257a43e1f6f --- sources/view/hd/adjustment/VPreTreatmentAdjustmentInitTreatment.h (.../VPreTreatmentAdjustmentInitTreatment.h) (revision 695e95aa2ec5e6e1c395567449ac0f671ecd61ed) +++ sources/view/hd/adjustment/VPreTreatmentAdjustmentInitTreatment.h (.../VPreTreatmentAdjustmentInitTreatment.h) (revision f688ed9f1c64a2603a6d10fbb090b257a43e1f6f) @@ -18,8 +18,8 @@ // Project #include "main.h" // Doxygen : don't remove -#include "VView.h" #include "VTreatmentAdjustmentResponseBase.h" +#include "MPreTreatmentAdjustInitTreatmentResponse.h" namespace View { Index: sources/view/hd/adjustment/VPreTreatmentAdjustmentPatientConnectionBegin.h =================================================================== diff -u -r695e95aa2ec5e6e1c395567449ac0f671ecd61ed -rf688ed9f1c64a2603a6d10fbb090b257a43e1f6f --- sources/view/hd/adjustment/VPreTreatmentAdjustmentPatientConnectionBegin.h (.../VPreTreatmentAdjustmentPatientConnectionBegin.h) (revision 695e95aa2ec5e6e1c395567449ac0f671ecd61ed) +++ sources/view/hd/adjustment/VPreTreatmentAdjustmentPatientConnectionBegin.h (.../VPreTreatmentAdjustmentPatientConnectionBegin.h) (revision f688ed9f1c64a2603a6d10fbb090b257a43e1f6f) @@ -18,8 +18,8 @@ // Project #include "main.h" // Doxygen : don't remove -#include "VView.h" #include "VTreatmentAdjustmentResponseBase.h" +#include "MPreTreatmentAdjustPatientConnectionBeginResponse.h" namespace View { Index: sources/view/hd/adjustment/VPreTreatmentAdjustmentPatientConnectionConfirm.h =================================================================== diff -u -r695e95aa2ec5e6e1c395567449ac0f671ecd61ed -rf688ed9f1c64a2603a6d10fbb090b257a43e1f6f --- sources/view/hd/adjustment/VPreTreatmentAdjustmentPatientConnectionConfirm.h (.../VPreTreatmentAdjustmentPatientConnectionConfirm.h) (revision 695e95aa2ec5e6e1c395567449ac0f671ecd61ed) +++ sources/view/hd/adjustment/VPreTreatmentAdjustmentPatientConnectionConfirm.h (.../VPreTreatmentAdjustmentPatientConnectionConfirm.h) (revision f688ed9f1c64a2603a6d10fbb090b257a43e1f6f) @@ -18,8 +18,8 @@ // Project #include "main.h" // Doxygen : don't remove -#include "VView.h" #include "VTreatmentAdjustmentResponseBase.h" +#include "MPreTreatmentAdjustPatientConnectionConfirmResponse.h" namespace View { Index: sources/view/hd/adjustment/VPreTreatmentAdjustmentStartTreatment.h =================================================================== diff -u -r695e95aa2ec5e6e1c395567449ac0f671ecd61ed -rf688ed9f1c64a2603a6d10fbb090b257a43e1f6f --- sources/view/hd/adjustment/VPreTreatmentAdjustmentStartTreatment.h (.../VPreTreatmentAdjustmentStartTreatment.h) (revision 695e95aa2ec5e6e1c395567449ac0f671ecd61ed) +++ sources/view/hd/adjustment/VPreTreatmentAdjustmentStartTreatment.h (.../VPreTreatmentAdjustmentStartTreatment.h) (revision f688ed9f1c64a2603a6d10fbb090b257a43e1f6f) @@ -18,8 +18,8 @@ // Project #include "main.h" // Doxygen : don't remove -#include "VView.h" #include "VTreatmentAdjustmentResponseBase.h" +#include "MPreTreatmentAdjustStartTreatmentResponse.h" namespace View { Index: sources/view/hd/adjustment/VPreTreatmentAdjustmentUltrafiltrationInit.h =================================================================== diff -u -r695e95aa2ec5e6e1c395567449ac0f671ecd61ed -rf688ed9f1c64a2603a6d10fbb090b257a43e1f6f --- sources/view/hd/adjustment/VPreTreatmentAdjustmentUltrafiltrationInit.h (.../VPreTreatmentAdjustmentUltrafiltrationInit.h) (revision 695e95aa2ec5e6e1c395567449ac0f671ecd61ed) +++ sources/view/hd/adjustment/VPreTreatmentAdjustmentUltrafiltrationInit.h (.../VPreTreatmentAdjustmentUltrafiltrationInit.h) (revision f688ed9f1c64a2603a6d10fbb090b257a43e1f6f) @@ -18,8 +18,8 @@ // Project #include "main.h" // Doxygen : don't remove -#include "VView.h" #include "VTreatmentAdjustmentResponseBase.h" +#include "MPreTreatmentAdjustUltrafiltrationInitResponse.h" namespace View { Index: sources/view/hd/adjustment/VPreTreatmentAdjustmentWaterSample.h =================================================================== diff -u -r695e95aa2ec5e6e1c395567449ac0f671ecd61ed -rf688ed9f1c64a2603a6d10fbb090b257a43e1f6f --- sources/view/hd/adjustment/VPreTreatmentAdjustmentWaterSample.h (.../VPreTreatmentAdjustmentWaterSample.h) (revision 695e95aa2ec5e6e1c395567449ac0f671ecd61ed) +++ sources/view/hd/adjustment/VPreTreatmentAdjustmentWaterSample.h (.../VPreTreatmentAdjustmentWaterSample.h) (revision f688ed9f1c64a2603a6d10fbb090b257a43e1f6f) @@ -18,8 +18,8 @@ // Project #include "main.h" // Doxygen : don't remove -#include "VView.h" #include "VTreatmentAdjustmentResponseBase.h" +#include "MPreTreatmentAdjustWaterSampleResponse.h" namespace View { Index: sources/view/hd/adjustment/VTreatmentAdjustmentDuration.h =================================================================== diff -u -rcc1e9d6d55c816f3fcd626dc6948cca24da283b3 -rf688ed9f1c64a2603a6d10fbb090b257a43e1f6f --- sources/view/hd/adjustment/VTreatmentAdjustmentDuration.h (.../VTreatmentAdjustmentDuration.h) (revision cc1e9d6d55c816f3fcd626dc6948cca24da283b3) +++ sources/view/hd/adjustment/VTreatmentAdjustmentDuration.h (.../VTreatmentAdjustmentDuration.h) (revision f688ed9f1c64a2603a6d10fbb090b257a43e1f6f) @@ -18,9 +18,8 @@ // Project #include "main.h" // Doxygen : don't remove -#include "MModel.h" -#include "VView.h" #include "VTreatmentAdjustmentResponseBase.h" +#include "MTreatmentAdjustDurationResponse.h" namespace View { Index: sources/view/hd/adjustment/VTreatmentAdjustmentEnd.h =================================================================== diff -u -r81999ff346ffc8e3f9c4dd1c948b4b7fc577de2c -rf688ed9f1c64a2603a6d10fbb090b257a43e1f6f --- sources/view/hd/adjustment/VTreatmentAdjustmentEnd.h (.../VTreatmentAdjustmentEnd.h) (revision 81999ff346ffc8e3f9c4dd1c948b4b7fc577de2c) +++ sources/view/hd/adjustment/VTreatmentAdjustmentEnd.h (.../VTreatmentAdjustmentEnd.h) (revision f688ed9f1c64a2603a6d10fbb090b257a43e1f6f) @@ -19,6 +19,7 @@ // Project #include "main.h" // Doxygen : don't remove #include "VTreatmentAdjustmentResponseBase.h" +#include "MTreatmentAdjustEndResponse.h" namespace View { Index: sources/view/hd/adjustment/VTreatmentAdjustmentFlows.h =================================================================== diff -u -r64d87d540594252e8039ab2595016d98f1e3cc28 -rf688ed9f1c64a2603a6d10fbb090b257a43e1f6f --- sources/view/hd/adjustment/VTreatmentAdjustmentFlows.h (.../VTreatmentAdjustmentFlows.h) (revision 64d87d540594252e8039ab2595016d98f1e3cc28) +++ sources/view/hd/adjustment/VTreatmentAdjustmentFlows.h (.../VTreatmentAdjustmentFlows.h) (revision f688ed9f1c64a2603a6d10fbb090b257a43e1f6f) @@ -19,8 +19,8 @@ // Project #include "main.h" // Doxygen : don't remove -#include "VView.h" #include "VTreatmentAdjustmentResponseBase.h" +#include "MTreatmentAdjustBloodDialysateResponse.h" namespace View { Index: sources/view/hd/adjustment/VTreatmentAdjustmentHeparin.h =================================================================== diff -u -rae1042a0c14d6d27556730183cc2cbe1a00bc0a7 -rf688ed9f1c64a2603a6d10fbb090b257a43e1f6f --- sources/view/hd/adjustment/VTreatmentAdjustmentHeparin.h (.../VTreatmentAdjustmentHeparin.h) (revision ae1042a0c14d6d27556730183cc2cbe1a00bc0a7) +++ sources/view/hd/adjustment/VTreatmentAdjustmentHeparin.h (.../VTreatmentAdjustmentHeparin.h) (revision f688ed9f1c64a2603a6d10fbb090b257a43e1f6f) @@ -19,6 +19,7 @@ // Project #include "main.h" // Doxygen : don't remove #include "VTreatmentAdjustmentResponseBase.h" +#include "MTreatmentAdjustHeparinResponse.h" namespace View { Index: sources/view/hd/adjustment/VTreatmentAdjustmentPressuresLimits.h =================================================================== diff -u -rc8b2c06141831ba2908323138d94dec0ccc0d402 -rf688ed9f1c64a2603a6d10fbb090b257a43e1f6f --- sources/view/hd/adjustment/VTreatmentAdjustmentPressuresLimits.h (.../VTreatmentAdjustmentPressuresLimits.h) (revision c8b2c06141831ba2908323138d94dec0ccc0d402) +++ sources/view/hd/adjustment/VTreatmentAdjustmentPressuresLimits.h (.../VTreatmentAdjustmentPressuresLimits.h) (revision f688ed9f1c64a2603a6d10fbb090b257a43e1f6f) @@ -19,8 +19,8 @@ // Project #include "main.h" // Doxygen : don't remove -#include "VView.h" #include "VTreatmentAdjustmentResponseBase.h" +#include "MTreatmentAdjustPressuresLimitsResponse.h" namespace View { Index: sources/view/hd/adjustment/VTreatmentAdjustmentRecirculate.h =================================================================== diff -u -r28a383251ad37c669202c0a717ff90b8fc21a442 -rf688ed9f1c64a2603a6d10fbb090b257a43e1f6f --- sources/view/hd/adjustment/VTreatmentAdjustmentRecirculate.h (.../VTreatmentAdjustmentRecirculate.h) (revision 28a383251ad37c669202c0a717ff90b8fc21a442) +++ sources/view/hd/adjustment/VTreatmentAdjustmentRecirculate.h (.../VTreatmentAdjustmentRecirculate.h) (revision f688ed9f1c64a2603a6d10fbb090b257a43e1f6f) @@ -19,6 +19,7 @@ // Project #include "main.h" // Doxygen : don't remove #include "VTreatmentAdjustmentResponseBase.h" +#include "MTreatmentAdjustRecirculateResponse.h" namespace View { Index: sources/view/hd/adjustment/VTreatmentAdjustmentResponseBase.cpp =================================================================== diff -u -rcc1e9d6d55c816f3fcd626dc6948cca24da283b3 -rf688ed9f1c64a2603a6d10fbb090b257a43e1f6f --- sources/view/hd/adjustment/VTreatmentAdjustmentResponseBase.cpp (.../VTreatmentAdjustmentResponseBase.cpp) (revision cc1e9d6d55c816f3fcd626dc6948cca24da283b3) +++ sources/view/hd/adjustment/VTreatmentAdjustmentResponseBase.cpp (.../VTreatmentAdjustmentResponseBase.cpp) (revision f688ed9f1c64a2603a6d10fbb090b257a43e1f6f) @@ -21,28 +21,6 @@ void VTreatmentAdjustmentResponseBase::initConnections() { } /*! - * \brief VTreatmentAdjustmentResponseBase::reasonText - * \details this code is the place holder for the alarms description mapping - * since it is another feature - * it returns the enum name for now - * \param vEnum - The Rejection Reason enum - * \return String representation of the Rejection Reason enum name - */ -QString VTreatmentAdjustmentResponseBase::reasonText(GuiRequestReasons vEnum) -{ - // TEST : this code is the place holder for the alarms description mapping - // since it is another feature - // it returns the enum name for now - const QMetaObject *mo = qt_getEnumMetaObject(vEnum); - int enumIdx = mo->indexOfEnumerator(qt_getEnumName(vEnum)); - QString mText = mo->enumerator(enumIdx).valueToKey(vEnum); - if ( ! mText.isEmpty() ) { - return mText; - } - return QString("[%1] Unknown Error").arg(vEnum); -} - -/*! * \brief View::VTreatmentAdjustmentResponseBase::text * \details The slot to get the Reason Description * \return Reason description as string @@ -51,6 +29,6 @@ { QString text; if (_adjustment_Reason != GuiRequestReasons::REQUEST_REJECT_REASON_NONE) - text = reasonText(static_cast(_adjustment_Reason)); + text = Gui::enumString(static_cast(_adjustment_Reason), "[%1] Unknown Error"); return text; } Index: sources/view/hd/adjustment/VTreatmentAdjustmentResponseBase.h =================================================================== diff -u -r2c9421bd6da03c7e0bd0bfa1f49fa95c2bd18a95 -rf688ed9f1c64a2603a6d10fbb090b257a43e1f6f --- sources/view/hd/adjustment/VTreatmentAdjustmentResponseBase.h (.../VTreatmentAdjustmentResponseBase.h) (revision 2c9421bd6da03c7e0bd0bfa1f49fa95c2bd18a95) +++ sources/view/hd/adjustment/VTreatmentAdjustmentResponseBase.h (.../VTreatmentAdjustmentResponseBase.h) (revision f688ed9f1c64a2603a6d10fbb090b257a43e1f6f) @@ -19,8 +19,9 @@ // Project #include "main.h" // Doxygen : don't remove -#include "MModel.h" #include "VView.h" +#include "MPreTreatmentAdjustRequests.h" +#include "MTreatmentAdjustRequests.h" #include "GuiGlobals.h" // forward declarations @@ -58,9 +59,6 @@ VIEW_DEC_CLASS(VTreatmentAdjustmentResponseBase) -private: - QString reasonText (GuiRequestReasons vEnum); - protected slots: QString text(); }; Index: sources/view/hd/adjustment/VTreatmentAdjustmentRinseback.h =================================================================== diff -u -r28a383251ad37c669202c0a717ff90b8fc21a442 -rf688ed9f1c64a2603a6d10fbb090b257a43e1f6f --- sources/view/hd/adjustment/VTreatmentAdjustmentRinseback.h (.../VTreatmentAdjustmentRinseback.h) (revision 28a383251ad37c669202c0a717ff90b8fc21a442) +++ sources/view/hd/adjustment/VTreatmentAdjustmentRinseback.h (.../VTreatmentAdjustmentRinseback.h) (revision f688ed9f1c64a2603a6d10fbb090b257a43e1f6f) @@ -19,6 +19,7 @@ // Project #include "main.h" // Doxygen : don't remove #include "VTreatmentAdjustmentResponseBase.h" +#include "MTreatmentAdjustRinsebackResponse.h" namespace View { Index: sources/view/hd/adjustment/VTreatmentAdjustmentSaline.h =================================================================== diff -u -ra6abc05918a15924460d2b9358365b3eeedf1d1c -rf688ed9f1c64a2603a6d10fbb090b257a43e1f6f --- sources/view/hd/adjustment/VTreatmentAdjustmentSaline.h (.../VTreatmentAdjustmentSaline.h) (revision a6abc05918a15924460d2b9358365b3eeedf1d1c) +++ sources/view/hd/adjustment/VTreatmentAdjustmentSaline.h (.../VTreatmentAdjustmentSaline.h) (revision f688ed9f1c64a2603a6d10fbb090b257a43e1f6f) @@ -19,6 +19,7 @@ // Project #include "main.h" // Doxygen : don't remove #include "VTreatmentAdjustmentResponseBase.h" +#include "MTreatmentAdjustSalineResponse.h" namespace View { Index: sources/view/hd/adjustment/VTreatmentAdjustmentUltrafiltrationConfirm.h =================================================================== diff -u -r64d87d540594252e8039ab2595016d98f1e3cc28 -rf688ed9f1c64a2603a6d10fbb090b257a43e1f6f --- sources/view/hd/adjustment/VTreatmentAdjustmentUltrafiltrationConfirm.h (.../VTreatmentAdjustmentUltrafiltrationConfirm.h) (revision 64d87d540594252e8039ab2595016d98f1e3cc28) +++ sources/view/hd/adjustment/VTreatmentAdjustmentUltrafiltrationConfirm.h (.../VTreatmentAdjustmentUltrafiltrationConfirm.h) (revision f688ed9f1c64a2603a6d10fbb090b257a43e1f6f) @@ -18,8 +18,8 @@ // Project #include "main.h" // Doxygen : don't remove -#include "VView.h" #include "VTreatmentAdjustmentResponseBase.h" +#include "MTreatmentAdjustUltrafiltrationConfirmResponse.h" namespace View { Index: sources/view/hd/adjustment/VTreatmentAdjustmentUltrafiltrationEdit.h =================================================================== diff -u -r64d87d540594252e8039ab2595016d98f1e3cc28 -rf688ed9f1c64a2603a6d10fbb090b257a43e1f6f --- sources/view/hd/adjustment/VTreatmentAdjustmentUltrafiltrationEdit.h (.../VTreatmentAdjustmentUltrafiltrationEdit.h) (revision 64d87d540594252e8039ab2595016d98f1e3cc28) +++ sources/view/hd/adjustment/VTreatmentAdjustmentUltrafiltrationEdit.h (.../VTreatmentAdjustmentUltrafiltrationEdit.h) (revision f688ed9f1c64a2603a6d10fbb090b257a43e1f6f) @@ -18,8 +18,8 @@ // Project #include "main.h" // Doxygen : don't remove -#include "VView.h" #include "VTreatmentAdjustmentResponseBase.h" +#include "MTreatmentAdjustUltrafiltrationEditResponse.h" namespace View { Index: sources/view/hd/adjustment/VTreatmentAdjustmentUltrafiltrationState.h =================================================================== diff -u -ra6abc05918a15924460d2b9358365b3eeedf1d1c -rf688ed9f1c64a2603a6d10fbb090b257a43e1f6f --- sources/view/hd/adjustment/VTreatmentAdjustmentUltrafiltrationState.h (.../VTreatmentAdjustmentUltrafiltrationState.h) (revision a6abc05918a15924460d2b9358365b3eeedf1d1c) +++ sources/view/hd/adjustment/VTreatmentAdjustmentUltrafiltrationState.h (.../VTreatmentAdjustmentUltrafiltrationState.h) (revision f688ed9f1c64a2603a6d10fbb090b257a43e1f6f) @@ -18,8 +18,8 @@ // Project #include "main.h" // Doxygen : don't remove -#include "VView.h" #include "VTreatmentAdjustmentResponseBase.h" +#include "MTreatmentAdjustUltrafiltrationStateResponse.h" namespace View { Index: sources/view/hd/adjustment/VTreatmentAdjustmentVersions.h =================================================================== diff -u -r2d2917978a4e25eb79a0fb71851b6124171d8072 -rf688ed9f1c64a2603a6d10fbb090b257a43e1f6f --- sources/view/hd/adjustment/VTreatmentAdjustmentVersions.h (.../VTreatmentAdjustmentVersions.h) (revision 2d2917978a4e25eb79a0fb71851b6124171d8072) +++ sources/view/hd/adjustment/VTreatmentAdjustmentVersions.h (.../VTreatmentAdjustmentVersions.h) (revision f688ed9f1c64a2603a6d10fbb090b257a43e1f6f) @@ -17,7 +17,10 @@ #include // Project +#include "main.h" // Doxygen : don't remove #include "VTreatmentAdjustmentResponseBase.h" +#include "MAdjustHDVersionsResponse.h" +#include "MAdjustDGVersionsResponse.h" namespace View { Index: sources/view/hd/alarm/VAlarmStatus.cpp =================================================================== diff -u -r695e95aa2ec5e6e1c395567449ac0f671ecd61ed -rf688ed9f1c64a2603a6d10fbb090b257a43e1f6f --- sources/view/hd/alarm/VAlarmStatus.cpp (.../VAlarmStatus.cpp) (revision 695e95aa2ec5e6e1c395567449ac0f671ecd61ed) +++ sources/view/hd/alarm/VAlarmStatus.cpp (.../VAlarmStatus.cpp) (revision f688ed9f1c64a2603a6d10fbb090b257a43e1f6f) @@ -152,29 +152,6 @@ } /*! - * \brief VAlarmStatus::alarmPriorityText - * \details this code is the place holder for the alarms description mapping - * since it is another feature - * it returns the enum name for now - * \param vEnum - The Alarm priority - * \return String representation of the Alarm priority Enum name - */ -QString VAlarmStatus::alarmPriorityText(GuiAlarmPriority vEnum) -{ - // coco begin validated: this code is the place holder for the alarms description mapping - // since it is another feature - // it returns the enum name for now - const QMetaObject *mo = qt_getEnumMetaObject(vEnum); - int enumIdx = mo->indexOfEnumerator(qt_getEnumName(vEnum)); - const char *key = mo->enumerator(enumIdx).valueToKey(vEnum); - if (key) - return qPrintable(key); - else - return QString("ALARM_PRIORITY_UNDEFINED [%1]").arg(vEnum); -} -// coco end - -/*! * \brief VAlarmStatus::alarmIDText * \details Looks up the alarm text from the alarm ID * \param vEnum - The Alarm ID Index: sources/view/hd/alarm/VAlarmStatus.h =================================================================== diff -u -r0e001d4680d0f449e2d1d1a42870841293c6fbd5 -rf688ed9f1c64a2603a6d10fbb090b257a43e1f6f --- sources/view/hd/alarm/VAlarmStatus.h (.../VAlarmStatus.h) (revision 0e001d4680d0f449e2d1d1a42870841293c6fbd5) +++ sources/view/hd/alarm/VAlarmStatus.h (.../VAlarmStatus.h) (revision f688ed9f1c64a2603a6d10fbb090b257a43e1f6f) @@ -19,8 +19,8 @@ // Project #include "main.h" // Doxygen : don't remove -#include "MModel.h" #include "VView.h" +#include "MTreatmentAdjustRequests.h" #include "GuiGlobals.h" #include "MessageGlobals.h" #include "GuiController.h" @@ -81,7 +81,6 @@ private: QString id (); QString text (); - QString alarmPriorityText (GuiAlarmPriority vEnum); QString alarmIDText (GuiAlarmID vEnum); signals: Index: sources/view/hd/data/VHDAccelerometerData.h =================================================================== diff -u -r2d2917978a4e25eb79a0fb71851b6124171d8072 -rf688ed9f1c64a2603a6d10fbb090b257a43e1f6f --- sources/view/hd/data/VHDAccelerometerData.h (.../VHDAccelerometerData.h) (revision 2d2917978a4e25eb79a0fb71851b6124171d8072) +++ sources/view/hd/data/VHDAccelerometerData.h (.../VHDAccelerometerData.h) (revision f688ed9f1c64a2603a6d10fbb090b257a43e1f6f) @@ -18,8 +18,9 @@ #include // Project -#include "MModel.h" +#include "main.h" // Doxygen : don't remove #include "VView.h" +#include "MHDAccelerometerData.h" // namespace namespace View { Index: sources/view/hd/data/VHDOperationModeData.cpp =================================================================== diff -u -rd6dc1cd63d86d7d4f4c4d05958bec4f870783f41 -rf688ed9f1c64a2603a6d10fbb090b257a43e1f6f --- sources/view/hd/data/VHDOperationModeData.cpp (.../VHDOperationModeData.cpp) (revision d6dc1cd63d86d7d4f4c4d05958bec4f870783f41) +++ sources/view/hd/data/VHDOperationModeData.cpp (.../VHDOperationModeData.cpp) (revision f688ed9f1c64a2603a6d10fbb090b257a43e1f6f) @@ -34,28 +34,8 @@ invalidMode ( vData.mOpMode == GuiHDOpModes::MODE_NLEG ); } -/*! - * \brief VHDOperationMode::opModeText - * \details returns the string conversion name of the enum GuiHDOpModes vEnum - * \param vEnum - the GuiHDOpModes vEnum - * \return String name of the enum - */ -QString VHDOperationMode::opModeText(GuiHDOpModes vEnum) -{ - // TEST : this code is the place holder for the alarms description mapping - // since it is another feature - // it returns the enum name for now - const QMetaObject *mo = qt_getEnumMetaObject(vEnum); - int enumIdx = mo->indexOfEnumerator(qt_getEnumName(vEnum)); - const char *key = mo->enumerator(enumIdx).valueToKey(vEnum); - if (key) - return qPrintable(key); - else - return QString("UNDEFINED [%1]").arg(vEnum); -} - QString View::VHDOperationMode::text() { - QString text = opModeText(static_cast(opMode())); + QString text = Gui::enumString(static_cast(opMode())); return text; } Index: sources/view/hd/data/VHDOperationModeData.h =================================================================== diff -u -rd6dc1cd63d86d7d4f4c4d05958bec4f870783f41 -rf688ed9f1c64a2603a6d10fbb090b257a43e1f6f --- sources/view/hd/data/VHDOperationModeData.h (.../VHDOperationModeData.h) (revision d6dc1cd63d86d7d4f4c4d05958bec4f870783f41) +++ sources/view/hd/data/VHDOperationModeData.h (.../VHDOperationModeData.h) (revision f688ed9f1c64a2603a6d10fbb090b257a43e1f6f) @@ -19,8 +19,8 @@ // Project #include "main.h" // Doxygen : don't remove -#include "MModel.h" #include "VView.h" +#include "MHDOperationModeData.h" #include "GuiGlobals.h" // namespace @@ -55,9 +55,6 @@ VIEW_DEC(VHDOperationMode, HDOperationModeData) -private: - QString opModeText(GuiHDOpModes vEnum); - public slots: QString text(); }; Index: sources/view/hd/data/VHDTreatmentStatesData.h =================================================================== diff -u -rbd01334f257c35b96b7b232beacbcd7fae60c852 -rf688ed9f1c64a2603a6d10fbb090b257a43e1f6f --- sources/view/hd/data/VHDTreatmentStatesData.h (.../VHDTreatmentStatesData.h) (revision bd01334f257c35b96b7b232beacbcd7fae60c852) +++ sources/view/hd/data/VHDTreatmentStatesData.h (.../VHDTreatmentStatesData.h) (revision f688ed9f1c64a2603a6d10fbb090b257a43e1f6f) @@ -19,12 +19,13 @@ // Project #include "main.h" // Doxygen : don't remove -#include "MModel.h" #include "VView.h" -#include "GuiGlobals.h" +#include "MTreatmentStatesData.h" +#include "MTreatmentAdjustUltrafiltrationStateResponse.h" +#include "MTreatmentAdjustSalineResponse.h" +#include "MTreatmentAdjustHeparinResponse.h" // namespace -using namespace Gui; namespace View { /*! Index: sources/view/hd/data/VPreTreatmentDisposablesPrimeData.h =================================================================== diff -u -r695e95aa2ec5e6e1c395567449ac0f671ecd61ed -rf688ed9f1c64a2603a6d10fbb090b257a43e1f6f --- sources/view/hd/data/VPreTreatmentDisposablesPrimeData.h (.../VPreTreatmentDisposablesPrimeData.h) (revision 695e95aa2ec5e6e1c395567449ac0f671ecd61ed) +++ sources/view/hd/data/VPreTreatmentDisposablesPrimeData.h (.../VPreTreatmentDisposablesPrimeData.h) (revision f688ed9f1c64a2603a6d10fbb090b257a43e1f6f) @@ -19,8 +19,8 @@ // Project #include "main.h" // Doxygen : don't remove -#include "MModel.h" #include "VView.h" +#include "MPreTreatmentDisposablesPrimeData.h" // namespace namespace View { Index: sources/view/hd/data/VPreTreatmentSelfTestDryData.h =================================================================== diff -u -r96854524927f212c24b9e4a253baeff2e672228f -rf688ed9f1c64a2603a6d10fbb090b257a43e1f6f --- sources/view/hd/data/VPreTreatmentSelfTestDryData.h (.../VPreTreatmentSelfTestDryData.h) (revision 96854524927f212c24b9e4a253baeff2e672228f) +++ sources/view/hd/data/VPreTreatmentSelfTestDryData.h (.../VPreTreatmentSelfTestDryData.h) (revision f688ed9f1c64a2603a6d10fbb090b257a43e1f6f) @@ -19,8 +19,8 @@ // Project #include "main.h" // Doxygen : don't remove -#include "MModel.h" #include "VView.h" +#include "MPreTreatmentSelfTestDryData.h" // namespace namespace View { Index: sources/view/hd/data/VPreTreatmentSelfTestNoCartridgeData.h =================================================================== diff -u -r96854524927f212c24b9e4a253baeff2e672228f -rf688ed9f1c64a2603a6d10fbb090b257a43e1f6f --- sources/view/hd/data/VPreTreatmentSelfTestNoCartridgeData.h (.../VPreTreatmentSelfTestNoCartridgeData.h) (revision 96854524927f212c24b9e4a253baeff2e672228f) +++ sources/view/hd/data/VPreTreatmentSelfTestNoCartridgeData.h (.../VPreTreatmentSelfTestNoCartridgeData.h) (revision f688ed9f1c64a2603a6d10fbb090b257a43e1f6f) @@ -19,8 +19,8 @@ // Project #include "main.h" // Doxygen : don't remove -#include "MModel.h" #include "VView.h" +#include "MPreTreatmentSelfTestNoCartridgeData.h" // namespace namespace View { Index: sources/view/hd/data/VPreTreatmentStatesData.h =================================================================== diff -u -rc6cfb5043fc9c29cc039e36915368bcd3a63baa6 -rf688ed9f1c64a2603a6d10fbb090b257a43e1f6f --- sources/view/hd/data/VPreTreatmentStatesData.h (.../VPreTreatmentStatesData.h) (revision c6cfb5043fc9c29cc039e36915368bcd3a63baa6) +++ sources/view/hd/data/VPreTreatmentStatesData.h (.../VPreTreatmentStatesData.h) (revision f688ed9f1c64a2603a6d10fbb090b257a43e1f6f) @@ -19,12 +19,10 @@ // Project #include "main.h" // Doxygen : don't remove -#include "MModel.h" #include "VView.h" -#include "GuiGlobals.h" +#include "MPreTreatmentStatesData.h" // namespace -using namespace Gui; namespace View { /*! Index: sources/view/hd/data/VTreatmentBloodFlow.h =================================================================== diff -u -r93b6bd48e2aec1fca4f2b5b79dcefffa49e9ce16 -rf688ed9f1c64a2603a6d10fbb090b257a43e1f6f --- sources/view/hd/data/VTreatmentBloodFlow.h (.../VTreatmentBloodFlow.h) (revision 93b6bd48e2aec1fca4f2b5b79dcefffa49e9ce16) +++ sources/view/hd/data/VTreatmentBloodFlow.h (.../VTreatmentBloodFlow.h) (revision f688ed9f1c64a2603a6d10fbb090b257a43e1f6f) @@ -19,8 +19,8 @@ // Project #include "main.h" // Doxygen : don't remove -#include "MModel.h" #include "VView.h" +#include "MTreatmentFlowsData.h" // namespace namespace View { Index: sources/view/hd/data/VTreatmentBloodPrimeData.h =================================================================== diff -u -r2d37388a2b6651ea4002d6720e933315e0ba7fa3 -rf688ed9f1c64a2603a6d10fbb090b257a43e1f6f --- sources/view/hd/data/VTreatmentBloodPrimeData.h (.../VTreatmentBloodPrimeData.h) (revision 2d37388a2b6651ea4002d6720e933315e0ba7fa3) +++ sources/view/hd/data/VTreatmentBloodPrimeData.h (.../VTreatmentBloodPrimeData.h) (revision f688ed9f1c64a2603a6d10fbb090b257a43e1f6f) @@ -19,8 +19,8 @@ // Project #include "main.h" // Doxygen : don't remove -#include "MModel.h" #include "VView.h" +#include "MTreatmentBloodPrimeData.h" // namespace namespace View { Index: sources/view/hd/data/VTreatmentDialysateFlow.h =================================================================== diff -u -r93b6bd48e2aec1fca4f2b5b79dcefffa49e9ce16 -rf688ed9f1c64a2603a6d10fbb090b257a43e1f6f --- sources/view/hd/data/VTreatmentDialysateFlow.h (.../VTreatmentDialysateFlow.h) (revision 93b6bd48e2aec1fca4f2b5b79dcefffa49e9ce16) +++ sources/view/hd/data/VTreatmentDialysateFlow.h (.../VTreatmentDialysateFlow.h) (revision f688ed9f1c64a2603a6d10fbb090b257a43e1f6f) @@ -19,8 +19,8 @@ // Project #include "main.h" // Doxygen : don't remove -#include "MModel.h" #include "VView.h" +#include "MTreatmentFlowsData.h" // namespace namespace View { Index: sources/view/hd/data/VTreatmentHeparinData.h =================================================================== diff -u -rae1042a0c14d6d27556730183cc2cbe1a00bc0a7 -rf688ed9f1c64a2603a6d10fbb090b257a43e1f6f --- sources/view/hd/data/VTreatmentHeparinData.h (.../VTreatmentHeparinData.h) (revision ae1042a0c14d6d27556730183cc2cbe1a00bc0a7) +++ sources/view/hd/data/VTreatmentHeparinData.h (.../VTreatmentHeparinData.h) (revision f688ed9f1c64a2603a6d10fbb090b257a43e1f6f) @@ -19,8 +19,8 @@ // Project #include "main.h" // Doxygen : don't remove -#include "MModel.h" #include "VView.h" +#include "MTreatmentHeparinData.h" // namespace namespace View { Index: sources/view/hd/data/VTreatmentPressureOcclusion.h =================================================================== diff -u -rff8553ddbd24f3b7e4727e78bc74c13e8eb7eeb5 -rf688ed9f1c64a2603a6d10fbb090b257a43e1f6f --- sources/view/hd/data/VTreatmentPressureOcclusion.h (.../VTreatmentPressureOcclusion.h) (revision ff8553ddbd24f3b7e4727e78bc74c13e8eb7eeb5) +++ sources/view/hd/data/VTreatmentPressureOcclusion.h (.../VTreatmentPressureOcclusion.h) (revision f688ed9f1c64a2603a6d10fbb090b257a43e1f6f) @@ -19,8 +19,8 @@ // Project #include "main.h" // Doxygen : don't remove -#include "MModel.h" #include "VView.h" +#include "MTreatmentPressureOcclusionData.h" // namespace namespace View { Index: sources/view/hd/data/VTreatmentRanges.h =================================================================== diff -u -r64d87d540594252e8039ab2595016d98f1e3cc28 -rf688ed9f1c64a2603a6d10fbb090b257a43e1f6f --- sources/view/hd/data/VTreatmentRanges.h (.../VTreatmentRanges.h) (revision 64d87d540594252e8039ab2595016d98f1e3cc28) +++ sources/view/hd/data/VTreatmentRanges.h (.../VTreatmentRanges.h) (revision f688ed9f1c64a2603a6d10fbb090b257a43e1f6f) @@ -19,8 +19,8 @@ // Project #include "main.h" // Doxygen : don't remove -#include "MModel.h" #include "VView.h" +#include "MTreatmentRangesData.h" // namespace namespace View { Index: sources/view/hd/data/VTreatmentRecirculateData.h =================================================================== diff -u -r07e0c7bd409782cab96a4ae761ee3f819bdb8639 -rf688ed9f1c64a2603a6d10fbb090b257a43e1f6f --- sources/view/hd/data/VTreatmentRecirculateData.h (.../VTreatmentRecirculateData.h) (revision 07e0c7bd409782cab96a4ae761ee3f819bdb8639) +++ sources/view/hd/data/VTreatmentRecirculateData.h (.../VTreatmentRecirculateData.h) (revision f688ed9f1c64a2603a6d10fbb090b257a43e1f6f) @@ -19,8 +19,8 @@ // Project #include "main.h" // Doxygen : don't remove -#include "MModel.h" #include "VView.h" +#include "MTreatmentRecirculateData.h" // namespace namespace View { Index: sources/view/hd/data/VTreatmentRinsebackData.h =================================================================== diff -u -r07e0c7bd409782cab96a4ae761ee3f819bdb8639 -rf688ed9f1c64a2603a6d10fbb090b257a43e1f6f --- sources/view/hd/data/VTreatmentRinsebackData.h (.../VTreatmentRinsebackData.h) (revision 07e0c7bd409782cab96a4ae761ee3f819bdb8639) +++ sources/view/hd/data/VTreatmentRinsebackData.h (.../VTreatmentRinsebackData.h) (revision f688ed9f1c64a2603a6d10fbb090b257a43e1f6f) @@ -19,8 +19,8 @@ // Project #include "main.h" // Doxygen : don't remove -#include "MModel.h" #include "VView.h" +#include "MTreatmentRinsebackData.h" // namespace namespace View { Index: sources/view/hd/data/VTreatmentSalineData.h =================================================================== diff -u -r64d87d540594252e8039ab2595016d98f1e3cc28 -rf688ed9f1c64a2603a6d10fbb090b257a43e1f6f --- sources/view/hd/data/VTreatmentSalineData.h (.../VTreatmentSalineData.h) (revision 64d87d540594252e8039ab2595016d98f1e3cc28) +++ sources/view/hd/data/VTreatmentSalineData.h (.../VTreatmentSalineData.h) (revision f688ed9f1c64a2603a6d10fbb090b257a43e1f6f) @@ -19,8 +19,8 @@ // Project #include "main.h" // Doxygen : don't remove -#include "MModel.h" #include "VView.h" +#include "MTreatmentSalineData.h" // namespace namespace View { Index: sources/view/hd/data/VTreatmentTime.h =================================================================== diff -u -r64d87d540594252e8039ab2595016d98f1e3cc28 -rf688ed9f1c64a2603a6d10fbb090b257a43e1f6f --- sources/view/hd/data/VTreatmentTime.h (.../VTreatmentTime.h) (revision 64d87d540594252e8039ab2595016d98f1e3cc28) +++ sources/view/hd/data/VTreatmentTime.h (.../VTreatmentTime.h) (revision f688ed9f1c64a2603a6d10fbb090b257a43e1f6f) @@ -19,8 +19,8 @@ // Project #include "main.h" // Doxygen : don't remove -#include "MModel.h" #include "VView.h" +#include "MTreatmentTimeData.h" // namespace namespace View { Index: sources/view/hd/data/VTreatmentUltrafiltration.h =================================================================== diff -u -r50a109da2a76b335793c2b95fa668733fb7df684 -rf688ed9f1c64a2603a6d10fbb090b257a43e1f6f --- sources/view/hd/data/VTreatmentUltrafiltration.h (.../VTreatmentUltrafiltration.h) (revision 50a109da2a76b335793c2b95fa668733fb7df684) +++ sources/view/hd/data/VTreatmentUltrafiltration.h (.../VTreatmentUltrafiltration.h) (revision f688ed9f1c64a2603a6d10fbb090b257a43e1f6f) @@ -19,8 +19,8 @@ // Project #include "main.h" // Doxygen : don't remove -#include "MModel.h" #include "VView.h" +#include "MTreatmentOutletFlowData.h" // namespace namespace View { Index: sources/view/settings/VSettings.cpp =================================================================== diff -u -rc6cfb5043fc9c29cc039e36915368bcd3a63baa6 -rf688ed9f1c64a2603a6d10fbb090b257a43e1f6f --- sources/view/settings/VSettings.cpp (.../VSettings.cpp) (revision c6cfb5043fc9c29cc039e36915368bcd3a63baa6) +++ sources/view/settings/VSettings.cpp (.../VSettings.cpp) (revision f688ed9f1c64a2603a6d10fbb090b257a43e1f6f) @@ -13,51 +13,34 @@ * */ #include "VSettings.h" -#include "MSettings.h" // Qt -#include // Project -#include "ApplicationController.h" +#include "GuiController.h" #include "MSettings.h" -using namespace View; +VIEW_DEF(VSettings, SettingsData) -QVariantMap VSettings::settings() +void VSettings::onActionReceive(const SettingsData &) { - return _settings; -} - -QString VSettings::groupFormat() -{ - return "%1^%2"; -} - -VSettings::VSettings(QObject *parent) : QObject(parent) -{ - connect(&_ApplicationController, SIGNAL(didSettingsUpdate()), - this , SLOT( onSettingsUpdate())); -} - -void VSettings::onSettingsUpdate() -{ + QVariantMap mSettings; for (const auto &group : _SettingModel.groups()) { - QVariantMap variantMap; - // DEBUG : qDebug() << " ### " + QVariantMap details; + // DEBUG : + // qDebug() << " ##### " // << _SettingModel.keys (group) // << _SettingModel.values (group); - QStringList keys = _SettingModel.keys (group); - QVariantList values = _SettingModel.values (group); - QString location= _SettingModel.location (group); + QStringList keys = _SettingModel.keys (group); + QVariantList values = _SettingModel.values (group); + QString location = _SettingModel.location (group); - variantMap["location" ] = location; - variantMap["keys" ] = keys; - variantMap["values" ] = values; + details["location"] = location; + details["keys" ] = keys ; + details["values" ] = values ; - _settings[group] = variantMap; + mSettings[group] = details; } - qDebug() << "Data Ready"; - emit settingsChanged(); + settings(mSettings); } Index: sources/view/settings/VSettings.h =================================================================== diff -u -r821bf955d0ba7e028bccfee7c04ca77cf80a0bd4 -rf688ed9f1c64a2603a6d10fbb090b257a43e1f6f --- sources/view/settings/VSettings.h (.../VSettings.h) (revision 821bf955d0ba7e028bccfee7c04ca77cf80a0bd4) +++ sources/view/settings/VSettings.h (.../VSettings.h) (revision f688ed9f1c64a2603a6d10fbb090b257a43e1f6f) @@ -19,28 +19,21 @@ #include // Project +#include "main.h" +#include "MSettings.h" +#include "VView.h" namespace View { class VSettings : public QObject { Q_OBJECT - QVariantMap _settings; + CONSTANT(QString , groupFormat, "%1^%2" ) + PROPERTY(bool , initialized, false ) + PROPERTY(QVariantMap, settings , {} ) - Q_PROPERTY(QString groupFormat READ groupFormat CONSTANT) - Q_PROPERTY(QVariantMap settings READ settings NOTIFY settingsChanged) - QVariantMap settings(); - QString groupFormat(); - -public: - explicit VSettings(QObject *parent = nullptr); - -private slots: - void onSettingsUpdate(); - -signals: - void settingsChanged(); + VIEW_DEC(VSettings, SettingsData) }; }