Adhere to revamped core

Author: ThomasKroes

src/ScalarAction.cpp

@@ -184,7 +184,7 @@ void ScalarAction::fromVariantMap(const QVariantMap& variantMap)
 
     _magnitudeAction.fromParentVariantMap(variantMap);
     _sourceAction.fromParentVariantMap(variantMap);
-    _sourceDatasetPickerAction.fromParentVariantMap(variantMap);
+    //_sourceDatasetPickerAction.fromParentVariantMap(variantMap);
 }
 
 QVariantMap ScalarAction::toVariantMap() const
@@ -193,7 +193,7 @@ QVariantMap ScalarAction::toVariantMap() const
 
     _magnitudeAction.insertIntoVariantMap(variantMap);
     _sourceAction.insertIntoVariantMap(variantMap);
-    _sourceDatasetPickerAction.insertIntoVariantMap(variantMap);
+    //_sourceDatasetPickerAction.insertIntoVariantMap(variantMap);
 
     return variantMap;
 }

src/ScatterplotPlugin.cpp

@@ -8,6 +8,7 @@
 
 #include <util/PixelSelectionTool.h>
 #include <util/Timer.h>
+#include <util/Serialization.h>
 
 #include <ClusterData/ClusterData.h>
 #include <ColorData/ColorData.h>

src/SettingsAction.cpp

@@ -70,8 +70,8 @@ void SettingsAction::fromVariantMap(const QVariantMap& variantMap)
     _plotAction.fromParentVariantMap(variantMap);
     _positionAction.fromParentVariantMap(variantMap);
     _coloringAction.fromParentVariantMap(variantMap);
-    _subsetAction.fromParentVariantMap(variantMap);
-    _clusteringAction.fromParentVariantMap(variantMap);
+    _subsetAction.fromParentVariantMap(variantMap, true);
+    _clusteringAction.fromParentVariantMap(variantMap, true);
     _renderModeAction.fromParentVariantMap(variantMap);
     _selectionAction.fromParentVariantMap(variantMap);
     _miscellaneousAction.fromParentVariantMap(variantMap);