Skip to content

Commit 49cb578

Browse files
committed
Add size and opacity to HUD
1 parent bd3f1f5 commit 49cb578

File tree

1 file changed

+12
-3
lines changed

1 file changed

+12
-3
lines changed

src/ScatterplotPlugin.cpp

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -374,6 +374,8 @@ void ScatterplotPlugin::init()
374374
connect(&_positionDataset, &Dataset<>::guiNameChanged, this, &ScatterplotPlugin::updateHeadsUpDisplay);
375375
connect(&_settingsAction.getColoringAction(), &ColoringAction::currentColorDatasetChanged, this, &ScatterplotPlugin::updateHeadsUpDisplay);
376376
connect(&_settingsAction.getColoringAction().getColorByAction(), &OptionAction::currentIndexChanged, this, &ScatterplotPlugin::updateHeadsUpDisplay);
377+
connect(&_settingsAction.getPlotAction().getPointPlotAction().getSizeAction(), &ScalarAction::sourceDataChanged, this, &ScatterplotPlugin::updateHeadsUpDisplay);
378+
connect(&_settingsAction.getPlotAction().getPointPlotAction().getOpacityAction(), &ScalarAction::sourceDataChanged, this, &ScatterplotPlugin::updateHeadsUpDisplay);
377379
}
378380

379381
void ScatterplotPlugin::loadData(const Datasets& datasets)
@@ -973,12 +975,19 @@ void ScatterplotPlugin::updateHeadsUpDisplay()
973975
getHeadsUpDisplayAction().removeAllHeadsUpDisplayItems();
974976

975977
if (_positionDataset.isValid()) {
976-
auto datasetsItem = getHeadsUpDisplayAction().addHeadsUpDisplayItem("Datasets", "", "");
978+
const auto datasetsItem = getHeadsUpDisplayAction().addHeadsUpDisplayItem("Datasets", "", "");
977979

978980
getHeadsUpDisplayAction().addHeadsUpDisplayItem("Position by:", _positionDataset->getGuiName(), "", datasetsItem);
979981

980-
if (_settingsAction.getColoringAction().getCurrentColorDataset().isValid())
981-
getHeadsUpDisplayAction().addHeadsUpDisplayItem("Color by:", _settingsAction.getColoringAction().getCurrentColorDataset()->getGuiName(), "", datasetsItem);
982+
auto addMetaDataToHeadsUpDisplay = [this](const QString& metaDataName, const Dataset<> data, const util::HeadsUpDisplayItemSharedPtr& itemPtr) {
983+
if (data.isValid())
984+
getHeadsUpDisplayAction().addHeadsUpDisplayItem(QString("%1 by:").arg(metaDataName), data->getGuiName(), "", itemPtr);
985+
};
986+
987+
addMetaDataToHeadsUpDisplay("Color", _settingsAction.getColoringAction().getCurrentColorDataset(), datasetsItem);
988+
addMetaDataToHeadsUpDisplay("Size", _settingsAction.getPlotAction().getPointPlotAction().getSizeAction().getCurrentDataset(), datasetsItem);
989+
addMetaDataToHeadsUpDisplay("Opacity", _settingsAction.getPlotAction().getPointPlotAction().getOpacityAction().getCurrentDataset(), datasetsItem);
990+
982991
} else {
983992
getHeadsUpDisplayAction().addHeadsUpDisplayItem("No datasets loaded", "", "");
984993
}

0 commit comments

Comments
 (0)