From a90e1a6d2ce8aa9728f03a84ef3abcdf25ec1dea Mon Sep 17 00:00:00 2001 From: Thomas Kroes Date: Tue, 19 Mar 2024 17:47:26 +0100 Subject: [PATCH 1/6] Added mv::VariantMap class Use this class in serialization routines --- ManiVault/cmake/CMakeMvSourcesPublic.cmake | 2 + ManiVault/src/AbstractDataHierarchyManager.h | 4 +- ManiVault/src/AbstractDataManager.h | 2 +- ManiVault/src/AbstractTaskTester.cpp | 2 +- ManiVault/src/AbstractTaskTester.h | 2 +- ManiVault/src/AnalysisPlugin.cpp | 4 +- ManiVault/src/AnalysisPlugin.h | 4 +- ManiVault/src/Application.h | 2 +- ManiVault/src/DataHierarchyItem.cpp | 4 +- ManiVault/src/DataHierarchyItem.h | 6 +- ManiVault/src/DatasetsMimeData.cpp | 2 +- ManiVault/src/DatasetsMimeData.h | 2 +- ManiVault/src/LinkedData.cpp | 12 +- ManiVault/src/LinkedData.h | 8 +- ManiVault/src/Plugin.cpp | 4 +- ManiVault/src/Plugin.h | 4 +- ManiVault/src/PluginType.cpp | 2 +- ManiVault/src/Project.cpp | 4 +- ManiVault/src/Project.h | 4 +- ManiVault/src/ProjectCompressionAction.cpp | 6 +- ManiVault/src/ProjectCompressionAction.h | 4 +- ManiVault/src/ProjectMetaAction.cpp | 4 +- ManiVault/src/ProjectMetaAction.h | 4 +- ManiVault/src/Set.cpp | 4 +- ManiVault/src/Set.h | 4 +- ManiVault/src/ViewPlugin.cpp | 4 +- ManiVault/src/ViewPlugin.h | 4 +- ManiVault/src/Workspace.cpp | 4 +- ManiVault/src/Workspace.h | 4 +- ManiVault/src/actions/Actions.h | 2 +- ManiVault/src/actions/ColorAction.cpp | 6 +- ManiVault/src/actions/ColorAction.h | 6 +- ManiVault/src/actions/ColorMapAction.cpp | 6 +- ManiVault/src/actions/ColorMapAction.h | 4 +- ManiVault/src/actions/ColorMapAxisAction.cpp | 6 +- ManiVault/src/actions/ColorMapAxisAction.h | 4 +- .../src/actions/ColorMapDiscreteAction.cpp | 6 +- .../src/actions/ColorMapDiscreteAction.h | 4 +- .../src/actions/ColorMapEditor1DAction.cpp | 6 +- .../src/actions/ColorMapEditor1DAction.h | 4 +- .../src/actions/ColorMapEditor1DNode.cpp | 6 +- ManiVault/src/actions/ColorMapEditor1DNode.h | 4 +- .../src/actions/ColorMapEditor1DNodeAction.h | 2 +- ManiVault/src/actions/DatasetPickerAction.cpp | 6 +- ManiVault/src/actions/DatasetPickerAction.h | 4 +- ManiVault/src/actions/DecimalAction.cpp | 4 +- ManiVault/src/actions/DecimalAction.h | 4 +- .../src/actions/DecimalRectangleAction.cpp | 4 +- .../src/actions/DecimalRectangleAction.h | 4 +- .../src/actions/DirectoryPickerAction.cpp | 4 +- ManiVault/src/actions/DirectoryPickerAction.h | 4 +- ManiVault/src/actions/FilePickerAction.cpp | 4 +- ManiVault/src/actions/FilePickerAction.h | 4 +- ManiVault/src/actions/GroupAction.cpp | 6 +- ManiVault/src/actions/GroupAction.h | 6 +- .../src/actions/HorizontalGroupAction.cpp | 2 +- ManiVault/src/actions/HorizontalGroupAction.h | 2 +- .../src/actions/HorizontalToolbarAction.h | 2 +- ManiVault/src/actions/ImageAction.cpp | 4 +- ManiVault/src/actions/ImageAction.h | 4 +- ManiVault/src/actions/IntegralAction.cpp | 4 +- ManiVault/src/actions/IntegralAction.h | 4 +- .../src/actions/IntegralRectangleAction.cpp | 6 +- .../src/actions/IntegralRectangleAction.h | 4 +- ManiVault/src/actions/LockingAction.cpp | 4 +- ManiVault/src/actions/LockingAction.h | 4 +- .../src/actions/NumericalRangeAction.cpp | 2 +- ManiVault/src/actions/NumericalRangeAction.h | 4 +- ManiVault/src/actions/OptionAction.cpp | 4 +- ManiVault/src/actions/OptionAction.h | 4 +- ManiVault/src/actions/OptionsAction.cpp | 4 +- ManiVault/src/actions/OptionsAction.h | 4 +- .../src/actions/PixelSelectionAction.cpp | 4 +- ManiVault/src/actions/PixelSelectionAction.h | 4 +- .../src/actions/PluginStatusBarAction.cpp | 2 +- ManiVault/src/actions/PluginStatusBarAction.h | 2 +- ManiVault/src/actions/PluginTriggerAction.h | 2 +- ManiVault/src/actions/SplashScreenAction.cpp | 6 +- ManiVault/src/actions/SplashScreenAction.h | 4 +- ManiVault/src/actions/StatusBarAction.cpp | 2 +- ManiVault/src/actions/StatusBarAction.h | 2 +- ManiVault/src/actions/StretchAction.cpp | 8 +- ManiVault/src/actions/StretchAction.h | 6 +- ManiVault/src/actions/StringAction.cpp | 4 +- ManiVault/src/actions/StringAction.h | 4 +- ManiVault/src/actions/StringsAction.cpp | 4 +- ManiVault/src/actions/StringsAction.h | 4 +- ManiVault/src/actions/TasksListAction.cpp | 2 +- ManiVault/src/actions/TasksTreeAction.cpp | 2 +- ManiVault/src/actions/ToggleAction.cpp | 4 +- ManiVault/src/actions/ToggleAction.h | 4 +- ManiVault/src/actions/ToolbarAction.h | 2 +- ManiVault/src/actions/ToolbarActionItem.h | 2 +- .../src/actions/ToolbarActionItemWidget.h | 2 +- ManiVault/src/actions/VariantAction.cpp | 4 +- ManiVault/src/actions/VariantAction.h | 4 +- ManiVault/src/actions/VersionAction.cpp | 6 +- ManiVault/src/actions/VersionAction.h | 6 +- ManiVault/src/actions/VerticalGroupAction.cpp | 2 +- ManiVault/src/actions/VerticalGroupAction.h | 2 +- ManiVault/src/actions/VerticalToolbarAction.h | 2 +- ManiVault/src/actions/WidgetAction.cpp | 6 +- ManiVault/src/actions/WidgetAction.h | 4 +- .../WidgetActionBadgeOverlayWidget.cpp | 2 +- .../actions/WidgetActionBadgeOverlayWidget.h | 2 +- .../actions/WidgetActionHighlightWidget.cpp | 2 +- .../src/actions/WidgetActionHighlightWidget.h | 2 +- .../src/actions/WidgetActionMimeData.cpp | 2 +- ManiVault/src/actions/WidgetActionMimeData.h | 2 +- ManiVault/src/actions/WindowLevelAction.cpp | 4 +- ManiVault/src/actions/WindowLevelAction.h | 4 +- .../src/models/AbstractDataHierarchyModel.h | 2 +- .../models/AbstractPluginFactoriesModel.cpp | 2 +- .../src/models/AbstractPluginFactoriesModel.h | 2 +- ManiVault/src/models/AbstractPluginsModel.cpp | 2 +- ManiVault/src/models/AbstractPluginsModel.h | 2 +- .../src/models/ActionsHierarchyModel.cpp | 2 +- .../src/models/CheckableStringListModel.cpp | 2 +- .../src/models/CheckableStringListModel.h | 2 +- .../src/models/DataHierarchyFilterModel.h | 2 +- ManiVault/src/models/DataHierarchyListModel.h | 2 +- ManiVault/src/models/DataHierarchyTreeModel.h | 2 +- ManiVault/src/models/LoggingFilterModel.cpp | 2 +- ManiVault/src/models/LoggingFilterModel.h | 2 +- ManiVault/src/models/LoggingModel.cpp | 2 +- ManiVault/src/models/LoggingModel.h | 2 +- .../src/models/PluginFactoriesFilterModel.cpp | 2 +- .../src/models/PluginFactoriesFilterModel.h | 2 +- .../src/models/PluginFactoriesListModel.h | 2 +- .../src/models/PluginFactoriesTreeModel.h | 2 +- ManiVault/src/models/PluginsFilterModel.cpp | 2 +- ManiVault/src/models/PluginsFilterModel.h | 2 +- ManiVault/src/models/PluginsTreeModel.h | 2 +- ManiVault/src/models/RawDataFilterModel.cpp | 2 +- ManiVault/src/models/RawDataFilterModel.h | 2 +- ManiVault/src/models/RawDataModel.cpp | 2 +- ManiVault/src/models/RawDataModel.h | 2 +- .../src/models/SelectionsFilterModel.cpp | 2 +- ManiVault/src/models/SelectionsFilterModel.h | 2 +- ManiVault/src/models/SelectionsModel.cpp | 2 +- ManiVault/src/models/SelectionsModel.h | 2 +- .../plugins/ClusterData/src/ClusterData.cpp | 8 +- .../src/plugins/ClusterData/src/ClusterData.h | 8 +- .../ClusterData/src/ClustersFilterModel.h | 2 +- .../plugins/ClusterData/src/ClustersModel.h | 2 +- .../ClusterData/src/ColorizeClustersAction.h | 2 +- .../ClusterData/src/MergeClustersAction.h | 2 +- .../OverwriteClustersConfirmationDialog.cpp | 2 +- ManiVault/src/plugins/ImageData/src/Common.h | 2 +- ManiVault/src/plugins/ImageData/src/Image.cpp | 2 +- .../src/plugins/ImageData/src/ImageData.json | 2 +- .../src/plugins/ImageData/src/Images.cpp | 4 +- ManiVault/src/plugins/ImageData/src/Images.h | 4 +- .../src/CreateSetFromSelectionAction.cpp | 2 +- .../PointData/src/DimensionPickerAction.cpp | 4 +- .../PointData/src/DimensionPickerAction.h | 4 +- .../PointData/src/DimensionsPickerAction.cpp | 4 +- .../PointData/src/DimensionsPickerAction.h | 6 +- .../src/plugins/PointData/src/InfoAction.h | 2 +- .../src/plugins/PointData/src/PointData.cpp | 8 +- .../src/plugins/PointData/src/PointData.h | 4 +- .../PointData/src/ProxyDatasetsAction.cpp | 2 +- .../PointData/src/SelectedIndicesAction.h | 2 +- .../src/PublicActionsModel.cpp | 2 +- ManiVault/src/private/ActionsManager.cpp | 4 +- ManiVault/src/private/ActionsManager.h | 4 +- .../src/private/DataHierarchyManager.cpp | 37 +++-- ManiVault/src/private/DataHierarchyManager.h | 4 +- ManiVault/src/private/DataManager.cpp | 6 +- ManiVault/src/private/DataManager.h | 4 +- ManiVault/src/private/DockComponentsFactory.h | 2 +- ManiVault/src/private/DockManager.cpp | 4 +- ManiVault/src/private/DockManager.h | 4 +- ManiVault/src/private/DockWidget.cpp | 4 +- ManiVault/src/private/DockWidget.h | 4 +- ManiVault/src/private/GroupDataDialog.h | 2 +- ManiVault/src/private/PluginManager.cpp | 4 +- ManiVault/src/private/PluginManager.h | 4 +- ManiVault/src/private/ProjectManager.cpp | 4 +- ManiVault/src/private/ProjectManager.h | 4 +- ManiVault/src/private/SettingsManagerDialog.h | 2 +- ManiVault/src/private/StartPageAction.h | 2 +- .../src/private/StartPageContentWidget.h | 2 +- .../src/private/StartPageGetStartedWidget.h | 2 +- .../src/private/ViewPluginDockWidget.cpp | 4 +- ManiVault/src/private/ViewPluginDockWidget.h | 4 +- ManiVault/src/private/WorkspaceManager.cpp | 6 +- ManiVault/src/private/WorkspaceManager.h | 4 +- .../src/util/AbstractItemModelTester.cpp | 2 +- ManiVault/src/util/AbstractItemModelTester.h | 2 +- ManiVault/src/util/DockWidgetPermission.cpp | 2 +- ManiVault/src/util/FileUtil.h | 2 +- ManiVault/src/util/FontAwesome.cpp | 2 +- ManiVault/src/util/Icon.h | 2 +- ManiVault/src/util/IconFonts.cpp | 2 +- ManiVault/src/util/IconFonts.h | 2 +- ManiVault/src/util/Logger.h | 2 +- ManiVault/src/util/NumericalRange.cpp | 2 +- ManiVault/src/util/Serializable.cpp | 20 +-- ManiVault/src/util/Serializable.h | 19 +-- ManiVault/src/util/Timer.cpp | 2 +- ManiVault/src/util/Timer.h | 2 +- ManiVault/src/util/VariantMap.cpp | 65 +++++++++ ManiVault/src/util/VariantMap.h | 128 ++++++++++++++++++ ManiVault/src/util/Version.cpp | 4 +- ManiVault/src/util/Version.h | 4 +- ManiVault/src/widgets/DropWidget.cpp | 2 +- ManiVault/src/widgets/DropWidget.h | 2 +- .../src/widgets/ViewPluginEditorDialog.cpp | 2 +- .../src/widgets/ViewPluginEditorDialog.h | 2 +- 210 files changed, 583 insertions(+), 380 deletions(-) create mode 100644 ManiVault/src/util/VariantMap.cpp create mode 100644 ManiVault/src/util/VariantMap.h diff --git a/ManiVault/cmake/CMakeMvSourcesPublic.cmake b/ManiVault/cmake/CMakeMvSourcesPublic.cmake index 1a270db1b..b5f6a2fc4 100644 --- a/ManiVault/cmake/CMakeMvSourcesPublic.cmake +++ b/ManiVault/cmake/CMakeMvSourcesPublic.cmake @@ -486,6 +486,7 @@ set(PUBLIC_UTIL_HEADERS src/util/Version.h src/util/DockWidgetPermission.h src/util/NumericalRange.h + src/util/VariantMap.h ) if(APPLE) @@ -530,6 +531,7 @@ set(PUBLIC_UTIL_SOURCES src/util/Version.cpp src/util/DockWidgetPermission.cpp src/util/NumericalRange.cpp + src/util/VariantMap.cpp ) if(APPLE) diff --git a/ManiVault/src/AbstractDataHierarchyManager.h b/ManiVault/src/AbstractDataHierarchyManager.h index 435624637..b2716c8ab 100644 --- a/ManiVault/src/AbstractDataHierarchyManager.h +++ b/ManiVault/src/AbstractDataHierarchyManager.h @@ -120,13 +120,13 @@ class AbstractDataHierarchyManager : public AbstractManager * Load widget action from variant * @param Variant representation of the widget action */ - virtual void fromVariantMap(const QVariantMap& variantMap) override = 0; + void fromVariantMap(const mv::VariantMap& variantMap) override = 0; /** * Save widget action to variant * @return Variant representation of the widget action */ - virtual QVariantMap toVariantMap() const override = 0; + mv::VariantMap toVariantMap() const override = 0; signals: diff --git a/ManiVault/src/AbstractDataManager.h b/ManiVault/src/AbstractDataManager.h index bab1eb8d9..27d366d34 100644 --- a/ManiVault/src/AbstractDataManager.h +++ b/ManiVault/src/AbstractDataManager.h @@ -389,4 +389,4 @@ class AbstractDataManager : public AbstractManager friend class RawDataModel; }; -} \ No newline at end of file +} diff --git a/ManiVault/src/AbstractTaskTester.cpp b/ManiVault/src/AbstractTaskTester.cpp index 7e818eb8d..f91db1184 100644 --- a/ManiVault/src/AbstractTaskTester.cpp +++ b/ManiVault/src/AbstractTaskTester.cpp @@ -25,4 +25,4 @@ QStringList AbstractTaskTester::getTesterNames() return testerNames; } -} \ No newline at end of file +} diff --git a/ManiVault/src/AbstractTaskTester.h b/ManiVault/src/AbstractTaskTester.h index 0d02db275..0b352b9b7 100644 --- a/ManiVault/src/AbstractTaskTester.h +++ b/ManiVault/src/AbstractTaskTester.h @@ -32,4 +32,4 @@ class AbstractTaskTester : public QObject static QStringList testerNames; }; -} \ No newline at end of file +} diff --git a/ManiVault/src/AnalysisPlugin.cpp b/ManiVault/src/AnalysisPlugin.cpp index 2baa4af63..7ef4ae8f5 100644 --- a/ManiVault/src/AnalysisPlugin.cpp +++ b/ManiVault/src/AnalysisPlugin.cpp @@ -46,7 +46,7 @@ void AnalysisPlugin::setOutputDatasets(const Datasets& outputDatasets) output->setAnalysis(this); } -void AnalysisPlugin::fromVariantMap(const QVariantMap& variantMap) +void AnalysisPlugin::fromVariantMap(const mv::VariantMap& variantMap) { Plugin::fromVariantMap(variantMap); @@ -55,7 +55,7 @@ void AnalysisPlugin::fromVariantMap(const QVariantMap& variantMap) // since they might be used in the init() function } -QVariantMap AnalysisPlugin::toVariantMap() const +mv::VariantMap AnalysisPlugin::toVariantMap() const { auto variantMap = Plugin::toVariantMap(); diff --git a/ManiVault/src/AnalysisPlugin.h b/ManiVault/src/AnalysisPlugin.h index f2dac59c3..37678b4bb 100644 --- a/ManiVault/src/AnalysisPlugin.h +++ b/ManiVault/src/AnalysisPlugin.h @@ -90,13 +90,13 @@ class AnalysisPlugin : public Plugin * Load analysis plugin from variant * @param Variant representation of the analysis plugin */ - void fromVariantMap(const QVariantMap& variantMap) override; + void fromVariantMap(const mv::VariantMap& variantMap) override; /** * Save analysis plugin to variant * @param Variant representation of the analysis plugin */ - QVariantMap toVariantMap() const override; + mv::VariantMap toVariantMap() const override; protected: /** Returns whether any output dataset is given */ diff --git a/ManiVault/src/Application.h b/ManiVault/src/Application.h index 329626234..d9826b8ed 100644 --- a/ManiVault/src/Application.h +++ b/ManiVault/src/Application.h @@ -257,4 +257,4 @@ class Application final : public QApplication QLockFile _lockFile; /** Lock file is used for fail-safe purging of the temporary directory */ }; -} \ No newline at end of file +} diff --git a/ManiVault/src/DataHierarchyItem.cpp b/ManiVault/src/DataHierarchyItem.cpp index f8247c1fa..0978e96de 100644 --- a/ManiVault/src/DataHierarchyItem.cpp +++ b/ManiVault/src/DataHierarchyItem.cpp @@ -269,7 +269,7 @@ void DataHierarchyItem::setExpanded(bool expanded) emit expandedChanged(_expanded); } -void DataHierarchyItem::fromVariantMap(const QVariantMap& variantMap) +void DataHierarchyItem::fromVariantMap(const mv::VariantMap& variantMap) { try { @@ -289,7 +289,7 @@ void DataHierarchyItem::fromVariantMap(const QVariantMap& variantMap) setSelected(variantMap["Selected"].toBool(), false); } -QVariantMap DataHierarchyItem::toVariantMap() const +mv::VariantMap DataHierarchyItem::toVariantMap() const { QVariantMap variantMap, children; diff --git a/ManiVault/src/DataHierarchyItem.h b/ManiVault/src/DataHierarchyItem.h index 597e1118a..00c111862 100644 --- a/ManiVault/src/DataHierarchyItem.h +++ b/ManiVault/src/DataHierarchyItem.h @@ -250,13 +250,13 @@ class DataHierarchyItem final : public mv::gui::WidgetAction * Load widget action from variant * @param Variant representation of the widget action */ - void fromVariantMap(const QVariantMap& variantMap) override; + void fromVariantMap(const mv::VariantMap& variantMap) override; /** * Save widget action to variant * @return Variant representation of the widget action */ - QVariantMap toVariantMap() const override; + mv::VariantMap toVariantMap() const override; signals: @@ -320,4 +320,4 @@ class DataHierarchyItem final : public mv::gui::WidgetAction Q_DECLARE_METATYPE(mv::DataHierarchyItem) -inline const auto dataHierarchyItemMetaTypeId = qRegisterMetaType("mv::DataHierarchyItem"); \ No newline at end of file +inline const auto dataHierarchyItemMetaTypeId = qRegisterMetaType("mv::DataHierarchyItem"); diff --git a/ManiVault/src/DatasetsMimeData.cpp b/ManiVault/src/DatasetsMimeData.cpp index 9202d7758..b103e1c77 100644 --- a/ManiVault/src/DatasetsMimeData.cpp +++ b/ManiVault/src/DatasetsMimeData.cpp @@ -27,4 +27,4 @@ QString DatasetsMimeData::format() return "application/datasets"; } -} \ No newline at end of file +} diff --git a/ManiVault/src/DatasetsMimeData.h b/ManiVault/src/DatasetsMimeData.h index cb29ebe8f..9a2bf77fe 100644 --- a/ManiVault/src/DatasetsMimeData.h +++ b/ManiVault/src/DatasetsMimeData.h @@ -46,4 +46,4 @@ class DatasetsMimeData final : public QMimeData Datasets _datasets; /** Mime data datasets */ }; -} \ No newline at end of file +} diff --git a/ManiVault/src/LinkedData.cpp b/ManiVault/src/LinkedData.cpp index 3e4852d75..994458f2c 100644 --- a/ManiVault/src/LinkedData.cpp +++ b/ManiVault/src/LinkedData.cpp @@ -95,7 +95,7 @@ bool SelectionMap::hasMappingForPointIndex(std::uint32_t pointIndex) const return false; } -void SelectionMap::fromVariantMap(const QVariantMap& variantMap) +void SelectionMap::fromVariantMap(const mv::VariantMap& variantMap) { Serializable::fromVariantMap(variantMap); @@ -131,9 +131,9 @@ void SelectionMap::fromVariantMap(const QVariantMap& variantMap) } } -QVariantMap SelectionMap::toVariantMap() const +mv::VariantMap SelectionMap::toVariantMap() const { - QVariantMap variantMap = Serializable::toVariantMap(); + auto variantMap = Serializable::toVariantMap(); // serialize a std::map>; std::vector serializedMap; @@ -194,7 +194,7 @@ void LinkedData::setMapping(SelectionMap& mapping) _mapping = mapping; } -void LinkedData::fromVariantMap(const QVariantMap& variantMap) +void LinkedData::fromVariantMap(const mv::VariantMap& variantMap) { Serializable::fromVariantMap(variantMap); @@ -207,9 +207,9 @@ void LinkedData::fromVariantMap(const QVariantMap& variantMap) _mapping.fromParentVariantMap(variantMap); } -QVariantMap LinkedData::toVariantMap() const +mv::VariantMap LinkedData::toVariantMap() const { - QVariantMap variantMap = Serializable::toVariantMap(); + auto variantMap = Serializable::toVariantMap(); variantMap["SourceDataset"] = QVariant::fromValue(_sourceDataSet.getDatasetId()); variantMap["TargetDataset"] = QVariant::fromValue(_targetDataSet.getDatasetId()); diff --git a/ManiVault/src/LinkedData.h b/ManiVault/src/LinkedData.h index 2580380fd..62e4dba46 100644 --- a/ManiVault/src/LinkedData.h +++ b/ManiVault/src/LinkedData.h @@ -69,13 +69,13 @@ class SelectionMap : public util::Serializable * Load from variant map * @param variantMap Variant map */ - void fromVariantMap(const QVariantMap& variantMap) override; + void fromVariantMap(const mv::VariantMap& variantMap) override; /** * Save to variant map * @return Variant map */ - QVariantMap toVariantMap() const override; + mv::VariantMap toVariantMap() const override; private: Type _type; /** The type of selection map */ @@ -101,13 +101,13 @@ class LinkedData : public util::Serializable * Load from variant map * @param variantMap Variant map */ - void fromVariantMap(const QVariantMap& variantMap) override; + void fromVariantMap(const mv::VariantMap& variantMap) override; /** * Save to variant map * @return Variant map */ - QVariantMap toVariantMap() const override; + mv::VariantMap toVariantMap() const override; private: Dataset _sourceDataSet; diff --git a/ManiVault/src/Plugin.cpp b/ManiVault/src/Plugin.cpp index 1c9583eeb..17c6d76b0 100644 --- a/ManiVault/src/Plugin.cpp +++ b/ManiVault/src/Plugin.cpp @@ -135,14 +135,14 @@ PluginGlobalSettingsGroupAction* Plugin::getGlobalSettingsAction() const return _factory->getGlobalSettingsGroupAction(); } -void Plugin::fromVariantMap(const QVariantMap& variantMap) +void Plugin::fromVariantMap(const mv::VariantMap& variantMap) { WidgetAction::fromVariantMap(variantMap); Serializable::fromVariantMap(_guiNameAction, variantMap, "GuiName"); } -QVariantMap Plugin::toVariantMap() const +mv::VariantMap Plugin::toVariantMap() const { auto variantMap = WidgetAction::toVariantMap(); diff --git a/ManiVault/src/Plugin.h b/ManiVault/src/Plugin.h index d2daf2582..0f413efc1 100644 --- a/ManiVault/src/Plugin.h +++ b/ManiVault/src/Plugin.h @@ -149,13 +149,13 @@ class Plugin : public mv::gui::WidgetAction * Load widget action from variant * @param Variant representation of the widget action */ - void fromVariantMap(const QVariantMap& variantMap) override; + void fromVariantMap(const mv::VariantMap& variantMap) override; /** * Save widget action to variant * @return Variant representation of the widget action */ - QVariantMap toVariantMap() const override; + mv::VariantMap toVariantMap() const override; public: // Miscellaneous diff --git a/ManiVault/src/PluginType.cpp b/ManiVault/src/PluginType.cpp index 2af647b65..351921ba8 100644 --- a/ManiVault/src/PluginType.cpp +++ b/ManiVault/src/PluginType.cpp @@ -38,4 +38,4 @@ QIcon getPluginTypeIcon(const Type& type) return typeNames[type]; } -} \ No newline at end of file +} diff --git a/ManiVault/src/Project.cpp b/ManiVault/src/Project.cpp index ed3247601..4fcb75e1c 100644 --- a/ManiVault/src/Project.cpp +++ b/ManiVault/src/Project.cpp @@ -81,7 +81,7 @@ bool Project::isStartupProject() const return _startupProject; } -void Project::fromVariantMap(const QVariantMap& variantMap) +void Project::fromVariantMap(const mv::VariantMap& variantMap) { Serializable::fromVariantMap(variantMap); @@ -104,7 +104,7 @@ void Project::fromVariantMap(const QVariantMap& variantMap) plugins().fromParentVariantMap(variantMap); } -QVariantMap Project::toVariantMap() const +mv::VariantMap Project::toVariantMap() const { projects().getProjectSerializationTask().setName("Save project"); diff --git a/ManiVault/src/Project.h b/ManiVault/src/Project.h index e032e462f..d4fe4dedb 100644 --- a/ManiVault/src/Project.h +++ b/ManiVault/src/Project.h @@ -89,13 +89,13 @@ class Project final : public QObject, public mv::util::Serializable * Load project from variant * @param Variant representation of the project */ - void fromVariantMap(const QVariantMap& variantMap) override; + void fromVariantMap(const mv::VariantMap& variantMap) override; /** * Save project to variant * @return Variant representation of the project */ - QVariantMap toVariantMap() const override; + mv::VariantMap toVariantMap() const override; public: diff --git a/ManiVault/src/ProjectCompressionAction.cpp b/ManiVault/src/ProjectCompressionAction.cpp index ae2b20a70..a0df6c7d6 100644 --- a/ManiVault/src/ProjectCompressionAction.cpp +++ b/ManiVault/src/ProjectCompressionAction.cpp @@ -28,7 +28,7 @@ ProjectCompressionAction::ProjectCompressionAction(QObject* parent /*= nullptr*/ updateCompressionLevelReadOnly(); } -void ProjectCompressionAction::fromVariantMap(const QVariantMap& variantMap) +void ProjectCompressionAction::fromVariantMap(const mv::VariantMap& variantMap) { WidgetAction::fromVariantMap(variantMap); @@ -36,9 +36,9 @@ void ProjectCompressionAction::fromVariantMap(const QVariantMap& variantMap) _levelAction.fromParentVariantMap(variantMap); } -QVariantMap ProjectCompressionAction::toVariantMap() const +mv::VariantMap ProjectCompressionAction::toVariantMap() const { - QVariantMap variantMap = WidgetAction::toVariantMap(); + auto variantMap = WidgetAction::toVariantMap(); _enabledAction.insertIntoVariantMap(variantMap); _levelAction.insertIntoVariantMap(variantMap); diff --git a/ManiVault/src/ProjectCompressionAction.h b/ManiVault/src/ProjectCompressionAction.h index e7309e045..65d98ba4d 100644 --- a/ManiVault/src/ProjectCompressionAction.h +++ b/ManiVault/src/ProjectCompressionAction.h @@ -32,13 +32,13 @@ class ProjectCompressionAction final : public gui::GroupAction { * Load compression action from variant * @param Variant representation of the compression action */ - void fromVariantMap(const QVariantMap& variantMap) override; + void fromVariantMap(const mv::VariantMap& variantMap) override; /** * Save compression action to variant * @return Variant representation of the compression action */ - QVariantMap toVariantMap() const override; + mv::VariantMap toVariantMap() const override; public: // Action getters diff --git a/ManiVault/src/ProjectMetaAction.cpp b/ManiVault/src/ProjectMetaAction.cpp index 2dd0f35c0..cad6ee4fd 100644 --- a/ManiVault/src/ProjectMetaAction.cpp +++ b/ManiVault/src/ProjectMetaAction.cpp @@ -77,7 +77,7 @@ ProjectMetaAction::ProjectMetaAction(const QString& filePath, QObject* parent /* } } -void ProjectMetaAction::fromVariantMap(const QVariantMap& variantMap) +void ProjectMetaAction::fromVariantMap(const mv::VariantMap& variantMap) { Serializable::fromVariantMap(variantMap); @@ -93,7 +93,7 @@ void ProjectMetaAction::fromVariantMap(const QVariantMap& variantMap) _compressionAction.fromParentVariantMap(variantMap); } -QVariantMap ProjectMetaAction::toVariantMap() const +mv::VariantMap ProjectMetaAction::toVariantMap() const { auto variantMap = Serializable::toVariantMap(); diff --git a/ManiVault/src/ProjectMetaAction.h b/ManiVault/src/ProjectMetaAction.h index 928b3ea62..33a8c044e 100644 --- a/ManiVault/src/ProjectMetaAction.h +++ b/ManiVault/src/ProjectMetaAction.h @@ -56,13 +56,13 @@ class ProjectMetaAction final : public gui::VerticalGroupAction * Load project from variant * @param Variant representation of the project */ - void fromVariantMap(const QVariantMap& variantMap) override; + void fromVariantMap(const mv::VariantMap& variantMap) override; /** * Save project to variant * @return Variant representation of the project */ - QVariantMap toVariantMap() const override; + mv::VariantMap toVariantMap() const override; private: diff --git a/ManiVault/src/Set.cpp b/ManiVault/src/Set.cpp index c47a341d4..d0c5ed5e0 100644 --- a/ManiVault/src/Set.cpp +++ b/ManiVault/src/Set.cpp @@ -142,7 +142,7 @@ mv::plugin::AnalysisPlugin* DatasetImpl::getAnalysis() return _analysis; } -void DatasetImpl::fromVariantMap(const QVariantMap& variantMap) +void DatasetImpl::fromVariantMap(const mv::VariantMap& variantMap) { WidgetAction::fromVariantMap(variantMap); @@ -210,7 +210,7 @@ void DatasetImpl::fromVariantMap(const QVariantMap& variantMap) } } -QVariantMap DatasetImpl::toVariantMap() const +mv::VariantMap DatasetImpl::toVariantMap() const { auto variantMap = WidgetAction::toVariantMap(); diff --git a/ManiVault/src/Set.h b/ManiVault/src/Set.h index 6109eb5d5..ae355104e 100644 --- a/ManiVault/src/Set.h +++ b/ManiVault/src/Set.h @@ -403,13 +403,13 @@ class DatasetImpl : public gui::WidgetAction * Load widget action from variant * @param Variant representation of the widget action */ - void fromVariantMap(const QVariantMap& variantMap) override; + void fromVariantMap(const mv::VariantMap& variantMap) override; /** * Save widget action to variant * @return Variant representation of the widget action */ - QVariantMap toVariantMap() const override; + mv::VariantMap toVariantMap() const override; public: // Grouping diff --git a/ManiVault/src/ViewPlugin.cpp b/ManiVault/src/ViewPlugin.cpp index e2a5f75f4..7329d65e3 100644 --- a/ManiVault/src/ViewPlugin.cpp +++ b/ManiVault/src/ViewPlugin.cpp @@ -236,7 +236,7 @@ void ViewPlugin::setTriggerShortcut(const QKeySequence& keySequence) _triggerShortcut = keySequence; } -void ViewPlugin::fromVariantMap(const QVariantMap& variantMap) +void ViewPlugin::fromVariantMap(const mv::VariantMap& variantMap) { Plugin::fromVariantMap(variantMap); @@ -247,7 +247,7 @@ void ViewPlugin::fromVariantMap(const QVariantMap& variantMap) _visibleAction.fromParentVariantMap(variantMap); } -QVariantMap ViewPlugin::toVariantMap() const +mv::VariantMap ViewPlugin::toVariantMap() const { auto variantMap = Plugin::toVariantMap(); diff --git a/ManiVault/src/ViewPlugin.h b/ManiVault/src/ViewPlugin.h index c9c0d1e7f..92331b91f 100644 --- a/ManiVault/src/ViewPlugin.h +++ b/ManiVault/src/ViewPlugin.h @@ -131,13 +131,13 @@ class ViewPlugin : public Plugin * Load view plugin from variant * @param Variant representation of the view plugin */ - void fromVariantMap(const QVariantMap& variantMap) override; + void fromVariantMap(const mv::VariantMap& variantMap) override; /** * Save view plugin to variant * @return Variant representation of the view plugin */ - QVariantMap toVariantMap() const override; + mv::VariantMap toVariantMap() const override; public: // Action getters diff --git a/ManiVault/src/Workspace.cpp b/ManiVault/src/Workspace.cpp index ade9e2830..aaf03b70d 100644 --- a/ManiVault/src/Workspace.cpp +++ b/ManiVault/src/Workspace.cpp @@ -84,7 +84,7 @@ void Workspace::setFilePath(const QString& filePath) emit filePathChanged(_filePath); } -void Workspace::fromVariantMap(const QVariantMap& variantMap) +void Workspace::fromVariantMap(const mv::VariantMap& variantMap) { Serializable::fromVariantMap(variantMap); @@ -97,7 +97,7 @@ void Workspace::fromVariantMap(const QVariantMap& variantMap) workspaces().getLockingAction().setLocked(_lockingAction.isLocked()); } -QVariantMap Workspace::toVariantMap() const +mv::VariantMap Workspace::toVariantMap() const { auto variantMap = Serializable::toVariantMap(); diff --git a/ManiVault/src/Workspace.h b/ManiVault/src/Workspace.h index 84f8353f5..dae078717 100644 --- a/ManiVault/src/Workspace.h +++ b/ManiVault/src/Workspace.h @@ -59,13 +59,13 @@ class Workspace final : public QObject, public mv::util::Serializable * Load workspace from variant * @param Variant representation of the workspace */ - void fromVariantMap(const QVariantMap& variantMap) override; + void fromVariantMap(const mv::VariantMap& variantMap) override; /** * Save workspace to variant * @return Variant representation of the widget action */ - QVariantMap toVariantMap() const override; + mv::VariantMap toVariantMap() const override; private: diff --git a/ManiVault/src/actions/Actions.h b/ManiVault/src/actions/Actions.h index 7b9ea4cf0..478603e52 100644 --- a/ManiVault/src/actions/Actions.h +++ b/ManiVault/src/actions/Actions.h @@ -40,4 +40,4 @@ #include "OptionAction.h" #include "StringAction.h" #include "WindowLevelAction.h" -#include "StatusAction.h" \ No newline at end of file +#include "StatusAction.h" diff --git a/ManiVault/src/actions/ColorAction.cpp b/ManiVault/src/actions/ColorAction.cpp index edd0e618c..e054e4ea5 100644 --- a/ManiVault/src/actions/ColorAction.cpp +++ b/ManiVault/src/actions/ColorAction.cpp @@ -76,7 +76,7 @@ void ColorAction::disconnectFromPublicAction(bool recursive) WidgetAction::disconnectFromPublicAction(recursive); } -void ColorAction::fromVariantMap(const QVariantMap& variantMap) +void ColorAction::fromVariantMap(const mv::VariantMap& variantMap) { WidgetAction::fromVariantMap(variantMap); @@ -85,9 +85,9 @@ void ColorAction::fromVariantMap(const QVariantMap& variantMap) setColor(variantMap["Value"].value()); } -QVariantMap ColorAction::toVariantMap() const +mv::VariantMap ColorAction::toVariantMap() const { - QVariantMap variantMap = WidgetAction::toVariantMap(); + auto variantMap = WidgetAction::toVariantMap(); variantMap.insert({ { "Value", QVariant::fromValue(_color) } diff --git a/ManiVault/src/actions/ColorAction.h b/ManiVault/src/actions/ColorAction.h index 19afdbfc1..eeda3b144 100644 --- a/ManiVault/src/actions/ColorAction.h +++ b/ManiVault/src/actions/ColorAction.h @@ -133,13 +133,13 @@ class ColorAction : public WidgetAction * Load widget action from variant map * @param Variant map representation of the widget action */ - void fromVariantMap(const QVariantMap& variantMap) override; + void fromVariantMap(const mv::VariantMap& variantMap) override; /** * Save widget action to variant map * @return Variant map representation of the widget action */ - QVariantMap toVariantMap() const override; + mv::VariantMap toVariantMap() const override; signals: @@ -162,4 +162,4 @@ class ColorAction : public WidgetAction Q_DECLARE_METATYPE(mv::gui::ColorAction) -inline const auto colorActionMetaTypeId = qRegisterMetaType("mv::gui::ColorAction"); \ No newline at end of file +inline const auto colorActionMetaTypeId = qRegisterMetaType("mv::gui::ColorAction"); diff --git a/ManiVault/src/actions/ColorMapAction.cpp b/ManiVault/src/actions/ColorMapAction.cpp index 240599ccd..91cabcfb8 100644 --- a/ManiVault/src/actions/ColorMapAction.cpp +++ b/ManiVault/src/actions/ColorMapAction.cpp @@ -405,7 +405,7 @@ void ColorMapAction::disconnectFromPublicAction(bool recursive) WidgetAction::disconnectFromPublicAction(recursive); } -void ColorMapAction::fromVariantMap(const QVariantMap& variantMap) +void ColorMapAction::fromVariantMap(const mv::VariantMap& variantMap) { WidgetAction::fromVariantMap(variantMap); @@ -427,9 +427,9 @@ void ColorMapAction::fromVariantMap(const QVariantMap& variantMap) _customColorMapAction.fromParentVariantMap(variantMap); } -QVariantMap ColorMapAction::toVariantMap() const +mv::VariantMap ColorMapAction::toVariantMap() const { - QVariantMap variantMap = WidgetAction::toVariantMap(); + auto variantMap = WidgetAction::toVariantMap(); variantMap.insert({ { "ColorMapType", static_cast(getColorMapType()) } diff --git a/ManiVault/src/actions/ColorMapAction.h b/ManiVault/src/actions/ColorMapAction.h index f5c907966..36acfc211 100644 --- a/ManiVault/src/actions/ColorMapAction.h +++ b/ManiVault/src/actions/ColorMapAction.h @@ -148,13 +148,13 @@ class ColorMapAction : public WidgetAction * Load widget action from variant map * @param Variant map representation of the widget action */ - void fromVariantMap(const QVariantMap& variantMap) override; + void fromVariantMap(const mv::VariantMap& variantMap) override; /** * Save widget action to variant map * @return Variant map representation of the widget action */ - QVariantMap toVariantMap() const override; + mv::VariantMap toVariantMap() const override; signals: diff --git a/ManiVault/src/actions/ColorMapAxisAction.cpp b/ManiVault/src/actions/ColorMapAxisAction.cpp index b952f5655..9aeff8b4e 100644 --- a/ManiVault/src/actions/ColorMapAxisAction.cpp +++ b/ManiVault/src/actions/ColorMapAxisAction.cpp @@ -48,7 +48,7 @@ void ColorMapAxisAction::disconnectFromPublicAction() WidgetAction::disconnectFromPublicAction(); } -void ColorMapAxisAction::fromVariantMap(const QVariantMap& variantMap) +void ColorMapAxisAction::fromVariantMap(const mv::VariantMap& variantMap) { WidgetAction::fromVariantMap(variantMap); @@ -56,9 +56,9 @@ void ColorMapAxisAction::fromVariantMap(const QVariantMap& variantMap) _mirrorAction.fromParentVariantMap(variantMap); } -QVariantMap ColorMapAxisAction::toVariantMap() const +mv::VariantMap ColorMapAxisAction::toVariantMap() const { - QVariantMap variantMap = WidgetAction::toVariantMap(); + auto variantMap = WidgetAction::toVariantMap(); _rangeAction.insertIntoVariantMap(variantMap); _mirrorAction.insertIntoVariantMap(variantMap); diff --git a/ManiVault/src/actions/ColorMapAxisAction.h b/ManiVault/src/actions/ColorMapAxisAction.h index 1bd88701c..512e826af 100644 --- a/ManiVault/src/actions/ColorMapAxisAction.h +++ b/ManiVault/src/actions/ColorMapAxisAction.h @@ -73,13 +73,13 @@ class ColorMapAxisAction : public WidgetAction * Load widget action from variant map * @param Variant map representation of the widget action */ - void fromVariantMap(const QVariantMap& variantMap) override; + void fromVariantMap(const mv::VariantMap& variantMap) override; /** * Save widget action to variant map * @return Variant map representation of the widget action */ - QVariantMap toVariantMap() const override; + mv::VariantMap toVariantMap() const override; public: // Action getters diff --git a/ManiVault/src/actions/ColorMapDiscreteAction.cpp b/ManiVault/src/actions/ColorMapDiscreteAction.cpp index a152a6b3e..b38a8fc36 100644 --- a/ManiVault/src/actions/ColorMapDiscreteAction.cpp +++ b/ManiVault/src/actions/ColorMapDiscreteAction.cpp @@ -34,16 +34,16 @@ void ColorMapDiscreteAction::disconnectFromPublicAction() } -void ColorMapDiscreteAction::fromVariantMap(const QVariantMap& variantMap) +void ColorMapDiscreteAction::fromVariantMap(const mv::VariantMap& variantMap) { WidgetAction::fromVariantMap(variantMap); } -QVariantMap ColorMapDiscreteAction::toVariantMap() const +mv::VariantMap ColorMapDiscreteAction::toVariantMap() const { - QVariantMap variantMap = WidgetAction::toVariantMap(); + auto variantMap = WidgetAction::toVariantMap(); diff --git a/ManiVault/src/actions/ColorMapDiscreteAction.h b/ManiVault/src/actions/ColorMapDiscreteAction.h index 44c75bc0c..5aae927ad 100644 --- a/ManiVault/src/actions/ColorMapDiscreteAction.h +++ b/ManiVault/src/actions/ColorMapDiscreteAction.h @@ -75,13 +75,13 @@ class ColorMapDiscreteAction final : public WidgetAction * Load widget action from variant map * @param Variant map representation of the widget action */ - void fromVariantMap(const QVariantMap& variantMap) override; + void fromVariantMap(const mv::VariantMap& variantMap) override; /** * Save widget action to variant map * @return Variant map representation of the widget action */ - QVariantMap toVariantMap() const override; + mv::VariantMap toVariantMap() const override; public: // Action getters diff --git a/ManiVault/src/actions/ColorMapEditor1DAction.cpp b/ManiVault/src/actions/ColorMapEditor1DAction.cpp index 8e2671c70..7edfad7bc 100644 --- a/ManiVault/src/actions/ColorMapEditor1DAction.cpp +++ b/ManiVault/src/actions/ColorMapEditor1DAction.cpp @@ -193,7 +193,7 @@ void ColorMapEditor1DAction::disconnectFromPublicAction(bool recursive) WidgetAction::disconnectFromPublicAction(recursive); } -void ColorMapEditor1DAction::fromVariantMap(const QVariantMap& variantMap) +void ColorMapEditor1DAction::fromVariantMap(const mv::VariantMap& variantMap) { WidgetAction::fromVariantMap(variantMap); @@ -208,9 +208,9 @@ void ColorMapEditor1DAction::fromVariantMap(const QVariantMap& variantMap) } } -QVariantMap ColorMapEditor1DAction::toVariantMap() const +mv::VariantMap ColorMapEditor1DAction::toVariantMap() const { - QVariantMap variantMap = WidgetAction::toVariantMap(); + auto variantMap = WidgetAction::toVariantMap(); QVariantList nodes; diff --git a/ManiVault/src/actions/ColorMapEditor1DAction.h b/ManiVault/src/actions/ColorMapEditor1DAction.h index 20a976831..7eef78313 100644 --- a/ManiVault/src/actions/ColorMapEditor1DAction.h +++ b/ManiVault/src/actions/ColorMapEditor1DAction.h @@ -158,13 +158,13 @@ class ColorMapEditor1DAction : public WidgetAction * Load widget action from variant map * @param Variant map representation of the widget action */ - void fromVariantMap(const QVariantMap& variantMap) override; + void fromVariantMap(const mv::VariantMap& variantMap) override; /** * Save widget action to variant map * @return Variant map representation of the widget action */ - QVariantMap toVariantMap() const override; + mv::VariantMap toVariantMap() const override; public: // Action getters diff --git a/ManiVault/src/actions/ColorMapEditor1DNode.cpp b/ManiVault/src/actions/ColorMapEditor1DNode.cpp index 90bccb6bd..610444a1b 100644 --- a/ManiVault/src/actions/ColorMapEditor1DNode.cpp +++ b/ManiVault/src/actions/ColorMapEditor1DNode.cpp @@ -90,7 +90,7 @@ QRectF ColorMapEditor1DNode::getLimits() const return QRectF(QPointF(previousNode->getNormalizedCoordinate().x(), 0.0f), QPointF(nextNode->getNormalizedCoordinate().x(), 1.0f)); } -void ColorMapEditor1DNode::fromVariantMap(const QVariantMap& variantMap) +void ColorMapEditor1DNode::fromVariantMap(const mv::VariantMap& variantMap) { Serializable::fromVariantMap(variantMap); @@ -104,9 +104,9 @@ void ColorMapEditor1DNode::fromVariantMap(const QVariantMap& variantMap) _radius = variantMap["Radius"].toFloat(); } -QVariantMap ColorMapEditor1DNode::toVariantMap() const +mv::VariantMap ColorMapEditor1DNode::toVariantMap() const { - QVariantMap variantMap = Serializable::toVariantMap(); + auto variantMap = Serializable::toVariantMap(); variantMap.insert({ { "NormX", QVariant::fromValue(_normalizedCoordinate.x()) }, diff --git a/ManiVault/src/actions/ColorMapEditor1DNode.h b/ManiVault/src/actions/ColorMapEditor1DNode.h index 1a89e8c91..8ffb10ffc 100644 --- a/ManiVault/src/actions/ColorMapEditor1DNode.h +++ b/ManiVault/src/actions/ColorMapEditor1DNode.h @@ -95,13 +95,13 @@ class ColorMapEditor1DNode : public QObject, public util::Serializable * Load widget action from variant map * @param Variant map representation of the widget action */ - void fromVariantMap(const QVariantMap& variantMap) override; + void fromVariantMap(const mv::VariantMap& variantMap) override; /** * Save widget action to variant map * @return Variant map representation of the widget action */ - QVariantMap toVariantMap() const override; + mv::VariantMap toVariantMap() const override; signals: diff --git a/ManiVault/src/actions/ColorMapEditor1DNodeAction.h b/ManiVault/src/actions/ColorMapEditor1DNodeAction.h index 2fc70dc5b..87eda9c28 100644 --- a/ManiVault/src/actions/ColorMapEditor1DNodeAction.h +++ b/ManiVault/src/actions/ColorMapEditor1DNodeAction.h @@ -90,4 +90,4 @@ class ColorMapEditor1DNodeAction : public WidgetAction Q_DECLARE_METATYPE(mv::gui::ColorMapEditor1DNodeAction) -inline const auto colorMapEditor1DNodeActionMetaTypeId = qRegisterMetaType("mv::gui::ColorMapEditor1DNodeAction"); \ No newline at end of file +inline const auto colorMapEditor1DNodeActionMetaTypeId = qRegisterMetaType("mv::gui::ColorMapEditor1DNodeAction"); diff --git a/ManiVault/src/actions/DatasetPickerAction.cpp b/ManiVault/src/actions/DatasetPickerAction.cpp index cdcba3bb0..385c47afa 100644 --- a/ManiVault/src/actions/DatasetPickerAction.cpp +++ b/ManiVault/src/actions/DatasetPickerAction.cpp @@ -218,7 +218,7 @@ void DatasetPickerAction::disconnectFromPublicAction(bool recursive) WidgetAction::disconnectFromPublicAction(recursive); } -void DatasetPickerAction::fromVariantMap(const QVariantMap& variantMap) +void DatasetPickerAction::fromVariantMap(const mv::VariantMap& variantMap) { WidgetAction::fromVariantMap(variantMap); @@ -227,9 +227,9 @@ void DatasetPickerAction::fromVariantMap(const QVariantMap& variantMap) setCurrentDataset(variantMap["Value"].toString()); } -QVariantMap DatasetPickerAction::toVariantMap() const +mv::VariantMap DatasetPickerAction::toVariantMap() const { - QVariantMap variantMap = WidgetAction::toVariantMap(); + auto variantMap = WidgetAction::toVariantMap(); variantMap.insert({ { "Value", getCurrentDatasetGuid() } diff --git a/ManiVault/src/actions/DatasetPickerAction.h b/ManiVault/src/actions/DatasetPickerAction.h index 30fe301ab..f00b033ca 100644 --- a/ManiVault/src/actions/DatasetPickerAction.h +++ b/ManiVault/src/actions/DatasetPickerAction.h @@ -268,13 +268,13 @@ Q_OBJECT * Load widget action from variant map * @param Variant map representation of the widget action */ - void fromVariantMap(const QVariantMap& variantMap) override; + void fromVariantMap(const mv::VariantMap& variantMap) override; /** * Save widget action to variant map * @return Variant map representation of the widget action */ - QVariantMap toVariantMap() const override; + mv::VariantMap toVariantMap() const override; signals: diff --git a/ManiVault/src/actions/DecimalAction.cpp b/ManiVault/src/actions/DecimalAction.cpp index 3edb6e2e1..6fad93458 100644 --- a/ManiVault/src/actions/DecimalAction.cpp +++ b/ManiVault/src/actions/DecimalAction.cpp @@ -102,7 +102,7 @@ void DecimalAction::disconnectFromPublicAction(bool recursive) WidgetAction::disconnectFromPublicAction(recursive); } -void DecimalAction::fromVariantMap(const QVariantMap& variantMap) +void DecimalAction::fromVariantMap(const mv::VariantMap& variantMap) { WidgetAction::fromVariantMap(variantMap); @@ -111,7 +111,7 @@ void DecimalAction::fromVariantMap(const QVariantMap& variantMap) setValue(static_cast(variantMap["Value"].toDouble())); } -QVariantMap DecimalAction::toVariantMap() const +mv::VariantMap DecimalAction::toVariantMap() const { auto variantMap = WidgetAction::toVariantMap(); diff --git a/ManiVault/src/actions/DecimalAction.h b/ManiVault/src/actions/DecimalAction.h index f1d9e68f8..90c636a06 100644 --- a/ManiVault/src/actions/DecimalAction.h +++ b/ManiVault/src/actions/DecimalAction.h @@ -136,13 +136,13 @@ class DecimalAction : public NumericalAction * Load widget action from variant map * @param Variant map representation of the widget action */ - void fromVariantMap(const QVariantMap& variantMap) override; + void fromVariantMap(const mv::VariantMap& variantMap) override; /** * Save widget action to variant map * @return Variant map representation of the widget action */ - QVariantMap toVariantMap() const override; + mv::VariantMap toVariantMap() const override; signals: diff --git a/ManiVault/src/actions/DecimalRectangleAction.cpp b/ManiVault/src/actions/DecimalRectangleAction.cpp index 0e5f45307..070d07d1b 100644 --- a/ManiVault/src/actions/DecimalRectangleAction.cpp +++ b/ManiVault/src/actions/DecimalRectangleAction.cpp @@ -43,7 +43,7 @@ void DecimalRectangleAction::disconnectFromPublicAction(bool recursive) RectangleAction::disconnectFromPublicAction(recursive); } -void DecimalRectangleAction::fromVariantMap(const QVariantMap& variantMap) +void DecimalRectangleAction::fromVariantMap(const mv::VariantMap& variantMap) { RectangleAction::fromVariantMap(variantMap); @@ -51,7 +51,7 @@ void DecimalRectangleAction::fromVariantMap(const QVariantMap& variantMap) getRangeAction(Axis::Y).fromParentVariantMap(variantMap); } -QVariantMap DecimalRectangleAction::toVariantMap() const +mv::VariantMap DecimalRectangleAction::toVariantMap() const { auto variantMap = RectangleAction::toVariantMap(); diff --git a/ManiVault/src/actions/DecimalRectangleAction.h b/ManiVault/src/actions/DecimalRectangleAction.h index de9996db0..e51fcad37 100644 --- a/ManiVault/src/actions/DecimalRectangleAction.h +++ b/ManiVault/src/actions/DecimalRectangleAction.h @@ -51,13 +51,13 @@ class DecimalRectangleAction : public RectangleAction("mv::gui::GroupAction"); \ No newline at end of file +inline const auto groupActionMetaTypeId = qRegisterMetaType("mv::gui::GroupAction"); diff --git a/ManiVault/src/actions/HorizontalGroupAction.cpp b/ManiVault/src/actions/HorizontalGroupAction.cpp index 933be96ed..2501b90d7 100644 --- a/ManiVault/src/actions/HorizontalGroupAction.cpp +++ b/ManiVault/src/actions/HorizontalGroupAction.cpp @@ -12,4 +12,4 @@ HorizontalGroupAction::HorizontalGroupAction(QObject* parent, const QString& tit setDefaultWidgetFlags(GroupAction::Horizontal); } -} \ No newline at end of file +} diff --git a/ManiVault/src/actions/HorizontalGroupAction.h b/ManiVault/src/actions/HorizontalGroupAction.h index 9869b3e71..61bb80106 100644 --- a/ManiVault/src/actions/HorizontalGroupAction.h +++ b/ManiVault/src/actions/HorizontalGroupAction.h @@ -34,4 +34,4 @@ class HorizontalGroupAction : public GroupAction Q_DECLARE_METATYPE(mv::gui::HorizontalGroupAction) -inline const auto horizontalGroupActionMetaTypeId = qRegisterMetaType("mv::gui::HorizontalGroupAction"); \ No newline at end of file +inline const auto horizontalGroupActionMetaTypeId = qRegisterMetaType("mv::gui::HorizontalGroupAction"); diff --git a/ManiVault/src/actions/HorizontalToolbarAction.h b/ManiVault/src/actions/HorizontalToolbarAction.h index 2f79aefd1..d5b400799 100644 --- a/ManiVault/src/actions/HorizontalToolbarAction.h +++ b/ManiVault/src/actions/HorizontalToolbarAction.h @@ -87,4 +87,4 @@ class HorizontalToolbarAction : public ToolbarAction Q_DECLARE_METATYPE(mv::gui::HorizontalToolbarAction) -inline const auto horizontalToolbarActionMetaTypeId = qRegisterMetaType("mv::gui::HorizontalToolbarAction"); \ No newline at end of file +inline const auto horizontalToolbarActionMetaTypeId = qRegisterMetaType("mv::gui::HorizontalToolbarAction"); diff --git a/ManiVault/src/actions/ImageAction.cpp b/ManiVault/src/actions/ImageAction.cpp index e2d8309af..1bca9ce27 100644 --- a/ManiVault/src/actions/ImageAction.cpp +++ b/ManiVault/src/actions/ImageAction.cpp @@ -141,7 +141,7 @@ QWidget* ImageAction::getWidget(QWidget* parent, const std::int32_t& widgetFlags return widget; } -void ImageAction::fromVariantMap(const QVariantMap& variantMap) +void ImageAction::fromVariantMap(const mv::VariantMap& variantMap) { WidgetAction::fromVariantMap(variantMap); @@ -155,7 +155,7 @@ void ImageAction::fromVariantMap(const QVariantMap& variantMap) _fileNameAction.fromParentVariantMap(variantMap); } -QVariantMap ImageAction::toVariantMap() const +mv::VariantMap ImageAction::toVariantMap() const { auto variantMap = WidgetAction::toVariantMap(); diff --git a/ManiVault/src/actions/ImageAction.h b/ManiVault/src/actions/ImageAction.h index 75c657cf4..2c90c5720 100644 --- a/ManiVault/src/actions/ImageAction.h +++ b/ManiVault/src/actions/ImageAction.h @@ -115,13 +115,13 @@ class ImageAction : public WidgetAction * Load image action from variant * @param Variant representation of the image action */ - void fromVariantMap(const QVariantMap& variantMap) override; + void fromVariantMap(const mv::VariantMap& variantMap) override; /** * Save image action to variant * @return Variant representation of the image action */ - QVariantMap toVariantMap() const override; + mv::VariantMap toVariantMap() const override; public: // Action getters diff --git a/ManiVault/src/actions/IntegralAction.cpp b/ManiVault/src/actions/IntegralAction.cpp index a71a4546c..9cc8e9b62 100644 --- a/ManiVault/src/actions/IntegralAction.cpp +++ b/ManiVault/src/actions/IntegralAction.cpp @@ -80,7 +80,7 @@ void IntegralAction::disconnectFromPublicAction(bool recursive) WidgetAction::disconnectFromPublicAction(recursive); } -void IntegralAction::fromVariantMap(const QVariantMap& variantMap) +void IntegralAction::fromVariantMap(const mv::VariantMap& variantMap) { WidgetAction::fromVariantMap(variantMap); @@ -89,7 +89,7 @@ void IntegralAction::fromVariantMap(const QVariantMap& variantMap) setValue(variantMap["Value"].toInt()); } -QVariantMap IntegralAction::toVariantMap() const +mv::VariantMap IntegralAction::toVariantMap() const { auto variantMap = WidgetAction::toVariantMap(); diff --git a/ManiVault/src/actions/IntegralAction.h b/ManiVault/src/actions/IntegralAction.h index ba6d4e12a..72fef5531 100644 --- a/ManiVault/src/actions/IntegralAction.h +++ b/ManiVault/src/actions/IntegralAction.h @@ -126,13 +126,13 @@ class IntegralAction : public NumericalAction * Load widget action from variant * @param Variant representation of the widget action */ - void fromVariantMap(const QVariantMap& variantMap) override; + void fromVariantMap(const mv::VariantMap& variantMap) override; /** * Save widget action to variant map * @return Variant map representation of the widget action */ - QVariantMap toVariantMap() const override; + mv::VariantMap toVariantMap() const override; signals: diff --git a/ManiVault/src/actions/IntegralRectangleAction.cpp b/ManiVault/src/actions/IntegralRectangleAction.cpp index dbc4a0b5b..3fefa6fb5 100644 --- a/ManiVault/src/actions/IntegralRectangleAction.cpp +++ b/ManiVault/src/actions/IntegralRectangleAction.cpp @@ -43,7 +43,7 @@ void IntegralRectangleAction::disconnectFromPublicAction(bool recursive) RectangleAction::disconnectFromPublicAction(recursive); } -void IntegralRectangleAction::fromVariantMap(const QVariantMap& variantMap) +void IntegralRectangleAction::fromVariantMap(const mv::VariantMap& variantMap) { RectangleAction::fromVariantMap(variantMap); @@ -51,7 +51,7 @@ void IntegralRectangleAction::fromVariantMap(const QVariantMap& variantMap) getRangeAction(Axis::Y).fromParentVariantMap(variantMap); } -QVariantMap IntegralRectangleAction::toVariantMap() const +mv::VariantMap IntegralRectangleAction::toVariantMap() const { auto variantMap = RectangleAction::toVariantMap(); @@ -61,4 +61,4 @@ QVariantMap IntegralRectangleAction::toVariantMap() const return variantMap; } -} \ No newline at end of file +} diff --git a/ManiVault/src/actions/IntegralRectangleAction.h b/ManiVault/src/actions/IntegralRectangleAction.h index 5bf90010c..d55bfbf71 100644 --- a/ManiVault/src/actions/IntegralRectangleAction.h +++ b/ManiVault/src/actions/IntegralRectangleAction.h @@ -51,13 +51,13 @@ class IntegralRectangleAction : public RectangleAction>; Q_DECLARE_METATYPE(mv::gui::PluginTriggerAction) -inline const auto pluginTriggerActionMetaTypeId = qRegisterMetaType("PluginTriggerAction"); \ No newline at end of file +inline const auto pluginTriggerActionMetaTypeId = qRegisterMetaType("PluginTriggerAction"); diff --git a/ManiVault/src/actions/SplashScreenAction.cpp b/ManiVault/src/actions/SplashScreenAction.cpp index 7cd35fee5..84ea3deab 100644 --- a/ManiVault/src/actions/SplashScreenAction.cpp +++ b/ManiVault/src/actions/SplashScreenAction.cpp @@ -195,7 +195,7 @@ void SplashScreenAction::closeSplashScreenWidget() _splashScreenWidget.clear(); } -void SplashScreenAction::fromVariantMap(const QVariantMap& variantMap) +void SplashScreenAction::fromVariantMap(const mv::VariantMap& variantMap) { HorizontalGroupAction::fromVariantMap(variantMap); @@ -204,7 +204,7 @@ void SplashScreenAction::fromVariantMap(const QVariantMap& variantMap) _affiliateLogosImageAction.fromParentVariantMap(variantMap); } -QVariantMap SplashScreenAction::toVariantMap() const +mv::VariantMap SplashScreenAction::toVariantMap() const { auto variantMap = HorizontalGroupAction::toVariantMap(); @@ -215,4 +215,4 @@ QVariantMap SplashScreenAction::toVariantMap() const return variantMap; } -} \ No newline at end of file +} diff --git a/ManiVault/src/actions/SplashScreenAction.h b/ManiVault/src/actions/SplashScreenAction.h index 7259cd3f0..8084666c5 100644 --- a/ManiVault/src/actions/SplashScreenAction.h +++ b/ManiVault/src/actions/SplashScreenAction.h @@ -180,13 +180,13 @@ class SplashScreenAction : public HorizontalGroupAction * Load splash screen action from variant * @param Variant representation of the project */ - void fromVariantMap(const QVariantMap& variantMap) override; + void fromVariantMap(const mv::VariantMap& variantMap) override; /** * Save splash screen action to variant * @return Variant representation of the project */ - QVariantMap toVariantMap() const override; + mv::VariantMap toVariantMap() const override; private: diff --git a/ManiVault/src/actions/StatusBarAction.cpp b/ManiVault/src/actions/StatusBarAction.cpp index 2cf53adb6..c2ab74f0a 100644 --- a/ManiVault/src/actions/StatusBarAction.cpp +++ b/ManiVault/src/actions/StatusBarAction.cpp @@ -233,4 +233,4 @@ StatusBarAction::Widget::ToolButton::ToolButton(QWidget* parent, StatusBarAction setLayout(layout); } -} \ No newline at end of file +} diff --git a/ManiVault/src/actions/StatusBarAction.h b/ManiVault/src/actions/StatusBarAction.h index 6d1c33d3e..6d55737d9 100644 --- a/ManiVault/src/actions/StatusBarAction.h +++ b/ManiVault/src/actions/StatusBarAction.h @@ -210,4 +210,4 @@ class StatusBarAction : public WidgetAction friend class WidgetActionToolButton; }; -} \ No newline at end of file +} diff --git a/ManiVault/src/actions/StretchAction.cpp b/ManiVault/src/actions/StretchAction.cpp index 9f7b66b64..eece5227c 100644 --- a/ManiVault/src/actions/StretchAction.cpp +++ b/ManiVault/src/actions/StretchAction.cpp @@ -47,16 +47,16 @@ void StretchAction::disconnectFromPublicAction(bool recursive) WidgetAction::disconnectFromPublicAction(recursive); } -void StretchAction::fromVariantMap(const QVariantMap& variantMap) +void StretchAction::fromVariantMap(const mv::VariantMap& variantMap) { WidgetAction::fromVariantMap(variantMap); } -QVariantMap StretchAction::toVariantMap() const +mv::VariantMap StretchAction::toVariantMap() const { - QVariantMap variantMap = WidgetAction::toVariantMap(); + auto variantMap = WidgetAction::toVariantMap(); return variantMap; } -} \ No newline at end of file +} diff --git a/ManiVault/src/actions/StretchAction.h b/ManiVault/src/actions/StretchAction.h index 572877beb..9ce7c7850 100644 --- a/ManiVault/src/actions/StretchAction.h +++ b/ManiVault/src/actions/StretchAction.h @@ -52,17 +52,17 @@ class StretchAction : public WidgetAction * Load widget action from variant map * @param Variant map representation of the widget action */ - void fromVariantMap(const QVariantMap& variantMap) override; + void fromVariantMap(const mv::VariantMap& variantMap) override; /** * Save widget action to variant map * @return Variant map representation of the widget action */ - QVariantMap toVariantMap() const override; + mv::VariantMap toVariantMap() const override; }; } Q_DECLARE_METATYPE(mv::gui::StretchAction) -inline const auto stretchActionMetaTypeId = qRegisterMetaType("mv::gui::StretchAction"); \ No newline at end of file +inline const auto stretchActionMetaTypeId = qRegisterMetaType("mv::gui::StretchAction"); diff --git a/ManiVault/src/actions/StringAction.cpp b/ManiVault/src/actions/StringAction.cpp index 1d9b76ac1..2ce26ce2d 100644 --- a/ManiVault/src/actions/StringAction.cpp +++ b/ManiVault/src/actions/StringAction.cpp @@ -170,7 +170,7 @@ void StringAction::disconnectFromPublicAction(bool recursive) WidgetAction::disconnectFromPublicAction(recursive); } -void StringAction::fromVariantMap(const QVariantMap& variantMap) +void StringAction::fromVariantMap(const mv::VariantMap& variantMap) { WidgetAction::fromVariantMap(variantMap); @@ -179,7 +179,7 @@ void StringAction::fromVariantMap(const QVariantMap& variantMap) setString(variantMap["Value"].toString()); } -QVariantMap StringAction::toVariantMap() const +mv::VariantMap StringAction::toVariantMap() const { auto variantMap = WidgetAction::toVariantMap(); diff --git a/ManiVault/src/actions/StringAction.h b/ManiVault/src/actions/StringAction.h index d2d9d9cba..5cf9d6840 100644 --- a/ManiVault/src/actions/StringAction.h +++ b/ManiVault/src/actions/StringAction.h @@ -221,13 +221,13 @@ class StringAction : public WidgetAction * Load widget action from variant * @param Variant representation of the widget action */ - void fromVariantMap(const QVariantMap& variantMap) override; + void fromVariantMap(const mv::VariantMap& variantMap) override; /** * Save widget action to variant * @return Variant representation of the widget action */ - QVariantMap toVariantMap() const override; + mv::VariantMap toVariantMap() const override; signals: diff --git a/ManiVault/src/actions/StringsAction.cpp b/ManiVault/src/actions/StringsAction.cpp index cfa17bbd5..53dce5089 100644 --- a/ManiVault/src/actions/StringsAction.cpp +++ b/ManiVault/src/actions/StringsAction.cpp @@ -86,7 +86,7 @@ void StringsAction::disconnectFromPublicAction(bool recursive) WidgetAction::disconnectFromPublicAction(recursive); } -void StringsAction::fromVariantMap(const QVariantMap& variantMap) +void StringsAction::fromVariantMap(const mv::VariantMap& variantMap) { WidgetAction::fromVariantMap(variantMap); @@ -95,7 +95,7 @@ void StringsAction::fromVariantMap(const QVariantMap& variantMap) setStrings(variantMap["Value"].toStringList()); } -QVariantMap StringsAction::toVariantMap() const +mv::VariantMap StringsAction::toVariantMap() const { auto variantMap = WidgetAction::toVariantMap(); diff --git a/ManiVault/src/actions/StringsAction.h b/ManiVault/src/actions/StringsAction.h index b3eca53fb..8dd1c28a2 100644 --- a/ManiVault/src/actions/StringsAction.h +++ b/ManiVault/src/actions/StringsAction.h @@ -143,13 +143,13 @@ class StringsAction : public WidgetAction * Load widget action from variant * @param Variant representation of the widget action */ - void fromVariantMap(const QVariantMap& variantMap) override; + void fromVariantMap(const mv::VariantMap& variantMap) override; /** * Save widget action to variant * @return Variant representation of the widget action */ - QVariantMap toVariantMap() const override; + mv::VariantMap toVariantMap() const override; public: // Action getters diff --git a/ManiVault/src/actions/TasksListAction.cpp b/ManiVault/src/actions/TasksListAction.cpp index 95383773c..eb2707c6f 100644 --- a/ManiVault/src/actions/TasksListAction.cpp +++ b/ManiVault/src/actions/TasksListAction.cpp @@ -153,4 +153,4 @@ void TasksListAction::Widget::cleanLayout() delete item; } -} \ No newline at end of file +} diff --git a/ManiVault/src/actions/TasksTreeAction.cpp b/ManiVault/src/actions/TasksTreeAction.cpp index 1bca5679c..70d5f98c5 100644 --- a/ManiVault/src/actions/TasksTreeAction.cpp +++ b/ManiVault/src/actions/TasksTreeAction.cpp @@ -324,4 +324,4 @@ bool TasksTreeAction::hasAgregateTasks() const return !matches.isEmpty(); } -} \ No newline at end of file +} diff --git a/ManiVault/src/actions/ToggleAction.cpp b/ManiVault/src/actions/ToggleAction.cpp index 2b8a7da31..e63a8d7ff 100644 --- a/ManiVault/src/actions/ToggleAction.cpp +++ b/ManiVault/src/actions/ToggleAction.cpp @@ -51,7 +51,7 @@ void ToggleAction::setIndeterminate(bool indeterminate) emit indeterminateChanged(_indeterminate); } -void ToggleAction::fromVariantMap(const QVariantMap& variantMap) +void ToggleAction::fromVariantMap(const mv::VariantMap& variantMap) { WidgetAction::fromVariantMap(variantMap); @@ -60,7 +60,7 @@ void ToggleAction::fromVariantMap(const QVariantMap& variantMap) setChecked(variantMap["Value"].toBool()); } -QVariantMap ToggleAction::toVariantMap() const +mv::VariantMap ToggleAction::toVariantMap() const { auto variantMap = WidgetAction::toVariantMap(); diff --git a/ManiVault/src/actions/ToggleAction.h b/ManiVault/src/actions/ToggleAction.h index 2794785c9..443aee0b8 100644 --- a/ManiVault/src/actions/ToggleAction.h +++ b/ManiVault/src/actions/ToggleAction.h @@ -131,13 +131,13 @@ class ToggleAction : public WidgetAction * Load widget action from variant map * @param Variant map representation of the widget action */ - void fromVariantMap(const QVariantMap& variantMap) override; + void fromVariantMap(const mv::VariantMap& variantMap) override; /** * Save widget action to variant map * @return Variant map representation of the widget action */ - QVariantMap toVariantMap() const override; + mv::VariantMap toVariantMap() const override; protected: // Linking diff --git a/ManiVault/src/actions/ToolbarAction.h b/ManiVault/src/actions/ToolbarAction.h index 6b3a328a9..ad496321f 100644 --- a/ManiVault/src/actions/ToolbarAction.h +++ b/ManiVault/src/actions/ToolbarAction.h @@ -116,4 +116,4 @@ class ToolbarAction : public WidgetAction Q_DECLARE_METATYPE(mv::gui::ToolbarAction) -inline const auto toolbarActionMetaTypeId = qRegisterMetaType("mv::gui::ToolbarAction"); \ No newline at end of file +inline const auto toolbarActionMetaTypeId = qRegisterMetaType("mv::gui::ToolbarAction"); diff --git a/ManiVault/src/actions/ToolbarActionItem.h b/ManiVault/src/actions/ToolbarActionItem.h index 35f6b2601..9bcdbf6c3 100644 --- a/ManiVault/src/actions/ToolbarActionItem.h +++ b/ManiVault/src/actions/ToolbarActionItem.h @@ -163,4 +163,4 @@ class ToolbarActionItem final : public QObject friend class ToolbarActionItemWidget; }; -} \ No newline at end of file +} diff --git a/ManiVault/src/actions/ToolbarActionItemWidget.h b/ManiVault/src/actions/ToolbarActionItemWidget.h index 4c0d3ada2..2a1920db3 100644 --- a/ManiVault/src/actions/ToolbarActionItemWidget.h +++ b/ManiVault/src/actions/ToolbarActionItemWidget.h @@ -80,4 +80,4 @@ class ToolbarActionItemWidget final : public QWidget friend class ToolbarActionItem; }; -} \ No newline at end of file +} diff --git a/ManiVault/src/actions/VariantAction.cpp b/ManiVault/src/actions/VariantAction.cpp index 9add30a3e..62a6d360b 100644 --- a/ManiVault/src/actions/VariantAction.cpp +++ b/ManiVault/src/actions/VariantAction.cpp @@ -70,7 +70,7 @@ void VariantAction::disconnectFromPublicAction(bool recursive) WidgetAction::disconnectFromPublicAction(recursive); } -void VariantAction::fromVariantMap(const QVariantMap& variantMap) +void VariantAction::fromVariantMap(const mv::VariantMap& variantMap) { WidgetAction::fromVariantMap(variantMap); @@ -79,7 +79,7 @@ void VariantAction::fromVariantMap(const QVariantMap& variantMap) setVariant(variantMap["Value"]); } -QVariantMap VariantAction::toVariantMap() const +mv::VariantMap VariantAction::toVariantMap() const { auto variantMap = WidgetAction::toVariantMap(); diff --git a/ManiVault/src/actions/VariantAction.h b/ManiVault/src/actions/VariantAction.h index 70fe04ccc..797ed3cb7 100644 --- a/ManiVault/src/actions/VariantAction.h +++ b/ManiVault/src/actions/VariantAction.h @@ -70,13 +70,13 @@ class VariantAction : public WidgetAction * Load widget action from variant * @param Variant representation of the widget action */ - void fromVariantMap(const QVariantMap& variantMap) override; + void fromVariantMap(const mv::VariantMap& variantMap) override; /** * Save widget action to variant * @return Variant representation of the widget action */ - QVariantMap toVariantMap() const override; + mv::VariantMap toVariantMap() const override; signals: diff --git a/ManiVault/src/actions/VersionAction.cpp b/ManiVault/src/actions/VersionAction.cpp index 7f814e0ba..24b1fef60 100644 --- a/ManiVault/src/actions/VersionAction.cpp +++ b/ManiVault/src/actions/VersionAction.cpp @@ -51,7 +51,7 @@ VersionAction::VersionAction(QObject* parent, const QString& title) : connect(&_suffixAction, &StringAction::stringChanged, this, updateVersionStringAction); } -void VersionAction::fromVariantMap(const QVariantMap& variantMap) +void VersionAction::fromVariantMap(const mv::VariantMap& variantMap) { Serializable::fromVariantMap(variantMap); @@ -60,7 +60,7 @@ void VersionAction::fromVariantMap(const QVariantMap& variantMap) _suffixAction.fromParentVariantMap(variantMap); } -QVariantMap VersionAction::toVariantMap() const +mv::VariantMap VersionAction::toVariantMap() const { auto variantMap = Serializable::toVariantMap(); @@ -71,4 +71,4 @@ QVariantMap VersionAction::toVariantMap() const return variantMap; } -} \ No newline at end of file +} diff --git a/ManiVault/src/actions/VersionAction.h b/ManiVault/src/actions/VersionAction.h index 7e9f41d32..ec2f71895 100644 --- a/ManiVault/src/actions/VersionAction.h +++ b/ManiVault/src/actions/VersionAction.h @@ -38,13 +38,13 @@ class VersionAction final : public HorizontalGroupAction * Load project from variant * @param Variant representation of the project */ - void fromVariantMap(const QVariantMap& variantMap) override; + void fromVariantMap(const mv::VariantMap& variantMap) override; /** * Save project to variant * @return Variant representation of the project */ - QVariantMap toVariantMap() const override; + mv::VariantMap toVariantMap() const override; public: // Action getters @@ -70,4 +70,4 @@ class VersionAction final : public HorizontalGroupAction Q_DECLARE_METATYPE(mv::gui::VersionAction) -inline const auto versionActionMetaTypeId = qRegisterMetaType("mv::gui::VersionAction"); \ No newline at end of file +inline const auto versionActionMetaTypeId = qRegisterMetaType("mv::gui::VersionAction"); diff --git a/ManiVault/src/actions/VerticalGroupAction.cpp b/ManiVault/src/actions/VerticalGroupAction.cpp index 378581040..fc002be06 100644 --- a/ManiVault/src/actions/VerticalGroupAction.cpp +++ b/ManiVault/src/actions/VerticalGroupAction.cpp @@ -12,4 +12,4 @@ VerticalGroupAction::VerticalGroupAction(QObject* parent, const QString& title, setDefaultWidgetFlags(GroupAction::Vertical); } -} \ No newline at end of file +} diff --git a/ManiVault/src/actions/VerticalGroupAction.h b/ManiVault/src/actions/VerticalGroupAction.h index c76c45013..1f5d26729 100644 --- a/ManiVault/src/actions/VerticalGroupAction.h +++ b/ManiVault/src/actions/VerticalGroupAction.h @@ -34,4 +34,4 @@ class VerticalGroupAction : public GroupAction Q_DECLARE_METATYPE(mv::gui::VerticalGroupAction) -inline const auto verticalGroupActionMetaTypeId = qRegisterMetaType("mv::gui::VerticalGroupAction"); \ No newline at end of file +inline const auto verticalGroupActionMetaTypeId = qRegisterMetaType("mv::gui::VerticalGroupAction"); diff --git a/ManiVault/src/actions/VerticalToolbarAction.h b/ManiVault/src/actions/VerticalToolbarAction.h index 4f62b4025..15f6a198a 100644 --- a/ManiVault/src/actions/VerticalToolbarAction.h +++ b/ManiVault/src/actions/VerticalToolbarAction.h @@ -76,4 +76,4 @@ class VerticalToolbarAction : public ToolbarAction Q_DECLARE_METATYPE(mv::gui::VerticalToolbarAction) -inline const auto verticalToolbarActionActionMetaTypeId = qRegisterMetaType("mv::gui::VerticalToolbarAction"); \ No newline at end of file +inline const auto verticalToolbarActionActionMetaTypeId = qRegisterMetaType("mv::gui::VerticalToolbarAction"); diff --git a/ManiVault/src/actions/WidgetAction.cpp b/ManiVault/src/actions/WidgetAction.cpp index a0e5775c2..6f0722821 100644 --- a/ManiVault/src/actions/WidgetAction.cpp +++ b/ManiVault/src/actions/WidgetAction.cpp @@ -683,7 +683,7 @@ QWidget* WidgetAction::getWidget(QWidget* parent, const std::int32_t& widgetFlag return new QWidget(); } -void WidgetAction::fromVariantMap(const QVariantMap& variantMap) +void WidgetAction::fromVariantMap(const mv::VariantMap& variantMap) { auto previousId = getId(); @@ -726,9 +726,9 @@ void WidgetAction::fromVariantMap(const QVariantMap& variantMap) setStudioMode(projects().getCurrentProject()->getStudioModeAction().isChecked(), false); } -QVariantMap WidgetAction::toVariantMap() const +mv::VariantMap WidgetAction::toVariantMap() const { - QVariantMap variantMap = Serializable::toVariantMap(); + auto variantMap = Serializable::toVariantMap(); variantMap.insert({ { "ActionType", QVariant::fromValue(getTypeString()) }, diff --git a/ManiVault/src/actions/WidgetAction.h b/ManiVault/src/actions/WidgetAction.h index 1fecdcfe8..cb628f8dc 100644 --- a/ManiVault/src/actions/WidgetAction.h +++ b/ManiVault/src/actions/WidgetAction.h @@ -679,13 +679,13 @@ class WidgetAction : public QWidgetAction, public util::Serializable * Load widget action from variant map * @param Variant map representation of the widget action */ - void fromVariantMap(const QVariantMap& variantMap) override; + void fromVariantMap(const mv::VariantMap& variantMap) override; /** * Save widget action to variant map * @return Variant map representation of the widget action */ - QVariantMap toVariantMap() const override; + mv::VariantMap toVariantMap() const override; public: // State caching diff --git a/ManiVault/src/actions/WidgetActionBadgeOverlayWidget.cpp b/ManiVault/src/actions/WidgetActionBadgeOverlayWidget.cpp index cd3aac131..a98b1553c 100644 --- a/ManiVault/src/actions/WidgetActionBadgeOverlayWidget.cpp +++ b/ManiVault/src/actions/WidgetActionBadgeOverlayWidget.cpp @@ -54,4 +54,4 @@ void WidgetActionBadgeOverlayWidget::paintEvent(QPaintEvent* paintEvent) } } -} \ No newline at end of file +} diff --git a/ManiVault/src/actions/WidgetActionBadgeOverlayWidget.h b/ManiVault/src/actions/WidgetActionBadgeOverlayWidget.h index 2ef6dcf56..c09b10592 100644 --- a/ManiVault/src/actions/WidgetActionBadgeOverlayWidget.h +++ b/ManiVault/src/actions/WidgetActionBadgeOverlayWidget.h @@ -38,4 +38,4 @@ class WidgetActionBadgeOverlayWidget final : public OverlayWidget WidgetAction* _action; /** Pointer to owning widget action */ }; -} \ No newline at end of file +} diff --git a/ManiVault/src/actions/WidgetActionHighlightWidget.cpp b/ManiVault/src/actions/WidgetActionHighlightWidget.cpp index 38844ff5b..84fd3de2b 100644 --- a/ManiVault/src/actions/WidgetActionHighlightWidget.cpp +++ b/ManiVault/src/actions/WidgetActionHighlightWidget.cpp @@ -68,4 +68,4 @@ void WidgetActionHighlightWidget::highlightingChanged(const WidgetAction::Highli } } -} \ No newline at end of file +} diff --git a/ManiVault/src/actions/WidgetActionHighlightWidget.h b/ManiVault/src/actions/WidgetActionHighlightWidget.h index bfa78f924..d7b57c8ac 100644 --- a/ManiVault/src/actions/WidgetActionHighlightWidget.h +++ b/ManiVault/src/actions/WidgetActionHighlightWidget.h @@ -55,4 +55,4 @@ class WidgetActionHighlightWidget final : public OverlayWidget mv::util::WidgetFader _widgetFader; /** Widget fader for animating the widget opacity */ }; -} \ No newline at end of file +} diff --git a/ManiVault/src/actions/WidgetActionMimeData.cpp b/ManiVault/src/actions/WidgetActionMimeData.cpp index d8bb95409..b9ab2c42a 100644 --- a/ManiVault/src/actions/WidgetActionMimeData.cpp +++ b/ManiVault/src/actions/WidgetActionMimeData.cpp @@ -53,4 +53,4 @@ QStringList WidgetActionMimeData::formats() const return { format() }; } -} \ No newline at end of file +} diff --git a/ManiVault/src/actions/WidgetActionMimeData.h b/ManiVault/src/actions/WidgetActionMimeData.h index fa25c76dd..601c724d6 100644 --- a/ManiVault/src/actions/WidgetActionMimeData.h +++ b/ManiVault/src/actions/WidgetActionMimeData.h @@ -59,4 +59,4 @@ class WidgetActionMimeData final : public QMimeData WidgetActions _highlightActions; /** Actions to be highlighted/un-highlighted */ }; -} \ No newline at end of file +} diff --git a/ManiVault/src/actions/WindowLevelAction.cpp b/ManiVault/src/actions/WindowLevelAction.cpp index e86ad6189..d49a1c5af 100644 --- a/ManiVault/src/actions/WindowLevelAction.cpp +++ b/ManiVault/src/actions/WindowLevelAction.cpp @@ -74,7 +74,7 @@ void WindowLevelAction::disconnectFromPublicAction(bool recursive) GroupAction::disconnectFromPublicAction(recursive); } -void WindowLevelAction::fromVariantMap(const QVariantMap& variantMap) +void WindowLevelAction::fromVariantMap(const mv::VariantMap& variantMap) { GroupAction::fromVariantMap(variantMap); @@ -82,7 +82,7 @@ void WindowLevelAction::fromVariantMap(const QVariantMap& variantMap) _levelAction.fromParentVariantMap(variantMap); } -QVariantMap WindowLevelAction::toVariantMap() const +mv::VariantMap WindowLevelAction::toVariantMap() const { auto variantMap = GroupAction::toVariantMap(); diff --git a/ManiVault/src/actions/WindowLevelAction.h b/ManiVault/src/actions/WindowLevelAction.h index 48c77791e..ece3affc5 100644 --- a/ManiVault/src/actions/WindowLevelAction.h +++ b/ManiVault/src/actions/WindowLevelAction.h @@ -50,13 +50,13 @@ class WindowLevelAction : public GroupAction * Load widget action from variant map * @param Variant map representation of the widget action */ - void fromVariantMap(const QVariantMap& variantMap) override; + void fromVariantMap(const mv::VariantMap& variantMap) override; /** * Save widget action to variant map * @return Variant map representation of the widget action */ - QVariantMap toVariantMap() const override; + mv::VariantMap toVariantMap() const override; public: /** Action getters */ diff --git a/ManiVault/src/models/AbstractDataHierarchyModel.h b/ManiVault/src/models/AbstractDataHierarchyModel.h index 53e3d12ad..3a331364b 100644 --- a/ManiVault/src/models/AbstractDataHierarchyModel.h +++ b/ManiVault/src/models/AbstractDataHierarchyModel.h @@ -686,4 +686,4 @@ class AbstractDataHierarchyModel : public QStandardItemModel void unhideItem(const QModelIndex& index); }; -} \ No newline at end of file +} diff --git a/ManiVault/src/models/AbstractPluginFactoriesModel.cpp b/ManiVault/src/models/AbstractPluginFactoriesModel.cpp index 0cd63a47b..8b734fa70 100644 --- a/ManiVault/src/models/AbstractPluginFactoriesModel.cpp +++ b/ManiVault/src/models/AbstractPluginFactoriesModel.cpp @@ -125,4 +125,4 @@ QVariant AbstractPluginFactoriesModel::headerData(int section, Qt::Orientation o return {}; } -} \ No newline at end of file +} diff --git a/ManiVault/src/models/AbstractPluginFactoriesModel.h b/ManiVault/src/models/AbstractPluginFactoriesModel.h index 729afa930..568f4528c 100644 --- a/ManiVault/src/models/AbstractPluginFactoriesModel.h +++ b/ManiVault/src/models/AbstractPluginFactoriesModel.h @@ -202,4 +202,4 @@ class AbstractPluginFactoriesModel : public QStandardItemModel QVariant headerData(int section, Qt::Orientation orientation, int role = Qt::DisplayRole) const override; }; -} \ No newline at end of file +} diff --git a/ManiVault/src/models/AbstractPluginsModel.cpp b/ManiVault/src/models/AbstractPluginsModel.cpp index 6a8390413..8ebc93319 100644 --- a/ManiVault/src/models/AbstractPluginsModel.cpp +++ b/ManiVault/src/models/AbstractPluginsModel.cpp @@ -51,4 +51,4 @@ QVariant AbstractPluginsModel::headerData(int section, Qt::Orientation orientati return {}; } -} \ No newline at end of file +} diff --git a/ManiVault/src/models/AbstractPluginsModel.h b/ManiVault/src/models/AbstractPluginsModel.h index 028ae995b..4e39bef23 100644 --- a/ManiVault/src/models/AbstractPluginsModel.h +++ b/ManiVault/src/models/AbstractPluginsModel.h @@ -142,4 +142,4 @@ class AbstractPluginsModel : public QStandardItemModel QVariant headerData(int section, Qt::Orientation orientation, int role = Qt::DisplayRole) const override; }; -} \ No newline at end of file +} diff --git a/ManiVault/src/models/ActionsHierarchyModel.cpp b/ManiVault/src/models/ActionsHierarchyModel.cpp index d7b6b83a4..51feb2200 100644 --- a/ManiVault/src/models/ActionsHierarchyModel.cpp +++ b/ManiVault/src/models/ActionsHierarchyModel.cpp @@ -91,4 +91,4 @@ void ActionsHierarchyModel::removeAction(gui::WidgetAction* action) removeRow(persistentMatch.row(), persistentMatch.parent()); } -} \ No newline at end of file +} diff --git a/ManiVault/src/models/CheckableStringListModel.cpp b/ManiVault/src/models/CheckableStringListModel.cpp index 117904325..63c64189d 100644 --- a/ManiVault/src/models/CheckableStringListModel.cpp +++ b/ManiVault/src/models/CheckableStringListModel.cpp @@ -77,4 +77,4 @@ mv::CheckableStringListModel::StringIndicesList CheckableStringListModel::getChe return StringIndicesList(_checkedItems.begin(), _checkedItems.end()); } -} \ No newline at end of file +} diff --git a/ManiVault/src/models/CheckableStringListModel.h b/ManiVault/src/models/CheckableStringListModel.h index 76015b613..26c85f375 100644 --- a/ManiVault/src/models/CheckableStringListModel.h +++ b/ManiVault/src/models/CheckableStringListModel.h @@ -89,4 +89,4 @@ class CheckableStringListModel final : public QStringListModel { StringIndicesSet _checkedItems; /** Keeps track of the selected items */ }; -} \ No newline at end of file +} diff --git a/ManiVault/src/models/DataHierarchyFilterModel.h b/ManiVault/src/models/DataHierarchyFilterModel.h index 462b4aff6..0f745763b 100644 --- a/ManiVault/src/models/DataHierarchyFilterModel.h +++ b/ManiVault/src/models/DataHierarchyFilterModel.h @@ -46,4 +46,4 @@ class DataHierarchyFilterModel : public QSortFilterProxyModel { gui::OptionsAction _derivedFilterAction; /** For selecting whether derived and/or non-derived datasets are shown or not */ }; -} \ No newline at end of file +} diff --git a/ManiVault/src/models/DataHierarchyListModel.h b/ManiVault/src/models/DataHierarchyListModel.h index 8951649e8..596ad842e 100644 --- a/ManiVault/src/models/DataHierarchyListModel.h +++ b/ManiVault/src/models/DataHierarchyListModel.h @@ -57,4 +57,4 @@ class DataHierarchyListModel final : public AbstractDataHierarchyModel void removeDataHierarchyModelItem(DataHierarchyItem* dataHierarchyItem); }; -} \ No newline at end of file +} diff --git a/ManiVault/src/models/DataHierarchyTreeModel.h b/ManiVault/src/models/DataHierarchyTreeModel.h index b3d06b858..7a75d3ae1 100644 --- a/ManiVault/src/models/DataHierarchyTreeModel.h +++ b/ManiVault/src/models/DataHierarchyTreeModel.h @@ -56,4 +56,4 @@ class DataHierarchyTreeModel final : public AbstractDataHierarchyModel void reparentDataHierarchyModelItem(DataHierarchyItem* dataHierarchyItem); }; -} \ No newline at end of file +} diff --git a/ManiVault/src/models/LoggingFilterModel.cpp b/ManiVault/src/models/LoggingFilterModel.cpp index 1b93fc44a..6cd559dbb 100644 --- a/ManiVault/src/models/LoggingFilterModel.cpp +++ b/ManiVault/src/models/LoggingFilterModel.cpp @@ -128,4 +128,4 @@ bool LoggingFilterModel::lessThan(const QModelIndex& lhs, const QModelIndex& rhs return false; } -} \ No newline at end of file +} diff --git a/ManiVault/src/models/LoggingFilterModel.h b/ManiVault/src/models/LoggingFilterModel.h index a43f72555..9eb8a1570 100644 --- a/ManiVault/src/models/LoggingFilterModel.h +++ b/ManiVault/src/models/LoggingFilterModel.h @@ -48,4 +48,4 @@ class LoggingFilterModel : public QSortFilterProxyModel mv::gui::OptionsAction _filterTypeAction; /** Options action for filtering log record item type */ }; -} \ No newline at end of file +} diff --git a/ManiVault/src/models/LoggingModel.cpp b/ManiVault/src/models/LoggingModel.cpp index 1ba29fef3..c7faa4e96 100644 --- a/ManiVault/src/models/LoggingModel.cpp +++ b/ManiVault/src/models/LoggingModel.cpp @@ -266,4 +266,4 @@ void LoggingModel::populateFromLogger() } } -} \ No newline at end of file +} diff --git a/ManiVault/src/models/LoggingModel.h b/ManiVault/src/models/LoggingModel.h index 86e3f0a55..d6815429a 100644 --- a/ManiVault/src/models/LoggingModel.h +++ b/ManiVault/src/models/LoggingModel.h @@ -344,4 +344,4 @@ class LoggingModel final : public QStandardItemModel QMetaObject::Connection _idleUpdateConnection; /** Update the logging widget when idle */ }; -} \ No newline at end of file +} diff --git a/ManiVault/src/models/PluginFactoriesFilterModel.cpp b/ManiVault/src/models/PluginFactoriesFilterModel.cpp index 86e7d0a13..688c51d4b 100644 --- a/ManiVault/src/models/PluginFactoriesFilterModel.cpp +++ b/ManiVault/src/models/PluginFactoriesFilterModel.cpp @@ -21,4 +21,4 @@ PluginFactoriesFilterModel::PluginFactoriesFilterModel(QObject* parent /*= nullp setRecursiveFilteringEnabled(true); } -} \ No newline at end of file +} diff --git a/ManiVault/src/models/PluginFactoriesFilterModel.h b/ManiVault/src/models/PluginFactoriesFilterModel.h index 54428a30b..ee930d244 100644 --- a/ManiVault/src/models/PluginFactoriesFilterModel.h +++ b/ManiVault/src/models/PluginFactoriesFilterModel.h @@ -28,4 +28,4 @@ class PluginFactoriesFilterModel : public QSortFilterProxyModel PluginFactoriesFilterModel(QObject* parent = nullptr); }; -} \ No newline at end of file +} diff --git a/ManiVault/src/models/PluginFactoriesListModel.h b/ManiVault/src/models/PluginFactoriesListModel.h index a7a3f4517..1de0329bf 100644 --- a/ManiVault/src/models/PluginFactoriesListModel.h +++ b/ManiVault/src/models/PluginFactoriesListModel.h @@ -26,4 +26,4 @@ class PluginFactoriesListModel : public AbstractPluginFactoriesModel PluginFactoriesListModel(QObject* parent = nullptr); }; -} \ No newline at end of file +} diff --git a/ManiVault/src/models/PluginFactoriesTreeModel.h b/ManiVault/src/models/PluginFactoriesTreeModel.h index ab65a494f..2a9072053 100644 --- a/ManiVault/src/models/PluginFactoriesTreeModel.h +++ b/ManiVault/src/models/PluginFactoriesTreeModel.h @@ -26,4 +26,4 @@ class PluginFactoriesTreeModel : public AbstractPluginFactoriesModel PluginFactoriesTreeModel(QObject* parent = nullptr); }; -} \ No newline at end of file +} diff --git a/ManiVault/src/models/PluginsFilterModel.cpp b/ManiVault/src/models/PluginsFilterModel.cpp index 17df9b0a5..2a3600ffd 100644 --- a/ManiVault/src/models/PluginsFilterModel.cpp +++ b/ManiVault/src/models/PluginsFilterModel.cpp @@ -80,4 +80,4 @@ bool PluginsFilterModel::hasPluginInstances(const QModelIndex& index, int level return false; } -} \ No newline at end of file +} diff --git a/ManiVault/src/models/PluginsFilterModel.h b/ManiVault/src/models/PluginsFilterModel.h index c1004b486..238d42ad8 100644 --- a/ManiVault/src/models/PluginsFilterModel.h +++ b/ManiVault/src/models/PluginsFilterModel.h @@ -52,4 +52,4 @@ class PluginsFilterModel : public QSortFilterProxyModel mv::gui::ToggleAction _instantiatedPluginsOnlyAction; /** Show only instantiated plugins */ }; -} \ No newline at end of file +} diff --git a/ManiVault/src/models/PluginsTreeModel.h b/ManiVault/src/models/PluginsTreeModel.h index 562666fa5..50c34db25 100644 --- a/ManiVault/src/models/PluginsTreeModel.h +++ b/ManiVault/src/models/PluginsTreeModel.h @@ -26,4 +26,4 @@ class PluginsTreeModel : public AbstractPluginsModel PluginsTreeModel(QObject* parent = nullptr); }; -} \ No newline at end of file +} diff --git a/ManiVault/src/models/RawDataFilterModel.cpp b/ManiVault/src/models/RawDataFilterModel.cpp index 72ac0b8ca..db6c925c8 100644 --- a/ManiVault/src/models/RawDataFilterModel.cpp +++ b/ManiVault/src/models/RawDataFilterModel.cpp @@ -16,4 +16,4 @@ RawDataFilterModel::RawDataFilterModel(QObject* parent /*= nullptr*/) : setRecursiveFilteringEnabled(true); } -} \ No newline at end of file +} diff --git a/ManiVault/src/models/RawDataFilterModel.h b/ManiVault/src/models/RawDataFilterModel.h index cc63e17b9..ca93533f6 100644 --- a/ManiVault/src/models/RawDataFilterModel.h +++ b/ManiVault/src/models/RawDataFilterModel.h @@ -24,4 +24,4 @@ class RawDataFilterModel : public QSortFilterProxyModel { RawDataFilterModel(QObject* parent = nullptr); }; -} \ No newline at end of file +} diff --git a/ManiVault/src/models/RawDataModel.cpp b/ManiVault/src/models/RawDataModel.cpp index 7762c8980..cf97be6fe 100644 --- a/ManiVault/src/models/RawDataModel.cpp +++ b/ManiVault/src/models/RawDataModel.cpp @@ -144,4 +144,4 @@ void RawDataModel::populateFromDataManager() _overallSizeAction.setString(QString("Overall size: %1").arg(util::getNoBytesHumanReadable(mv::data().getOverallRawDataSize()))); } -} \ No newline at end of file +} diff --git a/ManiVault/src/models/RawDataModel.h b/ManiVault/src/models/RawDataModel.h index 9afa192ac..a4ee83676 100644 --- a/ManiVault/src/models/RawDataModel.h +++ b/ManiVault/src/models/RawDataModel.h @@ -212,4 +212,4 @@ class RawDataModel final : public QStandardItemModel gui::StringAction _overallSizeAction; /** String action for displaying the overall raw data size */ }; -} \ No newline at end of file +} diff --git a/ManiVault/src/models/SelectionsFilterModel.cpp b/ManiVault/src/models/SelectionsFilterModel.cpp index b77657b3a..b54432e90 100644 --- a/ManiVault/src/models/SelectionsFilterModel.cpp +++ b/ManiVault/src/models/SelectionsFilterModel.cpp @@ -16,4 +16,4 @@ SelectionsFilterModel::SelectionsFilterModel(QObject* parent /*= nullptr*/) : setRecursiveFilteringEnabled(true); } -} \ No newline at end of file +} diff --git a/ManiVault/src/models/SelectionsFilterModel.h b/ManiVault/src/models/SelectionsFilterModel.h index 601c711e1..0c5145c5e 100644 --- a/ManiVault/src/models/SelectionsFilterModel.h +++ b/ManiVault/src/models/SelectionsFilterModel.h @@ -24,4 +24,4 @@ class SelectionsFilterModel : public QSortFilterProxyModel { SelectionsFilterModel(QObject* parent = nullptr); }; -} \ No newline at end of file +} diff --git a/ManiVault/src/models/SelectionsModel.cpp b/ManiVault/src/models/SelectionsModel.cpp index 6143691ff..68b5ce96e 100644 --- a/ManiVault/src/models/SelectionsModel.cpp +++ b/ManiVault/src/models/SelectionsModel.cpp @@ -159,4 +159,4 @@ void SelectionsModel::populateFromDataManager() _countAction.setString(QString("Count: %1").arg(QString::number(rowCount()))); } -} \ No newline at end of file +} diff --git a/ManiVault/src/models/SelectionsModel.h b/ManiVault/src/models/SelectionsModel.h index 65699cc2d..0053004d8 100644 --- a/ManiVault/src/models/SelectionsModel.h +++ b/ManiVault/src/models/SelectionsModel.h @@ -244,4 +244,4 @@ class SelectionsModel final : public QStandardItemModel gui::StringAction _countAction; /** String action for displaying the number of selections */ }; -} \ No newline at end of file +} diff --git a/ManiVault/src/plugins/ClusterData/src/ClusterData.cpp b/ManiVault/src/plugins/ClusterData/src/ClusterData.cpp index 6b720bb05..4bcd8b11d 100644 --- a/ManiVault/src/plugins/ClusterData/src/ClusterData.cpp +++ b/ManiVault/src/plugins/ClusterData/src/ClusterData.cpp @@ -81,7 +81,7 @@ std::int32_t ClusterData::getClusterIndex(const QString& clusterName) const return -1; } -void ClusterData::fromVariantMap(const QVariantMap& variantMap) +void ClusterData::fromVariantMap(const mv::VariantMap& variantMap) { WidgetAction::fromVariantMap(variantMap); @@ -159,7 +159,7 @@ void ClusterData::fromVariantMap(const QVariantMap& variantMap) } } -QVariantMap ClusterData::toVariantMap() const +mv::VariantMap ClusterData::toVariantMap() const { auto variantMap = WidgetAction::toVariantMap(); @@ -286,7 +286,7 @@ std::vector Clusters::getSelectedIndices() const return selectedIndices; } -void Clusters::fromVariantMap(const QVariantMap& variantMap) +void Clusters::fromVariantMap(const mv::VariantMap& variantMap) { DatasetImpl::fromVariantMap(variantMap); @@ -295,7 +295,7 @@ void Clusters::fromVariantMap(const QVariantMap& variantMap) events().notifyDatasetDataChanged(this); } -QVariantMap Clusters::toVariantMap() const +mv::VariantMap Clusters::toVariantMap() const { auto variantMap = DatasetImpl::toVariantMap(); diff --git a/ManiVault/src/plugins/ClusterData/src/ClusterData.h b/ManiVault/src/plugins/ClusterData/src/ClusterData.h index 7eca92d54..6e4dcbe10 100644 --- a/ManiVault/src/plugins/ClusterData/src/ClusterData.h +++ b/ManiVault/src/plugins/ClusterData/src/ClusterData.h @@ -75,13 +75,13 @@ class CLUSTERDATA_EXPORT ClusterData : public mv::plugin::RawData * Load widget action from variant * @param Variant representation of the widget action */ - void fromVariantMap(const QVariantMap& variantMap) override; + void fromVariantMap(const mv::VariantMap& variantMap) override; /** * Save widget action to variant * @return Variant representation of the widget action */ - QVariantMap toVariantMap() const override; + mv::VariantMap toVariantMap() const override; private: QVector _clusters; /** Clusters data */ @@ -220,13 +220,13 @@ class CLUSTERDATA_EXPORT Clusters : public DatasetImpl * Load widget action from variant * @param Variant representation of the widget action */ - void fromVariantMap(const QVariantMap& variantMap) override; + void fromVariantMap(const mv::VariantMap& variantMap) override; /** * Save widget action to variant * @return Variant representation of the widget action */ - QVariantMap toVariantMap() const override; + mv::VariantMap toVariantMap() const override; std::vector indices; diff --git a/ManiVault/src/plugins/ClusterData/src/ClustersFilterModel.h b/ManiVault/src/plugins/ClusterData/src/ClustersFilterModel.h index a95daa51a..64a15e431 100644 --- a/ManiVault/src/plugins/ClusterData/src/ClustersFilterModel.h +++ b/ManiVault/src/plugins/ClusterData/src/ClustersFilterModel.h @@ -48,4 +48,4 @@ class CLUSTERDATA_EXPORT ClustersFilterModel : public QSortFilterProxyModel { private: QString _nameFilter; /** Cluster name filter */ -}; \ No newline at end of file +}; diff --git a/ManiVault/src/plugins/ClusterData/src/ClustersModel.h b/ManiVault/src/plugins/ClusterData/src/ClustersModel.h index 701aba913..ef21da3f7 100644 --- a/ManiVault/src/plugins/ClusterData/src/ClustersModel.h +++ b/ManiVault/src/plugins/ClusterData/src/ClustersModel.h @@ -168,4 +168,4 @@ class CLUSTERDATA_EXPORT ClustersModel : public QAbstractListModel QVector _clusters; /** Vector of clusters */ QVector _modifiedByUser; /** Boolean for each cluster, denoting whether it has been modified by the user */ QString _clusterPrefix; /** Cluster prefix */ -}; \ No newline at end of file +}; diff --git a/ManiVault/src/plugins/ClusterData/src/ColorizeClustersAction.h b/ManiVault/src/plugins/ClusterData/src/ColorizeClustersAction.h index 47ccb51e4..0521a4e84 100644 --- a/ManiVault/src/plugins/ClusterData/src/ColorizeClustersAction.h +++ b/ManiVault/src/plugins/ClusterData/src/ColorizeClustersAction.h @@ -73,4 +73,4 @@ public slots: ColorMap1DAction _colorMapAction; /** Color map action */ IntegralAction _randomSeedAction; /** Random seed action for random color generation */ TriggerAction _colorizeAction; /** Colorize action */ -}; \ No newline at end of file +}; diff --git a/ManiVault/src/plugins/ClusterData/src/MergeClustersAction.h b/ManiVault/src/plugins/ClusterData/src/MergeClustersAction.h index 95021503c..5ef0362f9 100644 --- a/ManiVault/src/plugins/ClusterData/src/MergeClustersAction.h +++ b/ManiVault/src/plugins/ClusterData/src/MergeClustersAction.h @@ -30,4 +30,4 @@ class MergeClustersAction : public TriggerAction protected: ClustersActionWidget* _clustersActionWidget; /** Pointer to clusters action widget */ -}; \ No newline at end of file +}; diff --git a/ManiVault/src/plugins/ClusterData/src/OverwriteClustersConfirmationDialog.cpp b/ManiVault/src/plugins/ClusterData/src/OverwriteClustersConfirmationDialog.cpp index d71c62abd..f56d602d7 100644 --- a/ManiVault/src/plugins/ClusterData/src/OverwriteClustersConfirmationDialog.cpp +++ b/ManiVault/src/plugins/ClusterData/src/OverwriteClustersConfirmationDialog.cpp @@ -49,4 +49,4 @@ OverwriteClustersConfirmationDialog::OverwriteClustersConfirmationDialog(QWidget connect(&_discardAction, &TriggerAction::triggered, this, &OverwriteClustersConfirmationDialog::accept); connect(&_cancelAction, &TriggerAction::triggered, this, &OverwriteClustersConfirmationDialog::reject); -} \ No newline at end of file +} diff --git a/ManiVault/src/plugins/ImageData/src/Common.h b/ManiVault/src/plugins/ImageData/src/Common.h index ade2f17cf..e80e45f80 100644 --- a/ManiVault/src/plugins/ImageData/src/Common.h +++ b/ManiVault/src/plugins/ImageData/src/Common.h @@ -45,4 +45,4 @@ inline QString selectionModifierName(const SelectionModifier& selectionModifier) } return ""; -} \ No newline at end of file +} diff --git a/ManiVault/src/plugins/ImageData/src/Image.cpp b/ManiVault/src/plugins/ImageData/src/Image.cpp index e93238dc9..bd3e34d19 100644 --- a/ManiVault/src/plugins/ImageData/src/Image.cpp +++ b/ManiVault/src/plugins/ImageData/src/Image.cpp @@ -107,4 +107,4 @@ QString Image::dimensionName() const void Image::setDimensionName(const QString& dimensionName) { _dimensionName = dimensionName; -} \ No newline at end of file +} diff --git a/ManiVault/src/plugins/ImageData/src/ImageData.json b/ManiVault/src/plugins/ImageData/src/ImageData.json index c3209dc98..e2a353b6c 100644 --- a/ManiVault/src/plugins/ImageData/src/ImageData.json +++ b/ManiVault/src/plugins/ImageData/src/ImageData.json @@ -2,4 +2,4 @@ "name" : "Images", "version" : "1", "dependencies" : ["Points", "Cluster"] -} \ No newline at end of file +} diff --git a/ManiVault/src/plugins/ImageData/src/Images.cpp b/ManiVault/src/plugins/ImageData/src/Images.cpp index f20bcefe3..060f0cd49 100644 --- a/ManiVault/src/plugins/ImageData/src/Images.cpp +++ b/ManiVault/src/plugins/ImageData/src/Images.cpp @@ -681,7 +681,7 @@ std::int32_t Images::getPixelIndexFromPixelCoordinate(const QPoint& pixelCoordin return pixelCoordinate.y() * getImageSize().width() + pixelCoordinate.x(); } -void Images::fromVariantMap(const QVariantMap& variantMap) +void Images::fromVariantMap(const mv::VariantMap& variantMap) { DatasetImpl::fromVariantMap(variantMap); @@ -708,7 +708,7 @@ void Images::fromVariantMap(const QVariantMap& variantMap) events().notifyDatasetDataChanged(this); } -QVariantMap Images::toVariantMap() const +mv::VariantMap Images::toVariantMap() const { auto variantMap = DatasetImpl::toVariantMap(); diff --git a/ManiVault/src/plugins/ImageData/src/Images.h b/ManiVault/src/plugins/ImageData/src/Images.h index 8f1a2a91d..8e4034b66 100644 --- a/ManiVault/src/plugins/ImageData/src/Images.h +++ b/ManiVault/src/plugins/ImageData/src/Images.h @@ -237,13 +237,13 @@ class IMAGEDATA_EXPORT Images : public mv::DatasetImpl * Load widget action from variant * @param Variant representation of the widget action */ - void fromVariantMap(const QVariantMap& variantMap) override; + void fromVariantMap(const mv::VariantMap& variantMap) override; /** * Save widget action to variant * @return Variant representation of the widget action */ - QVariantMap toVariantMap() const override; + mv::VariantMap toVariantMap() const override; private: std::vector _indices; /** Selection indices */ diff --git a/ManiVault/src/plugins/PointData/src/CreateSetFromSelectionAction.cpp b/ManiVault/src/plugins/PointData/src/CreateSetFromSelectionAction.cpp index f20c99006..bddf39f43 100644 --- a/ManiVault/src/plugins/PointData/src/CreateSetFromSelectionAction.cpp +++ b/ManiVault/src/plugins/PointData/src/CreateSetFromSelectionAction.cpp @@ -64,4 +64,4 @@ CreateSetFromSelectionAction::Widget::Widget(QWidget* parent, CreateSetFromSelec layout->addWidget(createSetFromSelectionAction->getCreateAction().createWidget(this)); setLayout(layout); -} \ No newline at end of file +} diff --git a/ManiVault/src/plugins/PointData/src/DimensionPickerAction.cpp b/ManiVault/src/plugins/PointData/src/DimensionPickerAction.cpp index 3ab0b1be2..819828ca4 100644 --- a/ManiVault/src/plugins/PointData/src/DimensionPickerAction.cpp +++ b/ManiVault/src/plugins/PointData/src/DimensionPickerAction.cpp @@ -144,7 +144,7 @@ void DimensionPickerAction::disconnectFromPublicAction(bool recursive) WidgetAction::disconnectFromPublicAction(recursive); } -void DimensionPickerAction::fromVariantMap(const QVariantMap& variantMap) +void DimensionPickerAction::fromVariantMap(const mv::VariantMap& variantMap) { WidgetAction::fromVariantMap(variantMap); @@ -162,7 +162,7 @@ void DimensionPickerAction::fromVariantMap(const QVariantMap& variantMap) _currentDimensionAction.fromParentVariantMap(variantMap); } -QVariantMap DimensionPickerAction::toVariantMap() const +mv::VariantMap DimensionPickerAction::toVariantMap() const { auto variantMap = WidgetAction::toVariantMap(); diff --git a/ManiVault/src/plugins/PointData/src/DimensionPickerAction.h b/ManiVault/src/plugins/PointData/src/DimensionPickerAction.h index 04c18aad3..ba02dcbdc 100644 --- a/ManiVault/src/plugins/PointData/src/DimensionPickerAction.h +++ b/ManiVault/src/plugins/PointData/src/DimensionPickerAction.h @@ -128,13 +128,13 @@ Q_OBJECT * Load widget action from variant map * @param Variant map representation of the widget action */ - void fromVariantMap(const QVariantMap& variantMap) override; + void fromVariantMap(const mv::VariantMap& variantMap) override; /** * Save widget action to variant map * @return Variant map representation of the widget action */ - QVariantMap toVariantMap() const override; + mv::VariantMap toVariantMap() const override; signals: diff --git a/ManiVault/src/plugins/PointData/src/DimensionsPickerAction.cpp b/ManiVault/src/plugins/PointData/src/DimensionsPickerAction.cpp index 016f87050..2d875bae4 100644 --- a/ManiVault/src/plugins/PointData/src/DimensionsPickerAction.cpp +++ b/ManiVault/src/plugins/PointData/src/DimensionsPickerAction.cpp @@ -81,7 +81,7 @@ DimensionsPickerAction::~DimensionsPickerAction() disconnect(_summaryUpdateAwakeConnection); } -void DimensionsPickerAction::fromVariantMap(const QVariantMap& variantMap) +void DimensionsPickerAction::fromVariantMap(const mv::VariantMap& variantMap) { WidgetAction::fromVariantMap(variantMap); @@ -114,7 +114,7 @@ void DimensionsPickerAction::fromVariantMap(const QVariantMap& variantMap) } } -QVariantMap DimensionsPickerAction::toVariantMap() const +mv::VariantMap DimensionsPickerAction::toVariantMap() const { auto variantMap = WidgetAction::toVariantMap(); diff --git a/ManiVault/src/plugins/PointData/src/DimensionsPickerAction.h b/ManiVault/src/plugins/PointData/src/DimensionsPickerAction.h index 4b63cd30b..21e66e1e1 100644 --- a/ManiVault/src/plugins/PointData/src/DimensionsPickerAction.h +++ b/ManiVault/src/plugins/PointData/src/DimensionsPickerAction.h @@ -92,13 +92,13 @@ class POINTDATA_EXPORT DimensionsPickerAction : public WidgetAction * Load widget action from variant * @param Variant representation of the widget action */ - void fromVariantMap(const QVariantMap& variantMap) override; + void fromVariantMap(const mv::VariantMap& variantMap) override; /** * Save widget action to variant * @return Variant representation of the widget action */ - QVariantMap toVariantMap() const override; + mv::VariantMap toVariantMap() const override; public: @@ -299,4 +299,4 @@ class POINTDATA_EXPORT DimensionsPickerAction : public WidgetAction Q_DECLARE_METATYPE(DimensionsPickerAction) -inline const auto dimensionsPickerActionMetaTypeId = qRegisterMetaType("DimensionsPickerAction"); \ No newline at end of file +inline const auto dimensionsPickerActionMetaTypeId = qRegisterMetaType("DimensionsPickerAction"); diff --git a/ManiVault/src/plugins/PointData/src/InfoAction.h b/ManiVault/src/plugins/PointData/src/InfoAction.h index a8aaee5f1..cbfe8956d 100644 --- a/ManiVault/src/plugins/PointData/src/InfoAction.h +++ b/ManiVault/src/plugins/PointData/src/InfoAction.h @@ -58,4 +58,4 @@ class InfoAction : public GroupAction NumberOfSelectedPointsAction _numberOfSelectedPointsAction; /** Number of selected points action */ SelectedIndicesAction _selectedIndicesAction; /** Selected indices action */ CreateSetFromSelectionAction _createSetFromSelection; /** Create set from selection action */ -}; \ No newline at end of file +}; diff --git a/ManiVault/src/plugins/PointData/src/PointData.cpp b/ManiVault/src/plugins/PointData/src/PointData.cpp index 94fd73c4e..bfbd2da26 100644 --- a/ManiVault/src/plugins/PointData/src/PointData.cpp +++ b/ManiVault/src/plugins/PointData/src/PointData.cpp @@ -120,7 +120,7 @@ void PointData::setValueAt(const std::size_t index, const float newValue) _variantOfVectors); } -void PointData::fromVariantMap(const QVariantMap& variantMap) +void PointData::fromVariantMap(const mv::VariantMap& variantMap) { variantMapMustContain(variantMap, "Data"); variantMapMustContain(variantMap, "NumberOfPoints"); @@ -141,7 +141,7 @@ void PointData::fromVariantMap(const QVariantMap& variantMap) } -QVariantMap PointData::toVariantMap() const +mv::VariantMap PointData::toVariantMap() const { const auto typeSpecifier = getElementTypeSpecifier(); const auto typeSpecifierName = getElementTypeNames()[static_cast(typeSpecifier)]; @@ -890,7 +890,7 @@ void Points::selectInvert() events().notifyDatasetDataSelectionChanged(this); } -void Points::fromVariantMap(const QVariantMap& variantMap) +void Points::fromVariantMap(const mv::VariantMap& variantMap) { DatasetImpl::fromVariantMap(variantMap); @@ -987,7 +987,7 @@ void Points::fromVariantMap(const QVariantMap& variantMap) } } -QVariantMap Points::toVariantMap() const +mv::VariantMap Points::toVariantMap() const { auto variantMap = DatasetImpl::toVariantMap(); diff --git a/ManiVault/src/plugins/PointData/src/PointData.h b/ManiVault/src/plugins/PointData/src/PointData.h index 8328b4b48..486915c43 100644 --- a/ManiVault/src/plugins/PointData/src/PointData.h +++ b/ManiVault/src/plugins/PointData/src/PointData.h @@ -883,13 +883,13 @@ class POINTDATA_EXPORT Points : public mv::DatasetImpl * Load widget action from variant * @param Variant representation of the widget action */ - void fromVariantMap(const QVariantMap& variantMap) override; + void fromVariantMap(const mv::VariantMap& variantMap) override; /** * Save widget action to variant * @return Variant representation of the widget action */ - QVariantMap toVariantMap() const override; + mv::VariantMap toVariantMap() const override; public: // Linked data diff --git a/ManiVault/src/plugins/PointData/src/ProxyDatasetsAction.cpp b/ManiVault/src/plugins/PointData/src/ProxyDatasetsAction.cpp index 93f067999..cc0957326 100644 --- a/ManiVault/src/plugins/PointData/src/ProxyDatasetsAction.cpp +++ b/ManiVault/src/plugins/PointData/src/ProxyDatasetsAction.cpp @@ -44,4 +44,4 @@ ProxyDatasetsAction::Widget::Widget(QWidget* parent, ProxyDatasetsAction* proxyD layout->addWidget(proxyDatasetsAction->getEditProxyDatasetsAction().createCollapsedWidget(this)); setLayout(layout); -} \ No newline at end of file +} diff --git a/ManiVault/src/plugins/PointData/src/SelectedIndicesAction.h b/ManiVault/src/plugins/PointData/src/SelectedIndicesAction.h index 0aada08a4..f0bc76c82 100644 --- a/ManiVault/src/plugins/PointData/src/SelectedIndicesAction.h +++ b/ManiVault/src/plugins/PointData/src/SelectedIndicesAction.h @@ -101,4 +101,4 @@ class SelectedIndicesAction : public WidgetAction /** Above this threshold, selected indices need to be updated manually */ static const std::int32_t MANUAL_UPDATE_THRESHOLD = 1000; -}; \ No newline at end of file +}; diff --git a/ManiVault/src/plugins/SharedParametersPlugin/src/PublicActionsModel.cpp b/ManiVault/src/plugins/SharedParametersPlugin/src/PublicActionsModel.cpp index ec938a882..f4e95fc38 100644 --- a/ManiVault/src/plugins/SharedParametersPlugin/src/PublicActionsModel.cpp +++ b/ManiVault/src/plugins/SharedParametersPlugin/src/PublicActionsModel.cpp @@ -171,4 +171,4 @@ void PublicActionsModel::removePublicAction(WidgetAction* publicAction) removeRow(publicActionItem->row()); } -} \ No newline at end of file +} diff --git a/ManiVault/src/private/ActionsManager.cpp b/ManiVault/src/private/ActionsManager.cpp index a7643b177..1c4afa223 100644 --- a/ManiVault/src/private/ActionsManager.cpp +++ b/ManiVault/src/private/ActionsManager.cpp @@ -63,7 +63,7 @@ void ActionsManager::reset() endReset(); } -void ActionsManager::fromVariantMap(const QVariantMap& variantMap) +void ActionsManager::fromVariantMap(const mv::VariantMap& variantMap) { Serializable::fromVariantMap(variantMap); @@ -112,7 +112,7 @@ void ActionsManager::fromVariantMap(const QVariantMap& variantMap) } } -QVariantMap ActionsManager::toVariantMap() const +mv::VariantMap ActionsManager::toVariantMap() const { auto variantMap = Serializable::toVariantMap(); diff --git a/ManiVault/src/private/ActionsManager.h b/ManiVault/src/private/ActionsManager.h index 698a13faf..b12e97ef5 100644 --- a/ManiVault/src/private/ActionsManager.h +++ b/ManiVault/src/private/ActionsManager.h @@ -52,13 +52,13 @@ class ActionsManager final : public AbstractActionsManager * Load manager from variant map * @param Variant map representation of the manager */ - void fromVariantMap(const QVariantMap& variantMap) override; + void fromVariantMap(const mv::VariantMap& variantMap) override; /** * Save manager to variant map * @return Variant map representation of the manager */ - QVariantMap toVariantMap() const override; + mv::VariantMap toVariantMap() const override; }; } diff --git a/ManiVault/src/private/DataHierarchyManager.cpp b/ManiVault/src/private/DataHierarchyManager.cpp index 16a320d83..05e8dae5b 100644 --- a/ManiVault/src/private/DataHierarchyManager.cpp +++ b/ManiVault/src/private/DataHierarchyManager.cpp @@ -235,14 +235,17 @@ void DataHierarchyManager::removeAllItems() _items.clear(); } -void DataHierarchyManager::fromVariantMap(const QVariantMap& variantMap) +void DataHierarchyManager::fromVariantMap(const VariantMap& variantMap) { auto& projectDataSerializationTask = projects().getProjectSerializationTask().getDataTask(); + // For backward compatibility; older projects might not have an 'items' key + const auto itemsMap = variantMap.contains("Items") ? static_cast(variantMap["Items"].toMap()) : variantMap; + QStringList subtasks; - std::vector> datasetList; + std::vector> datasetList; - const std::function enumerateDatasetNames = [&enumerateDatasetNames, &subtasks, &datasetList](const QVariantMap& variantMap) -> void { + const std::function enumerateDatasetNames = [&enumerateDatasetNames, &subtasks, &datasetList](const VariantMap& variantMap) -> void { for (const auto& variant : variantMap.values()) { enumerateDatasetNames(variant.toMap()["Children"].toMap()); @@ -254,12 +257,12 @@ void DataHierarchyManager::fromVariantMap(const QVariantMap& variantMap) } }; - enumerateDatasetNames(variantMap); + enumerateDatasetNames(itemsMap); projectDataSerializationTask.setSubtasks(subtasks); projectDataSerializationTask.setRunning(); - const auto loadDataHierarchyItem = [&projectDataSerializationTask](const QVariantMap& dataHierarchyItemMap, const QString& guiName, Dataset parent) -> Dataset { + const auto loadDataHierarchyItem = [&projectDataSerializationTask](const VariantMap& dataHierarchyItemMap, const QString& guiName, Dataset parent) -> Dataset { const auto dataset = dataHierarchyItemMap["Dataset"].toMap(); const auto datasetId = dataset["ID"].toString(); const auto datasetName = dataset["Name"].toString(); @@ -287,12 +290,12 @@ void DataHierarchyManager::fromVariantMap(const QVariantMap& variantMap) return loadedDataset; }; - const std::function)> populateDataHierarchy = [&populateDataHierarchy, loadDataHierarchyItem](const QVariantMap& variantMap, Dataset parent) -> void { + const std::function)> populateDataHierarchy = [&populateDataHierarchy, loadDataHierarchyItem](const VariantMap& variantMap, Dataset parent) -> void { if (Application::isSerializationAborted()) return; - QVector sortedItems; + QVector sortedItems; sortedItems.resize(variantMap.count()); @@ -303,7 +306,7 @@ void DataHierarchyManager::fromVariantMap(const QVariantMap& variantMap) populateDataHierarchy(item["Children"].toMap(), loadDataHierarchyItem(item, item["Name"].toString(), parent)); }; - auto populateDatasets = [&projectDataSerializationTask, &datasetList](const QVariantMap& variantMap) -> void { + auto populateDatasets = [&projectDataSerializationTask, &datasetList](const VariantMap& variantMap) -> void { if (Application::isSerializationAborted()) return; @@ -313,7 +316,7 @@ void DataHierarchyManager::fromVariantMap(const QVariantMap& variantMap) // First load non-derived datasets std::stable_partition(datasetList.begin(), datasetList.end(), - [](const std::pair& element) { + [](const std::pair& element) { return !element.second; }); @@ -333,14 +336,14 @@ void DataHierarchyManager::fromVariantMap(const QVariantMap& variantMap) } }; - populateDataHierarchy(variantMap, Dataset()); + populateDataHierarchy(itemsMap, Dataset()); - populateDatasets(variantMap); + populateDatasets(itemsMap); projectDataSerializationTask.setFinished(); } -QVariantMap DataHierarchyManager::toVariantMap() const +VariantMap DataHierarchyManager::toVariantMap() const { if (!_items.empty()) { auto& projectDataSerializationTask = projects().getProjectSerializationTask().getDataTask(); @@ -353,7 +356,7 @@ QVariantMap DataHierarchyManager::toVariantMap() const projectDataSerializationTask.setSubtasks(subtasks); projectDataSerializationTask.setRunning(); - QVariantMap variantMap; + VariantMap variantMap; std::uint32_t sortIndex = 0; @@ -380,10 +383,14 @@ QVariantMap DataHierarchyManager::toVariantMap() const projectDataSerializationTask.setFinished(); - return variantMap; + return { + { "Items", variantMap } + }; } - return {}; + return { + { "Items", QVariantMap() } + }; } } diff --git a/ManiVault/src/private/DataHierarchyManager.h b/ManiVault/src/private/DataHierarchyManager.h index 307cc39b7..e53558295 100644 --- a/ManiVault/src/private/DataHierarchyManager.h +++ b/ManiVault/src/private/DataHierarchyManager.h @@ -116,13 +116,13 @@ class DataHierarchyManager final : public AbstractDataHierarchyManager * Load widget action from variant * @param Variant representation of the widget action */ - void fromVariantMap(const QVariantMap& variantMap) override; + void fromVariantMap(const mv::VariantMap& variantMap) override; /** * Save widget action to variant * @return Variant representation of the widget action */ - QVariantMap toVariantMap() const override; + mv::VariantMap toVariantMap() const override; private: std::vector> _items; /** Unique pointers to data hierarchy items */ diff --git a/ManiVault/src/private/DataManager.cpp b/ManiVault/src/private/DataManager.cpp index 10dd5e77f..2334720a2 100644 --- a/ManiVault/src/private/DataManager.cpp +++ b/ManiVault/src/private/DataManager.cpp @@ -752,7 +752,7 @@ ToggleAction& DataManager::getSelectionGroupingAction() return _selectionGroupingAction; } -void DataManager::fromVariantMap(const QVariantMap& variantMap) +void DataManager::fromVariantMap(const mv::VariantMap& variantMap) { AbstractDataManager::fromVariantMap(variantMap); @@ -760,9 +760,9 @@ void DataManager::fromVariantMap(const QVariantMap& variantMap) _selectionGroupingAction.fromParentVariantMap(variantMap); } -QVariantMap DataManager::toVariantMap() const +mv::VariantMap DataManager::toVariantMap() const { - QVariantMap variantMap = AbstractDataManager::toVariantMap(); + auto variantMap = AbstractDataManager::toVariantMap(); for (auto& dataset : _datasets) variantMap[dataset->getId()] = dataset->toVariantMap(); diff --git a/ManiVault/src/private/DataManager.h b/ManiVault/src/private/DataManager.h index 0e5d42ae7..1704f06a1 100644 --- a/ManiVault/src/private/DataManager.h +++ b/ManiVault/src/private/DataManager.h @@ -249,13 +249,13 @@ class DataManager final : public mv::AbstractDataManager * Load widget action from variant * @param Variant representation of the widget action */ - void fromVariantMap(const QVariantMap& variantMap) override; + void fromVariantMap(const mv::VariantMap& variantMap) override; /** * Save widget action to variant * @return Variant representation of the widget action */ - QVariantMap toVariantMap() const override; + mv::VariantMap toVariantMap() const override; private: std::unordered_map _rawDataMap; /** Maps raw data name to raw data plugin shared pointer (the plugins are owned by the plugin manager) */ diff --git a/ManiVault/src/private/DockComponentsFactory.h b/ManiVault/src/private/DockComponentsFactory.h index b36b30055..1c4a2f747 100644 --- a/ManiVault/src/private/DockComponentsFactory.h +++ b/ManiVault/src/private/DockComponentsFactory.h @@ -37,4 +37,4 @@ class DockComponentsFactory : public ads::CDockComponentsFactory // // return dockAreaTabBar; //} -}; \ No newline at end of file +}; diff --git a/ManiVault/src/private/DockManager.cpp b/ManiVault/src/private/DockManager.cpp index 8c6580a90..dfc4f98e5 100644 --- a/ManiVault/src/private/DockManager.cpp +++ b/ManiVault/src/private/DockManager.cpp @@ -138,7 +138,7 @@ QWidget* DockManager::getWidget() return this; } -void DockManager::fromVariantMap(const QVariantMap& variantMap) +void DockManager::fromVariantMap(const mv::VariantMap& variantMap) { #ifdef DOCK_MANAGER_VERBOSE qDebug() << __FUNCTION__ << objectName(); @@ -196,7 +196,7 @@ void DockManager::fromVariantMap(const QVariantMap& variantMap) show(); } -QVariantMap DockManager::toVariantMap() const +mv::VariantMap DockManager::toVariantMap() const { #ifdef DOCK_MANAGER_VERBOSE qDebug() << __FUNCTION__ << objectName(); diff --git a/ManiVault/src/private/DockManager.h b/ManiVault/src/private/DockManager.h index 883308786..4154e60a1 100644 --- a/ManiVault/src/private/DockManager.h +++ b/ManiVault/src/private/DockManager.h @@ -106,13 +106,13 @@ class DockManager : protected ads::CDockManager, public mv::util::Serializable * Load from variant map * @param variantMap Variant map representation of the serializable object */ - void fromVariantMap(const QVariantMap& variantMap) override; + void fromVariantMap(const mv::VariantMap& variantMap) override; /** * Save to variant map * @return Variant map representation of the serializable object */ - QVariantMap toVariantMap() const override; + mv::VariantMap toVariantMap() const override; friend class ViewPluginsDockWidget; friend class QPointer; diff --git a/ManiVault/src/private/DockWidget.cpp b/ManiVault/src/private/DockWidget.cpp index 457c32841..b4d82555c 100644 --- a/ManiVault/src/private/DockWidget.cpp +++ b/ManiVault/src/private/DockWidget.cpp @@ -85,14 +85,14 @@ void DockWidget::setWidget(QWidget* widget, eInsertMode insertMode /*= AutoScrol CDockWidget::setWidget(widget, insertMode); } -void DockWidget::fromVariantMap(const QVariantMap& variantMap) +void DockWidget::fromVariantMap(const mv::VariantMap& variantMap) { Serializable::fromVariantMap(variantMap); setObjectName(getId()); } -QVariantMap DockWidget::toVariantMap() const +mv::VariantMap DockWidget::toVariantMap() const { auto variantMap = Serializable::toVariantMap(); diff --git a/ManiVault/src/private/DockWidget.h b/ManiVault/src/private/DockWidget.h index cf071ebea..bfd9e7fc2 100644 --- a/ManiVault/src/private/DockWidget.h +++ b/ManiVault/src/private/DockWidget.h @@ -71,13 +71,13 @@ class DockWidget : public ads::CDockWidget, public mv::util::Serializable * Load widget action from variant * @param Variant representation of the widget action */ - void fromVariantMap(const QVariantMap& variantMap) override; + void fromVariantMap(const mv::VariantMap& variantMap) override; /** * Save widget action to variant * @return Variant representation of the widget action */ - QVariantMap toVariantMap() const override; + mv::VariantMap toVariantMap() const override; public: // Themes diff --git a/ManiVault/src/private/GroupDataDialog.h b/ManiVault/src/private/GroupDataDialog.h index 22ac08638..57ce90f05 100644 --- a/ManiVault/src/private/GroupDataDialog.h +++ b/ManiVault/src/private/GroupDataDialog.h @@ -50,4 +50,4 @@ class GroupDataDialog : public QDialog mv::Datasets _datasets; /** Datasets for grouping */ mv::gui::StringAction _groupNameAction; /** Group name action */ mv::gui::ToggleAction _showDialogAction; /** Whether to show the name dialog next time */ -}; \ No newline at end of file +}; diff --git a/ManiVault/src/private/PluginManager.cpp b/ManiVault/src/private/PluginManager.cpp index 58659e0c9..1727b7ae5 100644 --- a/ManiVault/src/private/PluginManager.cpp +++ b/ManiVault/src/private/PluginManager.cpp @@ -620,7 +620,7 @@ QIcon PluginManager::getPluginIcon(const QString& pluginKind) const return _pluginFactories[pluginKind]->getIcon(); } -void PluginManager::fromVariantMap(const QVariantMap& variantMap) +void PluginManager::fromVariantMap(const mv::VariantMap& variantMap) { Serializable::fromVariantMap(variantMap); @@ -676,7 +676,7 @@ void PluginManager::fromVariantMap(const QVariantMap& variantMap) } } -QVariantMap PluginManager::toVariantMap() const +mv::VariantMap PluginManager::toVariantMap() const { auto variantMap = Serializable::toVariantMap(); diff --git a/ManiVault/src/private/PluginManager.h b/ManiVault/src/private/PluginManager.h index ba22a0791..8127b4f67 100644 --- a/ManiVault/src/private/PluginManager.h +++ b/ManiVault/src/private/PluginManager.h @@ -188,13 +188,13 @@ class PluginManager final : public AbstractPluginManager * Load widget action from variant * @param Variant representation of the widget action */ - void fromVariantMap(const QVariantMap& variantMap) override; + void fromVariantMap(const mv::VariantMap& variantMap) override; /** * Save widget action to variant * @return Variant representation of the widget action */ - QVariantMap toVariantMap() const override; + mv::VariantMap toVariantMap() const override; protected: diff --git a/ManiVault/src/private/ProjectManager.cpp b/ManiVault/src/private/ProjectManager.cpp index 9ee0c31c0..90d6e674f 100644 --- a/ManiVault/src/private/ProjectManager.cpp +++ b/ManiVault/src/private/ProjectManager.cpp @@ -1010,12 +1010,12 @@ void ProjectManager::createProject() workspaces().reset(); } -void ProjectManager::fromVariantMap(const QVariantMap& variantMap) +void ProjectManager::fromVariantMap(const mv::VariantMap& variantMap) { _project->fromVariantMap(variantMap); } -QVariantMap ProjectManager::toVariantMap() const +mv::VariantMap ProjectManager::toVariantMap() const { if (hasProject()) return _project->toVariantMap(); diff --git a/ManiVault/src/private/ProjectManager.h b/ManiVault/src/private/ProjectManager.h index 0b39ef4b1..b6a8c51c9 100644 --- a/ManiVault/src/private/ProjectManager.h +++ b/ManiVault/src/private/ProjectManager.h @@ -139,13 +139,13 @@ class ProjectManager final : public mv::AbstractProjectManager * Load widget action from variant * @param Variant representation of the widget action */ - void fromVariantMap(const QVariantMap& variantMap) override; + void fromVariantMap(const mv::VariantMap& variantMap) override; /** * Save widget action to variant * @return Variant representation of the widget action */ - QVariantMap toVariantMap() const override; + mv::VariantMap toVariantMap() const override; public: // Action getters diff --git a/ManiVault/src/private/SettingsManagerDialog.h b/ManiVault/src/private/SettingsManagerDialog.h index c6d0814e7..5c2eac850 100644 --- a/ManiVault/src/private/SettingsManagerDialog.h +++ b/ManiVault/src/private/SettingsManagerDialog.h @@ -40,4 +40,4 @@ class SettingsManagerDialog : public QDialog GroupsAction _groupsAction; /** Groups action for all global settings sections */ }; -} \ No newline at end of file +} diff --git a/ManiVault/src/private/StartPageAction.h b/ManiVault/src/private/StartPageAction.h index d441029ac..f710acce8 100644 --- a/ManiVault/src/private/StartPageAction.h +++ b/ManiVault/src/private/StartPageAction.h @@ -116,4 +116,4 @@ class StartPageAction final static bool compactView; }; -using StartPageActions = QList; \ No newline at end of file +using StartPageActions = QList; diff --git a/ManiVault/src/private/StartPageContentWidget.h b/ManiVault/src/private/StartPageContentWidget.h index 5482be7e5..a3f132cc5 100644 --- a/ManiVault/src/private/StartPageContentWidget.h +++ b/ManiVault/src/private/StartPageContentWidget.h @@ -78,4 +78,4 @@ private slots: StartPageGetStartedWidget _getStartedWidget; /** Right column widget for getting started operations */ friend class StartPageWidget; -}; \ No newline at end of file +}; diff --git a/ManiVault/src/private/StartPageGetStartedWidget.h b/ManiVault/src/private/StartPageGetStartedWidget.h index f1249494f..6ab2504c0 100644 --- a/ManiVault/src/private/StartPageGetStartedWidget.h +++ b/ManiVault/src/private/StartPageGetStartedWidget.h @@ -62,4 +62,4 @@ class StartPageGetStartedWidget : public QWidget mv::gui::RecentFilesAction _recentProjectsAction; /** Action for recent projects (replicate workspace from recent project) */ friend class StartPageContentWidget; -}; \ No newline at end of file +}; diff --git a/ManiVault/src/private/ViewPluginDockWidget.cpp b/ManiVault/src/private/ViewPluginDockWidget.cpp index d671d6829..8e0aab0a3 100644 --- a/ManiVault/src/private/ViewPluginDockWidget.cpp +++ b/ManiVault/src/private/ViewPluginDockWidget.cpp @@ -199,7 +199,7 @@ QMenu* ViewPluginDockWidget::getSettingsMenu() return &_settingsMenu; } -void ViewPluginDockWidget::fromVariantMap(const QVariantMap& variantMap) +void ViewPluginDockWidget::fromVariantMap(const mv::VariantMap& variantMap) { #ifdef VIEW_PLUGIN_DOCK_WIDGET_VERBOSE qDebug() << __FUNCTION__; @@ -241,7 +241,7 @@ void ViewPluginDockWidget::fromVariantMap(const QVariantMap& variantMap) setProperty("ViewPluginId", _viewPlugin->getId()); } -QVariantMap ViewPluginDockWidget::toVariantMap() const +mv::VariantMap ViewPluginDockWidget::toVariantMap() const { #ifdef VIEW_PLUGIN_DOCK_WIDGET_VERBOSE qDebug() << __FUNCTION__; diff --git a/ManiVault/src/private/ViewPluginDockWidget.h b/ManiVault/src/private/ViewPluginDockWidget.h index 396255198..4c8dbd990 100644 --- a/ManiVault/src/private/ViewPluginDockWidget.h +++ b/ManiVault/src/private/ViewPluginDockWidget.h @@ -148,13 +148,13 @@ class ViewPluginDockWidget final : public DockWidget * Load view plugin dock widget from variant * @param Variant representation of the view plugin dock widget */ - void fromVariantMap(const QVariantMap& variantMap) override; + void fromVariantMap(const mv::VariantMap& variantMap) override; /** * Save view plugin dock widget to variant * @return Variant representation of the view plugin dock widget */ - QVariantMap toVariantMap() const override; + mv::VariantMap toVariantMap() const override; /** * Create a view plugin dock widget serialization task for \p viewPluginDockWidgetId (even if no instance is yet available) diff --git a/ManiVault/src/private/WorkspaceManager.cpp b/ManiVault/src/private/WorkspaceManager.cpp index 52ad06623..cddf54ab4 100644 --- a/ManiVault/src/private/WorkspaceManager.cpp +++ b/ManiVault/src/private/WorkspaceManager.cpp @@ -540,7 +540,7 @@ Workspace* WorkspaceManager::getCurrentWorkspace() return _workspace.get(); } -void WorkspaceManager::fromVariantMap(const QVariantMap& variantMap) +void WorkspaceManager::fromVariantMap(const mv::VariantMap& variantMap) { auto& projectSerializationTask = projects().getProjectSerializationTask(); @@ -562,7 +562,7 @@ void WorkspaceManager::fromVariantMap(const QVariantMap& variantMap) ViewPluginDockWidget::restoreViewPluginStates(); } -QVariantMap WorkspaceManager::toVariantMap() const +mv::VariantMap WorkspaceManager::toVariantMap() const { auto& projectSerializationTask = projects().getProjectSerializationTask(); @@ -758,4 +758,4 @@ QImage WorkspaceManager::toPreviewImage() const return _mainDockManager->grab().toImage(); } -} \ No newline at end of file +} diff --git a/ManiVault/src/private/WorkspaceManager.h b/ManiVault/src/private/WorkspaceManager.h index 252edd6d7..03aba085f 100644 --- a/ManiVault/src/private/WorkspaceManager.h +++ b/ManiVault/src/private/WorkspaceManager.h @@ -183,13 +183,13 @@ class WorkspaceManager final : public AbstractWorkspaceManager * Load layout from variant * @param Variant representation of the layout */ - void fromVariantMap(const QVariantMap& variantMap) override; + void fromVariantMap(const mv::VariantMap& variantMap) override; /** * Save layout to variant * @return Variant representation of the layout */ - QVariantMap toVariantMap() const override; + mv::VariantMap toVariantMap() const override; public: // Menus diff --git a/ManiVault/src/util/AbstractItemModelTester.cpp b/ManiVault/src/util/AbstractItemModelTester.cpp index f78aaa840..0915287e1 100644 --- a/ManiVault/src/util/AbstractItemModelTester.cpp +++ b/ManiVault/src/util/AbstractItemModelTester.cpp @@ -510,4 +510,4 @@ void AbstractItemModelTester::rowsRemoved(const QModelIndex & parent, int start, Q_ASSERT(c.oldSize - (end - start + 1) == model->rowCount(parent)); Q_ASSERT(c.last == model->data(model->index(start - 1, 0, c.parent))); Q_ASSERT(c.next == model->data(model->index(start, 0, c.parent))); -} \ No newline at end of file +} diff --git a/ManiVault/src/util/AbstractItemModelTester.h b/ManiVault/src/util/AbstractItemModelTester.h index d2f4bd282..a516bda56 100644 --- a/ManiVault/src/util/AbstractItemModelTester.h +++ b/ManiVault/src/util/AbstractItemModelTester.h @@ -51,4 +51,4 @@ protected Q_SLOTS: bool fetchingMore = false; QList changing; -}; \ No newline at end of file +}; diff --git a/ManiVault/src/util/DockWidgetPermission.cpp b/ManiVault/src/util/DockWidgetPermission.cpp index 3bc40233b..ef6ef6a94 100644 --- a/ManiVault/src/util/DockWidgetPermission.cpp +++ b/ManiVault/src/util/DockWidgetPermission.cpp @@ -6,4 +6,4 @@ namespace mv::util { -} \ No newline at end of file +} diff --git a/ManiVault/src/util/FileUtil.h b/ManiVault/src/util/FileUtil.h index 2babcb06a..81a81c341 100644 --- a/ManiVault/src/util/FileUtil.h +++ b/ManiVault/src/util/FileUtil.h @@ -16,4 +16,4 @@ bool ShowFileInFolder(const QString path); } -} \ No newline at end of file +} diff --git a/ManiVault/src/util/FontAwesome.cpp b/ManiVault/src/util/FontAwesome.cpp index bac0605c1..52ecc3782 100644 --- a/ManiVault/src/util/FontAwesome.cpp +++ b/ManiVault/src/util/FontAwesome.cpp @@ -74,4 +74,4 @@ QString FontAwesome::getIconCharacter(const QString& iconName) const return 0; } -} \ No newline at end of file +} diff --git a/ManiVault/src/util/Icon.h b/ManiVault/src/util/Icon.h index 96d49362f..c15ab0efe 100644 --- a/ManiVault/src/util/Icon.h +++ b/ManiVault/src/util/Icon.h @@ -72,4 +72,4 @@ QPixmap createNumberBadgeOverlayPixmap(const WidgetActionBadge& widgetActionBadg */ QIcon createIconWithNumberBadgeOverlay(const QIcon& icon, const WidgetActionBadge& widgetActionBadge, std::uint32_t iconMargin = 0); -} \ No newline at end of file +} diff --git a/ManiVault/src/util/IconFonts.cpp b/ManiVault/src/util/IconFonts.cpp index 4b6ac5147..16342f27e 100644 --- a/ManiVault/src/util/IconFonts.cpp +++ b/ManiVault/src/util/IconFonts.cpp @@ -107,4 +107,4 @@ void IconFonts::add(const QSharedPointer& iconFont) } } -} \ No newline at end of file +} diff --git a/ManiVault/src/util/IconFonts.h b/ManiVault/src/util/IconFonts.h index e4da0d4e6..cac06e868 100644 --- a/ManiVault/src/util/IconFonts.h +++ b/ManiVault/src/util/IconFonts.h @@ -114,4 +114,4 @@ inline QDebug operator << (QDebug debug, const IconFonts& iconFonts) { return debug; } -} \ No newline at end of file +} diff --git a/ManiVault/src/util/Logger.h b/ManiVault/src/util/Logger.h index 1dfa30482..f690895c0 100644 --- a/ManiVault/src/util/Logger.h +++ b/ManiVault/src/util/Logger.h @@ -67,4 +67,4 @@ class Logger } -#define MV_LOG_EXCEPTION(stdException) qCritical().noquote() << ::mv::Logger::ExceptionToText(stdException) \ No newline at end of file +#define MV_LOG_EXCEPTION(stdException) qCritical().noquote() << ::mv::Logger::ExceptionToText(stdException) diff --git a/ManiVault/src/util/NumericalRange.cpp b/ManiVault/src/util/NumericalRange.cpp index b73d8034d..982d7745c 100644 --- a/ManiVault/src/util/NumericalRange.cpp +++ b/ManiVault/src/util/NumericalRange.cpp @@ -6,4 +6,4 @@ namespace mv::util { -} \ No newline at end of file +} diff --git a/ManiVault/src/util/Serializable.cpp b/ManiVault/src/util/Serializable.cpp index 045e631e5..cbdae1286 100644 --- a/ManiVault/src/util/Serializable.cpp +++ b/ManiVault/src/util/Serializable.cpp @@ -53,14 +53,14 @@ void Serializable::setSerializationName(const QString& serializationName) _serializationName = serializationName; } -void Serializable::fromVariantMap(const QVariantMap& variantMap) +void Serializable::fromVariantMap(const VariantMap& variantMap) { variantMapMustContain(variantMap, "ID"); _id = variantMap["ID"].toString(); } -QVariantMap Serializable::toVariantMap() const +VariantMap Serializable::toVariantMap() const { return { { "ID", _id } @@ -78,7 +78,7 @@ QJsonDocument Serializable::toJsonDocument() const { QVariantMap variantMap; - variantMap[getSerializationName()] = const_cast(this)->toVariantMap(this); + variantMap[getSerializationName()] = const_cast(this)->toVariantMap(this).getVariantMap(); return QJsonDocument::fromVariant(variantMap); } @@ -160,7 +160,7 @@ QString Serializable::createId() return QUuid::createUuid().toString(QUuid::WithoutBraces); } -void Serializable::fromVariantMap(Serializable* serializable, const QVariantMap& variantMap) +void Serializable::fromVariantMap(Serializable* serializable, const VariantMap& variantMap) { #ifdef SERIALIZABLE_VERBOSE qDebug().noquote() << QString("From variant map: %1").arg(serializable->getSerializationName()); @@ -185,7 +185,7 @@ void Serializable::fromVariantMap(Serializable* serializable, const QVariantMap& */ } -void Serializable::fromVariantMap(Serializable& serializable, const QVariantMap& variantMap, const QString& key) +void Serializable::fromVariantMap(Serializable& serializable, const VariantMap& variantMap, const QString& key) { if (!variantMap.contains(key)) { const auto errorMessage = QString("%1 not found in map: %2").arg(key); @@ -199,7 +199,7 @@ void Serializable::fromVariantMap(Serializable& serializable, const QVariantMap& serializable.fromVariantMap(variantMap[key].toMap()); } -void Serializable::fromParentVariantMap(const QVariantMap& parentVariantMap) +void Serializable::fromParentVariantMap(const VariantMap& parentVariantMap) { try { @@ -234,7 +234,7 @@ void Serializable::fromParentVariantMap(const QVariantMap& parentVariantMap) } } -QVariantMap Serializable::toVariantMap(const Serializable* serializable) +VariantMap Serializable::toVariantMap(const Serializable* serializable) { #ifdef SERIALIZABLE_VERBOSE qDebug().noquote() << QString("To variant map: %1").arg(serializable->getSerializationName()); @@ -243,17 +243,17 @@ QVariantMap Serializable::toVariantMap(const Serializable* serializable) return serializable->toVariantMap(); } -void Serializable::insertIntoVariantMap(const Serializable& serializable, QVariantMap& variantMap, const QString& key) +void Serializable::insertIntoVariantMap(const Serializable& serializable, VariantMap& variantMap, const QString& key) { variantMap.insert(key, serializable.toVariantMap()); } -void Serializable::insertIntoVariantMap(const Serializable& serializable, QVariantMap& variantMap) +void Serializable::insertIntoVariantMap(const Serializable& serializable, VariantMap& variantMap) { serializable.insertIntoVariantMap(variantMap); } -void Serializable::insertIntoVariantMap(QVariantMap& variantMap) const +void Serializable::insertIntoVariantMap(VariantMap& variantMap) const { if (getSerializationName().isEmpty()) throw std::runtime_error("Serialization name may not be empty"); diff --git a/ManiVault/src/util/Serializable.h b/ManiVault/src/util/Serializable.h index e2a832f80..88b5df102 100644 --- a/ManiVault/src/util/Serializable.h +++ b/ManiVault/src/util/Serializable.h @@ -5,6 +5,7 @@ #pragma once #include "Serialization.h" +#include "VariantMap.h" #include #include @@ -66,25 +67,25 @@ class Serializable * Load from variant map * @param variantMap Variant map */ - virtual void fromVariantMap(const QVariantMap& variantMap); + virtual void fromVariantMap(const VariantMap& variantMap); /** * Load from variant map located in \p parentVariantMap at the serialization name * @param parentVariantMap Parent variant map */ - virtual void fromParentVariantMap(const QVariantMap& parentVariantMap); + virtual void fromParentVariantMap(const VariantMap& parentVariantMap); /** * Save to variant map * @return Variant map */ - virtual QVariantMap toVariantMap() const; + virtual VariantMap toVariantMap() const; /** * Save into \p variantMap * @param variantMap Variant map */ - virtual void insertIntoVariantMap(QVariantMap& variantMap) const final; + virtual void insertIntoVariantMap(VariantMap& variantMap) const final; /** * Load widget action from JSON document @@ -126,7 +127,7 @@ class Serializable * @param serializable Pointer to serializable object * @param Variant map */ - static void fromVariantMap(Serializable* serializable, const QVariantMap& variantMap); + static void fromVariantMap(Serializable* serializable, const VariantMap& variantMap); /** * Load from variant map @@ -134,14 +135,14 @@ class Serializable * @param variantMap Variant map * @param key Variant map key */ - static void fromVariantMap(Serializable& serializable, const QVariantMap& variantMap, const QString& key); + static void fromVariantMap(Serializable& serializable, const VariantMap& variantMap, const QString& key); /** * Save serializable object to variant map * @param serializable Pointer to serializable object * @return Variant map */ - static QVariantMap toVariantMap(const Serializable* serializable); + static VariantMap toVariantMap(const Serializable* serializable); /** * Save \p serializable object in \p variantMap with \p key @@ -149,14 +150,14 @@ class Serializable * @param variantMap Variant map * @param key Variant map key */ - static void insertIntoVariantMap(const Serializable& serializable, QVariantMap& variantMap, const QString& key); + static void insertIntoVariantMap(const Serializable& serializable, VariantMap& variantMap, const QString& key); /** * Save \p serializable object in \p variantMap * @param serializable Reference to serializable object * @param variantMap Variant map */ - static void insertIntoVariantMap(const Serializable& serializable, QVariantMap& variantMap); + static void insertIntoVariantMap(const Serializable& serializable, VariantMap& variantMap); public: // Operators diff --git a/ManiVault/src/util/Timer.cpp b/ManiVault/src/util/Timer.cpp index 317d91bce..f309ece17 100644 --- a/ManiVault/src/util/Timer.cpp +++ b/ManiVault/src/util/Timer.cpp @@ -48,4 +48,4 @@ void Timer::reset() void Timer::printTotalTime() { qDebug() << _event << "took" << QString::number(elapsedTimeMilliseconds(_start), 'f', 2) << "ms"; -} \ No newline at end of file +} diff --git a/ManiVault/src/util/Timer.h b/ManiVault/src/util/Timer.h index 98cb7330d..6525c67c9 100644 --- a/ManiVault/src/util/Timer.h +++ b/ManiVault/src/util/Timer.h @@ -69,4 +69,4 @@ class Timer QString _event; /** Name of the event */ SteadyClock _start; /** Global start time */ SteadyClock _eventStart; /** Event start time */ -}; \ No newline at end of file +}; diff --git a/ManiVault/src/util/VariantMap.cpp b/ManiVault/src/util/VariantMap.cpp new file mode 100644 index 000000000..15b0703aa --- /dev/null +++ b/ManiVault/src/util/VariantMap.cpp @@ -0,0 +1,65 @@ +// SPDX-License-Identifier: LGPL-3.0-or-later +// A corresponding LICENSE file is located in the root directory of this source tree +// Copyright (C) 2023 BioVault (Biomedical Visual Analytics Unit LUMC - TU Delft) + +#include "VariantMap.h" + +#ifdef _DEBUG + #define VARIANT_MAP_VERBOSE +#endif + +namespace mv { + +const QString VariantMap::serializationVersionKey = "SerializationVersion"; + +VariantMap::VariantMap() +{ + initialize(); +} + +VariantMap::VariantMap(std::initializer_list> list) : + _variantMap(list) +{ + initialize(); +} + +VariantMap::VariantMap(const std::map& other) : + _variantMap(other) +{ + initialize(); +} + +VariantMap::VariantMap(std::map&& other) : + _variantMap(other) +{ + initialize(); +} + +VariantMap::VariantMap(const QVariantMap& other) : + _variantMap(other) +{ + initialize(); +} + +VariantMap::VariantMap(QVariantMap&& other) : + _variantMap(other) +{ + initialize(); +} + +std::uint32_t VariantMap::getVersion() const +{ + return _version; +} + +const QVariantMap& VariantMap::getVariantMap() const +{ + return _variantMap; +} + +void VariantMap::initialize() +{ + //_variantMap["SerializationVersion"] = QVariant::fromValue(_version); +} + +} diff --git a/ManiVault/src/util/VariantMap.h b/ManiVault/src/util/VariantMap.h new file mode 100644 index 000000000..30cc34698 --- /dev/null +++ b/ManiVault/src/util/VariantMap.h @@ -0,0 +1,128 @@ +// SPDX-License-Identifier: LGPL-3.0-or-later +// A corresponding LICENSE file is located in the root directory of this source tree +// Copyright (C) 2023 BioVault (Biomedical Visual Analytics Unit LUMC - TU Delft) + +#pragma once + +#include + +namespace mv::util { + class Serializable; +} + +namespace mv { + +/** + * TODO + * + * @author Thomas Kroes + */ +class VariantMap final +{ +public: + VariantMap(); + VariantMap(std::initializer_list> list); + VariantMap(const std::map& other); + VariantMap(std::map&& other); + VariantMap(const QVariantMap& other); + VariantMap(QVariantMap&& other); + + std::uint32_t getVersion() const; + + bool contains(const QString& key) const { + return _variantMap.contains(key); + } + + QVariantMap::size_type count(const QString& key) const { + return _variantMap.count(key); + } + + QVariantMap::size_type count() const { + return _variantMap.count(); + } + + QVariantMap::iterator insert(const QString& key, const QVariant& value) { + return _variantMap.insert(key, value); + } + + QVariantMap::iterator insert(QVariantMap::const_iterator pos, const QString& key, const QVariant& value) { + return _variantMap.insert(pos, key, value); + } + + void insert(const QVariantMap& map) { + _variantMap.insert(map); + } + + void insert(QVariantMap&& map) { + _variantMap.insert(map); + } + + QList keys() const { + return _variantMap.keys(); + //auto allKeysExceptSerializationVersion = _variantMap.keys(); + + //allKeysExceptSerializationVersion.takeFirst(); + + //return allKeysExceptSerializationVersion; + } + + QList values() const { + return _variantMap.values(); + //auto allValuesExceptSerializationVersion = _variantMap.values(); + + //allValuesExceptSerializationVersion.takeFirst(); + + //return allValuesExceptSerializationVersion; + } + + QVariant& operator [](const QString& key) { + Q_ASSERT(key != serializationVersionKey); + + return _variantMap[key]; + } + + QVariant operator [](const QString& key) const { + Q_ASSERT(key != serializationVersionKey); + + return _variantMap[key]; + } + + VariantMap operator =(const VariantMap& other) { + _variantMap = other.getVariantMap(); + + return *this; + } + + VariantMap operator =(const QVariantMap& variantMap) { + _variantMap = variantMap; + + return *this; + } + + operator QVariant () const { + return _variantMap; + } + + operator QVariantMap () const { + return _variantMap; + } + +protected: + + const QVariantMap& getVariantMap() const; + +private: + + /** Add serialization version etc. */ + void initialize(); + +private: + const std::uint32_t _version{1}; /** Variant map serialization version */ + QVariantMap _variantMap; /** The actual variant map container */ + + static const QString serializationVersionKey; + + friend class mv::util::Serializable; +}; + +} diff --git a/ManiVault/src/util/Version.cpp b/ManiVault/src/util/Version.cpp index edfc87e42..e25027abc 100644 --- a/ManiVault/src/util/Version.cpp +++ b/ManiVault/src/util/Version.cpp @@ -76,7 +76,7 @@ void Version::setSuffix(const std::string& suffix) _suffix = suffix; } -void Version::fromVariantMap(const QVariantMap& variantMap) +void Version::fromVariantMap(const mv::VariantMap& variantMap) { Serializable::fromVariantMap(variantMap); @@ -91,7 +91,7 @@ void Version::fromVariantMap(const QVariantMap& variantMap) setSuffix(variantMap["Suffix"].toString().toStdString()); } -QVariantMap Version::toVariantMap() const +mv::VariantMap Version::toVariantMap() const { auto variantMap = Serializable::toVariantMap(); diff --git a/ManiVault/src/util/Version.h b/ManiVault/src/util/Version.h index a558ff1df..0291bc0bc 100644 --- a/ManiVault/src/util/Version.h +++ b/ManiVault/src/util/Version.h @@ -93,13 +93,13 @@ class Version final : public Serializable { * Load version from variant map * @param Variant map representation of the version */ - void fromVariantMap(const QVariantMap& variantMap) override; + void fromVariantMap(const mv::VariantMap& variantMap) override; /** * Save version to variant map * @return Variant map representation of the version */ - QVariantMap toVariantMap() const override; + mv::VariantMap toVariantMap() const override; private: std::int32_t _major; diff --git a/ManiVault/src/widgets/DropWidget.cpp b/ManiVault/src/widgets/DropWidget.cpp index bd1d3bab7..34a49351d 100644 --- a/ManiVault/src/widgets/DropWidget.cpp +++ b/ManiVault/src/widgets/DropWidget.cpp @@ -334,4 +334,4 @@ DropWidget::DropIndicatorWidget::DropIndicatorWidget(QWidget* parent, const QStr } } -} \ No newline at end of file +} diff --git a/ManiVault/src/widgets/DropWidget.h b/ManiVault/src/widgets/DropWidget.h index 1b3b41c18..6e26d8105 100644 --- a/ManiVault/src/widgets/DropWidget.h +++ b/ManiVault/src/widgets/DropWidget.h @@ -207,4 +207,4 @@ class DropWidget : public QWidget }; } -} \ No newline at end of file +} diff --git a/ManiVault/src/widgets/ViewPluginEditorDialog.cpp b/ManiVault/src/widgets/ViewPluginEditorDialog.cpp index f45398a41..e9c710114 100644 --- a/ManiVault/src/widgets/ViewPluginEditorDialog.cpp +++ b/ManiVault/src/widgets/ViewPluginEditorDialog.cpp @@ -73,4 +73,4 @@ void ViewPluginEditorDialog::init() _actionsWidget.getFilterModel().getPublicRootOnlyAction().setChecked(false); } -} \ No newline at end of file +} diff --git a/ManiVault/src/widgets/ViewPluginEditorDialog.h b/ManiVault/src/widgets/ViewPluginEditorDialog.h index 63a7f7051..ebe6383df 100644 --- a/ManiVault/src/widgets/ViewPluginEditorDialog.h +++ b/ManiVault/src/widgets/ViewPluginEditorDialog.h @@ -69,4 +69,4 @@ class ViewPluginEditorDialog : public QDialog GroupAction _settingsAction; /** Group action for miscellaneous settings actions */ }; -} \ No newline at end of file +} From 3d09adf897cad2e3c15ec48c2d136caf798f958e Mon Sep 17 00:00:00 2001 From: Thomas Kroes Date: Wed, 20 Mar 2024 11:16:33 +0100 Subject: [PATCH 2/6] Work on conversion routine --- ManiVault/cmake/CMakeMvSourcesPublic.cmake | 2 + .../src/plugins/PointData/src/PointData.cpp | 2 +- .../src/plugins/PointData/src/PointData.h | 4 +- ManiVault/src/util/Variant.cpp | 19 ++++++++++ ManiVault/src/util/Variant.h | 38 +++++++++++++++++++ ManiVault/src/util/VariantMap.cpp | 11 ++++++ ManiVault/src/util/VariantMap.h | 30 +++++++-------- 7 files changed, 87 insertions(+), 19 deletions(-) create mode 100644 ManiVault/src/util/Variant.cpp create mode 100644 ManiVault/src/util/Variant.h diff --git a/ManiVault/cmake/CMakeMvSourcesPublic.cmake b/ManiVault/cmake/CMakeMvSourcesPublic.cmake index b5f6a2fc4..0bb3e8d91 100644 --- a/ManiVault/cmake/CMakeMvSourcesPublic.cmake +++ b/ManiVault/cmake/CMakeMvSourcesPublic.cmake @@ -486,6 +486,7 @@ set(PUBLIC_UTIL_HEADERS src/util/Version.h src/util/DockWidgetPermission.h src/util/NumericalRange.h + src/util/Variant.h src/util/VariantMap.h ) @@ -531,6 +532,7 @@ set(PUBLIC_UTIL_SOURCES src/util/Version.cpp src/util/DockWidgetPermission.cpp src/util/NumericalRange.cpp + src/util/Variant.cpp src/util/VariantMap.cpp ) diff --git a/ManiVault/src/plugins/PointData/src/PointData.cpp b/ManiVault/src/plugins/PointData/src/PointData.cpp index bfbd2da26..a51b01740 100644 --- a/ManiVault/src/plugins/PointData/src/PointData.cpp +++ b/ManiVault/src/plugins/PointData/src/PointData.cpp @@ -1021,7 +1021,7 @@ mv::VariantMap Points::toVariantMap() const selection["Raw"] = rawDataToVariantMap((char*)selectionSet->indices.data(), selectionSet->indices.size() * sizeof(std::uint32_t), true); } - variantMap["Data"] = isFull() ? getRawData()->toVariantMap() : QVariantMap(); + variantMap["Data"] = isFull() ? getRawData()->toVariantMap() : VariantMap(); variantMap["NumberOfPoints"] = getNumPoints(); variantMap["Indices"] = indices; variantMap["Selection"] = selection; diff --git a/ManiVault/src/plugins/PointData/src/PointData.h b/ManiVault/src/plugins/PointData/src/PointData.h index 486915c43..f7ba06e51 100644 --- a/ManiVault/src/plugins/PointData/src/PointData.h +++ b/ManiVault/src/plugins/PointData/src/PointData.h @@ -413,13 +413,13 @@ class POINTDATA_EXPORT PointData : public mv::plugin::RawData * Load point data from variant map * @param Variant map representation of the point data */ - virtual void fromVariantMap(const QVariantMap& variantMap) final; + void fromVariantMap(const mv::VariantMap& variantMap) override final; /** * Save point data to variant map * @return Variant map representation of the point data */ - virtual QVariantMap toVariantMap() const final; + mv::VariantMap toVariantMap() const override final; private: VariantOfVectors _variantOfVectors; diff --git a/ManiVault/src/util/Variant.cpp b/ManiVault/src/util/Variant.cpp new file mode 100644 index 000000000..d555e2a23 --- /dev/null +++ b/ManiVault/src/util/Variant.cpp @@ -0,0 +1,19 @@ +// SPDX-License-Identifier: LGPL-3.0-or-later +// A corresponding LICENSE file is located in the root directory of this source tree +// Copyright (C) 2023 BioVault (Biomedical Visual Analytics Unit LUMC - TU Delft) + +#include "Variant.h" + +#ifdef _DEBUG + #define VARIANT_VERBOSE +#endif + +namespace mv { + +Variant::Variant(const QVariant& other) : + QVariant(other) +{ + +} + +} diff --git a/ManiVault/src/util/Variant.h b/ManiVault/src/util/Variant.h new file mode 100644 index 000000000..049327028 --- /dev/null +++ b/ManiVault/src/util/Variant.h @@ -0,0 +1,38 @@ +// SPDX-License-Identifier: LGPL-3.0-or-later +// A corresponding LICENSE file is located in the root directory of this source tree +// Copyright (C) 2023 BioVault (Biomedical Visual Analytics Unit LUMC - TU Delft) + +#pragma once + +#include + +namespace mv::util { + class Serializable; +} + +namespace mv { + +/** + * TODO + * + * @author Thomas Kroes + */ +class Variant : public QVariant +{ +public: + + Variant(const QVariant& other); + + operator QVariant () const { + return *this; + } + +protected: + +private: + +private: + friend class mv::util::Serializable; +}; + +} diff --git a/ManiVault/src/util/VariantMap.cpp b/ManiVault/src/util/VariantMap.cpp index 15b0703aa..b3472698b 100644 --- a/ManiVault/src/util/VariantMap.cpp +++ b/ManiVault/src/util/VariantMap.cpp @@ -62,4 +62,15 @@ void VariantMap::initialize() //_variantMap["SerializationVersion"] = QVariant::fromValue(_version); } +QVariant VariantMap::converted() const +{ + for (const auto& variant : _variantMap.values()) { + qDebug() << variant.typeName(); + if (variant.typeName() == "QStringList") + qDebug() << "Found a string list!"; + } + + return _variantMap; +} + } diff --git a/ManiVault/src/util/VariantMap.h b/ManiVault/src/util/VariantMap.h index 30cc34698..15c0cf0d3 100644 --- a/ManiVault/src/util/VariantMap.h +++ b/ManiVault/src/util/VariantMap.h @@ -4,6 +4,8 @@ #pragma once +#include "Variant.h" + #include namespace mv::util { @@ -19,6 +21,10 @@ namespace mv { */ class VariantMap final { +public: + + using PrivateVariantMap = QMap; + public: VariantMap(); VariantMap(std::initializer_list> list); @@ -44,35 +50,25 @@ class VariantMap final QVariantMap::iterator insert(const QString& key, const QVariant& value) { return _variantMap.insert(key, value); } - + QVariantMap::iterator insert(QVariantMap::const_iterator pos, const QString& key, const QVariant& value) { return _variantMap.insert(pos, key, value); } - + void insert(const QVariantMap& map) { _variantMap.insert(map); } - + void insert(QVariantMap&& map) { _variantMap.insert(map); } QList keys() const { return _variantMap.keys(); - //auto allKeysExceptSerializationVersion = _variantMap.keys(); - - //allKeysExceptSerializationVersion.takeFirst(); - - //return allKeysExceptSerializationVersion; } QList values() const { return _variantMap.values(); - //auto allValuesExceptSerializationVersion = _variantMap.values(); - - //allValuesExceptSerializationVersion.takeFirst(); - - //return allValuesExceptSerializationVersion; } QVariant& operator [](const QString& key) { @@ -100,7 +96,7 @@ class VariantMap final } operator QVariant () const { - return _variantMap; + return converted(); } operator QVariantMap () const { @@ -113,12 +109,14 @@ class VariantMap final private: + QVariant converted() const; + /** Add serialization version etc. */ void initialize(); private: - const std::uint32_t _version{1}; /** Variant map serialization version */ - QVariantMap _variantMap; /** The actual variant map container */ + const std::uint32_t _version{1}; /** Variant map serialization version */ + QVariantMap _variantMap; /** The actual variant map container */ static const QString serializationVersionKey; From 7372b79dd25437b78c3eb06ce8da373ac96431a2 Mon Sep 17 00:00:00 2001 From: Thomas Kroes Date: Wed, 20 Mar 2024 13:00:15 +0100 Subject: [PATCH 3/6] Work on variant map --- ManiVault/src/util/Serialization.cpp | 2 +- ManiVault/src/util/Serialization.h | 4 ++- ManiVault/src/util/Variant.cpp | 7 ++++ ManiVault/src/util/Variant.h | 8 ++++- ManiVault/src/util/VariantMap.cpp | 54 ++++++++++++++++++++++++---- ManiVault/src/util/VariantMap.h | 38 ++++++++++++++------ 6 files changed, 92 insertions(+), 21 deletions(-) diff --git a/ManiVault/src/util/Serialization.cpp b/ManiVault/src/util/Serialization.cpp index a84d41f28..bee855820 100644 --- a/ManiVault/src/util/Serialization.cpp +++ b/ManiVault/src/util/Serialization.cpp @@ -156,7 +156,7 @@ void populateDataBufferFromVariantMap(const QVariantMap& variantMap, char* bytes } } -void variantMapMustContain(const QVariantMap& variantMap, const QString& key) +void variantMapMustContain(const VariantMap& variantMap, const QString& key) { if (!variantMap.contains(key)) throw std::runtime_error(QString("%1 not found in map: %2").arg(key, variantMap.keys().join(", ")).toLatin1()); diff --git a/ManiVault/src/util/Serialization.h b/ManiVault/src/util/Serialization.h index 3f774ae37..460303cb0 100644 --- a/ManiVault/src/util/Serialization.h +++ b/ManiVault/src/util/Serialization.h @@ -4,6 +4,8 @@ #pragma once +#include "VariantMap.h" + #include #include #include @@ -50,6 +52,6 @@ void populateDataBufferFromVariantMap(const QVariantMap& variantMap, char* bytes * @param variantMap Variant map that should contain the key * @param key Item name */ -void variantMapMustContain(const QVariantMap& variantMap, const QString& key); +void variantMapMustContain(const VariantMap& variantMap, const QString& key); } diff --git a/ManiVault/src/util/Variant.cpp b/ManiVault/src/util/Variant.cpp index d555e2a23..60d6a800d 100644 --- a/ManiVault/src/util/Variant.cpp +++ b/ManiVault/src/util/Variant.cpp @@ -10,10 +10,17 @@ namespace mv { +Variant::Variant() +{ + +} + Variant::Variant(const QVariant& other) : QVariant(other) { } + + } diff --git a/ManiVault/src/util/Variant.h b/ManiVault/src/util/Variant.h index 049327028..8edcb2331 100644 --- a/ManiVault/src/util/Variant.h +++ b/ManiVault/src/util/Variant.h @@ -20,9 +20,15 @@ namespace mv { class Variant : public QVariant { public: - + Variant(); Variant(const QVariant& other); + Variant operator =(const QVariant& other) { + QVariant::operator=(other); + + return *this; + } + operator QVariant () const { return *this; } diff --git a/ManiVault/src/util/VariantMap.cpp b/ManiVault/src/util/VariantMap.cpp index b3472698b..5ae111d4f 100644 --- a/ManiVault/src/util/VariantMap.cpp +++ b/ManiVault/src/util/VariantMap.cpp @@ -12,6 +12,41 @@ namespace mv { const QString VariantMap::serializationVersionKey = "SerializationVersion"; +_VariantMap::_VariantMap() +{ +} + +_VariantMap::_VariantMap(std::initializer_list> list) : + QMap() +{ +} + +_VariantMap::_VariantMap(const std::map& other) : + QMap() +{ +} + +_VariantMap::_VariantMap(std::map&& other) : + QMap() +{ +} + +_VariantMap::_VariantMap(const QVariantMap& other) : + QMap() +{ +} + +_VariantMap::_VariantMap(QVariantMap&& other) : + QMap() +{ +} + + + + + + + VariantMap::VariantMap() { initialize(); @@ -24,25 +59,25 @@ VariantMap::VariantMap(std::initializer_list> list) } VariantMap::VariantMap(const std::map& other) : - _variantMap(other) + _variantMap(_VariantMap(other)) { initialize(); } VariantMap::VariantMap(std::map&& other) : - _variantMap(other) + _variantMap(_VariantMap(other)) { initialize(); } VariantMap::VariantMap(const QVariantMap& other) : - _variantMap(other) + _variantMap(_VariantMap(other)) { initialize(); } VariantMap::VariantMap(QVariantMap&& other) : - _variantMap(other) + _variantMap(_VariantMap(other)) { initialize(); } @@ -52,9 +87,14 @@ std::uint32_t VariantMap::getVersion() const return _version; } -const QVariantMap& VariantMap::getVariantMap() const +QVariantMap VariantMap::getVariantMap() const { - return _variantMap; + QVariantMap variantMap; + + for (const auto& key : _variantMap.keys()) + variantMap[key] = _variantMap[key]; + + return variantMap; } void VariantMap::initialize() @@ -70,7 +110,7 @@ QVariant VariantMap::converted() const qDebug() << "Found a string list!"; } - return _variantMap; + return getVariantMap(); } } diff --git a/ManiVault/src/util/VariantMap.h b/ManiVault/src/util/VariantMap.h index 15c0cf0d3..d5cff2066 100644 --- a/ManiVault/src/util/VariantMap.h +++ b/ManiVault/src/util/VariantMap.h @@ -14,6 +14,16 @@ namespace mv::util { namespace mv { +class _VariantMap : public QMap { +public: + _VariantMap(); + _VariantMap(std::initializer_list> list); + _VariantMap(const std::map& other); + _VariantMap(std::map&& other); + _VariantMap(const QVariantMap& other); + _VariantMap(QVariantMap&& other); +}; + /** * TODO * @@ -23,7 +33,7 @@ class VariantMap final { public: - using PrivateVariantMap = QMap; + public: VariantMap(); @@ -47,20 +57,20 @@ class VariantMap final return _variantMap.count(); } - QVariantMap::iterator insert(const QString& key, const QVariant& value) { + _VariantMap::iterator insert(const QString& key, const QVariant& value) { return _variantMap.insert(key, value); } - QVariantMap::iterator insert(QVariantMap::const_iterator pos, const QString& key, const QVariant& value) { + _VariantMap::iterator insert(_VariantMap::const_iterator pos, const QString& key, const QVariant& value) { return _variantMap.insert(pos, key, value); } void insert(const QVariantMap& map) { - _variantMap.insert(map); + _variantMap.insert(_VariantMap(map)); } void insert(QVariantMap&& map) { - _variantMap.insert(map); + _variantMap.insert(_VariantMap(map)); } QList keys() const { @@ -68,7 +78,12 @@ class VariantMap final } QList values() const { - return _variantMap.values(); + QList variantValues; + + for (const auto& value : _variantMap.values()) + variantValues << value; + + return variantValues; } QVariant& operator [](const QString& key) { @@ -84,13 +99,14 @@ class VariantMap final } VariantMap operator =(const VariantMap& other) { - _variantMap = other.getVariantMap(); + _variantMap = other._variantMap; return *this; } VariantMap operator =(const QVariantMap& variantMap) { - _variantMap = variantMap; + for (const auto& key : variantMap.keys()) + _variantMap[key] = variantMap[key]; return *this; } @@ -100,12 +116,12 @@ class VariantMap final } operator QVariantMap () const { - return _variantMap; + return getVariantMap(); } protected: - const QVariantMap& getVariantMap() const; + QVariantMap getVariantMap() const; private: @@ -116,7 +132,7 @@ class VariantMap final private: const std::uint32_t _version{1}; /** Variant map serialization version */ - QVariantMap _variantMap; /** The actual variant map container */ + _VariantMap _variantMap; /** The actual variant map container */ static const QString serializationVersionKey; From 153ff4581a6d6bbf1baa0a8fed4052eef15e60a0 Mon Sep 17 00:00:00 2001 From: Thomas Kroes Date: Fri, 22 Mar 2024 11:12:45 +0100 Subject: [PATCH 4/6] Add VariantProxy class Work on VariantMap implementation --- ManiVault/cmake/CMakeMvSourcesPublic.cmake | 4 +- ManiVault/src/util/Variant.cpp | 26 ---- ManiVault/src/util/Variant.h | 44 ------- ManiVault/src/util/VariantMap.cpp | 65 ++++----- ManiVault/src/util/VariantMap.h | 53 ++++---- ManiVault/src/util/VariantProxy.cpp | 36 +++++ ManiVault/src/util/VariantProxy.h | 146 +++++++++++++++++++++ 7 files changed, 235 insertions(+), 139 deletions(-) delete mode 100644 ManiVault/src/util/Variant.cpp delete mode 100644 ManiVault/src/util/Variant.h create mode 100644 ManiVault/src/util/VariantProxy.cpp create mode 100644 ManiVault/src/util/VariantProxy.h diff --git a/ManiVault/cmake/CMakeMvSourcesPublic.cmake b/ManiVault/cmake/CMakeMvSourcesPublic.cmake index 0bb3e8d91..0b4e00966 100644 --- a/ManiVault/cmake/CMakeMvSourcesPublic.cmake +++ b/ManiVault/cmake/CMakeMvSourcesPublic.cmake @@ -486,7 +486,7 @@ set(PUBLIC_UTIL_HEADERS src/util/Version.h src/util/DockWidgetPermission.h src/util/NumericalRange.h - src/util/Variant.h + src/util/VariantProxy.h src/util/VariantMap.h ) @@ -532,7 +532,7 @@ set(PUBLIC_UTIL_SOURCES src/util/Version.cpp src/util/DockWidgetPermission.cpp src/util/NumericalRange.cpp - src/util/Variant.cpp + src/util/VariantProxy.cpp src/util/VariantMap.cpp ) diff --git a/ManiVault/src/util/Variant.cpp b/ManiVault/src/util/Variant.cpp deleted file mode 100644 index 60d6a800d..000000000 --- a/ManiVault/src/util/Variant.cpp +++ /dev/null @@ -1,26 +0,0 @@ -// SPDX-License-Identifier: LGPL-3.0-or-later -// A corresponding LICENSE file is located in the root directory of this source tree -// Copyright (C) 2023 BioVault (Biomedical Visual Analytics Unit LUMC - TU Delft) - -#include "Variant.h" - -#ifdef _DEBUG - #define VARIANT_VERBOSE -#endif - -namespace mv { - -Variant::Variant() -{ - -} - -Variant::Variant(const QVariant& other) : - QVariant(other) -{ - -} - - - -} diff --git a/ManiVault/src/util/Variant.h b/ManiVault/src/util/Variant.h deleted file mode 100644 index 8edcb2331..000000000 --- a/ManiVault/src/util/Variant.h +++ /dev/null @@ -1,44 +0,0 @@ -// SPDX-License-Identifier: LGPL-3.0-or-later -// A corresponding LICENSE file is located in the root directory of this source tree -// Copyright (C) 2023 BioVault (Biomedical Visual Analytics Unit LUMC - TU Delft) - -#pragma once - -#include - -namespace mv::util { - class Serializable; -} - -namespace mv { - -/** - * TODO - * - * @author Thomas Kroes - */ -class Variant : public QVariant -{ -public: - Variant(); - Variant(const QVariant& other); - - Variant operator =(const QVariant& other) { - QVariant::operator=(other); - - return *this; - } - - operator QVariant () const { - return *this; - } - -protected: - -private: - -private: - friend class mv::util::Serializable; -}; - -} diff --git a/ManiVault/src/util/VariantMap.cpp b/ManiVault/src/util/VariantMap.cpp index 5ae111d4f..22fb37a2b 100644 --- a/ManiVault/src/util/VariantMap.cpp +++ b/ManiVault/src/util/VariantMap.cpp @@ -12,72 +12,50 @@ namespace mv { const QString VariantMap::serializationVersionKey = "SerializationVersion"; -_VariantMap::_VariantMap() -{ -} - -_VariantMap::_VariantMap(std::initializer_list> list) : - QMap() -{ -} - -_VariantMap::_VariantMap(const std::map& other) : - QMap() -{ -} - -_VariantMap::_VariantMap(std::map&& other) : - QMap() -{ -} - -_VariantMap::_VariantMap(const QVariantMap& other) : - QMap() -{ -} - -_VariantMap::_VariantMap(QVariantMap&& other) : - QMap() -{ -} - - - - - - - -VariantMap::VariantMap() +VariantMap::VariantMap() : + _version(), + _variantMap(), + _variantProxy(_variantMap) { initialize(); } VariantMap::VariantMap(std::initializer_list> list) : - _variantMap(list) + _version(), + _variantMap(list), + _variantProxy(_variantMap) { initialize(); } VariantMap::VariantMap(const std::map& other) : - _variantMap(_VariantMap(other)) + _version(), + _variantMap(other), + _variantProxy(_variantMap) { initialize(); } VariantMap::VariantMap(std::map&& other) : - _variantMap(_VariantMap(other)) + _version(), + _variantMap(other), + _variantProxy(_variantMap) { initialize(); } VariantMap::VariantMap(const QVariantMap& other) : - _variantMap(_VariantMap(other)) + _version(), + _variantMap(other), + _variantProxy(_variantMap) { initialize(); } VariantMap::VariantMap(QVariantMap&& other) : - _variantMap(_VariantMap(other)) + _version(), + _variantMap(other), + _variantProxy(_variantMap) { initialize(); } @@ -113,4 +91,9 @@ QVariant VariantMap::converted() const return getVariantMap(); } +QVariant VariantMap::toVariant() const +{ + return _variantMap; +} + } diff --git a/ManiVault/src/util/VariantMap.h b/ManiVault/src/util/VariantMap.h index d5cff2066..51607e032 100644 --- a/ManiVault/src/util/VariantMap.h +++ b/ManiVault/src/util/VariantMap.h @@ -4,7 +4,7 @@ #pragma once -#include "Variant.h" +#include "VariantProxy.h" #include @@ -14,15 +14,15 @@ namespace mv::util { namespace mv { -class _VariantMap : public QMap { -public: - _VariantMap(); - _VariantMap(std::initializer_list> list); - _VariantMap(const std::map& other); - _VariantMap(std::map&& other); - _VariantMap(const QVariantMap& other); - _VariantMap(QVariantMap&& other); -}; +//class _VariantMap : public QMap { +//public: +// _VariantMap(); +// _VariantMap(std::initializer_list> list); +// _VariantMap(const std::map& other); +// _VariantMap(std::map&& other); +// _VariantMap(const QVariantMap& other); +// _VariantMap(QVariantMap&& other); +//}; /** * TODO @@ -57,20 +57,20 @@ class VariantMap final return _variantMap.count(); } - _VariantMap::iterator insert(const QString& key, const QVariant& value) { + QVariantMap::iterator insert(const QString& key, const QVariant& value) { return _variantMap.insert(key, value); } - _VariantMap::iterator insert(_VariantMap::const_iterator pos, const QString& key, const QVariant& value) { - return _variantMap.insert(pos, key, value); - } + //QVariantMap::iterator insert(QVariantMap::const_iterator pos, const QString& key, const QVariant& value) { + // return _variantMap.insert(pos, key, value); + //} void insert(const QVariantMap& map) { - _variantMap.insert(_VariantMap(map)); + _variantMap.insert(map); } void insert(QVariantMap&& map) { - _variantMap.insert(_VariantMap(map)); + _variantMap.insert(map); } QList keys() const { @@ -86,25 +86,23 @@ class VariantMap final return variantValues; } - QVariant& operator [](const QString& key) { - Q_ASSERT(key != serializationVersionKey); + VariantProxy& operator[](const QString& key) { + _variantProxy.setKey(key); - return _variantMap[key]; + return _variantProxy; } - QVariant operator [](const QString& key) const { - Q_ASSERT(key != serializationVersionKey); - - return _variantMap[key]; + QVariant operator[](const QString& key) const { + return VariantProxy(key, const_cast(_variantMap)).get(); } - VariantMap operator =(const VariantMap& other) { + VariantMap operator=(const VariantMap& other) { _variantMap = other._variantMap; return *this; } - VariantMap operator =(const QVariantMap& variantMap) { + VariantMap operator=(const QVariantMap& variantMap) { for (const auto& key : variantMap.keys()) _variantMap[key] = variantMap[key]; @@ -119,6 +117,8 @@ class VariantMap final return getVariantMap(); } + QVariant toVariant() const; + protected: QVariantMap getVariantMap() const; @@ -132,7 +132,8 @@ class VariantMap final private: const std::uint32_t _version{1}; /** Variant map serialization version */ - _VariantMap _variantMap; /** The actual variant map container */ + QVariantMap _variantMap; /** The actual variant map container */ + VariantProxy _variantProxy; /** */ static const QString serializationVersionKey; diff --git a/ManiVault/src/util/VariantProxy.cpp b/ManiVault/src/util/VariantProxy.cpp new file mode 100644 index 000000000..6ec145204 --- /dev/null +++ b/ManiVault/src/util/VariantProxy.cpp @@ -0,0 +1,36 @@ +// SPDX-License-Identifier: LGPL-3.0-or-later +// A corresponding LICENSE file is located in the root directory of this source tree +// Copyright (C) 2023 BioVault (Biomedical Visual Analytics Unit LUMC - TU Delft) + +#include "VariantProxy.h" + +#ifdef _DEBUG + #define VARIANT_PROXY_VERBOSE +#endif + +namespace mv { + +VariantProxy::VariantProxy(const QString& key, QVariantMap& variantMap) : + _key(key), + _variantMap(variantMap) +{ +} + +VariantProxy::VariantProxy(QVariantMap& variantMap) : + _variantMap(variantMap) +{ +} + +VariantProxy::VariantProxy(const VariantProxy& other) : + _key(), + _variantMap(other._variantMap) +{ + *this = other; +} + +void VariantProxy::setKey(const QString& key) +{ + _key = key; +} + +} diff --git a/ManiVault/src/util/VariantProxy.h b/ManiVault/src/util/VariantProxy.h new file mode 100644 index 000000000..926b80d16 --- /dev/null +++ b/ManiVault/src/util/VariantProxy.h @@ -0,0 +1,146 @@ +// SPDX-License-Identifier: LGPL-3.0-or-later +// A corresponding LICENSE file is located in the root directory of this source tree +// Copyright (C) 2023 BioVault (Biomedical Visual Analytics Unit LUMC - TU Delft) + +#pragma once + +#include + +#ifdef _DEBUG + #define VARIANT_PROXY_VERBOSE +#endif + +namespace mv { + +// Forward declare the ManiVault variant map because it is a friend of the VariantProxy class +class VariantMap; + +/** + * Variant proxy class + * + * This class acts a proxy for modifying QVariant data in a \p QVariantMap located + * elsewhere. It does not contain the actual QVariant data, it merely uses a key and + * a reference to a \p QVariantMap to modify it. + * + * @author Thomas Kroes + */ +class VariantProxy +{ +protected: + + /** + * Copy constructor + * @param other Other variant proxy to copy + */ + VariantProxy(const VariantProxy& other); + + /** + * Initialize with current \p key and reference to \p variantMap + * @param key Key of the \p QVariant to modify in VariantProxy#_variantMap + * @param variantMap Reference to the external \p QVariantMap that we want to modify + */ + VariantProxy(const QString& key, QVariantMap& variantMap); + + /** + * Initialize with reference to \p variantMap + * @param variantMap Reference to the external \p QVariantMap that we want to modify + */ + VariantProxy(QVariantMap& variantMap); + + /** + * Sets current key to \p key + * @param key Key of the \p QVariant to modify in VariantProxy#_variantMap + */ + void setKey(const QString& key); + +public: + + /** + * Assign \p rhs ManiVault variant proxy + * @param rhs Other variant proxy + */ + VariantProxy operator=(const VariantProxy& rhs) { + _key = rhs._key; + _variantMap = rhs._variantMap; + + return *this; + } + + /** + * Assign \p rhs ManiVault variant map + * @param rhs Other variant map + */ + VariantProxy operator=(const VariantMap& rhs) { + Q_ASSERT(!_variantMap.contains(_key)); + + _variantMap[_key] = rhs.toVariant(); + + return *this; + } + + /** + * Assign \p rhs QVariant + * @param rhs Other QVariant + */ + VariantProxy operator=(const QVariant& rhs) { + Q_ASSERT(!_variantMap.contains(_key)); + +#ifdef VARIANT_PROXY_VERBOSE + qDebug() << __FUNCTION__; +#endif + + _variantMap[_key] = rhs; + + return *this; + } + + /** + * Assign \p rhs QVariantList + * @param rhs Other QVariantList + */ + VariantProxy operator=(const QVariantList& rhs) { + Q_ASSERT(!_variantMap.contains(_key)); + + _variantMap[_key] = rhs; + + return *this; + } + + /** + * Assign \p rhs QVariantMap + * @param rhs Other QVariantMap + */ + VariantProxy operator=(const QVariantMap& rhs) { + Q_ASSERT(!_variantMap.contains(_key)); + + _variantMap[_key] = rhs; + + return *this; + } + + /** + * Assign \p rhs float + * @param rhs Other float + */ + //VariantProxy operator =(const float& rhs) { + // Q_ASSERT(!_variantMap.contains(_key)); + + // _variantMap[_key] = rhs; + + // return *this; + //} + +protected: + + QVariant get() const { + return _variantMap[_key]; + } + +private: + QString _key; /** Key of the \p QVariant to modify in VariantProxy#_variantMap */ + QVariantMap& _variantMap; /** Reference to the external \p QVariantMap that we want to modify */ + + friend class mv::VariantMap; +}; + +} From c450173e1c9021e9eaf0a8ceb6e9a32d26f36adf Mon Sep 17 00:00:00 2001 From: Thomas Kroes Date: Fri, 22 Mar 2024 13:06:12 +0100 Subject: [PATCH 5/6] Move operators to cpp --- ManiVault/src/util/VariantMap.cpp | 95 +++++++++++++++++++++++++++-- ManiVault/src/util/VariantMap.h | 78 +++++------------------ ManiVault/src/util/VariantProxy.cpp | 63 ++++++++++++++++++- ManiVault/src/util/VariantProxy.h | 71 ++++----------------- 4 files changed, 177 insertions(+), 130 deletions(-) diff --git a/ManiVault/src/util/VariantMap.cpp b/ManiVault/src/util/VariantMap.cpp index 22fb37a2b..4dc3930b4 100644 --- a/ManiVault/src/util/VariantMap.cpp +++ b/ManiVault/src/util/VariantMap.cpp @@ -15,7 +15,7 @@ const QString VariantMap::serializationVersionKey = "SerializationVersion"; VariantMap::VariantMap() : _version(), _variantMap(), - _variantProxy(_variantMap) + _variantProxy(&_variantMap) { initialize(); } @@ -23,7 +23,7 @@ VariantMap::VariantMap() : VariantMap::VariantMap(std::initializer_list> list) : _version(), _variantMap(list), - _variantProxy(_variantMap) + _variantProxy(&_variantMap) { initialize(); } @@ -31,7 +31,7 @@ VariantMap::VariantMap(std::initializer_list> list) VariantMap::VariantMap(const std::map& other) : _version(), _variantMap(other), - _variantProxy(_variantMap) + _variantProxy(&_variantMap) { initialize(); } @@ -39,7 +39,7 @@ VariantMap::VariantMap(const std::map& other) : VariantMap::VariantMap(std::map&& other) : _version(), _variantMap(other), - _variantProxy(_variantMap) + _variantProxy(&_variantMap) { initialize(); } @@ -47,7 +47,7 @@ VariantMap::VariantMap(std::map&& other) : VariantMap::VariantMap(const QVariantMap& other) : _version(), _variantMap(other), - _variantProxy(_variantMap) + _variantProxy(&_variantMap) { initialize(); } @@ -55,7 +55,7 @@ VariantMap::VariantMap(const QVariantMap& other) : VariantMap::VariantMap(QVariantMap&& other) : _version(), _variantMap(other), - _variantProxy(_variantMap) + _variantProxy(&_variantMap) { initialize(); } @@ -65,6 +65,79 @@ std::uint32_t VariantMap::getVersion() const return _version; } +bool VariantMap::contains(const QString& key) const +{ + return _variantMap.contains(key); +} + +QVariantMap::size_type VariantMap::count() const +{ + return _variantMap.count(); +} + +QVariantMap::size_type VariantMap::count(const QString& key) const +{ + return _variantMap.count(key); +} + +QVariantMap::iterator VariantMap::insert(const QString& key, const QVariant& value) +{ + return _variantMap.insert(key, value); +} + +void VariantMap::insert(const QVariantMap& map) +{ + _variantMap.insert(map); +} + +void VariantMap::insert(QVariantMap&& map) +{ + _variantMap.insert(map); +} + +QList VariantMap::keys() const +{ + return _variantMap.keys(); +} + +QList VariantMap::values() const +{ + QList variantValues; + + for (const auto& value : _variantMap.values()) + variantValues << value; + + return variantValues; +} + +VariantProxy& VariantMap::operator[](const QString& key) +{ + _variantProxy.setKey(key); + + return _variantProxy; +} + + +QVariant VariantMap::operator[](const QString& key) const +{ + return VariantProxy(key, const_cast(&_variantMap)).get(); +} + +VariantMap VariantMap::operator=(const VariantMap& other) +{ + _variantMap = other._variantMap; + + return *this; +} + +VariantMap VariantMap::operator=(const QVariantMap& variantMap) +{ + for (const auto& key : variantMap.keys()) + _variantMap[key] = variantMap[key]; + + return *this; +} + QVariantMap VariantMap::getVariantMap() const { QVariantMap variantMap; @@ -96,4 +169,14 @@ QVariant VariantMap::toVariant() const return _variantMap; } +VariantMap::operator QVariantMap() const +{ + return getVariantMap(); +} + +VariantMap::operator QVariant() const +{ + return converted(); +} + } diff --git a/ManiVault/src/util/VariantMap.h b/ManiVault/src/util/VariantMap.h index 51607e032..325fddc1d 100644 --- a/ManiVault/src/util/VariantMap.h +++ b/ManiVault/src/util/VariantMap.h @@ -14,16 +14,6 @@ namespace mv::util { namespace mv { -//class _VariantMap : public QMap { -//public: -// _VariantMap(); -// _VariantMap(std::initializer_list> list); -// _VariantMap(const std::map& other); -// _VariantMap(std::map&& other); -// _VariantMap(const QVariantMap& other); -// _VariantMap(QVariantMap&& other); -//}; - /** * TODO * @@ -45,77 +35,37 @@ class VariantMap final std::uint32_t getVersion() const; - bool contains(const QString& key) const { - return _variantMap.contains(key); - } + bool contains(const QString& key) const; - QVariantMap::size_type count(const QString& key) const { - return _variantMap.count(key); - } + QVariantMap::size_type count(const QString& key) const; - QVariantMap::size_type count() const { - return _variantMap.count(); - } + QVariantMap::size_type count() const; - QVariantMap::iterator insert(const QString& key, const QVariant& value) { - return _variantMap.insert(key, value); - } + QVariantMap::iterator insert(const QString& key, const QVariant& value); //QVariantMap::iterator insert(QVariantMap::const_iterator pos, const QString& key, const QVariant& value) { // return _variantMap.insert(pos, key, value); //} - void insert(const QVariantMap& map) { - _variantMap.insert(map); - } - - void insert(QVariantMap&& map) { - _variantMap.insert(map); - } - - QList keys() const { - return _variantMap.keys(); - } - - QList values() const { - QList variantValues; - - for (const auto& value : _variantMap.values()) - variantValues << value; - - return variantValues; - } + void insert(const QVariantMap& map); - VariantProxy& operator[](const QString& key) { - _variantProxy.setKey(key); + void insert(QVariantMap&& map); - return _variantProxy; - } + QList keys() const; - QVariant operator[](const QString& key) const { - return VariantProxy(key, const_cast(_variantMap)).get(); - } + QList values() const; - VariantMap operator=(const VariantMap& other) { - _variantMap = other._variantMap; + VariantProxy& operator[](const QString& key); - return *this; - } + QVariant operator[](const QString& key) const; - VariantMap operator=(const QVariantMap& variantMap) { - for (const auto& key : variantMap.keys()) - _variantMap[key] = variantMap[key]; + VariantMap operator=(const VariantMap& other); - return *this; - } + VariantMap operator=(const QVariantMap& variantMap); - operator QVariant () const { - return converted(); - } + operator QVariant () const; - operator QVariantMap () const { - return getVariantMap(); - } + operator QVariantMap () const; QVariant toVariant() const; diff --git a/ManiVault/src/util/VariantProxy.cpp b/ManiVault/src/util/VariantProxy.cpp index 6ec145204..b6eadf091 100644 --- a/ManiVault/src/util/VariantProxy.cpp +++ b/ManiVault/src/util/VariantProxy.cpp @@ -3,6 +3,7 @@ // Copyright (C) 2023 BioVault (Biomedical Visual Analytics Unit LUMC - TU Delft) #include "VariantProxy.h" +#include "VariantMap.h" #ifdef _DEBUG #define VARIANT_PROXY_VERBOSE @@ -10,15 +11,17 @@ namespace mv { -VariantProxy::VariantProxy(const QString& key, QVariantMap& variantMap) : +VariantProxy::VariantProxy(const QString& key, QVariantMap* variantMap) : _key(key), _variantMap(variantMap) { + Q_ASSERT(_variantMap); } -VariantProxy::VariantProxy(QVariantMap& variantMap) : +VariantProxy::VariantProxy(QVariantMap* variantMap) : _variantMap(variantMap) { + Q_ASSERT(_variantMap); } VariantProxy::VariantProxy(const VariantProxy& other) : @@ -33,4 +36,60 @@ void VariantProxy::setKey(const QString& key) _key = key; } +VariantProxy& VariantProxy::operator=(const VariantProxy& rhs) +{ + _key = rhs._key; + _variantMap = rhs._variantMap; + + return *this; +} + +VariantProxy VariantProxy::operator=(const VariantMap& rhs) +{ + Q_ASSERT(!_variantMap->contains(_key)); + + (*_variantMap)[_key] = rhs.toVariant(); + + return *this; +} + +VariantProxy VariantProxy::operator=(const QVariant& rhs) +{ + Q_ASSERT(!_variantMap->contains(_key)); + +#ifdef VARIANT_PROXY_VERBOSE + qDebug() << __FUNCTION__ << _key; +#endif + + (*_variantMap)[_key] = rhs; + + return *this; +} + +VariantProxy VariantProxy::operator=(const QVariantList& rhs) +{ + Q_ASSERT(!_variantMap->contains(_key)); + +#ifdef VARIANT_PROXY_VERBOSE + qDebug() << __FUNCTION__ << _key; +#endif + + (*_variantMap)[_key] = rhs; + + return *this; +} + +VariantProxy VariantProxy::operator=(const QVariantMap& rhs) +{ + Q_ASSERT(!_variantMap->contains(_key)); + +#ifdef VARIANT_PROXY_VERBOSE + qDebug() << __FUNCTION__ << _key; +#endif + + (*_variantMap)[_key] = rhs; + + return *this; +} + } diff --git a/ManiVault/src/util/VariantProxy.h b/ManiVault/src/util/VariantProxy.h index 926b80d16..19e961884 100644 --- a/ManiVault/src/util/VariantProxy.h +++ b/ManiVault/src/util/VariantProxy.h @@ -35,17 +35,17 @@ class VariantProxy VariantProxy(const VariantProxy& other); /** - * Initialize with current \p key and reference to \p variantMap + * Initialize with current \p key and pointer to \p variantMap * @param key Key of the \p QVariant to modify in VariantProxy#_variantMap - * @param variantMap Reference to the external \p QVariantMap that we want to modify + * @param variantMap Pointer to the external \p QVariantMap that we want to modify */ - VariantProxy(const QString& key, QVariantMap& variantMap); + VariantProxy(const QString& key, QVariantMap* variantMap); /** - * Initialize with reference to \p variantMap - * @param variantMap Reference to the external \p QVariantMap that we want to modify + * Initialize with pointer to \p variantMap + * @param variantMap Pointer to the external \p QVariantMap that we want to modify */ - VariantProxy(QVariantMap& variantMap); + VariantProxy(QVariantMap* variantMap); /** * Sets current key to \p key @@ -59,86 +59,41 @@ class VariantProxy * Assign \p rhs ManiVault variant proxy * @param rhs Other variant proxy */ - VariantProxy operator=(const VariantProxy& rhs) { - _key = rhs._key; - _variantMap = rhs._variantMap; - - return *this; - } + VariantProxy& operator=(const VariantProxy& rhs); /** * Assign \p rhs ManiVault variant map * @param rhs Other variant map */ - VariantProxy operator=(const VariantMap& rhs) { - Q_ASSERT(!_variantMap.contains(_key)); - - _variantMap[_key] = rhs.toVariant(); - - return *this; - } + VariantProxy operator=(const VariantMap& rhs); /** * Assign \p rhs QVariant * @param rhs Other QVariant */ - VariantProxy operator=(const QVariant& rhs) { - Q_ASSERT(!_variantMap.contains(_key)); - -#ifdef VARIANT_PROXY_VERBOSE - qDebug() << __FUNCTION__; -#endif - - _variantMap[_key] = rhs; - - return *this; - } + VariantProxy operator=(const QVariant& rhs); /** * Assign \p rhs QVariantList * @param rhs Other QVariantList */ - VariantProxy operator=(const QVariantList& rhs) { - Q_ASSERT(!_variantMap.contains(_key)); - - _variantMap[_key] = rhs; - - return *this; - } + VariantProxy operator=(const QVariantList& rhs); /** * Assign \p rhs QVariantMap * @param rhs Other QVariantMap */ - VariantProxy operator=(const QVariantMap& rhs) { - Q_ASSERT(!_variantMap.contains(_key)); - - _variantMap[_key] = rhs; - - return *this; - } - - /** - * Assign \p rhs float - * @param rhs Other float - */ - //VariantProxy operator =(const float& rhs) { - // Q_ASSERT(!_variantMap.contains(_key)); - - // _variantMap[_key] = rhs; - - // return *this; - //} + VariantProxy operator=(const QVariantMap& rhs); protected: QVariant get() const { - return _variantMap[_key]; + return (*_variantMap)[_key]; } private: QString _key; /** Key of the \p QVariant to modify in VariantProxy#_variantMap */ - QVariantMap& _variantMap; /** Reference to the external \p QVariantMap that we want to modify */ + QVariantMap* _variantMap; /** Pointer to the external \p QVariantMap that we want to modify */ friend class mv::VariantMap; }; From ca675ed6427014fc78a01f1879f8d783a1b91e79 Mon Sep 17 00:00:00 2001 From: Thomas Kroes Date: Mon, 25 Mar 2024 15:11:56 +0100 Subject: [PATCH 6/6] Work on variant proxy --- ManiVault/src/util/Serializable.cpp | 2 +- ManiVault/src/util/VariantMap.cpp | 89 ++++++++--------------------- ManiVault/src/util/VariantMap.h | 35 +++++------- ManiVault/src/util/VariantProxy.cpp | 28 +++++---- ManiVault/src/util/VariantProxy.h | 36 ++++++------ 5 files changed, 72 insertions(+), 118 deletions(-) diff --git a/ManiVault/src/util/Serializable.cpp b/ManiVault/src/util/Serializable.cpp index cbdae1286..1f7747408 100644 --- a/ManiVault/src/util/Serializable.cpp +++ b/ManiVault/src/util/Serializable.cpp @@ -78,7 +78,7 @@ QJsonDocument Serializable::toJsonDocument() const { QVariantMap variantMap; - variantMap[getSerializationName()] = const_cast(this)->toVariantMap(this).getVariantMap(); + variantMap[getSerializationName()] = const_cast(this)->toVariantMap(this).get(); return QJsonDocument::fromVariant(variantMap); } diff --git a/ManiVault/src/util/VariantMap.cpp b/ManiVault/src/util/VariantMap.cpp index 4dc3930b4..bd2058bcb 100644 --- a/ManiVault/src/util/VariantMap.cpp +++ b/ManiVault/src/util/VariantMap.cpp @@ -15,48 +15,26 @@ const QString VariantMap::serializationVersionKey = "SerializationVersion"; VariantMap::VariantMap() : _version(), _variantMap(), - _variantProxy(&_variantMap) + _variantProxy(this) { initialize(); } -VariantMap::VariantMap(std::initializer_list> list) : - _version(), - _variantMap(list), - _variantProxy(&_variantMap) -{ - initialize(); -} - -VariantMap::VariantMap(const std::map& other) : +VariantMap::VariantMap(const QVariantMap& variantMap) : _version(), - _variantMap(other), - _variantProxy(&_variantMap) + _variantMap(variantMap), + _variantProxy(this) { - initialize(); } -VariantMap::VariantMap(std::map&& other) : - _version(), - _variantMap(other), - _variantProxy(&_variantMap) -{ - initialize(); -} - -VariantMap::VariantMap(const QVariantMap& other) : +VariantMap::VariantMap(std::initializer_list> list) : _version(), - _variantMap(other), - _variantProxy(&_variantMap) + _variantMap(), + _variantProxy(this) { - initialize(); -} + for (const auto& [key, value] : list) + (*this)[key] = value; -VariantMap::VariantMap(QVariantMap&& other) : - _version(), - _variantMap(other), - _variantProxy(&_variantMap) -{ initialize(); } @@ -90,11 +68,6 @@ void VariantMap::insert(const QVariantMap& map) _variantMap.insert(map); } -void VariantMap::insert(QVariantMap&& map) -{ - _variantMap.insert(map); -} - QList VariantMap::keys() const { return _variantMap.keys(); @@ -102,12 +75,7 @@ QList VariantMap::keys() const QList VariantMap::values() const { - QList variantValues; - - for (const auto& value : _variantMap.values()) - variantValues << value; - - return variantValues; + return _variantMap.values(); } VariantProxy& VariantMap::operator[](const QString& key) @@ -117,15 +85,15 @@ VariantProxy& VariantMap::operator[](const QString& key) return _variantProxy; } - QVariant VariantMap::operator[](const QString& key) const { - return VariantProxy(key, const_cast(&_variantMap)).get(); + return VariantProxy(key, const_cast(this)).get(); } VariantMap VariantMap::operator=(const VariantMap& other) { - _variantMap = other._variantMap; + _variantMap = other._variantMap; + _variantProxy = other._variantProxy; return *this; } @@ -138,30 +106,19 @@ VariantMap VariantMap::operator=(const QVariantMap& variantMap) return *this; } -QVariantMap VariantMap::getVariantMap() const +QVariantMap& VariantMap::get() { - QVariantMap variantMap; - - for (const auto& key : _variantMap.keys()) - variantMap[key] = _variantMap[key]; - - return variantMap; + return _variantMap; } -void VariantMap::initialize() +const QVariantMap& VariantMap::get() const { - //_variantMap["SerializationVersion"] = QVariant::fromValue(_version); + return _variantMap; } -QVariant VariantMap::converted() const +void VariantMap::initialize() { - for (const auto& variant : _variantMap.values()) { - qDebug() << variant.typeName(); - if (variant.typeName() == "QStringList") - qDebug() << "Found a string list!"; - } - - return getVariantMap(); + //_variantMap["SerializationVersion"] = QVariant::fromValue(_version); } QVariant VariantMap::toVariant() const @@ -169,14 +126,14 @@ QVariant VariantMap::toVariant() const return _variantMap; } -VariantMap::operator QVariantMap() const +VariantMap::operator QVariant() const { - return getVariantMap(); + return get(); } -VariantMap::operator QVariant() const +VariantMap::operator QVariantMap() const { - return converted(); + return get(); } } diff --git a/ManiVault/src/util/VariantMap.h b/ManiVault/src/util/VariantMap.h index 325fddc1d..07432a844 100644 --- a/ManiVault/src/util/VariantMap.h +++ b/ManiVault/src/util/VariantMap.h @@ -17,66 +17,56 @@ namespace mv { /** * TODO * - * @author Thomas Kroes + * @author Thomas Kroes & Jeroen Eggermont */ class VariantMap final { -public: - - - public: VariantMap(); + VariantMap(const QVariantMap& variantMap); VariantMap(std::initializer_list> list); - VariantMap(const std::map& other); - VariantMap(std::map&& other); - VariantMap(const QVariantMap& other); - VariantMap(QVariantMap&& other); std::uint32_t getVersion() const; bool contains(const QString& key) const; QVariantMap::size_type count(const QString& key) const; - QVariantMap::size_type count() const; - QVariantMap::iterator insert(const QString& key, const QVariant& value); - - //QVariantMap::iterator insert(QVariantMap::const_iterator pos, const QString& key, const QVariant& value) { - // return _variantMap.insert(pos, key, value); - //} +public: // Insertion + QVariantMap::iterator insert(const QString& key, const QVariant& value); void insert(const QVariantMap& map); - void insert(QVariantMap&& map); +public: // keys, values QList keys() const; - QList values() const; +public: + VariantProxy& operator[](const QString& key); QVariant operator[](const QString& key) const; - VariantMap operator=(const VariantMap& other); + VariantMap operator=(const VariantMap& other); VariantMap operator=(const QVariantMap& variantMap); - operator QVariant () const; +public: // Conversion operators + operator QVariant () const; operator QVariantMap () const; QVariant toVariant() const; protected: - QVariantMap getVariantMap() const; + QVariantMap& get(); + const QVariantMap& get() const; private: - QVariant converted() const; - /** Add serialization version etc. */ void initialize(); @@ -87,6 +77,7 @@ class VariantMap final static const QString serializationVersionKey; + friend class VariantProxy; friend class mv::util::Serializable; }; diff --git a/ManiVault/src/util/VariantProxy.cpp b/ManiVault/src/util/VariantProxy.cpp index b6eadf091..8db120355 100644 --- a/ManiVault/src/util/VariantProxy.cpp +++ b/ManiVault/src/util/VariantProxy.cpp @@ -11,17 +11,16 @@ namespace mv { -VariantProxy::VariantProxy(const QString& key, QVariantMap* variantMap) : +VariantProxy::VariantProxy(const QString& key, VariantMap* variantMap) : _key(key), _variantMap(variantMap) { - Q_ASSERT(_variantMap); } -VariantProxy::VariantProxy(QVariantMap* variantMap) : +VariantProxy::VariantProxy(VariantMap* variantMap) : + _key(), _variantMap(variantMap) { - Q_ASSERT(_variantMap); } VariantProxy::VariantProxy(const VariantProxy& other) : @@ -46,50 +45,55 @@ VariantProxy& VariantProxy::operator=(const VariantProxy& rhs) VariantProxy VariantProxy::operator=(const VariantMap& rhs) { - Q_ASSERT(!_variantMap->contains(_key)); + Q_ASSERT(!_variantMap->get().contains(_key)); - (*_variantMap)[_key] = rhs.toVariant(); + _variantMap->get()[_key] = rhs.toVariant(); return *this; } VariantProxy VariantProxy::operator=(const QVariant& rhs) { - Q_ASSERT(!_variantMap->contains(_key)); + Q_ASSERT(!_variantMap->get().contains(_key)); #ifdef VARIANT_PROXY_VERBOSE qDebug() << __FUNCTION__ << _key; #endif - (*_variantMap)[_key] = rhs; + _variantMap->get()[_key] = rhs; return *this; } VariantProxy VariantProxy::operator=(const QVariantList& rhs) { - Q_ASSERT(!_variantMap->contains(_key)); + Q_ASSERT(!_variantMap->get().contains(_key)); #ifdef VARIANT_PROXY_VERBOSE qDebug() << __FUNCTION__ << _key; #endif - (*_variantMap)[_key] = rhs; + _variantMap->get()[_key] = rhs; return *this; } VariantProxy VariantProxy::operator=(const QVariantMap& rhs) { - Q_ASSERT(!_variantMap->contains(_key)); + Q_ASSERT(!_variantMap->get().contains(_key)); #ifdef VARIANT_PROXY_VERBOSE qDebug() << __FUNCTION__ << _key; #endif - (*_variantMap)[_key] = rhs; + _variantMap->get()[_key] = rhs; return *this; } +QVariant VariantProxy::get() const +{ + return _variantMap->get()[_key]; +} + } diff --git a/ManiVault/src/util/VariantProxy.h b/ManiVault/src/util/VariantProxy.h index 19e961884..381153a60 100644 --- a/ManiVault/src/util/VariantProxy.h +++ b/ManiVault/src/util/VariantProxy.h @@ -20,9 +20,9 @@ class VariantMap; * * This class acts a proxy for modifying QVariant data in a \p QVariantMap located * elsewhere. It does not contain the actual QVariant data, it merely uses a key and - * a reference to a \p QVariantMap to modify it. + * a reference to a ManiVault \p VariantMap to modify it. * - * @author Thomas Kroes + * @author Thomas Kroes & Jeroen Eggermont */ class VariantProxy { @@ -35,21 +35,21 @@ class VariantProxy VariantProxy(const VariantProxy& other); /** - * Initialize with current \p key and pointer to \p variantMap + * Initialize with current \p key and pointer to owning \p variantMap * @param key Key of the \p QVariant to modify in VariantProxy#_variantMap - * @param variantMap Pointer to the external \p QVariantMap that we want to modify + * @param variantMap Pointer to the owning ManiVault VariantMap */ - VariantProxy(const QString& key, QVariantMap* variantMap); + VariantProxy(const QString& key, VariantMap* variantMap); /** - * Initialize with pointer to \p variantMap - * @param variantMap Pointer to the external \p QVariantMap that we want to modify + * Initialize with pointer to owning ManiVault \p variantMap + * @param variantMap Pointer to the owning ManiVault VariantMap */ - VariantProxy(QVariantMap* variantMap); + VariantProxy(VariantMap* variantMap); /** * Sets current key to \p key - * @param key Key of the \p QVariant to modify in VariantProxy#_variantMap + * @param key Key of the \p QVariant to modify in VariantMap#_variantMap */ void setKey(const QString& key); @@ -57,13 +57,13 @@ class VariantProxy /** * Assign \p rhs ManiVault variant proxy - * @param rhs Other variant proxy + * @param rhs Other ManiVault variant proxy */ VariantProxy& operator=(const VariantProxy& rhs); /** * Assign \p rhs ManiVault variant map - * @param rhs Other variant map + * @param rhs Other ManiVault variant map */ VariantProxy operator=(const VariantMap& rhs); @@ -87,15 +87,17 @@ class VariantProxy protected: - QVariant get() const { - return (*_variantMap)[_key]; - } + /** + * Get the proxy as a QVariant + * @return Proxy as QVariant + */ + QVariant get() const; private: - QString _key; /** Key of the \p QVariant to modify in VariantProxy#_variantMap */ - QVariantMap* _variantMap; /** Pointer to the external \p QVariantMap that we want to modify */ + QString _key; /** Key of the \p QVariant to modify in VariantMap#_variantMap */ + VariantMap* _variantMap; /** Pointer to owning ManiVault variant map */ - friend class mv::VariantMap; + friend class VariantMap; }; }