Changeset 0f7883 for molecuilder/src/Parser/TremoloParser.hpp

Timestamp:

Apr 1, 2010, 12:16:29 PM (15 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/TremoloParser.hpp (modified) (4 diffs)

molecuilder/src/Parser/TremoloParser.hpp

@@ -12 +12 @@
 #include "FormatParser.hpp"
 
+/**
+ * Holds tremolo-specific information which is not store in the atom class.
+ */
+class TremoloAtomInfoContainer {
+public:
+  TremoloAtomInfoContainer();
+  std::string F;
+  std::string stress;
+  std::string imprData;
+  std::string GroupMeasureTypeNo;
+  std::string extType;
+  std::string name;
+  std::string resName;
+  std::string chainID;
+  std::string resSeq;
+  std::string occupancy;
+  std::string tempFactor;
+  std::string segID;
+  std::string Charge;
+  std::string charge;
+  std::string GrpTypeNo;
+};
+
+/**
+ * Loads a tremolo file into the World and saves the World as a tremolo file.
+ */
 class TremoloParser:public FormatParser
 {
@@ -27 +53 @@
    * Known keys for the ATOMDATA line.
    */
-  enum StringValue {
+  enum atomDataKey {
+    noKey,
     x,
     u,
@@ -53 +80 @@
    * Map to associate the known keys with numbers.
    */
-  std::map<std::string, StringValue> knownKeys;
+  std::map<std::string, atomDataKey> knownKeys;
 
   /**
@@ -64 +91 @@
    * file.
    */
-  std::map<std::string, std::string> moreData;
+  std::map<int, TremoloAtomInfoContainer> moreData;
 };