Skip to content
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

Jump to bottom

Turn off Color Opacity Map unless a VTK widget is active #1509

Merged
merged 1 commit into from Dec 7, 2023
Merged

Turn off Color Opacity Map unless a VTK widget is active #1509

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
21 changes: 18 additions & 3 deletions avogadro/qtplugins/coloropacitymap/coloropacitymap.cpp
View file
Open in desktop
Expand Up @@ -8,10 +8,10 @@
#include "histogramwidget.h"

#include <QAction>
#include <QDebug>
#include <QDialog>
#include <QMessageBox>
#include <QString>
#include <QDebug>

#include <avogadro/core/crystaltools.h>
#include <avogadro/core/cube.h>
Expand Down Expand Up @@ -84,6 +84,18 @@ QStringList ColorOpacityMap::menuPath(QAction*) const
return QStringList() << tr("&Extensions");
}

void ColorOpacityMap::setActiveWidget(QWidget* widget)
{
auto vtkWidget = qobject_cast<VTK::vtkGLWidget*>(widget);
if (vtkWidget) {
m_vtkWidget = true;
updateActions();
} else {
m_vtkWidget = false;
updateActions();
}
}

void ColorOpacityMap::setMolecule(QtGui::Molecule* mol)
{
if (m_molecule == mol)
Expand Down Expand Up @@ -114,16 +126,18 @@ void ColorOpacityMap::moleculeChanged(unsigned int c)

void ColorOpacityMap::updateActions()
{
// Just leave it enabled, if you click on it it will be empty...
foreach (QAction* action, m_actions)
action->setEnabled(true);
action->setEnabled(m_vtkWidget);
}

void ColorOpacityMap::updateHistogram()
{
auto widget = ActiveObjects::instance().activeWidget();
auto vtkWidget = qobject_cast<VTK::vtkGLWidget*>(widget);

if (vtkWidget == nullptr)
m_vtkWidget = false;

if (widget && vtkWidget && widget != m_activeWidget) {
if (m_activeWidget)
disconnect(widget, nullptr, this, nullptr);
Expand All @@ -132,6 +146,7 @@ void ColorOpacityMap::updateHistogram()
}

if (vtkWidget && m_molecule && m_molecule->cubeCount()) {
m_vtkWidget = true;
vtkNew<vtkTable> table;
auto imageData = vtkWidget->imageData();
auto lut = vtkWidget->lut();
Expand Down
3 changes: 3 additions & 0 deletions avogadro/qtplugins/coloropacitymap/coloropacitymap.h
View file
Open in desktop
Expand Up @@ -31,6 +31,8 @@ public slots:

void moleculeChanged(unsigned int changes);

void setActiveWidget(QWidget* widget) override;

private slots:
void updateActions();

Expand All @@ -48,6 +50,7 @@ private slots:
HistogramWidget* m_histogramWidget = nullptr;
QScopedPointer<QAction> m_displayDialogAction;

bool m_vtkWidget = false;
QWidget* m_activeWidget = nullptr;
};

Expand Down