Changes in src/World.cpp [654394:e4afb4]

File:

• src/World.cpp (modified) (12 diffs)

src/World.cpp

@@ -34 +34 @@
 #include "Descriptors/MoleculeDescriptor_impl.hpp"
 #include "Descriptors/SelectiveIterator_impl.hpp"
+#include "Actions/ActionTraits.hpp"
 #include "Actions/ManipulateAtomsProcess.hpp"
 #include "Helpers/Assert.hpp"
@@ -245 +246 @@
 
 ManipulateAtomsProcess* World::manipulateAtoms(boost::function<void(atom*)> op,std::string name,AtomDescriptor descr){
-  return new ManipulateAtomsProcess(op, descr,name,true);
+  ActionTraits manipulateTrait(name);
+  return new ManipulateAtomsProcess(op, descr,manipulateTrait,false);
 }
 
@@ -535 +537 @@
 }
 
-void World::selectAtom(atom *atom){
-  ASSERT(atom,"Invalid pointer in selection of atom");
-  selectedAtoms[atom->getId()]=atom;
-}
-
-void World::selectAtom(atomId_t id){
+void World::selectAtom(const atom *_atom){
+  // atom * is unchanged in this function, but we do store entity as changeable
+  ASSERT(_atom,"Invalid pointer in selection of atom");
+  selectedAtoms[_atom->getId()]=const_cast<atom *>(_atom);
+}
+
+void World::selectAtom(const atomId_t id){
   ASSERT(atoms.count(id),"Atom Id selected that was not in the world");
   selectedAtoms[id]=atoms[id];
@@ -548 +551 @@
   internal_AtomIterator begin = getAtomIter_internal(descr);
   internal_AtomIterator end = atomEnd_internal();
-  void (World::*func)(atom*) = &World::selectAtom; // needed for type resolution of overloaded function
+  void (World::*func)(const atom*) = &World::selectAtom; // needed for type resolution of overloaded function
   for_each(begin,end,bind1st(mem_fun(func),this)); // func is select... see above
 }
 
-void World::selectAtomsOfMolecule(molecule *_mol){
+void World::selectAtomsOfMolecule(const molecule *_mol){
   ASSERT(_mol,"Invalid pointer to molecule in selection of Atoms of Molecule");
   // need to make it const to get the fast iterators
   const molecule *mol = _mol;
-  void (World::*func)(atom*) = &World::selectAtom; // needed for type resolution of overloaded function
+  void (World::*func)(const atom*) = &World::selectAtom; // needed for type resolution of overloaded function
   for_each(mol->begin(),mol->end(),bind1st(mem_fun(func),this)); // func is select... see above
 }
 
-void World::selectAtomsOfMolecule(moleculeId_t id){
+void World::selectAtomsOfMolecule(const moleculeId_t id){
   ASSERT(molecules.count(id),"No molecule with the given id upon Selection of atoms from molecule");
   selectAtomsOfMolecule(molecules[id]);
 }
 
-void World::unselectAtom(atom *atom){
-  ASSERT(atom,"Invalid pointer in unselection of atom");
-  unselectAtom(atom->getId());
-}
-
-void World::unselectAtom(atomId_t id){
+void World::unselectAtom(const atom *_atom){
+  ASSERT(_atom,"Invalid pointer in unselection of atom");
+  unselectAtom(_atom->getId());
+}
+
+void World::unselectAtom(const atomId_t id){
   ASSERT(atoms.count(id),"Atom Id unselected that was not in the world");
   selectedAtoms.erase(id);
@@ -578 +581 @@
   internal_AtomIterator begin = getAtomIter_internal(descr);
   internal_AtomIterator end = atomEnd_internal();
-  void (World::*func)(atom*) = &World::unselectAtom; // needed for type resolution of overloaded function
+  void (World::*func)(const atom*) = &World::unselectAtom; // needed for type resolution of overloaded function
   for_each(begin,end,bind1st(mem_fun(func),this)); // func is unselect... see above
 }
 
-void World::unselectAtomsOfMolecule(molecule *_mol){
+void World::unselectAtomsOfMolecule(const molecule *_mol){
   ASSERT(_mol,"Invalid pointer to molecule in selection of Atoms of Molecule");
   // need to make it const to get the fast iterators
   const molecule *mol = _mol;
-  void (World::*func)(atom*) = &World::unselectAtom; // needed for type resolution of overloaded function
+  void (World::*func)(const atom*) = &World::unselectAtom; // needed for type resolution of overloaded function
   for_each(mol->begin(),mol->end(),bind1st(mem_fun(func),this)); // func is unsselect... see above
 }
 
-void World::unselectAtomsOfMolecule(moleculeId_t id){
+void World::unselectAtomsOfMolecule(const moleculeId_t id){
   ASSERT(molecules.count(id),"No molecule with the given id upon Selection of atoms from molecule");
   unselectAtomsOfMolecule(molecules[id]);
@@ -602 +605 @@
 }
 
-bool World::isSelected(atom *atom) const {
-  return selectedAtoms.find(atom->getId()) != selectedAtoms.end();
+bool World::isSelected(const atom *_atom) const {
+  return selectedAtoms.find(_atom->getId()) != selectedAtoms.end();
 }
 
@@ -622 +625 @@
 }
 
-void World::selectMolecule(molecule *mol){
-  ASSERT(mol,"Invalid pointer to molecule in selection");
-  selectedMolecules[mol->getId()]=mol;
-}
-
-void World::selectMolecule(moleculeId_t id){
+void World::selectMolecule(const molecule *_mol){
+  // molecule * is unchanged in this function, but we do store entity as changeable
+  ASSERT(_mol,"Invalid pointer to molecule in selection");
+  selectedMolecules[_mol->getId()]=const_cast<molecule *>(_mol);
+}
+
+void World::selectMolecule(const moleculeId_t id){
   ASSERT(molecules.count(id),"Molecule Id selected that was not in the world");
   selectedMolecules[id]=molecules[id];
@@ -635 +639 @@
   internal_MoleculeIterator begin = getMoleculeIter_internal(descr);
   internal_MoleculeIterator end = moleculeEnd_internal();
-  void (World::*func)(molecule*) = &World::selectMolecule; // needed for type resolution of overloaded function
+  void (World::*func)(const molecule*) = &World::selectMolecule; // needed for type resolution of overloaded function
   for_each(begin,end,bind1st(mem_fun(func),this)); // func is select... see above
 }
 
-void World::selectMoleculeOfAtom(atom *atom){
-  ASSERT(atom,"Invalid atom pointer in selection of MoleculeOfAtom");
-  molecule *mol=atom->getMolecule();
+void World::selectMoleculeOfAtom(const atom *_atom){
+  ASSERT(_atom,"Invalid atom pointer in selection of MoleculeOfAtom");
+  molecule *mol=_atom->getMolecule();
   // the atom might not be part of a molecule
   if(mol){
@@ -648 +652 @@
 }
 
-void World::selectMoleculeOfAtom(atomId_t id){
+void World::selectMoleculeOfAtom(const atomId_t id){
   ASSERT(atoms.count(id),"No such atom with given ID in selection of Molecules of Atom");\
   selectMoleculeOfAtom(atoms[id]);
 }
 
-void World::unselectMolecule(molecule *mol){
-  ASSERT(mol,"invalid pointer in unselection of molecule");
-  unselectMolecule(mol->getId());
-}
-
-void World::unselectMolecule(moleculeId_t id){
+void World::unselectMolecule(const molecule *_mol){
+  ASSERT(_mol,"invalid pointer in unselection of molecule");
+  unselectMolecule(_mol->getId());
+}
+
+void World::unselectMolecule(const moleculeId_t id){
   ASSERT(molecules.count(id),"No such molecule with ID in unselection");
   selectedMolecules.erase(id);
@@ -666 +670 @@
   internal_MoleculeIterator begin = getMoleculeIter_internal(descr);
   internal_MoleculeIterator end = moleculeEnd_internal();
-  void (World::*func)(molecule*) = &World::unselectMolecule; // needed for type resolution of overloaded function
+  void (World::*func)(const molecule*) = &World::unselectMolecule; // needed for type resolution of overloaded function
   for_each(begin,end,bind1st(mem_fun(func),this)); // func is unselect... see above
 }
 
-void World::unselectMoleculeOfAtom(atom *atom){
-  ASSERT(atom,"Invalid atom pointer in selection of MoleculeOfAtom");
-  molecule *mol=atom->getMolecule();
+void World::unselectMoleculeOfAtom(const atom *_atom){
+  ASSERT(_atom,"Invalid atom pointer in selection of MoleculeOfAtom");
+  molecule *mol=_atom->getMolecule();
   // the atom might not be part of a molecule
   if(mol){
@@ -679 +683 @@
 }
 
-void World::unselectMoleculeOfAtom(atomId_t id){
+void World::unselectMoleculeOfAtom(const atomId_t id){
   ASSERT(atoms.count(id),"No such atom with given ID in selection of Molecules of Atom");\
   unselectMoleculeOfAtom(atoms[id]);
@@ -691 +695 @@
 }
 
-bool World::isSelected(molecule *mol) const {
-  return selectedMolecules.find(mol->getId()) != selectedMolecules.end();
+bool World::isSelected(const molecule *_mol) const {
+  return selectedMolecules.find(_mol->getId()) != selectedMolecules.end();
 }