Changeset 0f7883 for molecuilder/src/Parser/XyzParser.cpp

Timestamp:

Apr 1, 2010, 12:16:29 PM (16 years ago)

Author:

Saskia Metzler <metzler@…>

Children:

d3513b

Parents:

2704e2 (diff), 770138 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge Till's structure refactoring

Merge commit 'till/StructureRefactoring' into StateAndFormatParser

Conflicts:

molecuilder/src/Makefile.am
molecuilder/src/unittests/Makefile.am

File:

• molecuilder/src/Parser/XyzParser.cpp (modified) (2 diffs)

molecuilder/src/Parser/XyzParser.cpp

@@ -44 +44 @@
 
   for (int i = 0; i < numberOfAtoms; i++) {
-    newAtom = World::get()->createAtom();
+    newAtom = World::getInstance().createAtom();
     *file >> type >> ws >> newAtom->x.x[0] >> ws >> newAtom->x.x[1] >> ws >> newAtom->x.x[2];
-    newAtom->setType(World::get()->getPeriode()->FindElement(type));
+    newAtom->setType(World::getInstance().getPeriode()->FindElement(type));
   }
 }
@@ -56 +56 @@
  */
 void XyzParser::save(ostream* file) {
-  *file << World::get()->numAtoms() << endl << comment << endl;
+  *file << World::getInstance().numAtoms() << endl << comment << endl;
 
-  vector<atom*> atoms = World::get()->getAllAtoms();
+  vector<atom*> atoms = World::getInstance().getAllAtoms();
   for(vector<atom*>::iterator it = atoms.begin(); it < atoms.end(); it++) {
     *file << fixed << (*it)->getType()->symbol << "\t" << (*it)->x.x[0] << "\t" << (*it)->x.x[1] << "\t" << (*it)->x.x[2] << endl;