Changeset b59da6 for src/UIElements/TextUI

Timestamp:

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

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.

Location:

src/UIElements/TextUI

Files:

• TextWindow.cpp (modified) (3 diffs)
• TextWindow.hpp (modified) (2 diffs)

src/UIElements/TextUI/TextWindow.cpp

@@ -23 +23 @@
 #include <boost/shared_ptr.hpp>
 
-#include "Menu/Menu.hpp"
-#include "Menu/MenuDescription.hpp"
-#include "Menu/TextMenu.hpp"
-#include "Menu/ActionMenuItem.hpp"
-#include "Menu/SeperatorItem.hpp"
-#include "Menu/DisplayMenuItem.hpp"
-#include "Menu/SubMenuItem.hpp"
+#include "Menu/TextMenu/TextMenu.hpp"
+#include "Menu/TextMenu/TxMenu.hpp"
+#include "Menu/TextMenu/ActionMenuItem.hpp"
+#include "Menu/TextMenu/SeperatorItem.hpp"
+#include "Menu/TextMenu/DisplayMenuItem.hpp"
+#include "Menu/TextMenu/SubMenuItem.hpp"
 #include "TextUI/TextStatusIndicator.hpp"
 #include "TextUI/TextWindow.hpp"
@@ -57 +56 @@
 TextWindow::TextWindow()
 {
-  map <std::string, TextMenu *> NametoTextMenuMap;
-  std::set <char> ShortcutList;
+  // build the main menu
+  main_menu = new TextMenu<TxMenu>(std::cout, "");
   // reserve s for save and q for quite
-  ShortcutList.insert('s');
-  ShortcutList.insert('q');
-
-  // build the main menu
-  main_menu = new TextMenu(Log() << Verbose(0), "Main Menu");
+  main_menu->reserveShortcut('s', "output");
+  main_menu->reserveShortcut('q', "quit");
 
   moleculeView = new StreamStringView(boost::bind(&MoleculeListClass::Enumerate,World::getInstance().getMolecules(),_1));
-  new DisplayMenuItem(main_menu,moleculeView,"Molecule List");
+  new DisplayMenuItem(main_menu->getMenuInstance(),moleculeView,"Molecule List");
 
-  new SeperatorItem(main_menu);
+  new SeperatorItem(main_menu->getMenuInstance());
 
-  Action* undoAction = ActionRegistry::getInstance().getActionByName("undo");
-  new ActionMenuItem(getSuitableShortForm(ShortcutList,"Undo last operation"),"Undo last operation",main_menu,undoAction);
+  main_menu->init();
 
-  Action* redoAction = ActionRegistry::getInstance().getActionByName("redo");
-  new ActionMenuItem(getSuitableShortForm(ShortcutList,"Redo last operation"),"Redo last operation",main_menu,redoAction);
-
-  new SeperatorItem(main_menu);
-
-  MenuDescription menudescriptions;
-  for(MenuDescription::const_iterator iter = menudescriptions.getBeginIter(); iter != menudescriptions.getEndIter(); ++iter) {
-    const std::string &MenuName = iter->first;
-    TextMenu *Menu = new TextMenu((ostream &)std::cout, menudescriptions.getDescription(MenuName));
-    NametoTextMenuMap.insert( pair <std::string, TextMenu *> (MenuName, Menu) );
-    new SubMenuItem(getSuitableShortForm(ShortcutList,MenuName),menudescriptions.getDescription(MenuName).c_str(),main_menu,Menu);
-  }
-
-  new SeperatorItem(main_menu);
+  new SeperatorItem(main_menu->getMenuInstance());
 
   // save has reserved key 's'
-  Action *saveConfigAction = ActionRegistry::getInstance().getActionByName("output");
-  new ActionMenuItem('s',"save current setup to config files",main_menu,saveConfigAction);
+//  Action *saveConfigAction = ActionRegistry::getInstance().getActionByName("output");
+  new ActionMenuItem('s',"save current setup to config files",main_menu->getMenuInstance(),"output");
 
-  ActionTraits quitTrait(OptionTrait("quitAction", &typeid(void), "quits the program"));
-  quitAction = new MethodAction(quitTrait,boost::bind(&TextMenu::doQuit,main_menu),false);
-  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)
-    populateMenu(MenuRunner->second, MenuRunner->first);
+  // create a specific quit action for this UI and store in registry
+  ActionTraits quitTrait(OptionTrait("quit", &typeid(void), "quits the program"));
+  quitAction = new MethodAction(quitTrait,boost::bind(&TxMenu::doQuit,main_menu->getMenuInstance()),true);
+  new ActionMenuItem('q',"quit",main_menu->getMenuInstance(),"quit");
 
   // Add status indicators etc...
-
   statusIndicator = new TextStatusIndicator();
 }
@@ -122 +99 @@
 }
 
-char TextWindow::getSuitableShortForm(std::set <char> &ShortcutList, const std::string name) const
-{
-  for (std::string::const_iterator CharRunner = name.begin(); CharRunner != name.end(); ++CharRunner) {
-    if (ShortcutList.find(*CharRunner) == ShortcutList.end()) {
-      ShortcutList.insert(*CharRunner);
-      return *CharRunner;
-    }
-  }
-  // 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 '#';
-  }
-}
-
-void TextWindow::populateMenu(TextMenu* Menu, const  std::string &MenuName)
-{
-  Action *ActionItem = NULL;
-  set <char> ShortcutList;
-  // reserve 'q' for quit
-  ShortcutList.insert('q');
-  // through all actions for this menu
-  MenuDescription md;
-  std::multimap <std::string, std::string> MenuItems = md.getMenuItemsMap();
-  std::pair < std::multimap <std::string, std::string>::iterator, std::multimap <std::string, std::string>::iterator > MenuActions = MenuItems.equal_range(MenuName);
-  for (std::multimap <std::string, std::string>::const_iterator MenuRunner = MenuActions.first; MenuRunner != MenuActions.second; ++MenuRunner) {
-    ActionItem = ActionRegistry::getInstance().getActionByName(MenuRunner->second);
-    new ActionMenuItem(getSuitableShortForm(ShortcutList, MenuRunner->second),ActionItem->Traits.getDescription().c_str(),Menu,ActionItem);
-  }
-  // finally add default quit item
-  ActionTraits LeaveActionTraits("Leave menu: "+Menu->getTitle());
-  Action *returnFromAction = new TextMenu::LeaveAction(Menu, LeaveActionTraits);
-  //returnFromActions.push_back(returnFromAction);
-  MenuItem *returnFromItem = new ActionMenuItem('q',"return to Main menu",Menu,returnFromAction);
-  Menu->addDefault(returnFromItem);
-}

src/UIElements/TextUI/TextWindow.hpp

@@ -14 +14 @@
 #include <set>
 
-class TextMenu;
+#include "Menu/TextMenu/TextMenu.hpp"
+
 class Action;
 class StringView;
 class TextStatusIndicator;
+class TxMenu;
 
 
@@ -29 +31 @@
 
 private:
-  // populaters
-  char getSuitableShortForm(std::set <char> &ShortcutList, const std::string name) const;
-  void populateMenu(TextMenu* Menu, const std::string &name);
-
-  TextMenu *main_menu;
+  TextMenu<TxMenu> *main_menu;
 
   // some actions only needed in textMenus