Changeset 7bfc19 for molecuilder/src/World.cpp

Timestamp:

Feb 24, 2010, 4:21:12 PM (16 years ago)

Author:

Tillmann Crueger <crueger@…>

Children:

5bf941

Parents:

01d28a

git-author:

Tillmann Crueger <crueger@…> (02/24/10 15:29:12)

git-committer:

Tillmann Crueger <crueger@…> (02/24/10 16:21:12)

Message:

Made the world solely responsible for creating and destroying atoms.

File:

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

molecuilder/src/World.cpp

@@ -51 +51 @@
 
 
+atom *World::createAtom(){
+  OBSERVE;
+  atom *res = NewAtom();
+  res->setId(currAtomId++);
+  res->setWorld(this);
+  atoms[res->getId()] = res;
+  return res;
+}
+
+int World::registerAtom(atom *atom){
+  OBSERVE;
+  atom->setId(currAtomId++);
+  atom->setWorld(this);
+  atoms[atom->getId()] = atom;
+  return atom->getId();
+}
+
+void World::destroyAtom(atom* atom){
+  OBSERVE;
+  int id = atom->getId();
+  destroyAtom(id);
+}
+
+void World::destroyAtom(int id) {
+  OBSERVE;
+  atom *atom = atoms[id];
+  assert(atom);
+  DeleteAtom(atom);
+  atoms.erase(id);
+}
+
 ManipulateAtomsProcess* World::manipulateAtoms(boost::function<void(atom*)> op,std::string name,AtomDescriptor descr){
   return new ManipulateAtomsProcess(op, descr,name,true);
@@ -160 +191 @@
 
 World::World() :
-    dummyId(0),
+    currAtomId(0),
     periode(new periodentafel),
     molecules_deprecated(new MoleculeListClass),
@@ -170 +201 @@
 World::~World()
 {
+  delete molecules_deprecated;
   delete periode;
+  AtomList::iterator iter;
+  for(iter=atoms.begin();iter!=atoms.end();++iter){
+    DeleteAtom((*iter).second);
+  }
+  atoms.clear();
 }
 
@@ -183 +220 @@
 
 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);
@@ -194 +227 @@
 
 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;
   {
@@ -224 +253 @@
   return molecules_deprecated;
 }
-
-// some legacy stuff to let the World know about items created outside
-void World::registerAtom(atom *theAtom){
-  OBSERVE;
-  atoms[dummyId++] = theAtom;
-}
-
-void World::destroyLegacy(){
-  //delete molecules_deprecated;
-}
-
-void World::unregisterAtom(atom *theAtom){
-  OBSERVE;
-  atoms.erase(theAtom->getId());
-}