Changeset 120f8b for molecuilder/src/World.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/World.cpp (modified) (8 diffs)

molecuilder/src/World.cpp

@@ -9 +9 @@
 
 #include "atom.hpp"
+#include "molecule.hpp"
+#include "periodentafel.hpp"
 #include "Descriptors/AtomDescriptor.hpp"
 
@@ -14 +16 @@
 
 /******************************* getter and setter ************************/
-periodentafel* World::getPeriode(){
+periodentafel *&World::getPeriode(){
   return periode;
 }
@@ -26 +28 @@
 }
 
+int World::numAtoms(){
+  return atoms.size();
+}
+
+int World::numMolecules(){
+  return molecules_deprecated->ListOfMolecules.size();
+}
+
+molecule* World::createMolecule(){
+  OBSERVE;
+  molecule *mol = NULL;
+  mol = new molecule(periode);
+  molecules_deprecated->insert(mol);
+  molecules.insert(mol);
+  mol->signOn(this);
+  return mol;
+}
+
+
 /******************************* Singleton Stuff **************************/
 
@@ -35 +56 @@
 
 World::World() :
-    dummyId(0)
+    dummyId(0),
+    periode(new periodentafel),
+    molecules_deprecated(new MoleculeListClass)
 {}
 
 World::~World()
-{}
+{
+  delete periode;
+}
 
 World* World::get(){
@@ -51 +76 @@
 
 void World::destroy(){
+  // For legacy reasons all atoms have to be destroyed first, since unregistering would cause deadlocks otherwise
+  theWorld->destroyLegacy();
+  //WARNING: at this point we have a small race condition, when sombody now tries to access the world.
+
   // boost supports RAII-Style locking, so we don't need to unlock
   boost::mutex::scoped_lock guard(worldLock);
@@ -58 +87 @@
 
 World* World::reset(){
+  // For legacy reasons all atoms have to be destroyed first, since unregistering would cause deadlocks otherwise
+  theWorld->destroyLegacy();
+  //WARNING: at this point we have a small race condition, when sombody now tries to access the world.
+
   World* oldWorld = 0;
   {
@@ -81 +114 @@
 /******************************* deprecated Legacy Stuff ***********************/
 
-MoleculeListClass *World::getMolecules() {
-  return molecules;
+MoleculeListClass *&World::getMolecules() {
+  return molecules_deprecated;
 }
 
@@ -91 +124 @@
 }
 
+void World::destroyLegacy(){
+  //delete molecules_deprecated;
+}
+
 void World::unregisterAtom(atom *theAtom){
   OBSERVE;