Changeset ffb9ad for src/UIElements/Menu/MenuDescription.cpp

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.

File:

• src/UIElements/Menu/MenuDescription.cpp (modified) (11 diffs)

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();
 }