Skip to content

Ffix opacity selection for non descendants #245

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
sbvis merged 2 commits into from
Jul 21, 2026
Merged

Ffix opacity selection for non descendants #245

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
09914e2
Set current point dataset when opacity dataset changed
ThomasKroes Jul 21, 2026
004ae93
Add extra null guard
ThomasKroes Jul 21, 2026
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
4 changes: 4 additions & 0 deletions src/PointPlotAction.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -162,6 +162,10 @@ void PointPlotAction::initialize(ScatterplotPlugin* scatterplotPlugin)
connect(&_opacityAction, &ScalarAction::magnitudeChanged, this, &PointPlotAction::updateScatterPlotWidgetPointOpacityScalars);
connect(&_opacityAction, &ScalarAction::offsetChanged, this, &PointPlotAction::updateScatterPlotWidgetPointOpacityScalars);
connect(&_opacityAction, &ScalarAction::sourceSelectionChanged, this, &PointPlotAction::updateScatterPlotWidgetPointOpacityScalars);
connect(&_opacityAction.getSourceDatasetPickerAction(), &DatasetPickerAction::datasetPicked, this, [this](Dataset<> picked) -> void {
setCurrentPointOpacityDataset(Dataset<DatasetImpl>(picked));
});

connect(&_opacityAction, &ScalarAction::sourceDataChanged, this, &PointPlotAction::updateScatterPlotWidgetPointOpacityScalars);
connect(&_opacityAction, &ScalarAction::scalarRangeChanged, this, &PointPlotAction::updateScatterPlotWidgetPointOpacityScalars);
}
Expand Down
13 changes: 8 additions & 5 deletions src/ScalarAction.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,13 +29,16 @@ ScalarAction::ScalarAction(QObject* parent, const QString& title, const float& m
if (auto scatterplotPlugin = dynamic_cast<ScatterplotPlugin*>(findPluginAncestor())) {
auto positionDataset = scatterplotPlugin->getPositionDataset();
auto scalarSourcePointsDataset = Dataset<Points>(getCurrentDataset());
const auto numScalars = scalarSourcePointsDataset->getNumPoints();
const auto numPositions = positionDataset->getNumPoints();

if (numScalars != numPositions) {
emitSourceSelectionChanged = false;
if (scalarSourcePointsDataset.isValid() && positionDataset.isValid()) {
const auto numScalars = scalarSourcePointsDataset->getNumPoints();
const auto numPositions = positionDataset->getNumPoints();

scatterplotPlugin->addNotification(QString("The number of points in the scalar source dataset does not match the number of points in the position dataset. (numPositions=%1, numScalars:%2)").arg(QString::number(numPositions), QString::number(numScalars)));
if (numScalars != numPositions) {
emitSourceSelectionChanged = false;

scatterplotPlugin->addNotification(QString("The number of points in the scalar source dataset does not match the number of points in the position dataset. (numPositions=%1, numScalars:%2)").arg(QString::number(numPositions), QString::number(numScalars)));
}
}
}
} else {
Expand Down
Loading