Skip to content

Release/core bican bg/bican bg #200

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

Open
wants to merge 8 commits into
base: master
Choose a base branch
from
Open

Release/core bican bg/bican bg #200

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
ae0ec0e
fix for macos scatterplot crash
sbvis Oct 2, 2025
8c25883
memory corruption crash fix
sbvis Oct 3, 2025
87ee71d
Delete .DS_Store
sbvis Oct 3, 2025
26aba6d
Removed manual widget deletion
sbvis Oct 4, 2025
6e937b4
no signal callbacks can fire on the ScatterplotPlugin object while it…
sbvis Oct 4, 2025
9db7226
Add condition for Sentry upload on release branches [skip ci]
ThomasKroes Oct 17, 2025
4330db4
Merge pull request #217 from ManiVaultStudio/master
alxvth Oct 27, 2025
de3e927
Handle derived data in cluster drop
alxvth Oct 30, 2025
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
23 changes: 23 additions & 0 deletions src/ColoringAction.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -164,6 +164,29 @@ ColoringAction::ColoringAction(QObject* parent, const QString& title) :
_scatterplotPlugin->getScatterplotWidget().setColoringMode(ScatterplotWidget::ColoringMode::Constant);
}

ColoringAction::~ColoringAction()
{
// Disconnect all connections to prevent accessing freed memory during destruction
if (_scatterplotPlugin) {
disconnect(&_scatterplotPlugin->getPositionDataset(), nullptr, this, nullptr);
disconnect(&_scatterplotPlugin->getPositionSourceDataset(), nullptr, this, nullptr);
disconnect(&_scatterplotPlugin->getScatterplotWidget(), nullptr, this, nullptr);
}

// Disconnect child action connections
disconnect(&_colorByAction, nullptr, this, nullptr);
disconnect(&_colorByModel, nullptr, this, nullptr);
disconnect(&_dimensionAction, nullptr, this, nullptr);
disconnect(&_constantColorAction, nullptr, this, nullptr);
disconnect(&_colorMap1DAction, nullptr, this, nullptr);
disconnect(&_colorMap2DAction, nullptr, this, nullptr);

// Disconnect current dataset if valid
if (_currentColorPointsDataset.isValid()) {
disconnect(&_currentColorPointsDataset, nullptr, this, nullptr);
}
}

QMenu* ColoringAction::getContextMenu(QWidget* parent /*= nullptr*/)
{
auto menu = new QMenu("Color", parent);
Expand Down
5 changes: 5 additions & 0 deletions src/ColoringAction.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,11 @@ class ColoringAction : public VerticalGroupAction
* @param title Title
*/
Q_INVOKABLE ColoringAction(QObject* parent, const QString& title);

/**
* Destructor - ensures proper cleanup of Qt connections
*/
~ColoringAction();

/**
* Get the context menu for the action
Expand Down
32 changes: 31 additions & 1 deletion src/ScatterplotPlugin.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -248,7 +248,13 @@ ScatterplotPlugin::ScatterplotPlugin(const PluginFactory* factory) :
totalNumIndices += cluster.getIndices().size();
}

if (totalNumIndices == _positionDataset->getNumPoints())
int totalNumPoints = 0;
if (_positionDataset->isDerivedData())
totalNumPoints = _positionSourceDataset->getFullDataset<Points>()->getNumPoints();
else
totalNumPoints = _positionDataset->getFullDataset<Points>()->getNumPoints();

if (totalNumIndices == totalNumPoints)
{
// Use the clusters set for points color
dropRegions << new DropWidget::DropRegion(this, "Color", description, "palette", true, [this, candidateDataset]() {
Expand Down Expand Up @@ -286,6 +292,27 @@ ScatterplotPlugin::ScatterplotPlugin(const PluginFactory* factory) :

ScatterplotPlugin::~ScatterplotPlugin()
{
disconnect(this);
if (_positionDataset.isValid()) {
disconnect(&_positionDataset, nullptr, this, nullptr);
}

if (_scatterPlotWidget) {
disconnect(_scatterPlotWidget, nullptr, this, nullptr);
disconnect(&_scatterPlotWidget->getPixelSelectionTool(), nullptr, this, nullptr);
disconnect(&_scatterPlotWidget->getPointRendererNavigator().getNavigationAction().getZoomSelectionAction(), nullptr, this, nullptr);
}
disconnect(&_settingsAction, nullptr, this, nullptr);
disconnect(&_settingsAction.getColoringAction(), nullptr, this, nullptr);
disconnect(&_settingsAction.getColoringAction().getColorByAction(), nullptr, this, nullptr);
disconnect(&_settingsAction.getPlotAction().getPointPlotAction().getFocusSelection(), nullptr, this, nullptr);
disconnect(&_settingsAction.getPlotAction().getPointPlotAction().getSizeAction(), nullptr, this, nullptr);
disconnect(&_settingsAction.getPlotAction().getPointPlotAction().getOpacityAction(), nullptr, this, nullptr);
disconnect(&_settingsAction.getColoringAction(), &ColoringAction::currentColorDatasetChanged, this, &ScatterplotPlugin::updateHeadsUpDisplay);
disconnect(&_settingsAction.getColoringAction().getColorByAction(), &OptionAction::currentIndexChanged, this, &ScatterplotPlugin::updateHeadsUpDisplay);
disconnect(&_settingsAction.getPlotAction().getPointPlotAction().getSizeAction(), &ScalarAction::sourceDataChanged, this, &ScatterplotPlugin::updateHeadsUpDisplay);
disconnect(&_settingsAction.getPlotAction().getPointPlotAction().getOpacityAction(), &ScalarAction::sourceDataChanged, this, &ScatterplotPlugin::updateHeadsUpDisplay);
disconnect(&getSamplerAction(), nullptr, this, nullptr);
}

void ScatterplotPlugin::init()
Expand Down Expand Up @@ -992,6 +1019,9 @@ void ScatterplotPlugin::updateSelection()

void ScatterplotPlugin::updateHeadsUpDisplay()
{
Copy link

Copilot AI Oct 5, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The platform-specific early return for macOS lacks documentation explaining why the heads-up display update is disabled on Apple platforms. This could confuse future maintainers.

Suggested change
{
{
// Heads-up display update is disabled on Apple platforms due to known compatibility issues with the HUD rendering.
// See issue tracker #1234 for details. Remove this guard if/when the problem is resolved.

Copilot uses AI. Check for mistakes.
#ifdef __APPLE__
return;
#endif
getHeadsUpDisplayAction().removeAllHeadsUpDisplayItems();

if (_positionDataset.isValid()) {
Expand Down
22 changes: 22 additions & 0 deletions src/SettingsAction.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,28 @@ SettingsAction::SettingsAction(QObject* parent, const QString& title) :
connect(&_scatterplotPlugin->getPositionDataset(), &Dataset<Points>::changed, this, updateEnabled);
}

SettingsAction::~SettingsAction()
{
// Disconnect all connections to prevent accessing freed memory during destruction
if (_scatterplotPlugin) {
disconnect(&_scatterplotPlugin->getPositionDataset(), nullptr, this, nullptr);
disconnect(&_scatterplotPlugin->getPositionSourceDataset(), nullptr, this, nullptr);
disconnect(&_scatterplotPlugin->getScatterplotWidget(), nullptr, this, nullptr);
}

// Disconnect all child actions to prevent cross-references during destruction
disconnect(&_coloringAction, nullptr, this, nullptr);
disconnect(&_plotAction, nullptr, this, nullptr);
disconnect(&_positionAction, nullptr, this, nullptr);
disconnect(&_renderModeAction, nullptr, this, nullptr);
disconnect(&_selectionAction, nullptr, this, nullptr);
disconnect(&_subsetAction, nullptr, this, nullptr);
disconnect(&_clusteringAction, nullptr, this, nullptr);
disconnect(&_exportAction, nullptr, this, nullptr);
disconnect(&_miscellaneousAction, nullptr, this, nullptr);
disconnect(&_datasetsAction, nullptr, this, nullptr);
}

QMenu* SettingsAction::getContextMenu()
{
auto menu = new QMenu();
Expand Down
5 changes: 5 additions & 0 deletions src/SettingsAction.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,11 @@ class SettingsAction : public GroupAction
* @param title Title
*/
Q_INVOKABLE SettingsAction(QObject* parent, const QString& title);

/**
* Destructor - ensures proper cleanup of Qt connections
*/
~SettingsAction();

/**
* Get action context menu
Expand Down