Changeset 536ce2 for molecuilder

Timestamp:

May 8, 2010, 8:14:04 PM (16 years ago)

Author:

Frederik Heber <heber@…>

Children:

e04838

Parents:

4d2636

Message:

...UIFactory::makeMainWindow() now has only a single parameter, namely menuPopulaters.

• as molecules and periodentafel can be accessed globally from singleton World, there is no need to pass these around anymore.
• typedef MenuMaker and populateEditMoleculesMenu() equally stripped.

Location:

molecuilder/src

Files:

• UIElements/CommandLineUIFactory.cpp (modified) (1 diff)
• UIElements/CommandLineUIFactory.hpp (modified) (1 diff)
• UIElements/CommandLineWindow.cpp (modified) (1 diff)
• UIElements/CommandLineWindow.hpp (modified) (1 diff)
• UIElements/MainWindow.hpp (modified) (1 diff)
• UIElements/TextUIFactory.cpp (modified) (1 diff)
• UIElements/TextUIFactory.hpp (modified) (1 diff)
• UIElements/TextWindow.cpp (modified) (3 diffs)
• UIElements/TextWindow.hpp (modified) (1 diff)
• UIElements/UIFactory.hpp (modified) (1 diff)
• builder.cpp (modified) (2 diffs)

molecuilder/src/UIElements/CommandLineUIFactory.cpp

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

molecuilder/src/UIElements/CommandLineUIFactory.hpp

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

molecuilder/src/UIElements/CommandLineWindow.cpp

@@ -16 +16 @@
 
 // TODO: see what code can be moved to a base class for Graphic and CommandLine Windows
-CommandLineWindow::CommandLineWindow(menuPopulaters populaters,MoleculeListClass *molecules, config *configuration, periodentafel *periode, char *ConfigFileName)
+CommandLineWindow::CommandLineWindow(menuPopulaters populaters)
 {
 

molecuilder/src/UIElements/CommandLineWindow.hpp

@@ -16 +16 @@
 {
 public:
-  CommandLineWindow(menuPopulaters,MoleculeListClass *, config *, periodentafel *, char *);
+  CommandLineWindow(menuPopulaters);
   virtual ~CommandLineWindow();
 

molecuilder/src/UIElements/MainWindow.hpp

@@ -28 +28 @@
  * The type of menuPopulators
  */
-typedef void (*MenuMaker)(Menu*,MoleculeListClass*, config*, periodentafel*);
+typedef void (*MenuMaker)(Menu*);
 
 /**

molecuilder/src/UIElements/TextUIFactory.cpp

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

molecuilder/src/UIElements/TextUIFactory.hpp

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

molecuilder/src/UIElements/TextWindow.cpp

@@ -27 +27 @@
 #include "molecule.hpp"
 #include "periodentafel.hpp"
+#include "World.hpp"
 
 #include "Legacy/oldmenu.hpp"
@@ -48 +49 @@
 
 // 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)
+TextWindow::TextWindow(menuPopulaters populaters)
 {
+  MoleculeListClass *molecules = World::getInstance().getMolecules();
+  config *configuration = NULL;
+  periodentafel *periode = World::getInstance().getPeriode();
+  char *ConfigFileName = NULL;
   old_menu = new oldmenu;
 
@@ -101 +106 @@
   // call all functions used to build the submenus
 
-  populaters.MakeEditMoleculesMenu(editMoleculesMenu,molecules,configuration,periode);
+  populaters.MakeEditMoleculesMenu(editMoleculesMenu);
 
   Action *returnFromEditMoleculeAction = new TextMenu::LeaveAction(editMoleculesMenu);

molecuilder/src/UIElements/TextWindow.hpp

@@ -20 +20 @@
 {
 public:
-  TextWindow(menuPopulaters,MoleculeListClass *, config *, periodentafel *, char *);
+  TextWindow(menuPopulaters);
   virtual ~TextWindow();
 

molecuilder/src/UIElements/UIFactory.hpp

@@ -38 +38 @@
    * Produce some kind of main window, of whichever type was chosen when the factory was created
    */
-  virtual MainWindow* makeMainWindow(menuPopulaters,MoleculeListClass *, config *, periodentafel *, char *)=0;
+  virtual MainWindow* makeMainWindow(menuPopulaters)=0;
 
   /**

molecuilder/src/builder.cpp

@@ -2514 +2514 @@
 /***************************************** Functions used to build all menus **********************/
 
-void populateEditMoleculesMenu(Menu* editMoleculesMenu,MoleculeListClass *molecules, config *configuration, periodentafel *periode){
+void populateEditMoleculesMenu(Menu* editMoleculesMenu){
+  MoleculeListClass *molecules = World::getInstance().getMolecules();
+  periodentafel *periode = World::getInstance().getPeriode();
+
   // build the EditMoleculesMenu
   Action *createMoleculeAction = new MethodAction("createMoleculeAction",boost::bind(&MoleculeListClass::createNewMolecule,molecules,periode));
@@ -2587 +2590 @@
       populaters.MakeEditMoleculesMenu = populateEditMoleculesMenu;
 
-      MainWindow *mainWindow = UIFactory::getInstance().makeMainWindow(populaters,World::getInstance().getMolecules(), configuration, World::getInstance().getPeriode(), ConfigFileName);
+      MainWindow *mainWindow = UIFactory::getInstance().makeMainWindow(populaters);
       mainWindow->display();
       delete mainWindow;