Changeset d17f3d for src/UIElements

Timestamp:

Aug 19, 2010, 4:59:34 PM (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:

51c3e4, 9c1c89

Parents:

9c7e0f

git-author:

Frederik Heber <heber@…> (08/19/10 16:56:30)

git-committer:

Frederik Heber <heber@…> (08/19/10 16:59:34)

Message:

FIX: Using getSuitableShortForm() in TextWindow::TextWindow() for all triggers.

• also reserving q and s by initially pytting them into the list.

File:

• src/UIElements/TextUI/TextWindow.cpp (modified) (6 diffs)

src/UIElements/TextUI/TextWindow.cpp

@@ -56 +56 @@
 {
   map <std::string, TextMenu *> NametoTextMenuMap;
+  std::set <char> ShortcutList;
+  // reserve s for save and q for quite
+  ShortcutList.insert('s');
+  ShortcutList.insert('q');
 
   // populate all actions
@@ -69 +73 @@
 
   Action* undoAction = ActionRegistry::getInstance().getActionByName("undo");
-  new ActionMenuItem('u',"Undo last operation",main_menu,undoAction);
+  new ActionMenuItem(getSuitableShortForm(ShortcutList,"Undo last operation"),"Undo last operation",main_menu,undoAction);
 
   Action* redoAction = ActionRegistry::getInstance().getActionByName("redo");
-  new ActionMenuItem('r',"Redo last operation",main_menu,redoAction);
+  new ActionMenuItem(getSuitableShortForm(ShortcutList,"Redo last operation"),"Redo last operation",main_menu,redoAction);
 
   new SeperatorItem(main_menu);
 
-  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);
+    TextMenu *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);
@@ -86 +88 @@
   new SeperatorItem(main_menu);
 
+  // save has reserved key 's'
   Action *saveConfigAction = ActionRegistry::getInstance().getActionByName("output");
   new ActionMenuItem('s',"save current setup to config files",main_menu,saveConfigAction);
@@ -92 +95 @@
   new ActionMenuItem('q',"quit",main_menu,quitAction);
 
+  // quit has reserved key 'q'
   // go through all menus and create them
-  for (map <std::string, TextMenu *>::iterator MenuRunner = NametoTextMenuMap.begin(); MenuRunner != NametoTextMenuMap.end(); ++MenuRunner) {
-    cout << "Creating Menu " << MenuRunner->first << "." << endl;
+  for (map <std::string, TextMenu *>::iterator MenuRunner = NametoTextMenuMap.begin(); MenuRunner != NametoTextMenuMap.end(); ++MenuRunner)
     populateMenu(MenuRunner->second, MenuRunner->first);
-  }
 
   // Add status indicators etc...
@@ -118 +120 @@
 {
   for (std::string::const_iterator CharRunner = name.begin(); CharRunner != name.end(); ++CharRunner) {
-    if (ShortcutList.find(*CharRunner) == ShortcutList.end())
+    if (ShortcutList.find(*CharRunner) == ShortcutList.end()) {
+      ShortcutList.insert(*CharRunner);
       return *CharRunner;
+    }
   }
-  DoeLog(1) && (eLog() << Verbose(1) << "Could not find a suitable shortform for TextWindow::getSuitableShortForm()." << endl);
-  return ((char)(ShortcutList.size() % 10) + '0');
+  // if no letter matches, take digits
+  int i=0;
+  for (;i<10;++i) {
+    if (ShortcutList.find((char)i + '0') == ShortcutList.end())
+      break;
+  }
+  if (i != 10) {
+    ShortcutList.insert((char)i + '0');
+    return ((char)i + '0');
+  } else {
+    DoeLog(1) && (eLog() << Verbose(1) << "Could not find a suitable shortform for " << name << "." << endl);
+    return '#';
+  }
 }
 
@@ -129 +144 @@
   Action *ActionItem = NULL;
   set <char> ShortcutList;
+  // reserve 'q' for quit
+  ShortcutList.insert('q');
   // through all actions for this menu
   pair < multimap <std::string, std::string>::iterator, multimap <std::string, std::string>::iterator > MenuActions = MapOfActions::getInstance().MenuContainsActionMap.equal_range(MenuName);
   for (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),MapOfActions::getInstance().getDescription(MenuRunner->second).c_str(),Menu,ActionItem);