Last change
on this file since 401b97 was 0647f4, checked in by Frederik Heber <heber@…>, 15 years ago |
Merge branch 'StateAndFormatParser' into CommandLineActionMapping
Conflicts:
molecuilder/src/Makefile.am
molecuilder/src/tesselation.cpp
molecuilder/src/unittests/Makefile.am
The following conflicts had to be resolved:
- molecuilder/src/Makefile.am had an old version of the HEADER definition which would not be merged automatically. ${PARSERHEADER} was missing.
- molecuilder/src/unittests/Makefile.am had an blank line too much
- TesselPoint::TesselPoint() had an older version where TesselPoint::Name was initialized to "-" instead of NULL. The latter should be correct due to missing delete(Name) in destructor.
- compilation errors arose due to the private nature of Vector::x[] introduced in the branch VectorRefactoring. This has been fixed in XyzParser, TremoloParser and the ParserUnitTest.
- ParserUnitTest runs fine.
Signed-off-by: Frederik Heber <heber@…>
|
-
Property mode
set to
100644
|
File size:
1.4 KB
|
Line | |
---|
1 | /*
|
---|
2 | * XyzParser.cpp
|
---|
3 | *
|
---|
4 | * Created on: Mar 2, 2010
|
---|
5 | * Author: metzler
|
---|
6 | */
|
---|
7 |
|
---|
8 | #include "XyzParser.hpp"
|
---|
9 | #include "World.hpp"
|
---|
10 | #include "atom.hpp"
|
---|
11 | #include "element.hpp"
|
---|
12 | #include "periodentafel.hpp"
|
---|
13 |
|
---|
14 | using namespace std;
|
---|
15 |
|
---|
16 | /**
|
---|
17 | * Constructor.
|
---|
18 | */
|
---|
19 | XyzParser::XyzParser() {
|
---|
20 | comment = "";
|
---|
21 | }
|
---|
22 |
|
---|
23 | /**
|
---|
24 | * Destructor.
|
---|
25 | */
|
---|
26 | XyzParser::~XyzParser() {
|
---|
27 | delete(&comment);
|
---|
28 | }
|
---|
29 |
|
---|
30 | /**
|
---|
31 | * Loads an XYZ file into the World.
|
---|
32 | *
|
---|
33 | * \param XYZ file
|
---|
34 | */
|
---|
35 | void XyzParser::load(istream* file) {
|
---|
36 | atom* newAtom;
|
---|
37 | int numberOfAtoms;
|
---|
38 | char commentBuffer[512], type[3];
|
---|
39 |
|
---|
40 | // the first line tells number of atoms, the second line is always a comment
|
---|
41 | *file >> numberOfAtoms >> ws;
|
---|
42 | file->getline(commentBuffer, 512);
|
---|
43 | comment = commentBuffer;
|
---|
44 |
|
---|
45 | for (int i = 0; i < numberOfAtoms; i++) {
|
---|
46 | newAtom = World::getInstance().createAtom();
|
---|
47 | *file >> type >> ws >> newAtom->x[0] >> ws >> newAtom->x[1] >> ws >> newAtom->x[2];
|
---|
48 | newAtom->setType(World::getInstance().getPeriode()->FindElement(type));
|
---|
49 | }
|
---|
50 | }
|
---|
51 |
|
---|
52 | /**
|
---|
53 | * Saves the current state of the World into the given XYZ file.
|
---|
54 | *
|
---|
55 | * \param XYZ file
|
---|
56 | */
|
---|
57 | void XyzParser::save(ostream* file) {
|
---|
58 | *file << World::getInstance().numAtoms() << endl << comment << endl;
|
---|
59 |
|
---|
60 | vector<atom*> atoms = World::getInstance().getAllAtoms();
|
---|
61 | for(vector<atom*>::iterator it = atoms.begin(); it < atoms.end(); it++) {
|
---|
62 | *file << fixed << (*it)->getType()->symbol << "\t" << (*it)->x[0] << "\t" << (*it)->x[1] << "\t" << (*it)->x[2] << endl;
|
---|
63 | }
|
---|
64 | }
|
---|
Note:
See
TracBrowser
for help on using the repository browser.