Merge pull request #1509 from ghutchis/fix-color-opacity

Turn off Color Opacity Map unless a VTK widget is active
OpenChemistry · Dec 7, 2023 · dfeeb77 · dfeeb77
2 parents a738694 + 6b290e3
commit dfeeb77
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 3 deletions.
diff --git a/avogadro/qtplugins/coloropacitymap/coloropacitymap.cpp b/avogadro/qtplugins/coloropacitymap/coloropacitymap.cpp
@@ -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>
@@ -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)
@@ -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);
@@ -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();

diff --git a/avogadro/qtplugins/coloropacitymap/coloropacitymap.h b/avogadro/qtplugins/coloropacitymap/coloropacitymap.h
@@ -31,6 +31,8 @@ public slots:
 
   void moleculeChanged(unsigned int changes);
 
+  void setActiveWidget(QWidget* widget) override;
+
 private slots:
   void updateActions();
 
@@ -48,6 +50,7 @@ private slots:
   HistogramWidget* m_histogramWidget = nullptr;
   QScopedPointer<QAction> m_displayDialogAction;
 
+  bool m_vtkWidget = false;
   QWidget* m_activeWidget = nullptr;
 };