Changeset 323177 for molecuilder/src/World.hpp

Timestamp:

Feb 16, 2010, 4:24:07 PM (16 years ago)

Author:

Tillmann Crueger <crueger@…>

Children:

120f8b

Parents:

973c03

Message:

Rebuilt AtomDescriptors using PIMPL-Idiom and added unittest for descriptors

File:

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

molecuilder/src/World.hpp

@@ -21 +21 @@
 class atom;
 class AtomDescriptor;
+class AtomDescriptor_impl;
 
 class World : public Observable
 {
-friend class AtomDescriptor;
+friend class AtomDescriptor_impl;
 public:
 
   /***** getter and setter *****/
   periodentafel* getPeriode();
-  atom* getAtom(AtomDescriptor& descriptor);
-  std::vector<atom*> getAllAtoms(AtomDescriptor& descriptor);
+  atom* getAtom(AtomDescriptor descriptor);
+  std::vector<atom*> getAllAtoms(AtomDescriptor descriptor);
 private:
   periodentafel *periode;
@@ -63 +64 @@
 private:
   MoleculeListClass *molecules;
+
+  // this is needed to assign unique IDs to atoms... so far
+  // IDs are not assigned upon Atom creation, so we cannot query the ID
+  // during construction. By using the dummy ID we can make sure all atoms
+  // are actually stored in the map and don't overwrite each other.
+  int dummyId;
 };