Changeset 120f8b for molecuilder/src/builder.cpp

Timestamp:

Feb 16, 2010, 5:26:59 PM (16 years ago)

Author:

Tillmann Crueger <crueger@…>

Children:

b53a7e

Parents:

323177

Message:

Moved control of molecules and periode to World.

File:

• molecuilder/src/builder.cpp (modified) (6 diffs)

molecuilder/src/builder.cpp

@@ -76 +76 @@
 #include "Actions/MethodAction.hpp"
 #include "Actions/small_actions.hpp"
+#include "World.hpp"
 #include "version.h"
 
@@ -2164 +2165 @@
 /********************************************** Main routine **************************************/
 
+void cleanUp(config *configuration){
+  World::destroy();
+  delete(configuration);
+  Log() << Verbose(0) <<  "Maximum of allocated memory: "
+    << MemoryUsageObserver::getInstance()->getMaximumUsedMemory() << endl;
+  Log() << Verbose(0) <<  "Remaining non-freed memory: "
+    << MemoryUsageObserver::getInstance()->getUsedMemorySize() << endl;
+  MemoryUsageObserver::purgeInstance();
+  logger::purgeInstance();
+  errorLogger::purgeInstance();
+  UIFactory::purgeInstance();
+  ActionRegistry::purgeRegistry();
+}
+
 int main(int argc, char **argv)
 {
-  periodentafel *periode = new periodentafel;
-    MoleculeListClass *molecules = new MoleculeListClass;
     molecule *mol = NULL;
     config *configuration = new config;
@@ -2178 +2191 @@
     setVerbosity(0);
     /* structure of ParseCommandLineOptions will be refactored later */
-    j = ParseCommandLineOptions(argc, argv, molecules, periode, *configuration, ConfigFileName);
+    j = ParseCommandLineOptions(argc, argv,  World::get()->getMolecules(), World::get()->getPeriode(), *configuration, ConfigFileName);
     switch (j){
         case 255:
         case 2:
         case 1:
-            delete (molecules);
-            delete (periode);
-            delete (configuration);
-            Log() << Verbose(0) << "Maximum of allocated memory: " << MemoryUsageObserver::getInstance()->getMaximumUsedMemory() << endl;
-            Log() << Verbose(0) << "Remaining non-freed memory: " << MemoryUsageObserver::getInstance()->getUsedMemorySize() << endl;
-            MemoryUsageObserver::getInstance()->purgeInstance();
-            logger::purgeInstance();
-            errorLogger::purgeInstance();
+            cleanUp(configuration);
             return (j == 1 ? 0 : j);
         default:
             break;
     }
-    if(molecules->ListOfMolecules.size() == 0){
-        mol = new molecule(periode);
+    if(World::get()->numMolecules() == 0){
+        mol = World::get()->createMolecule();
         if(mol->cell_size[0] == 0.){
             Log() << Verbose(0) << "enter lower tridiagonal form of basis matrix" << endl << endl;
@@ -2204 +2210 @@
             }
         }
-
         mol->ActiveFlag = true;
-        molecules->insert(mol);
     }
 
@@ -2218 +2222 @@
 
       UIFactory::makeUserInterface(UIFactory::Text);
-      MainWindow *mainWindow = UIFactory::get()->makeMainWindow(populaters,molecules, configuration, periode, ConfigFileName);
+      MainWindow *mainWindow = UIFactory::get()->makeMainWindow(populaters,World::get()->getMolecules(), configuration, World::get()->getPeriode(), ConfigFileName);
       mainWindow->display();
       delete mainWindow;
     }
 
-    if(periode->StorePeriodentafel(configuration->databasepath))
+    if(World::get()->getPeriode()->StorePeriodentafel(configuration->databasepath))
         Log() << Verbose(0) << "Saving of elements.db successful." << endl;
 
@@ -2229 +2233 @@
         Log() << Verbose(0) << "Saving of elements.db failed." << endl;
 
-    delete (molecules);
-    delete(periode);
-  delete(configuration);
-
-
-
-  Log() << Verbose(0) <<  "Maximum of allocated memory: "
-    << MemoryUsageObserver::getInstance()->getMaximumUsedMemory() << endl;
-  Log() << Verbose(0) <<  "Remaining non-freed memory: "
-    << MemoryUsageObserver::getInstance()->getUsedMemorySize() << endl;
-  MemoryUsageObserver::purgeInstance();
-  logger::purgeInstance();
-  errorLogger::purgeInstance();
-  UIFactory::purgeInstance();
-  ActionRegistry::purgeRegistry();
+  cleanUp(configuration);
   return (0);
 }