Changeset a2c7c3

Timestamp:

Nov 3, 2025, 7:52:35 AM (2 months ago)

Author:

Frederik Heber <frederik.heber@…>

Branches:

Candidate_v1.7.1, stable

Children:

b6f2d2

Parents:

49719b

Message:

Right-click context menu depends on selection mode.

• if atoms are being selected, we show the atom menu. If molecules are being selected, then we show the molecule menu.

Location:

src/UIElements

Files:

• Qt4/QtMainWindow.cpp (modified) (1 diff)
• Views/Qt4/Qt3D/GLWorldScene.cpp (modified) (3 diffs)
• Views/Qt4/Qt3D/GLWorldScene.hpp (modified) (1 diff)
• Views/Qt4/Qt3D/GLWorldView.cpp (modified) (1 diff)
• Views/Qt4/Qt3D/GLWorldView.hpp (modified) (2 diffs)

src/UIElements/Qt4/QtMainWindow.cpp

@@ -203 +203 @@
 void QtMainWindow::slotContextMenuRequested(const QPoint &pos)
 {
-  // pick the atoms menu
-  QtMenu<QMenu_tooltip> * atoms_submenu = MainMenu->findSubmenu("atom");
+  // switch to atoms or molecule depending on selection mode
+  const string menu_name = 
+        glWorldView->getSelectionMode() == GLWorldScene::SelectAtom ? "atom" : "molecule";
+  QtMenu<QMenu_tooltip> * atoms_submenu = MainMenu->findSubmenu(menu_name);
   // and show it
   if (atoms_submenu != NULL) {
     atoms_submenu->popup(glWorldView->mapToGlobal(pos));
   } else {
-    ELOG(1, "Could not find atom submenu.");
+    ELOG(1, "Could not find " << menu_name << " submenu.");
   }
 }

src/UIElements/Views/Qt4/Qt3D/GLWorldScene.cpp

@@ -334 +334 @@
       +" to stored observed value.");
   QObject * sender = iter->second;
+#ifndef NDEBUG
   const size_t erased = _ObservedValues.erase(sender);
   ASSERT( erased == 1,
@@ -339 +340 @@
       +toString(_id));
   _ObservedValueIndexLookup.erase(iter);
+#endif
 }
 
@@ -943 +945 @@
 }
 
+GLWorldScene::SelectionModeType GLWorldScene::getSelectionMode() const
+{
+        return selectionMode;
+}
+
 void GLWorldScene::setSelectionModeAtom()
 {

src/UIElements/Views/Qt4/Qt3D/GLWorldScene.hpp

@@ -74 +74 @@
   };
   void setSelectionMode(SelectionModeType mode);
+  SelectionModeType getSelectionMode() const;
 
 signals:

src/UIElements/Views/Qt4/Qt3D/GLWorldView.cpp

@@ -139 +139 @@
 }
 
+GLWorldScene::SelectionModeType GLWorldView::getSelectionMode() const
+{
+        return worldscene->getSelectionMode();
+}
 
 /**

src/UIElements/Views/Qt4/Qt3D/GLWorldView.hpp

@@ -32 +32 @@
 
 #include "UIElements/Qt4/InstanceBoard/ObservedValue_types.hpp"
+#include "UIElements/Views/Qt4/Qt3D/GLWorldScene.hpp"
 
 /** This class is the view on the 3D representation of the World, i.e. the whole
@@ -54 +55 @@
   void subjectKilled(Observable *publisher);
   void recieveNotification(Observable *publisher, Notification_ptr notification);
+  
+  GLWorldScene::SelectionModeType getSelectionMode() const;
 
 public slots: