Changeset b59da6 for src/UIElements/Menu/Menu.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/Menu/Menu.cpp (modified) (1 diff)

src/UIElements/Menu/Menu.cpp

@@ -20 +20 @@
 #include "Helpers/MemDebug.hpp"
 
-#include "Menu.hpp"
+#include <iostream>
 
-Menu::Menu()
+#include "Actions/ActionRegistry.hpp"
+#include "Actions/Action.hpp"
+#include "Actions/ActionTraits.hpp"
+#include "Menu/Menu.hpp"
+
+/** Constructor of class Menu.
+ * \param &_name name of menu
+ */
+Menu::Menu(const std::string &_name) :
+  MenuInterface(_name),
+  name(_name),
+  TopPosition(0),
+  LastItem(NoItem)
+{}
+
+/** Destructor of class Menu.
+ *
+ */
+Menu::~Menu()
+{}
+
+/** Initialiser for class Menu.
+ * Fills menus with items.
+ */
+void Menu::init()
 {
-  // TODO Auto-generated constructor stub
-
+  populate();
+  populateActions();
 }
 
-Menu::~Menu()
+/** Initializing function.
+ * Inserts Menus and Actions obtained from MenuDescription and
+ * ActionRegistry.
+ */
+void Menu::populate()
 {
-  // TODO Auto-generated destructor stub
+  // go through all menus and create them
+
+  bool CompleteFlag = false;  // indicates whether all menus have been added
+  bool PossibleMissingFlag = false; // indicates whether a separator is missing
+  while (!CompleteFlag) {
+    CompleteFlag = true;
+    PossibleMissingFlag = false;
+    for(MenuDescription::const_iterator iter = menudescriptions.getBeginIter();
+        iter != menudescriptions.getEndIter();
+        ++iter) {
+      // skip when already present
+      if (!isPresent(iter->first)) {
+        // 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;
+
+        // does it belong to us?
+        if (TopName == name) {
+          if (MenuPosition-1 == TopPosition) {
+            Menu::addSubmenu(MenuName, MenuPosition);
+            CompleteFlag = false;
+          }
+          // is there a menuposition specified that we have not reached yet?
+          if (MenuPosition-1 > TopPosition)
+            PossibleMissingFlag = true;
+        }
+      }
+    }
+    if (PossibleMissingFlag && (CompleteFlag)) {
+      Menu::addSeparator();
+      CompleteFlag = false; // pass once more as there should be a menu to come
+    }
+  }
 }
+
+/** Fills this menu with all Actions that belong to it.
+ */
+void Menu::populateActions()
+{
+  // go through all actions and add those beloning to this menu
+  ActionRegistry &AR = ActionRegistry::getInstance();
+  for (ActionRegistry::const_iterator iter = AR.getBeginIter();
+      iter != AR.getEndIter();
+      ++iter) {
+    const std::string &MenuName = iter->second->Traits.getMenuName();
+    if (MenuName == name) {
+      const std::string &ActionName = iter->first;
+      Menu::addAction(ActionName);
+    }
+  }
+}
+
+void Menu::addAction(const std::string &ActionName)
+{
+  LastItem = ActionItem;
+  addActionItem(ActionName, ActionName);
+}
+
+void Menu::addSeparator()
+{
+  std::cout << "Creating separator at position " << TopPosition << std::endl;
+  ASSERT( LastItem != SeparatorItem,
+      "Menu::populate() - adding another separator after a separator!");
+  LastItem = SeparatorItem;
+  addSeparatorItem();
+  TopPosition++;
+}
+
+void Menu::addSubmenu(const std::string &MenuName, const int MenuPosition)
+{
+  std::cout << "Creating top-level menu " << MenuName
+      << " at position " << TopPosition << std::endl;
+  ASSERT (!isPresent(MenuName),
+      "Menu::addSubmenu() - trying to add menu "+MenuName+" with already present token!");
+  addSubmenuItem(MenuName, menudescriptions.getDescription(MenuName));
+  DuplicatesList.insert(MenuName);
+  LastItem = MenuItem;
+  TopPosition = MenuPosition;
+}
+
+bool Menu::isPresent(const std::string &token)
+{
+  return (DuplicatesList.find(token) != DuplicatesList.end());
+}