Changeset 12b845 for src/UIElements

Timestamp:

Jan 9, 2010, 11:30:49 AM (15 years ago)

Author:

Tillmann Crueger <crueger@…>

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:

3c5606

Parents:

cc04b7

Message:

Seperated building of mainWindow and contained Menus

• Moved code to build Menus to builder.cpp
• Moved WindowGeneration code to constructor

Location:

src/UIElements

Files:

• MainWindow.hpp (modified) (2 diffs)
• TextUIFactory.cpp (modified) (1 diff)
• TextUIFactory.hpp (modified) (1 diff)
• TextWindow.cpp (modified) (2 diffs)
• TextWindow.hpp (modified) (1 diff)
• UIFactory.hpp (modified) (2 diffs)

src/UIElements/MainWindow.hpp

@@ -13 +13 @@
 class periodentafel;
 
+class Menu;
+
 class MainWindow
 {
@@ -19 +21 @@
   virtual ~MainWindow();
 
-  virtual void display(MoleculeListClass *, config *, periodentafel *, char *)=0;
+  virtual void display()=0;
 
 };
 
+typedef void (*MenuMaker)(Menu*,MoleculeListClass*, config*, periodentafel*);
+
+struct menuPopulaters{
+  MenuMaker MakeEditMoleculesMenu;
+};
+
 #endif /* MAINWINDOW_HPP_ */

src/UIElements/TextUIFactory.cpp

@@ -27 +27 @@
 }
 
-MainWindow* TextUIFactory::makeMainWindow() {
-  return new TextWindow();
+MainWindow* TextUIFactory::makeMainWindow(menuPopulaters populaters,MoleculeListClass *molecules, config *configuration, periodentafel *periode, char *ConfigFileName) {
+  return new TextWindow(populaters,molecules,configuration,periode,ConfigFileName);
 }
 

src/UIElements/TextUIFactory.hpp

@@ -19 +19 @@
 
   virtual Dialog* makeDialog();
-  virtual MainWindow* makeMainWindow();
+  virtual MainWindow* makeMainWindow(menuPopulaters,MoleculeListClass *, config *, periodentafel *, char *);
 
 protected:

src/UIElements/TextWindow.cpp

@@ -7 +7 @@
 
 #include "UIElements/TextWindow.hpp"
+
+#include <boost/bind.hpp>
+
+
+// TODO: When done with refactoring most of these wont be needed anymore
+#include "analysis_correlation.hpp"
+#include "atom.hpp"
+#include "bond.hpp"
+#include "bondgraph.hpp"
+#include "boundary.hpp"
+#include "config.hpp"
+#include "element.hpp"
+#include "ellipsoid.hpp"
+#include "helpers.hpp"
+#include "leastsquaremin.hpp"
+#include "linkedcell.hpp"
+#include "log.hpp"
+#include "memoryusageobserverunittest.hpp"
+#include "molecule.hpp"
+#include "periodentafel.hpp"
+
 #include "../menu.hpp"
+
+#include "Menu/Menu.hpp"
+#include "Menu/TextMenu.hpp"
+#include "Menu/ActionMenuItem.hpp"
+#include "Menu/SeperatorItem.hpp"
+#include "Menu/DisplayMenuItem.hpp"
+#include "Menu/SubMenuItem.hpp"
+#include "Actions/MethodAction.hpp"
+#include "Actions/ErrorAction.hpp"
+#include "Views/StreamStringView.hpp"
+#include "Views/MethodStringView.hpp"
 
 #include <iostream>
@@ -13 +45 @@
 using namespace std;
 
-TextWindow::TextWindow()
+// TODO: see what code can be moved to a base class for Graphic and Text Windows
+TextWindow::TextWindow(menuPopulaters populaters,MoleculeListClass *molecules, config *configuration, periodentafel *periode, char *ConfigFileName)
 {
-  // TODO Auto-generated constructor stub
+  old_menu = new oldmenu;
 
+  // build the main menu
+  main_menu = new TextMenu(Log() << Verbose(0), "Main Menu");
+
+  moleculeView = new StreamStringView(boost::bind(&MoleculeListClass::Enumerate,molecules,_1));
+  new DisplayMenuItem(main_menu,moleculeView,"Molecule List");
+
+  new SeperatorItem(main_menu);
+
+  Action *setMoleculeAction = new MethodAction("setMoleculeAction",boost::bind(&MoleculeListClass::flipChosen,molecules));
+  new ActionMenuItem('a',"set molecule (in)active",main_menu,setMoleculeAction);
+
+  TextMenu *editMoleculesMenu = new TextMenu(Log() << Verbose(0), "Edit Molecules");
+  new SubMenuItem('e',"edit molecules (load, parse, save)",main_menu,editMoleculesMenu);
+
+  Action *manipulateMoleculeAction = new MethodAction("manipulateMoleculeAction",boost::bind(&oldmenu::ManipulateMolecules,old_menu,periode, molecules, configuration));
+  new ActionMenuItem('g',"globally manipulate atoms in molecule",main_menu,manipulateMoleculeAction);
+
+  Action *mergeMoleculeAction = new MethodAction("mergeMoleculeAction",boost::bind(&oldmenu::MergeMolecules,old_menu,periode, molecules));
+  new ActionMenuItem('M',"Merge molecules",main_menu,mergeMoleculeAction);
+
+  Action *manipulateAtomsAction = new MethodAction("manipulateAtomsAction",boost::bind(&oldmenu::ManipulateAtoms,old_menu,periode, molecules, configuration));
+  new ActionMenuItem('m',"manipulate atoms",main_menu,manipulateAtomsAction);
+
+  new SeperatorItem(main_menu);
+
+  Action *editConfigAction = new MethodAction("editConfigAction",boost::bind(&config::Edit,configuration));
+  new ActionMenuItem('c',"edit the current configuration",main_menu,editConfigAction);
+
+  new SeperatorItem(main_menu);
+
+  Action *saveConfigAction = new MethodAction("saveConfigAction",boost::bind(&config::SaveAll,configuration, ConfigFileName, periode, molecules));
+  new ActionMenuItem('s',"save current setup to config file",main_menu,saveConfigAction);
+
+  Action *doTestAction = new MethodAction("doTestAction",boost::bind(&oldmenu::testroutine,old_menu,molecules));
+  new ActionMenuItem('T',"call the current test routine",main_menu,doTestAction);
+
+  quitAction = new MethodAction("quitAction",boost::bind(&TextMenu::doQuit,main_menu),false);
+  new ActionMenuItem('q',"quit",main_menu,quitAction);
+
+  // call all functions used to build the submenus
+
+  populaters.MakeEditMoleculesMenu(editMoleculesMenu,molecules,configuration,periode);
+
+  returnFromEditMoleculeAction = new MethodAction("returnAction",boost::bind(&TextMenu::doQuit,editMoleculesMenu),false);
+  MenuItem *returnItem = new ActionMenuItem('q',"return to Main menu",editMoleculesMenu,returnFromEditMoleculeAction);
+
+  editMoleculesMenu->addDefault(returnItem);
 }
 
 TextWindow::~TextWindow()
 {
-  // TODO Auto-generated destructor stub
+  delete old_menu;
+  delete quitAction;
+  delete returnFromEditMoleculeAction;
+  delete moleculeView;
+  delete main_menu;
 }
 
-void TextWindow::display(MoleculeListClass *molecules, config *configuration, periodentafel *periode, char *ConfigFileName) {
-  cout << "creating main window" <<endl;
-  oldmenu *main_menu;
-  main_menu = new oldmenu;
-  main_menu->perform(molecules, configuration, periode, ConfigFileName);
-  delete main_menu;
+void TextWindow::display() {
+  main_menu->display();
 }

src/UIElements/TextWindow.hpp

@@ -11 +11 @@
 #include "UIElements/MainWindow.hpp"
 
+class TextMenu;
+class Action;
+class oldmenu;
+class StringView;
+
 class TextWindow : public MainWindow
 {
 public:
-  TextWindow();
+  TextWindow(menuPopulaters,MoleculeListClass *, config *, periodentafel *, char *);
   virtual ~TextWindow();
 
-  virtual void display(MoleculeListClass *, config *, periodentafel *, char *);
+  virtual void display();
+private:
+  TextMenu *main_menu;
+
+  // some actions only needed in textMenus
+  Action *quitAction;
+  Action *returnFromEditMoleculeAction;
+  // all views that are contained in the main Menu
+  StringView *moleculeView;
+
+  // This class still contains a lot of scattered functionality
+  oldmenu *old_menu;
 };
 

src/UIElements/UIFactory.hpp

@@ -12 +12 @@
 class Dialog;
 
+class MoleculeListClass;
+class config;
+class periodentafel;
+
+struct menuPopulaters;
+
 class UIFactory
 {
@@ -20 +26 @@
 
   // methods for creating UIElements
-  virtual MainWindow* makeMainWindow()=0;
+  virtual MainWindow* makeMainWindow(menuPopulaters,MoleculeListClass *, config *, periodentafel *, char *)=0;
   virtual Dialog* makeDialog()=0;