Changeset adcdf8

Timestamp:

Feb 2, 2010, 12:21:13 PM (16 years ago)

Author:

Tillmann Crueger <crueger@…>

Children:

4bb871a

Parents:

795b4d

git-author:

Tillmann Crueger <crueger@…> (01/15/10 15:53:29)

git-committer:

Tillmann Crueger <crueger@…> (02/02/10 12:21:13)

Message:

Moved method to rename molecules to a seperate Action

Location:

molecuilder/src

Files:

• Actions/small_actions.cpp (modified) (1 diff)
• molecule.cpp (modified) (1 diff)
• molecule.hpp (modified) (3 diffs)
• moleculelist.cpp (modified) (1 diff)

molecuilder/src/Actions/small_actions.cpp

@@ -32 +32 @@
   dialog->queryString("Enter name: ",&filename);
   if(dialog->display()) {
-    strcpy(mol->name, filename.c_str());
+    mol->setName(filename);
   }
 

molecuilder/src/molecule.cpp

@@ -61 +61 @@
   delete(start);
 };
+
+
+// getter and setter
+const std::string molecule::getName(){
+  return std::string(name);
+}
+
+void molecule::setName(const std::string _name){
+  START_OBSERVER;
+  strncpy(name,_name.c_str(),MAXSTRINGSIZE);
+  FINISH_OBSERVER;
+}
 
 

molecuilder/src/molecule.hpp

@@ -26 +26 @@
 #include <list>
 #include <vector>
+
+#include <string>
 
 #include "graph.hpp"
@@ -81 +83 @@
  * Class incorporates number of types
  */
-class molecule : public PointCloud {
+class molecule : public PointCloud , public Observable {
   public:
     double cell_size[6];//!< cell size
@@ -100 +102 @@
     bool ActiveFlag;    //!< in a MoleculeListClass used to discern active from inactive molecules
     Vector Center;      //!< Center of molecule in a global box
+    int IndexNr;        //!< index of molecule in a MoleculeListClass
     char name[MAXSTRINGSIZE];         //!< arbitrary name
-    int IndexNr;        //!< index of molecule in a MoleculeListClass
-
+
+public:
   molecule(const periodentafel * const teil);
   virtual ~molecule();
+
+  //getter and setter
+  const std::string getName();
+  void setName(const std::string);
 
   // re-definition of virtual functions from PointCloud

molecuilder/src/moleculelist.cpp

@@ -50 +50 @@
 void MoleculeListClass::insert(molecule *mol)
 {
+  START_OBSERVER;
   mol->IndexNr = MaxIndex++;
   ListOfMolecules.push_back(mol);
+  mol->signOn(this);
+  FINISH_OBSERVER;
 };