Changeset e04838 for molecuilder

Timestamp:

May 8, 2010, 8:34:05 PM (16 years ago)

Author:

Frederik Heber <heber@…>

Children:

495a53

Parents:

536ce2

git-author:

Frederik Heber <heber@…> (05/08/10 20:30:27)

git-committer:

Frederik Heber <heber@…> (05/08/10 20:34:05)

Message:

class config added to World.

• World now has the global configuration.
• new function World::getConfig().
• TextWindow::TextWindow() uses thr above to obtain the configuration.

Signed-off-by: Frederik Heber <heber@…>

Location:

molecuilder/src

Files:

• UIElements/TextWindow.cpp (modified) (1 diff)
• UIElements/UIFactory.hpp (modified) (1 diff)
• World.cpp (modified) (4 diffs)
• World.hpp (modified) (3 diffs)
• builder.cpp (modified) (1 diff)

molecuilder/src/UIElements/TextWindow.cpp

@@ -52 +52 @@
 {
   MoleculeListClass *molecules = World::getInstance().getMolecules();
-  config *configuration = NULL;
+  config *configuration = World::getInstance().getConfig();
   periodentafel *periode = World::getInstance().getPeriode();
   char *ConfigFileName = NULL;

molecuilder/src/UIElements/UIFactory.hpp

@@ -12 +12 @@
 class Dialog;
 class DialogDescription;
-
-class MoleculeListClass;
-class config;
-class periodentafel;
 
 struct menuPopulaters;

molecuilder/src/World.cpp

@@ -9 +9 @@
 
 #include "atom.hpp"
+#include "config.hpp"
 #include "molecule.hpp"
 #include "periodentafel.hpp"
@@ -25 +26 @@
 periodentafel *&World::getPeriode(){
   return periode;
+}
+
+config *&World::getConfig(){
+  return configuration;
 }
 
@@ -267 +272 @@
 World::World() :
     periode(new periodentafel),
+    configuration(new config),
     atoms(),
     currAtomId(0),
@@ -292 +298 @@
   delete molecules_deprecated;
   delete periode;
+  delete configuration;
   MoleculeSet::iterator molIter;
   for(molIter=molecules.begin();molIter!=molecules.end();++molIter){

molecuilder/src/World.hpp

@@ -30 +30 @@
 
 // forward declarations
+class config;
 class periodentafel;
 class MoleculeListClass;
@@ -75 +76 @@
 
   /**
+   * returns the configuration for the world.
+   */
+  config *&getConfig();
+
+  /**
    * returns the first atom that matches a given descriptor.
    * Do not rely on ordering for descriptors that match more than one atom.
@@ -234 +240 @@
 
   periodentafel *periode;
+  config *configuration;
   static double *cell_size;
   static char *defaultName;

molecuilder/src/builder.cpp

@@ -2560 +2560 @@
 int main(int argc, char **argv)
 {
-    config *configuration = new config;
+    config *configuration = World::getInstance().getConfig();
     Vector x, y, z, n;
     ifstream test;
     ofstream output;
     string line;
-    char *ConfigFileName = NULL;
 
     cout << ESPACKVersion << endl;