Changeset b59da6 for src/UIElements/Qt4/QtMainWindow.cpp

Timestamp:

Dec 4, 2010, 11:33:47 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:

0af7ef

Parents:

5813ac

git-author:

Frederik Heber <heber@…> (11/08/10 09:36:45)

git-committer:

Frederik Heber <heber@…> (12/04/10 23:33:47)

Message:

Refactoring of Menu structure for Qt and Text UI done.

• Menu is now the initialising class for the menu structure.
• MenuInterface contains virtual declarations of all functions that Menu needs to call.
• TextMenu and QtMenu are templated classes which contain both Menu and MenuInterface and implement the virtual functions.
• class TxMenu and its ...MenuItems contain most of the old Menu code for the text-based system. Most of the stuff, such as triggers, are now hidden internally.
• in ..MainWindow() we basically just construct the desired Menu and call init at the correct time.

File:

• src/UIElements/Qt4/QtMainWindow.cpp (modified) (3 diffs)

src/UIElements/Qt4/QtMainWindow.cpp

@@ -39 +39 @@
 #include "Actions/ActionRegistry.hpp"
 #include "Actions/ValueStorage.hpp"
-#include "Menu/MenuDescription.hpp"
-#include "Menu/Menu.hpp"
 #include "Menu/Qt4/QtMenu.hpp"
-#include "Menu/ActionMenuItem.hpp"
-#include "Menu/SubMenuItem.hpp"
 #include "Views/Qt4/QtWorldView.hpp"
 #include "Views/Qt4/GLMoleculeView.hpp"
@@ -60 +56 @@
   molecule3dDisplay = new GLMoleculeView();
 
-  MenuBar = menuBar();
-
-  // populate menus and add actions
-  {
-    QtMenuReferenceMap NametoTextMenuMap; // contains token to menu reference map
-    MenuShortcutMap ShortcutMap;
-    populateMenu(NametoTextMenuMap, ShortcutMap);
-    populateMenuWithActions(NametoTextMenuMap, ShortcutMap);
-  }
+  MainMenu = new QtMenu<QMenuBar>(menuBar(), "");
+  MainMenu->init();
 
   setCentralWidget(splitter1);
@@ -93 +82 @@
 }
 
-/** 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;
-  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);
-  }
-}