Add ManiVault variant map for serialization

ManiVault/cmake/CMakeMvSourcesPublic.cmake

@@ -486,6 +486,8 @@ set(PUBLIC_UTIL_HEADERS
     src/util/Version.h
     src/util/DockWidgetPermission.h
     src/util/NumericalRange.h
+    src/util/VariantProxy.h
+    src/util/VariantMap.h
 )
 
 if(APPLE)
@@ -530,6 +532,8 @@ set(PUBLIC_UTIL_SOURCES
     src/util/Version.cpp
     src/util/DockWidgetPermission.cpp
     src/util/NumericalRange.cpp
+    src/util/VariantProxy.cpp
+    src/util/VariantMap.cpp
 )
 
 if(APPLE)

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:
 

ManiVault/src/AbstractDataManager.h

@@ -389,4 +389,4 @@ class AbstractDataManager : public AbstractManager
     friend class RawDataModel;
 };
 
-}
+}

ManiVault/src/AbstractTaskTester.cpp

@@ -25,4 +25,4 @@ QStringList AbstractTaskTester::getTesterNames()
     return testerNames;
 }
 
-}
+}

ManiVault/src/AbstractTaskTester.h

@@ -32,4 +32,4 @@ class AbstractTaskTester : public QObject
     static QStringList testerNames;
 };
 
-}
+}

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

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 */

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 */
 };
 
-}
+}

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;
 

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*>("mv::DataHierarchyItem");
+inline const auto dataHierarchyItemMetaTypeId = qRegisterMetaType<mv::DataHierarchyItem*>("mv::DataHierarchyItem");

ManiVault/src/DatasetsMimeData.cpp

@@ -27,4 +27,4 @@ QString DatasetsMimeData::format()
     return "application/datasets";
 }
 
-}
+}

ManiVault/src/DatasetsMimeData.h

@@ -46,4 +46,4 @@ class DatasetsMimeData final : public QMimeData
     Datasets    _datasets;     /** Mime data datasets */
 };
 
-}
+}

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::uint32_t, std::vector<std::uint32_t>>;
     std::vector<std::uint32_t> 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());

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<DatasetImpl>    _sourceDataSet;

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

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
 

ManiVault/src/PluginType.cpp

@@ -38,4 +38,4 @@ QIcon getPluginTypeIcon(const Type& type)
     return typeNames[type];
 }
 
-}
+}

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

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:
 

ManiVault/src/ProjectCompressionAction.cpp

@@ -28,17 +28,17 @@ ProjectCompressionAction::ProjectCompressionAction(QObject* parent /*= nullptr*/
     updateCompressionLevelReadOnly();
 }
 
-void ProjectCompressionAction::fromVariantMap(const QVariantMap& variantMap)
+void ProjectCompressionAction::fromVariantMap(const mv::VariantMap& variantMap)
 {
     WidgetAction::fromVariantMap(variantMap);
 
     _enabledAction.fromParentVariantMap(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);

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
 

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

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:
 

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