Changeset b59da6 for src/UIElements/Menu/TextMenu/TxMenu.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/TextMenu/TxMenu.cpp (moved) (moved from src/UIElements/Menu/TextMenu.cpp ) (11 diffs)

src/UIElements/Menu/TextMenu/TxMenu.cpp

@@ -7 +7 @@
 
 /*
- * TextMenu.cpp
+ * TxMenu.cpp
  *
  *  Created on: Dec 10, 2009
@@ -21 +21 @@
 
 #include <boost/bind.hpp>
+#include <algorithm>
 #include <iostream>
 #include <cmath>
-#include "Menu/TextMenu.hpp"
-#include "Menu/MenuItem.hpp"
+#include "Actions/Action.hpp"
+#include "Actions/ActionTraits.hpp"
+#include "Menu/TextMenu/TxMenu.hpp"
+#include "Menu/TextMenu/MenuItem.hpp"
 #include "Helpers/Assert.hpp"
 
@@ -32 +35 @@
  * The text will later be displayed using the stream passed to the constructor.
  */
-TextMenu::TextMenu(ostream& _outputter, const string _title, char _spacer,int _length) :
+TxMenu::TxMenu(std::ostream& _outputter, const std::string _title, char _spacer,int _length) :
   defaultItem(0),
   outputter(_outputter),
@@ -42 +45 @@
 }
 
-TextMenu::~TextMenu()
+TxMenu::~TxMenu()
 {
-  for(list<MenuItem*>::iterator it=items.begin(); it != items.end(); it++)
+  for(std::list<MenuItem*>::iterator it=items.begin(); it != items.end(); it++)
     delete (*it);
 }
 
-
-void TextMenu::addItem(MenuItem* item) {
+void TxMenu::addItem(MenuItem* item) {
   items.push_back(item);
 }
 
-void TextMenu::removeItem(MenuItem* item) {
+void TxMenu::removeItem(MenuItem* item) {
   items.remove(item);
 }
 
-void TextMenu::doQuit(){
+void TxMenu::doQuit(){
   quit = true;
 }
 
-bool TextMenu::hasQuit(){
+bool TxMenu::hasQuit(){
   return quit;
 }
 
-void TextMenu::showEntry(MenuItem* entry){
+void TxMenu::showEntry(MenuItem* entry){
   if(entry->isActive()==false){
     outputter << "(";
@@ -76 +78 @@
 }
 
-void TextMenu::display() {
+void TxMenu::display() {
   char choice;
   bool somethingChosen = false;
@@ -89 +91 @@
           outputter << spacer;
     outputter << '\n';
-    for_each(items.begin(), items.end(), boost::bind(&TextMenu::showEntry,this,_1));
+    for_each(items.begin(), items.end(), boost::bind(&TxMenu::showEntry,this,_1));
     outputter.flush();
 
-    cin >> choice;
+    std::cin >> choice;
 
-    list<MenuItem*>::iterator iter;
+    std::list<MenuItem*>::iterator iter;
     for(iter = items.begin(); iter!=items.end();iter++){
       if((*iter)->isActive()){
@@ -106 +108 @@
       }
       else{
-        outputter << "Invalid Choice!" <<  endl;
+        outputter << "Invalid Choice!" <<  std::endl;
       }
     }
@@ -112 +114 @@
 }
 
-string TextMenu::getTitle(){
+std::string TxMenu::getTitle(){
   return title;
 }
 
-void TextMenu::addDefault(MenuItem* _defaultItem) {
+std::ostream& TxMenu::getOutputter()
+{
+  return outputter;
+}
+
+
+void TxMenu::addDefault(MenuItem* _defaultItem) {
   defaultItem = _defaultItem;
 }
@@ -122 +130 @@
 /****************************** Contained Actions ****************/
 
-TextMenu::LeaveAction::LeaveAction(TextMenu* _menu, const ActionTraits & LeaveActionTrait) :
-  Action(LeaveActionTrait, false),
+TxMenu::LeaveAction::LeaveAction(TxMenu* const _menu, const ActionTraits & LeaveActionTrait) :
+  Action(LeaveActionTrait, true),
   menu(_menu)
 {}
 
-TextMenu::LeaveAction::~LeaveAction(){}
+TxMenu::LeaveAction::~LeaveAction(){}
 
-bool TextMenu::LeaveAction::canUndo(){
+bool TxMenu::LeaveAction::canUndo(){
   return false;
 }
 
-bool TextMenu::LeaveAction::shouldUndo(){
+bool TxMenu::LeaveAction::shouldUndo(){
   return false;
 }
 
-void TextMenu::LeaveAction::getParametersfromValueStorage()
+void TxMenu::LeaveAction::getParametersfromValueStorage()
 {}
 
-Dialog* TextMenu::LeaveAction::fillDialog(Dialog *dialog){
+Dialog* TxMenu::LeaveAction::fillDialog(Dialog *dialog){
   ASSERT(dialog,"No Dialog given when filling action dialog");
   return dialog;
@@ -146 +154 @@
 
 
-Action::state_ptr TextMenu::LeaveAction::performCall(){
+Action::state_ptr TxMenu::LeaveAction::performCall(){
   menu->doQuit();
   return Action::success;
@@ -152 +160 @@
 
 
-Action::state_ptr TextMenu::LeaveAction::performUndo(Action::state_ptr){
+Action::state_ptr TxMenu::LeaveAction::performUndo(Action::state_ptr){
   ASSERT(0,"Cannot undo leaving a menu");
   return Action::success;
 }
 
-Action::state_ptr TextMenu::LeaveAction::performRedo(Action::state_ptr){
+Action::state_ptr TxMenu::LeaveAction::performRedo(Action::state_ptr){
   ASSERT(0,"Cannot redo leaving a menu");
   return Action::success;