Changeset 7bfc19 for molecuilder/src/Legacy

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/Legacy/oldmenu.cpp (modified) (8 diffs)

molecuilder/src/Legacy/oldmenu.cpp

@@ -9 +9 @@
 #include "Legacy/oldmenu.hpp"
 #include "analysis_correlation.hpp"
+#include "World.hpp"
 #include "atom.hpp"
 #include "bond.hpp"
@@ -77 +78 @@
       case 'a': // absolute coordinates of atom
         Log() << Verbose(0) << "Enter absolute coordinates." << endl;
-        first = new atom;
+        first = World::get()->createAtom();
         first->x.AskPosition(mol->cell_size, false);
         first->type = periode->AskElement();  // give type
@@ -84 +85 @@
 
       case 'b': // relative coordinates of atom wrt to reference point
-        first = new atom;
+        first = World::get()->createAtom();
         valid = true;
         do {
@@ -100 +101 @@
 
       case 'c': // relative coordinates of atom wrt to already placed atom
-        first = new atom;
+        first = World::get()->createAtom();
         valid = true;
         do {
@@ -116 +117 @@
 
     case 'd': // two atoms, two angles and a distance
-        first = new atom;
+        first = World::get()->createAtom();
         valid = true;
         do {
@@ -216 +217 @@
 
       case 'e': // least square distance position to a set of atoms
-        first = new atom;
+        first = World::get()->createAtom();
         atoms = new (Vector*[128]);
         valid = true;
@@ -238 +239 @@
           mol->AddAtom(first);  // add to molecule
         } else {
-          delete first;
+          World::get()->destroyAtom(first);
           Log() << Verbose(0) << "Please enter at least two vectors!\n";
         }
@@ -781 +782 @@
         x.AddVector(&y); // per factor one cell width further
         for (int k=count;k--;) { // go through every atom of the original cell
-          first = new atom(); // create a new body
+          first = World::get()->createAtom(); // create a new body
           first->x.CopyVector(vectors[k]);  // use coordinate of original atom
           first->x.AddVector(&x);     // translate the coordinates