Changeset 9cdab3

Timestamp:

Aug 11, 2025, 5:45:54 PM (2 months ago)

Author:

Frederik Heber <frederik.heber@…>

Branches:

Candidate_v1.7.0, stable

Children:

5718cc

Parents:

ae9ad6

git-author:

Frederik Heber <frederik.heber@…> (07/20/25 20:19:22)

git-committer:

Frederik Heber <frederik.heber@…> (08/11/25 17:45:54)

Message:

Adds context menu "atom" to GLWorldView.

Location:

src/UIElements

Files:

• Menu/Menu.cpp (modified) (1 diff)
• Menu/Menu.hpp (modified) (1 diff)
• Menu/Qt4/QtMenu.hpp (modified) (5 diffs)
• Qt4/QtMainWindow.cpp (modified) (2 diffs)
• Qt4/QtMainWindow.hpp (modified) (1 diff)
• Views/Qt4/Qt3D/GLWorldView.cpp (modified) (1 diff)
• Views/Qt4/Qt3D/GLWorldView.hpp (modified) (1 diff)

src/UIElements/Menu/Menu.cpp

@@ -87 +87 @@
         iter != MenuDescription::getInstance().getEndIter();
         ++iter) {
+        const std::string &MenuName = iter->first;
       // skip when already present
-      if (!isPresent(iter->first)) {
+      if (!isPresent(MenuName)) {
         // have some short refs to infos
-        const std::string &MenuName = iter->first;
         const std::string &TopName = iter->second.first;
         const int &MenuPosition = iter->second.second;

src/UIElements/Menu/Menu.hpp

@@ -60 +60 @@
   void init();
 
+  //!> Getter for the menu's name.
+  const std::string getName() const {
+    return name;
+  }
+
 protected:
   //!> Unique name of the menu for identification.

src/UIElements/Menu/Qt4/QtMenu.hpp

@@ -10 +10 @@
 
 // include config.h
+#include <cstddef>
 #ifdef HAVE_CONFIG_H
 #include <config.h>
@@ -16 +17 @@
 
 #include <Qt/qaction.h>
+#include <Qt/qpoint.h>
 
 #include "Menu/Qt4/QMenu_tooltip.hpp"
@@ -52 +54 @@
   virtual ~QtMenu()
   {
+    // delete all plumbed actions
     for(std::list<QtMenuPipe*>::iterator it=plumbing.begin(); it != plumbing.end(); it++)
       delete (*it);
 
+    // delete all submenus
+    for(SubMenus_t::iterator iter = submenus.begin(); iter != submenus.end(); ++iter)
+      delete(*iter);
+
+    // delete the wrapped instance if we took over ownership
     if (deleteMenu)
       delete MenuInstance;
@@ -103 +111 @@
   MenuShortcutMap ShortcutMap;
 
+  typedef std::list< QtMenu<QMenu_tooltip>* > SubMenus_t;
+  SubMenus_t submenus;
+
   virtual void addActionItem(const std::string &token, const std::string &description)
   {
@@ -123 +134 @@
     MenuInstance->addMenu(Menu);
     QtMenu<QMenu_tooltip> *NewMenu = new QtMenu<QMenu_tooltip>(Menu, token);
+    submenus.push_back(NewMenu);
     NewMenu->init();
   }
 
+public:
+  QtMenu<QMenu_tooltip>* findSubmenu(const std::string &token) {
+    for (SubMenus_t::iterator iter = submenus.begin(); iter != submenus.end(); ++iter) {
+      QtMenu<QMenu_tooltip>* submenu = *(iter);
+      if (submenu->getName() == token)
+        return submenu;
+      else {
+        QtMenu<QMenu_tooltip>* found_submenu = submenu->findSubmenu(token);
+        if (found_submenu != NULL)
+        return found_submenu;
+      }
+    }
+    return NULL;
+  }
+
+  void popup(const QPoint &pos) {
+    MenuInstance->popup(pos);
+  }
 };
 

src/UIElements/Qt4/QtMainWindow.cpp

@@ -134 +134 @@
   toolbar->addFavoriteActionItems(20);
   addToolBar(toolbar);
+
+  // add context menu on right click
+  glWorldView->setContextMenuPolicy(Qt::CustomContextMenu);
+  connect(glWorldView, SIGNAL(customContextMenuRequested(const QPoint&)), this, SLOT(slotContextMenuRequested(const QPoint&)));
 
   setCentralWidget(splitter1);
@@ -193 +197 @@
 }
 
+void QtMainWindow::slotContextMenuRequested(const QPoint &pos)
+{
+  // pick the atoms menu
+  QtMenu<QMenu_tooltip> * atoms_submenu = MainMenu->findSubmenu("atom");
+  // and show it
+  if (atoms_submenu != NULL) {
+    atoms_submenu->popup(glWorldView->mapToGlobal(pos));
+  } else {
+    ELOG(1, "Could not find atom submenu.");
+  }
+}
 QtMainWindow::~QtMainWindow()
 {

src/UIElements/Qt4/QtMainWindow.hpp

@@ -57 +57 @@
   virtual void closeEvent(QCloseEvent *event);
 
+public slots:
+  void slotContextMenuRequested(const QPoint &pos);
 
 private:

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

@@ -609 +609 @@
   QGLView::mousePressEvent(event);
 
+  // check for right mouse button
+  if (event->button() == Qt::RightButton) {
+    emit customContextMenuRequested(event->pos());
+  }
+
   // Reset the saved mouse position.
   lastMousePos = event->posF();

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

@@ -73 +73 @@
   void ShapeRemoved(const std::string &);
   void moleculesVisibilityChanged(ObservedValue_Index_t,bool);
+  void customContextMenuRequested(const QPoint&);
 
 protected: