Merge pull request #195 from ManiVaultStudio/master

Merge `master` into `release/core_bican_bg/bican_bg`

Author: alxvth

src/ScatterplotPlugin.cpp

@@ -262,6 +262,10 @@ ScatterplotPlugin::ScatterplotPlugin(const PluginFactory* factory) :
     getSamplerAction().getEnabledAction().setChecked(false);
 
     getLearningCenterAction().addVideos(QStringList({ "Practitioner", "Developer" }));
+
+    setOverlayActionsTargetWidget(_scatterPlotWidget);
+
+    
 }
 
 ScatterplotPlugin::~ScatterplotPlugin()
@@ -270,35 +274,23 @@ ScatterplotPlugin::~ScatterplotPlugin()
 
 void ScatterplotPlugin::init()
 {
+    getWidget().setMouseTracking(true);
+
     auto layout = new QVBoxLayout();
 
     layout->setContentsMargins(0, 0, 0, 0);
     layout->setSpacing(0);
     layout->addWidget(_primaryToolbarAction.createWidget(&getWidget()));
     layout->addWidget(_scatterPlotWidget, 100);
 
-    auto navigationWidget = new QWidget();
-    auto navigationLayout = new QHBoxLayout();
-
-    navigationLayout->setContentsMargins(4, 4, 4, 4);
-
-    navigationLayout->addStretch(1);
-    {
-        auto renderersNavigationGroupAction = new HorizontalGroupAction(this, "Navigation");
-
-        renderersNavigationGroupAction->setShowLabels(false);
-
-        renderersNavigationGroupAction->addAction(const_cast<NavigationAction*>(&_scatterPlotWidget->getPointRendererNavigator().getNavigationAction()));
+    auto& navigationAction = _scatterPlotWidget->getPointRendererNavigator().getNavigationAction();
 
-        _scatterPlotWidget->getPointRendererNavigator().getNavigationAction().setParent(&_settingsAction);
+    if (auto navigationWidget = navigationAction.createWidget(&getWidget())) {
+        layout->addWidget(navigationWidget);
+        layout->setAlignment(navigationWidget, Qt::AlignCenter);
 
-        navigationLayout->addWidget(renderersNavigationGroupAction->createWidget(&getWidget()));
+        navigationAction.setParent(&_settingsAction);
     }
-    navigationLayout->addStretch(1);
-
-    navigationWidget->setLayout(navigationLayout);
-
-    layout->addWidget(navigationWidget);
 
     getWidget().setLayout(layout);
 
@@ -375,6 +367,15 @@ void ScatterplotPlugin::init()
         return pointIndicesTableWidget;
         });
 #endif
+
+    updateHeadsUpDisplay();
+
+    connect(&_positionDataset, &Dataset<>::changed, this, &ScatterplotPlugin::updateHeadsUpDisplay);
+    connect(&_positionDataset, &Dataset<>::guiNameChanged, this, &ScatterplotPlugin::updateHeadsUpDisplay);
+    connect(&_settingsAction.getColoringAction(), &ColoringAction::currentColorDatasetChanged, this, &ScatterplotPlugin::updateHeadsUpDisplay);
+    connect(&_settingsAction.getColoringAction().getColorByAction(), &OptionAction::currentIndexChanged, this, &ScatterplotPlugin::updateHeadsUpDisplay);
+    connect(&_settingsAction.getPlotAction().getPointPlotAction().getSizeAction(), &ScalarAction::sourceDataChanged, this, &ScatterplotPlugin::updateHeadsUpDisplay);
+    connect(&_settingsAction.getPlotAction().getPointPlotAction().getOpacityAction(), &ScalarAction::sourceDataChanged, this, &ScatterplotPlugin::updateHeadsUpDisplay);
 }
 
 void ScatterplotPlugin::loadData(const Datasets& datasets)
@@ -969,6 +970,29 @@ void ScatterplotPlugin::updateSelection()
     }
 }
 
+void ScatterplotPlugin::updateHeadsUpDisplay()
+{
+    getHeadsUpDisplayAction().removeAllHeadsUpDisplayItems();
+
+    if (_positionDataset.isValid()) {
+        const auto datasetsItem = getHeadsUpDisplayAction().addHeadsUpDisplayItem("Datasets", "", "");
+
+        getHeadsUpDisplayAction().addHeadsUpDisplayItem("Position by:", _positionDataset->getGuiName(), "", datasetsItem);
+
+        auto addMetaDataToHeadsUpDisplay = [this](const QString& metaDataName, const Dataset<> data, const util::HeadsUpDisplayItemSharedPtr& itemPtr) {
+            if (data.isValid())
+                getHeadsUpDisplayAction().addHeadsUpDisplayItem(QString("%1 by:").arg(metaDataName), data->getGuiName(), "", itemPtr);
+            };
+
+        addMetaDataToHeadsUpDisplay("Color",   _settingsAction.getColoringAction().getCurrentColorDataset(), datasetsItem);
+        addMetaDataToHeadsUpDisplay("Size",    _settingsAction.getPlotAction().getPointPlotAction().getSizeAction().getCurrentDataset(), datasetsItem);
+        addMetaDataToHeadsUpDisplay("Opacity", _settingsAction.getPlotAction().getPointPlotAction().getOpacityAction().getCurrentDataset(), datasetsItem);
+
+    } else {
+        getHeadsUpDisplayAction().addHeadsUpDisplayItem("No datasets loaded", "", "");
+    }
+}
+
 void ScatterplotPlugin::fromVariantMap(const QVariantMap& variantMap)
 {
     ViewPlugin::fromVariantMap(variantMap);
@@ -982,7 +1006,7 @@ void ScatterplotPlugin::fromVariantMap(const QVariantMap& variantMap)
     _primaryToolbarAction.fromParentVariantMap(variantMap);
     _settingsAction.fromParentVariantMap(variantMap);
 
-    
+    updateHeadsUpDisplay();
 
     if (pointRenderer.getNavigator().getNavigationAction().getSerializationCountFrom() == 0) {
         qDebug() << "Resetting view";

src/ScatterplotPlugin.h

@@ -94,6 +94,8 @@ class ScatterplotPlugin : public ViewPlugin
     void updateData();
     void updateSelection();
 
+    void updateHeadsUpDisplay();
+
 public: // Serialization
 
     /**