Changes in src/atom.hpp [e138de:46d958]

File:

• src/atom.hpp (modified) (4 diffs)

src/atom.hpp

@@ -32 +32 @@
 
 class Vector;
+class World;
 
 /********************************************** declarations *******************************/
@@ -39 +40 @@
  */
 class atom : public TesselPoint, public TrajectoryParticle, public GraphNode, public BondedParticle, public virtual ParticleInfo, public virtual AtomInfo {
+  friend atom* NewAtom();
+  friend void  DeleteAtom(atom*);
   public:
     atom *previous; //!< previous atom in molecule list
@@ -45 +48 @@
     int *sort;      //!< sort criteria
 
-  atom();
-  atom(class atom *pointer);
-  virtual ~atom();
+  virtual atom *clone();
 
   bool OutputIndexed(ofstream * const out, const int ElementNo, const int AtomNo, const char *comment = NULL) const;
@@ -67 +68 @@
   bool IsInParallelepiped(const Vector offset, const double *parallelepiped) const;
 
+  // getter and setter
+
+  /**
+   * returns the World that contains this atom.
+   * Use this if you need to get the world without locking
+   * the singleton for example.
+   *
+   */
+  World *getWorld();
+  void setWorld(World*);
+
+  virtual int getId();
+  virtual void setId(int);
+  protected:
+    /**
+     * Protected constructor to ensure construction of atoms through the world.
+     * see World::createAtom()
+     */
+    atom();
+
+    /**
+     * Protected copy-constructor to ensure construction of atoms by cloning.
+     * see atom::clone()
+     */
+    atom(class atom *pointer);
+
+    /**
+     * Protected destructor to ensure destruction of atoms through the world.
+     * see World::destroyAtom()
+     */
+    virtual ~atom();
   private:
+    World* world;
+    int id;
 };
 
+/**
+ * internal method used by the world. Do not use if you don't know what you are doing.
+ * You might get burned...
+ * Use World::createAtom() instead.
+ */
+atom* NewAtom();
+
+/**
+* internal method used by the world. Do not use if you don't know what you are doing.
+ * You might get burned...
+ * Use World::destroyAtom() instead.
+ */
+void  DeleteAtom(atom*);
+
+
 #endif /* ATOM_HPP_ */