Merge pull request #1588 from ghutchis/label-bug

Fix bug with incorrect Unicode characters added to labels
OpenChemistry · Feb 1, 2024 · 424f2d2 · 424f2d2
2 parents 71be4ad + debb817
commit 424f2d2
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 3 deletions.
diff --git a/avogadro/qtgui/extensionplugin.h b/avogadro/qtgui/extensionplugin.h
@@ -144,8 +144,8 @@ public slots:
   void requestActiveTool(QString toolName);
 
   /**
-   * Request a specific display type (or types) are active, and all others are
-   * disabled. This can be useful when loading a specific type of data that
+   * Request a specific display type (or types) are made active.
+   * This can be useful when loading a specific type of data that
    * would be most readily viewed with a specialized view.
    */
   void requestActiveDisplayTypes(QStringList displayTypes);

diff --git a/avogadro/qtgui/toolplugin.h b/avogadro/qtgui/toolplugin.h
@@ -137,6 +137,13 @@ class AVOGADROQTGUI_EXPORT ToolPlugin : public QObject
    */
   void registerCommand(QString command, QString description);
 
+  /**
+   * Request a specific display type (or types) are made active.
+   * This can be useful when loading a specific type of data that
+   * would be most readily viewed with a specialized view.
+   */
+  void requestActiveDisplayTypes(QStringList displayTypes);
+
 public slots:
   /**
    * Called when the current molecule changes.

diff --git a/avogadro/qtplugins/label/labeleditor.cpp b/avogadro/qtplugins/label/labeleditor.cpp
@@ -13,6 +13,8 @@
 #include <QAction>
 #include <QKeyEvent>
 
+#include <QDebug>
+
 namespace Avogadro::QtPlugins {
 
 using Core::Elements;
@@ -57,7 +59,7 @@ QUndoCommand* LabelEditor::keyPressEvent(QKeyEvent* e)
 {
   if (m_selected && !e->text().isEmpty()) {
     e->accept();
-    auto text = e->text()[0];
+    const QChar text = e->text()[0];
     if (text.isPrint()) {
       m_text.append(text);
     } else if (e->key() == Qt::Key_Backspace) {
@@ -77,6 +79,10 @@ void LabelEditor::save()
   m_molecule->endMergeMode();
   m_text.clear();
   m_selectedAtom = RWAtom();
+
+  // make sure the label display is made active
+  qDebug() << "Requesting active display types";
+  emit requestActiveDisplayTypes(QStringList() << "Labels");
 }
 
 QUndoCommand* LabelEditor::mousePressEvent(QMouseEvent* e)