Changeset db6b872 for molecuilder/src/atom.hpp

Timestamp:

Mar 4, 2010, 10:34:52 AM (16 years ago)

Author:

Tillmann Crueger <crueger@…>

Children:

fe3540

Parents:

d50264 (diff), f058ef (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 branch 'StructureRefactoring' into MenuRefactoring

File:

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

molecuilder/src/atom.hpp

@@ -40 +40 @@
  */
 class atom : public TesselPoint, public TrajectoryParticle, public GraphNode, public BondedParticle, public virtual ParticleInfo, public virtual AtomInfo {
-  friend atom* NewAtom();
+  friend atom* NewAtom(atomId_t);
   friend void  DeleteAtom(atom*);
   public:
@@ -79 +79 @@
   void setWorld(World*);
 
-  virtual int getId();
-  virtual void setId(int);
+  virtual atomId_t getId();
+  virtual bool changeId(atomId_t newId);
+
+  /**
+   * this function sets the Id without notifying the world. Only use it, if the world has already
+   * gotten an ID for this Atom.
+   */
+   virtual void setId(atomId_t);
+
   protected:
     /**
@@ -101 +108 @@
   private:
     World* world;
-    int id;
+    atomId_t id;
 };
 
@@ -109 +116 @@
  * Use World::createAtom() instead.
  */
-atom* NewAtom();
+atom* NewAtom(atomId_t _id);
 
 /**