Changeset a5471c for molecuilder/src/World.hpp

Timestamp:

Feb 18, 2010, 1:21:35 PM (16 years ago)

Author:

Tillmann Crueger <crueger@…>

Children:

cbc27f

Parents:

b53a7e

Message:

Added iterator structure that allows iterating over selected atoms in the World.

File:

• molecuilder/src/World.hpp (modified) (3 diffs)

molecuilder/src/World.hpp

@@ -13 +13 @@
 #include <vector>
 #include <set>
+#include <boost/shared_ptr.hpp>
 
 #include "Patterns/Observer.hpp"
@@ -28 +29 @@
 {
 friend class AtomDescriptor_impl;
+friend class AtomDescriptor;
+
+typedef std::map<int,atom*> AtomList;
 public:
 
@@ -40 +44 @@
   /***** Methods to work with the World *****/
   molecule *createMolecule();
+
+protected:
+  /**** Iterators to use internal data structures */
+  class AtomIterator {
+  public:
+    AtomIterator(AtomDescriptor, World*);
+    AtomIterator(const AtomIterator&);
+    AtomIterator& operator++();
+    bool operator==(const AtomIterator&);
+    bool operator!=(const AtomIterator&);
+    atom* operator*();
+  protected:
+    void advanceState();
+    World* world;
+    AtomList::iterator state;
+    boost::shared_ptr<AtomDescriptor_impl>  descr;
+  };
+
+  AtomIterator getAtomIter(AtomDescriptor descr);
+
 private:
   periodentafel *periode;
-  std::map<int,atom*> atoms;
+  AtomList atoms;
   std::set<molecule*> molecules;