Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
45 changes: 34 additions & 11 deletions src/ScatterplotPlugin.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -288,6 +288,8 @@ ScatterplotPlugin::ScatterplotPlugin(const PluginFactory* factory) :
getLearningCenterAction().addVideos(QStringList({ "Practitioner", "Developer" }));

setOverlayActionsTargetWidget(_scatterPlotWidget);

connect(&mv::projects(), &AbstractProjectManager::projectOpened, this, &ScatterplotPlugin::updateHeadsUpDisplay);
}

ScatterplotPlugin::~ScatterplotPlugin()
Expand Down Expand Up @@ -342,9 +344,6 @@ void ScatterplotPlugin::init()
connect(&_positionDataset, &Dataset<>::guiNameChanged, this, &ScatterplotPlugin::updateHeadsUpDisplay);

const auto currentColorDatasetChanged = [this](Dataset<DatasetImpl> currentColorDataset) -> void {
if (_colorDataset == currentColorDataset)
return;

if (_colorDataset.isValid())
disconnect(&_colorDataset, &Dataset<>::guiNameChanged, this, nullptr);

Expand All @@ -360,8 +359,35 @@ void ScatterplotPlugin::init()
currentColorDatasetChanged(_settingsAction.getColoringAction().getCurrentColorDataset());
});

connect(&_settingsAction.getPlotAction().getPointPlotAction().getSizeAction(), &ScalarAction::sourceDataChanged, this, &ScatterplotPlugin::updateHeadsUpDisplay);
connect(&_settingsAction.getPlotAction().getPointPlotAction().getOpacityAction(), &ScalarAction::sourceDataChanged, this, &ScatterplotPlugin::updateHeadsUpDisplay);
const auto currentPointSizeDatasetChanged = [this]() -> void {
auto currentPointSizeDataset = _settingsAction.getPlotAction().getPointPlotAction().getSizeAction().getCurrentDataset();

if (_pointSizeDataset.isValid())
disconnect(&_pointSizeDataset, &Dataset<>::guiNameChanged, this, nullptr);

_pointSizeDataset = currentPointSizeDataset;

connect(&_pointSizeDataset, &Dataset<>::guiNameChanged, this, &ScatterplotPlugin::updateHeadsUpDisplay);

updateHeadsUpDisplay();
};

connect(&_settingsAction.getPlotAction().getPointPlotAction().getSizeAction(), &ScalarAction::sourceSelectionChanged, this, currentPointSizeDatasetChanged);

const auto currentPointOpacityDatasetChanged = [this]() -> void {
auto currentPointOpacityDataset = _settingsAction.getPlotAction().getPointPlotAction().getOpacityAction().getCurrentDataset();

if (_pointOpacityDataset.isValid())
disconnect(&_pointOpacityDataset, &Dataset<>::guiNameChanged, this, nullptr);

_pointOpacityDataset = currentPointOpacityDataset;

connect(&_pointOpacityDataset, &Dataset<>::guiNameChanged, this, &ScatterplotPlugin::updateHeadsUpDisplay);

updateHeadsUpDisplay();
};

connect(&_settingsAction.getPlotAction().getPointPlotAction().getOpacityAction(), &ScalarAction::sourceSelectionChanged, this, currentPointOpacityDatasetChanged);

connect(&_settingsAction.getMiscellaneousAction().getBackgroundColorAction(), &ColorAction::colorChanged, this, &ScatterplotPlugin::updateHeadsUpDisplayTextColor);

Expand Down Expand Up @@ -1016,6 +1042,9 @@ void ScatterplotPlugin::updateSelection()

void ScatterplotPlugin::updateHeadsUpDisplay()
{
if (mv::projects().isOpeningProject())
return;

getHeadsUpDisplayAction().removeAllHeadsUpDisplayItems();

if (_positionDataset.isValid()) {
Expand All @@ -1033,7 +1062,6 @@ void ScatterplotPlugin::updateHeadsUpDisplay()

addMetaDataToHeadsUpDisplay("Size", _settingsAction.getPlotAction().getPointPlotAction().getSizeAction().getCurrentDataset(), datasetsItem);
addMetaDataToHeadsUpDisplay("Opacity", _settingsAction.getPlotAction().getPointPlotAction().getOpacityAction().getCurrentDataset(), datasetsItem);

} else {
getHeadsUpDisplayAction().addHeadsUpDisplayItem("No datasets loaded", "", "");
}
Expand Down Expand Up @@ -1065,12 +1093,7 @@ void ScatterplotPlugin::fromVariantMap(const QVariantMap& variantMap)
_primaryToolbarAction.fromParentVariantMap(variantMap);
_settingsAction.fromParentVariantMap(variantMap);

updateHeadsUpDisplay();

if (pointRenderer.getNavigator().getNavigationAction().getSerializationCountFrom() == 0) {
qDebug() << "Resetting view";


_scatterPlotWidget->update();
}

Expand Down
4 changes: 3 additions & 1 deletion src/ScatterplotPlugin.h
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,9 @@ class ScatterplotPlugin : public ViewPlugin
ScatterplotWidget* _scatterPlotWidget; /** The visualization widget */
Dataset<Points> _positionDataset; /** Smart pointer to points dataset for point position */
Dataset<Points> _positionSourceDataset; /** Smart pointer to source of the points dataset for point position (if any) */
Dataset<DatasetImpl> _colorDataset; /** Smart pointer to dataset used for coloring (if any) */
Dataset<DatasetImpl> _colorDataset; /** Smart pointer to dataset used for coloring (if any) */
Dataset<DatasetImpl> _pointSizeDataset; /** Smart pointer to dataset for driving point size (if any) */
Dataset<DatasetImpl> _pointOpacityDataset; /** Smart pointer to dataset for driving point opacity (if any) */
std::vector<mv::Vector2f> _positions; /** Point positions */
unsigned int _numPoints; /** Number of point positions */
SettingsAction _settingsAction; /** Group action for all settings */
Expand Down