Changeset ffb9ad for src/UIElements

Timestamp:

Nov 9, 2010, 3:38:03 PM (14 years ago)

Author:

Frederik Heber <heber@…>

Branches:

Action_Thermostats, Add_AtomRandomPerturbation, Add_FitFragmentPartialChargesAction, Add_RotateAroundBondAction, Add_SelectAtomByNameAction, Added_ParseSaveFragmentResults, AddingActions_SaveParseParticleParameters, Adding_Graph_to_ChangeBondActions, Adding_MD_integration_tests, Adding_ParticleName_to_Atom, Adding_StructOpt_integration_tests, AtomFragments, Automaking_mpqc_open, AutomationFragmentation_failures, Candidate_v1.5.4, Candidate_v1.6.0, Candidate_v1.6.1, ChangeBugEmailaddress, ChangingTestPorts, ChemicalSpaceEvaluator, CombiningParticlePotentialParsing, Combining_Subpackages, Debian_Package_split, Debian_package_split_molecuildergui_only, Disabling_MemDebug, Docu_Python_wait, EmpiricalPotential_contain_HomologyGraph, EmpiricalPotential_contain_HomologyGraph_documentation, Enable_parallel_make_install, Enhance_userguide, Enhanced_StructuralOptimization, Enhanced_StructuralOptimization_continued, Example_ManyWaysToTranslateAtom, Exclude_Hydrogens_annealWithBondGraph, FitPartialCharges_GlobalError, Fix_BoundInBox_CenterInBox_MoleculeActions, Fix_ChargeSampling_PBC, Fix_ChronosMutex, Fix_FitPartialCharges, Fix_FitPotential_needs_atomicnumbers, Fix_ForceAnnealing, Fix_IndependentFragmentGrids, Fix_ParseParticles, Fix_ParseParticles_split_forward_backward_Actions, Fix_PopActions, Fix_QtFragmentList_sorted_selection, Fix_Restrictedkeyset_FragmentMolecule, Fix_StatusMsg, Fix_StepWorldTime_single_argument, Fix_Verbose_Codepatterns, Fix_fitting_potentials, Fixes, ForceAnnealing_goodresults, ForceAnnealing_oldresults, ForceAnnealing_tocheck, ForceAnnealing_with_BondGraph, ForceAnnealing_with_BondGraph_continued, ForceAnnealing_with_BondGraph_continued_betteresults, ForceAnnealing_with_BondGraph_contraction-expansion, FragmentAction_writes_AtomFragments, FragmentMolecule_checks_bonddegrees, GeometryObjects, Gui_Fixes, Gui_displays_atomic_force_velocity, ImplicitCharges, IndependentFragmentGrids, IndependentFragmentGrids_IndividualZeroInstances, IndependentFragmentGrids_IntegrationTest, IndependentFragmentGrids_Sole_NN_Calculation, JobMarket_RobustOnKillsSegFaults, JobMarket_StableWorkerPool, JobMarket_unresolvable_hostname_fix, MoreRobust_FragmentAutomation, ODR_violation_mpqc_open, PartialCharges_OrthogonalSummation, PdbParser_setsAtomName, PythonUI_with_named_parameters, QtGui_reactivate_TimeChanged_changes, Recreated_GuiChecks, Rewrite_FitPartialCharges, RotateToPrincipalAxisSystem_UndoRedo, SaturateAtoms_findBestMatching, SaturateAtoms_singleDegree, StoppableMakroAction, Subpackage_CodePatterns, Subpackage_JobMarket, Subpackage_LinearAlgebra, Subpackage_levmar, Subpackage_mpqc_open, Subpackage_vmg, Switchable_LogView, ThirdParty_MPQC_rebuilt_buildsystem, TrajectoryDependenant_MaxOrder, TremoloParser_IncreasedPrecision, TremoloParser_MultipleTimesteps, TremoloParser_setsAtomName, Ubuntu_1604_changes, stable

Children:

5813ac

Parents:

e262c7

git-author:

Frederik Heber <heber@…> (11/01/10 20:29:58)

git-committer:

Frederik Heber <heber@…> (11/09/10 15:38:03)

Message:

FIX: Menu entries are again correctly added to QtGui part.

• also expanded MenuDescriptions to contain position for each menu and submenuing.
• MenuDescriptions::MenuSet was replaced by MenuPositionMap which is iterable.

Location:

src/UIElements

Files:

• Menu/MenuDescription.cpp (modified) (11 diffs)
• Menu/MenuDescription.hpp (modified) (2 diffs)
• Qt4/QtMainWindow.cpp (modified) (5 diffs)
• Qt4/QtMainWindow.hpp (modified) (2 diffs)
• TextUI/TextWindow.cpp (modified) (1 diff)

src/UIElements/Menu/MenuDescription.cpp

@@ -13 +13 @@
  */
 
+#include <iostream>
 #include <map>
 #include <string>
@@ -24 +25 @@
 MenuDescription::MenuDescription()
 {
-  // put each menu into set
-  MenuSet.insert("analysis");
-  MenuSet.insert("atom");
-  MenuSet.insert("command");
-  MenuSet.insert("fragmentation");
-  MenuSet.insert("molecule");
-  MenuSet.insert("parser");
-  MenuSet.insert("selection");
-  MenuSet.insert("tesselation");
-  MenuSet.insert("world");
+  // put each menu into its place, "" means top level
+  MenuPositionMap["analysis"] = TopPosition("tools",1);
+  MenuPositionMap["atom"] = TopPosition("edit",1);
+  MenuPositionMap["command"] = TopPosition("",3);
+  MenuPositionMap["edit"] = TopPosition("",2);
+  MenuPositionMap["fragmentation"] = TopPosition("tools",3);
+  MenuPositionMap["molecule"] = TopPosition("edit",2);
+  MenuPositionMap["parser"] = TopPosition("edit",3);
+  MenuPositionMap["selection"] = TopPosition("edit",4);
+  MenuPositionMap["tesselation"] = TopPosition("tools",2);
+  MenuPositionMap["tools"] = TopPosition("",4);
+  MenuPositionMap["world"] = TopPosition("",1);
 
   // put menu description into each menu category
@@ -39 +42 @@
   MenuDescriptionsMap["atom"] = "Edit atoms";
   MenuDescriptionsMap["command"] = "Configuration";
+  MenuDescriptionsMap["edit"] = "Edit";
   MenuDescriptionsMap["fragmentation"] = "Fragmentation";
   MenuDescriptionsMap["molecule"] = "Parse files into system";
@@ -44 +48 @@
   MenuDescriptionsMap["selection"] = "Select atoms/molecules";
   MenuDescriptionsMap["tesselation"] = "Tesselate molecules";
+  MenuDescriptionsMap["tools"] = "Various tools";
   MenuDescriptionsMap["world"] = "Edit world";
 
@@ -49 +54 @@
   MenuNameMap["analysis"] = "Analysis";
   MenuNameMap["atom"] = "Atoms";
-  MenuNameMap["command"] = "configuration options";
+  MenuNameMap["command"] = "Configuration";
+  MenuNameMap["edit"] = "Edit";
   MenuNameMap["fragmentation"] = "Fragmentation";
   MenuNameMap["molecule"] = "Molecules";
@@ -55 +61 @@
   MenuNameMap["selection"] = "Selection";
   MenuNameMap["tesselation"] = "Tesselation";
+  MenuNameMap["tools"] = "Tools";
   MenuNameMap["world"] = "Globals";
 }
@@ -97 +104 @@
   ActionRegistry &AR = ActionRegistry::getInstance();
   for (ActionRegistry::const_iterator iter = AR.getBeginIter();iter != AR.getEndIter();++iter) {
+    std::cout << "Inserting " << (iter->second)->getName() << " into menu " << (iter->second)->Traits.getMenuName() << std::endl;
     result.insert( std::pair<std::string, std::string> ((iter->second)->Traits.getMenuName(), (iter->second)->getName()));
   }
@@ -108 +116 @@
 MenuDescription::iterator MenuDescription::getBeginIter()
 {
-  return MenuSet.begin();
+  return MenuPositionMap.begin();
 }
 
@@ -116 +124 @@
 MenuDescription::iterator MenuDescription::getEndIter()
 {
-  return MenuSet.end();
+  return MenuPositionMap.end();
 }
 
@@ -124 +132 @@
 MenuDescription::const_iterator MenuDescription::getBeginIter() const
 {
-  return MenuSet.begin();
+  return MenuPositionMap.begin();
 }
 
@@ -132 +140 @@
 MenuDescription::const_iterator MenuDescription::getEndIter() const
 {
-  return MenuSet.end();
+  return MenuPositionMap.end();
 }
 

src/UIElements/Menu/MenuDescription.hpp

@@ -25 +25 @@
   ~MenuDescription();
 
-  typedef std::set<std::string>::iterator iterator;
-  typedef std::set<std::string>::const_iterator const_iterator ;
+  typedef std::pair<std::string, int> TopPosition;
+  typedef std::map<std::string, TopPosition> IterableMap;
+  typedef IterableMap::iterator iterator;
+  typedef IterableMap::const_iterator const_iterator ;
+  typedef std::map<std::string, std::string> TextMap;
 
   // getter for description
@@ -41 +44 @@
 
 private:
-  std::set<std::string> MenuSet;
-  std::map<std::string, std::string> MenuDescriptionsMap;
-  std::map<std::string, std::string> MenuNameMap;
+  TextMap MenuDescriptionsMap;
+  IterableMap MenuPositionMap;
+  TextMap MenuNameMap;
   std::multimap <std::string, std::string> MenuItemMap;
 };

src/UIElements/Qt4/QtMainWindow.cpp

@@ -43 +43 @@
 #include "Menu/Qt4/QtMenu.hpp"
 #include "Menu/ActionMenuItem.hpp"
+#include "Menu/SubMenuItem.hpp"
 #include "Views/Qt4/QtWorldView.hpp"
 #include "Views/Qt4/GLMoleculeView.hpp"
@@ -48 +49 @@
 #include "Views/Qt4/QtStatusBar.hpp"
 
-using namespace std;
-
 QtMainWindow::QtMainWindow(QApplication *_theApp) :
     theApp(_theApp)
@@ -63 +62 @@
   MenuBar = menuBar();
 
-  std::map <std::string, QtMenu *> NametoTextMenuMap;
-  // go through all menus and create them
-  QtMenu *Menu = NULL;
-  MenuDescription menudescriptions;
-  for(MenuDescription::const_iterator iter = menudescriptions.getBeginIter(); iter != menudescriptions.getEndIter(); ++iter) {
-    cout << "Creating menu " << *iter << endl;
-    Menu = new QtMenu(menudescriptions.getName(*iter).c_str());
-    MenuBar->addMenu(Menu);
-    NametoTextMenuMap.insert( pair <std::string, QtMenu *> (menudescriptions.getName(*iter), Menu) );
-    //new SubMenuItem(getSuitableShortForm(menudescriptions.getName(iter->first.c_str())),menudescriptions.getName(iter->first.c_str()),main_menu,Menu);
-  }
-
-  // go through all actions and add them to its menu
-  for (std::map <std::string, QtMenu *>::iterator MenuRunner = NametoTextMenuMap.begin(); MenuRunner != NametoTextMenuMap.end(); ++MenuRunner) {
-    cout << "Creating Action " << MenuRunner->first << " in menu " << MenuRunner->second << endl;
-    populateMenu(MenuRunner->second, MenuRunner->first);
+  // populate menus and add actions
+  {
+    QtMenuReferenceMap NametoTextMenuMap; // contains token to menu reference map
+    MenuShortcutMap ShortcutMap;
+    populateMenu(NametoTextMenuMap, ShortcutMap);
+    populateMenuWithActions(NametoTextMenuMap, ShortcutMap);
   }
 
@@ -97 +86 @@
 {
   menuBar()->clear();
-  delete editMoleculesMenu;
 }
 
@@ -105 +93 @@
 }
 
-char QtMainWindow::getSuitableShortForm(set <char> &ShortcutList, const std::string name) const
-{
-  for (std::string::const_iterator CharRunner = name.begin(); CharRunner != name.end(); ++CharRunner) {
-    if (ShortcutList.find(*CharRunner) == ShortcutList.end())
-      return *CharRunner;
-  }
-  DoeLog(1) && (eLog() << Verbose(1) << "Could not find a suitable shortform for TextWindow::getSuitableShortForm()." << endl);
-  return ((char)(ShortcutList.size() % 10) + '0');
-}
-
-void QtMainWindow::populateMenu(QtMenu* Menu, const  std::string &MenuName)
-{
+/** Puts Qt's token, the ampersand, in front of the accelerator char in the menu name.
+ * \param ShortcutMap map to all already present accelerator keys
+ * \param MenuName Action of menu
+ * \param ActionName Action of menu
+ * \return name with ampersand added at the right place
+ */
+std::string QtMainWindow::getNameWithAccelerator(MenuShortcutMap &ShortcutMap, const std::string &MenuName, const std::string &ActionName) const
+{
+  std::string newname;
+  bool Inserted = false;
+  std::pair < MenuShortcutMap::iterator, bool > Inserter;
+  for (std::string::const_iterator CharRunner = ActionName.begin(); CharRunner != ActionName.end(); ++CharRunner) {
+    if (!Inserted) {
+      Inserter = ShortcutMap.insert( std::pair<std::string, char> (MenuName, *CharRunner) );
+      if (Inserter.second) {
+        newname += '&';
+        Inserted = true;
+      }
+    }
+    newname += *CharRunner;
+  }
+  return newname;
+}
+
+/** Instantiate all menus.
+ * \param NametoTextMenuMap lookup for token to menu reference
+ */
+void QtMainWindow::populateMenu(QtMenuReferenceMap &NametoTextMenuMap, MenuShortcutMap &ShortcutMap)
+{
+  // go through all menus and create them
+  std::map <std::string, int> TopPositions;
+  TopPositions.insert( std::pair<std::string, int> ("", 0) ); // contains which position was added last
+  QtMenu *Menu = NULL;
+  MenuDescription menudescriptions;
+  std::set <char> ShortcutList;
+  bool CompleteFlag = false;
+  while (!CompleteFlag) {
+    CompleteFlag = true;
+    for(MenuDescription::const_iterator iter = menudescriptions.getBeginIter(); iter != menudescriptions.getEndIter(); ++iter) {
+      // skip when already present
+      if (NametoTextMenuMap.find(iter->first) == NametoTextMenuMap.end()) {
+        // 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;
+        std::cout << "MenuName is " << MenuName << ", TopName is " << TopName << " and Position is " << MenuPosition << std::endl;
+
+        // is it top level?
+        if (TopName == "") {
+          ASSERT(TopPositions.find(TopName) != TopPositions.end(),
+              "QtMainWindow::QtMainWindow() - "+TopName+" not present in TopPositions.");
+          if (MenuPosition-1 == TopPositions[TopName]) {
+            std::cout << "Creating top-level menu " << MenuName << " at position " << MenuPosition << std::endl;
+            Menu = new QtMenu(getNameWithAccelerator(ShortcutMap, TopName, MenuName).c_str());
+            MenuBar->addMenu(Menu);
+            NametoTextMenuMap.insert( pair <std::string, QtMenu *> (MenuName, Menu) );
+            CompleteFlag = false;
+            TopPositions[TopName] = MenuPosition;
+            TopPositions[MenuName] = 0;
+          }
+        }
+        // is it a submenu and the top-level menu is present?
+        else if (NametoTextMenuMap.find(TopName) != NametoTextMenuMap.end()) {
+          ASSERT(TopPositions.find(TopName) != TopPositions.end(),
+              "QtMainWindow::QtMainWindow() - "+TopName+" not present in TopPositions.");
+          if (MenuPosition-1 == TopPositions[TopName]) {
+            QtMenu *& TopMenu = NametoTextMenuMap[TopName];
+            std::cout << "Creating submenu " << MenuName << " to menu " << TopName << " at position " << MenuPosition << std::endl;
+            Menu = new QtMenu(getNameWithAccelerator(ShortcutMap, TopName, MenuName).c_str());
+            TopMenu->addMenu(Menu);
+            NametoTextMenuMap.insert( pair <std::string, QtMenu *> (MenuName, Menu) );
+            CompleteFlag = false;
+            TopPositions[TopName] = MenuPosition;
+          }
+        }
+      }
+    }
+  }
+}
+
+/** Instantiate all actions within the menus.
+ * \param NametoTextMenuMap lookup for token to menu reference
+ * \param ShortcutMap map for all shortcuts within one menu
+ */
+void QtMainWindow::populateMenuWithActions(QtMenuReferenceMap &NametoTextMenuMap, MenuShortcutMap &ShortcutMap)
+{
+  typedef std::multimap <std::string, std::string> MenuMap;
+
+  // go through all menus
+  MenuDescription md;
+  MenuMap MenuItems = md.getMenuItemsMap();
+  QtMenu *Menu = NULL;
   Action *ActionItem = NULL;
-  set <char> ShortcutList;
-  // through all actions for this menu
-  MenuDescription md;
-  std::multimap <std::string, std::string> MenuItems = md.getMenuItemsMap();
-  std::pair < std::multimap <std::string, std::string>::iterator, std::multimap <std::string, std::string>::iterator > MenuActions = MenuItems.equal_range(MenuName);
-  for (std::multimap <std::string, std::string>::const_iterator MenuRunner = MenuActions.first; MenuRunner != MenuActions.second; ++MenuRunner) {
-    cout << " Adding " << MenuRunner->second << " to submenu " << MenuName << endl;
-    ActionItem = ActionRegistry::getInstance().getActionByName(MenuRunner->second);
-    new ActionMenuItem(getSuitableShortForm(ShortcutList, MenuRunner->second),ActionItem->Traits.getDescription().c_str(),Menu,ActionItem);
-  }
-  // finally add default quit item
-  //Action *returnFromAction = new TextMenu::LeaveAction(Menu);
-  //MenuItem *returnFromItem = new ActionMenuItem('q',"return to Main menu",Menu,returnFromAction);
-  //Menu->addDefault(returnFromItem);
-}
+  std::string OldMenuName;
+  for (MenuMap::const_iterator MenuRunner = MenuItems.begin(); MenuRunner != MenuItems.end(); ++MenuRunner) {
+    const std::string &ActionName = MenuRunner->second;
+    const std::string &MenuName = MenuRunner->first;
+    // add the actions to this menu
+    std::cout << " Adding " << ActionName << " to submenu " << MenuName << std::endl;
+    ActionItem = ActionRegistry::getInstance().getActionByName(ActionName);
+    ASSERT(NametoTextMenuMap.find(MenuName) != NametoTextMenuMap.end(),
+        "QtMainWindow::populateMenu() - cannot find reference for menu "+MenuName+" in NametoTextMenuMap.");
+    Menu = NametoTextMenuMap[MenuName];
+    //ASSERT(ShortcutMap.find(MenuName) != ShortcutMap.end(),
+      //  "QtMainWindow::populateMenuWithActions() - missing "+MenuName+" in ShortcutMap.");
+    new ActionMenuItem(
+        'a',
+        ActionItem->Traits.getDescription().c_str(),
+        Menu,
+        ActionItem);
+  }
+}

src/UIElements/Qt4/QtMainWindow.hpp

@@ -12 +12 @@
 #include <QtGui/QMainWindow>
 
+#include <map>
 #include <set>
 
@@ -31 +32 @@
   virtual void display();
 
-  char getSuitableShortForm(std::set <char> &ShortcutList, const std::string name) const;
-  void populateMenu(QtMenu* Menu, const  std::string &MenuName);
 
 private:
+  typedef std::map <std::string, QtMenu *> QtMenuReferenceMap;
+  typedef std::map <std::string, char> MenuShortcutMap;
+
+  void populateMenu(QtMenuReferenceMap &NametoTextMenuMap, MenuShortcutMap &ShortcutMap);
+  void populateMenuWithActions(QtMenuReferenceMap &NametoTextMenuMap, MenuShortcutMap &ShortcutMap);
+  std::string getNameWithAccelerator(MenuShortcutMap &ShortcutMap, const std::string &MenuName, const std::string &ActionName) const;
+
   // All kinds of QTStuff used in this window
   QApplication *theApp;
   QtWorldView *worldDisplay;
-  QtMenu *editMoleculesMenu;
   GLMoleculeView *molecule3dDisplay;
   QtMoleculeView *moleculeDisplay;

src/UIElements/TextUI/TextWindow.cpp

@@ -81 +81 @@
   MenuDescription menudescriptions;
   for(MenuDescription::const_iterator iter = menudescriptions.getBeginIter(); iter != menudescriptions.getEndIter(); ++iter) {
-    TextMenu *Menu = new TextMenu((ostream &)std::cout, menudescriptions.getDescription(*iter));
-    NametoTextMenuMap.insert( pair <std::string, TextMenu *> (*iter, Menu) );
-    new SubMenuItem(getSuitableShortForm(ShortcutList,*iter),menudescriptions.getDescription(*iter).c_str(),main_menu,Menu);
+    const std::string &MenuName = iter->first;
+    TextMenu *Menu = new TextMenu((ostream &)std::cout, menudescriptions.getDescription(MenuName));
+    NametoTextMenuMap.insert( pair <std::string, TextMenu *> (MenuName, Menu) );
+    new SubMenuItem(getSuitableShortForm(ShortcutList,MenuName),menudescriptions.getDescription(MenuName).c_str(),main_menu,Menu);
   }