Changeset 9ef76a

Timestamp:

Feb 19, 2010, 11:49:54 AM (16 years ago)

Author:

Tillmann Crueger <crueger@…>

Children:

01d28a

Parents:

5d4edf

Message:

Added a mechanism that allows the world to track changes done by the manipulators

Location:

molecuilder/src

Files:

• Actions/ManipulateAtomsProcess.cpp (modified) (2 diffs)
• Actions/ManipulateAtomsProcess.hpp (modified) (1 diff)
• World.cpp (modified) (2 diffs)
• World.hpp (modified) (1 diff)
• unittests/manipulateAtomsTest.cpp (modified) (2 diffs)
• unittests/manipulateAtomsTest.hpp (modified) (2 diffs)

molecuilder/src/Actions/ManipulateAtomsProcess.cpp

@@ -23 +23 @@
 
 void ManipulateAtomsProcess::call(){
-  World* world = World::get();
+  World::get()->doManipulate(this);
+}
+
+void ManipulateAtomsProcess::undo(){
+
+}
+
+bool ManipulateAtomsProcess::canUndo(){
+  return false;
+}
+
+void ManipulateAtomsProcess::doManipulate(World *world){
   setMaxSteps(world->numAtoms());
   start();
@@ -33 +44 @@
   stop();
 }
-
-void ManipulateAtomsProcess::undo(){
-
-}
-
-bool ManipulateAtomsProcess::canUndo(){
-  return false;
-}

molecuilder/src/Actions/ManipulateAtomsProcess.hpp

@@ -21 +21 @@
   virtual void undo();
   virtual bool canUndo();
+
+  virtual void doManipulate(World *);
 private:
   AtomDescriptor descr;

molecuilder/src/World.cpp

@@ -37 +37 @@
   return molecules_deprecated->ListOfMolecules.size();
 }
+
+/******************** Methods to change World state *********************/
 
 molecule* World::createMolecule(){
@@ -53 +55 @@
 }
 
+/********************* Internal Change methods for double Callback and Observer mechanism ********/
+
+void World::doManipulate(ManipulateAtomsProcess *proc){
+  proc->signOn(this);
+  {
+    OBSERVE;
+    proc->doManipulate(this);
+  }
+  proc->signOff(this);
+}
+
 /******************************* Iterators ********************************/
 

molecuilder/src/World.hpp

@@ -80 +80 @@
   AtomList::iterator atomEnd();
 
+  /******* Internal manipulation routines for double callback and Observer mechanism ******/
+  void doManipulate(ManipulateAtomsProcess *);
+
 private:
   periodentafel *periode;

molecuilder/src/unittests/manipulateAtomsTest.cpp

@@ -49 +49 @@
 };
 
+class countObserver : public Observer{
+public:
+  countObserver() :
+    count(0)
+    {}
+  virtual ~countObserver(){}
+
+  void update(Observable *){
+    count++;
+  }
+
+  void subjectKilled(Observable *)
+  {}
+
+  int count;
+};
 
 // set up and tear down
@@ -131 +147 @@
 }
 
+void manipulateAtomsTest::testObserver(){
+  countObserver *obs = new countObserver();
+  World::get()->signOn(obs);
+  ManipulateAtomsProcess *proc = World::get()->manipulateAtoms(boost::bind(operation,_1),"FOO",AllAtoms() && !AtomById(ATOM_COUNT/2));
+  proc->call();
+
+  CPPUNIT_ASSERT_EQUAL(1,obs->count);
+  World::get()->signOff(obs);
+  delete obs;
+}
+
 /********************************************** Main routine **************************************/
 

molecuilder/src/unittests/manipulateAtomsTest.hpp

@@ -20 +20 @@
   CPPUNIT_TEST ( testManipulateSimple );
   CPPUNIT_TEST ( testManipulateExcluded );
+  CPPUNIT_TEST ( testObserver );
   CPPUNIT_TEST_SUITE_END();
 
@@ -28 +29 @@
   void testManipulateSimple();
   void testManipulateExcluded();
+  void testObserver();
 
 private: