Changeset f2efcf for molecuilder/src/Parser

Timestamp:

Mar 5, 2010, 12:53:13 PM (16 years ago)

Author:

Saskia Metzler <metzler@…>

Children:

5aefaa

Parents:

4938aa

Message:

the XYZ parser

Location:

molecuilder/src/Parser

Files:

• ChangeTracker.cpp (moved) (moved from molecuilder/src/ChangeTracker.cpp ) (4 diffs)
• ChangeTracker.hpp (moved) (moved from molecuilder/src/ChangeTracker.hpp )
• FormatParser.cpp (added)
• FormatParser.hpp (moved) (moved from molecuilder/src/FormatParser.hpp ) (1 diff)
• TremoloParser.cpp (moved) (moved from molecuilder/src/TremoloParser.cpp )
• TremoloParser.hpp (moved) (moved from molecuilder/src/TremoloParser.hpp )
• XyzParser.cpp (added)
• XyzParser.hpp (added)

molecuilder/src/Parser/ChangeTracker.cpp

@@ -10 +10 @@
 ChangeTracker* ChangeTracker::instance = NULL;
 
+/**
+ * Constructor. Signs on as an observer for the World.
+ */
 ChangeTracker::ChangeTracker() {
   isConsistent = true;
@@ -15 +18 @@
 }
 
+/**
+ * Destructor. Signs off from the World.
+ */
 ChangeTracker::~ChangeTracker() {
   World::get()->signOff(this);
 }
 
+/**
+ * Returns the change tracker instance.
+ *
+ * \return this
+ */
 ChangeTracker* ChangeTracker::get() {
   if (instance == NULL) {
@@ -27 +38 @@
 }
 
+/**
+ * Destroys the change tracker instance. Be careful, the change tracker is a
+ * singleton and destruction might lead to a loss of consistency.
+ */
 void ChangeTracker::destroy() {
   delete instance;
@@ -32 +47 @@
 }
 
+/**
+ * With this, the World can update the change tracker's state.
+ */
 void ChangeTracker::update(Observable *publisher) {
   isConsistent = false;
 }
 
+/**
+ * Gets whether there are non-saved changes.
+ *
+ * \param true if there are any changes, false otherwise
+ */
 bool ChangeTracker::hasChanged() {
   return !isConsistent;
 }
 
+/**
+ * Tells all observers (which are the different parsers) that they are supposed
+ * to save the current state.
+ */
 void ChangeTracker::saveStatus() {
   if (hasChanged()) {

molecuilder/src/Parser/FormatParser.hpp

@@ -13 +13 @@
 #include "parser.hpp"
 
-using namespace std;
-
+/**
+ * General parser which observes the change tracker.
+ */
 class FormatParser : public Observer {
 public:
   FormatParser();
-  ~FormatParser();
-  virtual void save(char* fileName);
-  virtual void load(char* fileName);
+  virtual ~FormatParser();
+  virtual void save(std::ostream* file)=0;
+  virtual void load(std::istream* file)=0;
+  void setOstream(std::ostream* file);
+  void update(Observable *publisher);
+  void subjectKilled(Observable *publisher);
 
 private:
-  MatrixContainer* readData(char* fileName, int skiplines, int skipcolumns);
-  virtual int getHeaderSize(char identifier);
+  std::ostream* saveStream;
 };