Changeset bb89b9 for molecuilder/src

Timestamp:

Feb 25, 2010, 10:32:14 AM (15 years ago)

Author:

Tillmann Crueger <crueger@…>

Children:

a1a532

Parents:

e7e088

Message:

Added overloaded methods for all methods in the world taking an AtomDescriptor

Location:

molecuilder/src

Files:

• World.cpp (modified) (2 diffs)
• World.hpp (modified) (3 diffs)
• World_calculations.hpp (modified) (1 diff)

molecuilder/src/World.cpp

@@ -30 +30 @@
 }
 
+vector<atom*> World::getAllAtoms(){
+  return getAllAtoms(AllAtoms());
+}
+
 int World::numAtoms(){
   return atoms.size();
@@ -86 +90 @@
 }
 
+ManipulateAtomsProcess* World::manipulateAtoms(boost::function<void(atom*)> op,std::string name){
+  return manipulateAtoms(op,name,AllAtoms());
+}
+
 /********************* Internal Change methods for double Callback and Observer mechanism ********/
 

molecuilder/src/World.hpp

@@ -61 +61 @@
    */
   std::vector<atom*> getAllAtoms(AtomDescriptor descriptor);
+  std::vector<atom*> getAllAtoms();
 
   /**
@@ -67 +68 @@
    * menus, be kept around for later use etc.
    */
-  template<typename T>
-  AtomsCalculation<T>* calcOnAtoms(boost::function<T(atom*)>,std::string,AtomDescriptor);
+  template<typename T> AtomsCalculation<T>* calcOnAtoms(boost::function<T(atom*)>,std::string,AtomDescriptor);
+  template<typename T> AtomsCalculation<T>* calcOnAtoms(boost::function<T(atom*)>,std::string);
 
   /**
@@ -117 +118 @@
    */
   ManipulateAtomsProcess* manipulateAtoms(boost::function<void(atom*)>,std::string,AtomDescriptor);
+  ManipulateAtomsProcess* manipulateAtoms(boost::function<void(atom*)>,std::string);
 
 protected:

molecuilder/src/World_calculations.hpp

@@ -18 +18 @@
 }
 
+template<typename T>
+AtomsCalculation<T>* World::calcOnAtoms(boost::function<T(atom*)> op,std::string name) {
+  return calcOnAtoms<T>(op,name,AllAtoms());
+}
+
 #endif /* WORLD_CALCULATIONS_HPP_ */