Fix crash at startup when opening a file from commandline

App would query if render plugins had options too early Added separate method (vs. checking for nullptr) Fix OpenChemistry#1617 Signed-off-by: Geoff Hutchison <geoff.hutchison@gmail.com>
ghutchis · Feb 16, 2024 · 237adcf · 237adcf
1 parent dfbd6f6
commit 237adcf
Show file tree

Hide file tree

Showing 10 changed files with 46 additions and 18 deletions.
diff --git a/avogadro/qtgui/sceneplugin.h b/avogadro/qtgui/sceneplugin.h
@@ -77,13 +77,26 @@ class AVOGADROQTGUI_EXPORT ScenePlugin : public QObject
    */
   virtual void setEnabled(bool enable);
 
+  /**
+   * @return the widget for plugin settings (e.g., colors, widths, etc.)
+   */
   virtual QWidget* setupWidget();
+  /**
+   * This method exists to query without creating the widget.
+   * @return true if the plugin has a setup widget
+   */
+  virtual bool hasSetupWidget() const { return false; }
 
   /**
-  * Returns if this plugin should be considered in the default behavior,
-  * or it should reset to true or false.
-  */
-  enum DefaultBehavior { Ignore, False, True };
+   * Returns if this plugin should be considered in the default behavior,
+   * or it should reset to true or false.
+   */
+  enum DefaultBehavior
+  {
+    Ignore,
+    False,
+    True
+  };
   virtual DefaultBehavior defaultBehavior() const { return Ignore; }
 
 signals:

diff --git a/avogadro/qtgui/scenepluginmodel.cpp b/avogadro/qtgui/scenepluginmodel.cpp
@@ -86,7 +86,7 @@ QVariant ScenePluginModel::data(const QModelIndex& index_, int role) const
     switch (role) {
       case Qt::DisplayRole:
       case Qt::EditRole:
-        return (item->setupWidget() != nullptr) ? "•••" : " ";
+        return (item->hasSetupWidget()) ? "•••" : " ";
       case Qt::ToolTipRole:
       case Qt::WhatsThisRole:
         return tr("Settings");

diff --git a/avogadro/qtplugins/ballandstick/ballandstick.h b/avogadro/qtplugins/ballandstick/ballandstick.h
@@ -34,6 +34,7 @@ class BallAndStick : public QtGui::ScenePlugin
   }
 
   QWidget* setupWidget() override;
+  bool hasSetupWidget() const override { return true; }
 
   DefaultBehavior defaultBehavior() const override
   {

diff --git a/avogadro/qtplugins/cartoons/cartoons.h b/avogadro/qtplugins/cartoons/cartoons.h
@@ -27,14 +27,18 @@ class Cartoons : public QtGui::ScenePlugin
   void process(const QtGui::Molecule& molecule,
                Rendering::GroupNode& node) override;
 
-  QString name() const override { return tr("Cartoons", "protein ribbon / cartoon rendering"); }
+  QString name() const override
+  {
+    return tr("Cartoons", "protein ribbon / cartoon rendering");
+  }
 
   QString description() const override
   {
     return tr("Display of biomolecule ribbons / cartoons.");
   }
 
   QWidget* setupWidget() override;
+  bool hasSetupWidget() const override { return true; }
 
   DefaultBehavior defaultBehavior() const override
   {

diff --git a/avogadro/qtplugins/closecontacts/closecontacts.h b/avogadro/qtplugins/closecontacts/closecontacts.h
@@ -27,14 +27,18 @@ class CloseContacts : public QtGui::ScenePlugin
   void process(const QtGui::Molecule& molecule,
                Rendering::GroupNode& node) override;
 
-  QString name() const override { return tr("Close Contacts", "rendering of non-covalent close contacts"); }
+  QString name() const override
+  {
+    return tr("Close Contacts", "rendering of non-covalent close contacts");
+  }
 
   QString description() const override
   {
     return tr("Render close contacts between atoms.");
   }
-  
+
   QWidget* setupWidget() override;
+  bool hasSetupWidget() const override { return true; }
 
   DefaultBehavior defaultBehavior() const override
   {
@@ -47,10 +51,10 @@ public slots:
 
 private:
   std::string m_name = "Close Contacts";
-  
-  const std::array<QString, 3> INTERACTION_NAMES = {
-	tr("Contact"), tr("Salt Bridge"), tr("Repulsive")
-  };
+
+  const std::array<QString, 3> INTERACTION_NAMES = { tr("Contact"),
+                                                     tr("Salt Bridge"),
+                                                     tr("Repulsive") };
 
   std::array<double, 3> m_maximumDistances;
   std::array<Vector3ub, 3> m_lineColors;

diff --git a/avogadro/qtplugins/crystal/crystalscene.h b/avogadro/qtplugins/crystal/crystalscene.h
@@ -36,6 +36,7 @@ class CrystalScene : public QtGui::ScenePlugin
   }
 
   QWidget* setupWidget() override;
+  bool hasSetupWidget() const override { return true; }
 
 private slots:
   void setColor(const QColor& color);

diff --git a/avogadro/qtplugins/label/label.h b/avogadro/qtplugins/label/label.h
@@ -30,6 +30,8 @@ class Label : public QtGui::ScenePlugin
   }
 
   QWidget* setupWidget() override;
+  bool hasSetupWidget() const override { return true; }
+
   void process(const QtGui::Molecule& molecule,
                Rendering::GroupNode& node) override;
 

diff --git a/avogadro/qtplugins/meshes/meshes.h b/avogadro/qtplugins/meshes/meshes.h
@@ -31,6 +31,7 @@ class Meshes : public QtGui::ScenePlugin
   QString description() const override { return tr("Render polygon meshes."); }
 
   QWidget* setupWidget() override;
+  bool hasSetupWidget() const override { return true; }
 
   DefaultBehavior defaultBehavior() const override
   {

diff --git a/avogadro/qtplugins/noncovalent/noncovalent.h b/avogadro/qtplugins/noncovalent/noncovalent.h
@@ -33,8 +33,9 @@ class NonCovalent : public QtGui::ScenePlugin
   {
     return tr("Render a few non-covalent interactions.");
   }
-  
+
   QWidget* setupWidget() override;
+  bool hasSetupWidget() const override { return true; }
 
   DefaultBehavior defaultBehavior() const override
   {
@@ -48,11 +49,11 @@ public slots:
 
 private:
   const std::string m_name = "Non-Covalent";
-  
-  const std::array<QString, 3> INTERACTION_NAMES = {
-	tr("Hydrogen"), tr("Halogen"), tr("Chalcogen")
-  };
-  
+
+  const std::array<QString, 3> INTERACTION_NAMES = { tr("Hydrogen"),
+                                                     tr("Halogen"),
+                                                     tr("Chalcogen") };
+
   std::array<double, 3> m_angleTolerancesDegrees;
   std::array<double, 3> m_maximumDistances;
   std::array<Vector3ub, 3> m_lineColors;

diff --git a/avogadro/qtplugins/wireframe/wireframe.h b/avogadro/qtplugins/wireframe/wireframe.h
@@ -33,6 +33,7 @@ class Wireframe : public QtGui::ScenePlugin
   }
 
   QWidget* setupWidget() override;
+  bool hasSetupWidget() const override { return true; }
 
   DefaultBehavior defaultBehavior() const override
   {