Changeset b2531f for src/UIElements/TextUI

Timestamp:

Jun 27, 2010, 12:52:31 AM (15 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:

bdb143

Parents:

b0acc3

git-author:

Frederik Heber <heber@…> (06/26/10 23:55:00)

git-committer:

Frederik Heber <heber@…> (06/27/10 00:52:31)

Message:

Introduced a MenuBar and Menus to the QT interface.

• new map MapOfActions::MenuDescriptionMap which contains short and long descriptions of the menus.
• MapOfActions::populateActions() - rotate-to-pas and suspend-in-water actions were missing.
• QTMainWindow
  • QTMainWindow() - creates a MenuBar and QTMenus and fills them with the actions from the maps in MapOfActions.
  • new function populateMenu() - same as in TextWindow.
  • new function getSuitableShortForm() - same as in TextWindow.
• TextWindow::TextWindow() - also makes use of the new map MenuDescriptionMap.
• MoleculeSuspendInWaterAction - changed argument to density and molecule is obtained by molecule-by-id

• TESTFIX: Molecule/8 had wrong argument for rotate-to-pas
• TESTFIX: Filling/2 had missing molecule-by-id

File:

• src/UIElements/TextUI/TextWindow.cpp (modified) (1 diff)

src/UIElements/TextUI/TextWindow.cpp

@@ -71 +71 @@
   new ActionMenuItem('a',"set molecule (in)active",main_menu,setMoleculeAction);
 
-  TextMenu *AnalysisMenu = new TextMenu(Log() << Verbose(0), "Analysis");
-  NametoTextMenuMap.insert( pair <std::string, TextMenu *> ("analysis", AnalysisMenu) );
-  new SubMenuItem('A',"Analysis (pair correlation, volume)",main_menu,AnalysisMenu);
-
-  TextMenu *CommandMenu = new TextMenu(Log() << Verbose(0), "Configuration");
-  NametoTextMenuMap.insert( pair <std::string, TextMenu *> ("command", CommandMenu) );
-  new SubMenuItem('c',"configuration",main_menu,CommandMenu);
-
-  TextMenu *AtomMenu = new TextMenu(Log() << Verbose(0), "Atoms");
-  NametoTextMenuMap.insert( pair <std::string, TextMenu *> ("atom", AtomMenu) );
-  new SubMenuItem('e',"edit atoms",main_menu,AtomMenu);
-
-  TextMenu *FragmentationMenu = new TextMenu(Log() << Verbose(0), "Fragmentation");
-  NametoTextMenuMap.insert( pair <std::string, TextMenu *> ("fragmentation", FragmentationMenu) );
-  new SubMenuItem('f',"fragmentation",main_menu,FragmentationMenu);
-
-  TextMenu *ParserMenu = new TextMenu(Log() << Verbose(0), "Parse files");
-  NametoTextMenuMap.insert( pair <std::string, TextMenu *> ("parser", ParserMenu) );
-  new SubMenuItem('p',"parse files into system",main_menu,ParserMenu);
-
-  TextMenu *MoleculesMenu = new TextMenu(Log() << Verbose(0), "Edit Molecules");
-  NametoTextMenuMap.insert( pair <std::string, TextMenu *> ("analysis", AnalysisMenu) );
-  new SubMenuItem('m',"edit molecules (load, parse, save)",main_menu,MoleculesMenu);
-
-  TextMenu *TesselationMenu = new TextMenu(Log() << Verbose(0), "Tesselate Molecules");
-  NametoTextMenuMap.insert( pair <std::string, TextMenu *> ("tesselation", TesselationMenu) );
-  new SubMenuItem('t',"tesselate molecules",main_menu,TesselationMenu);
-
-  TextMenu *WorldMenu = new TextMenu(Log() << Verbose(0), "World");
-  NametoTextMenuMap.insert( pair <std::string, TextMenu *> ("world", WorldMenu) );
-  new SubMenuItem('w',"edit world",main_menu,WorldMenu);
+  TextMenu *Menu = NULL;
+  std::set <char> ShortcutList;
+  for(map<std::string, pair<std::string,std::string> >::iterator iter = MapOfActions::getInstance().MenuDescription.begin(); iter != MapOfActions::getInstance().MenuDescription.end(); ++iter) {
+    Menu = new TextMenu(Log() << Verbose(0), iter->second.second);
+    NametoTextMenuMap.insert( pair <std::string, TextMenu *> (iter->first, Menu) );
+    new SubMenuItem(getSuitableShortForm(ShortcutList,iter->first),iter->second.first.c_str(),main_menu,Menu);
+  }
 
   new SeperatorItem(main_menu);