Revert 060dee771a9a8c7f5d6257d054e6717fa729182d^..HEAD

src/AbstractAnalysis.cpp

@@ -34,13 +34,7 @@
 #include "RefractiveIndex.h"
 
 void AbstractAnalysis::do_synthesize() {
-    // acquire images + pattern on display
-    pattern_acquire();
-    // acquire notify obeservers
-    ofNotifyEvent(_acquire_cb, _name);
-    // analysis and synthesis of acquired images
     synthesize();
-    // synthesize notify obeservers
     ofNotifyEvent(_synthesize_cb, _name);
 }
 

src/AbstractAnalysis.h

@@ -28,20 +28,16 @@ public:
         
 protected:
     
-    // creates working directory 
-    virtual void create_dir();    
- 
-    // acquire images from camera and display patters on screen
-    virtual void pattern_acquire() = 0;
+    virtual void create_dir();
     
-    // analyses and sythesizes images acquired
-    virtual void synthesize() = 0;       
-            
+    // the runnable function in the thread 
+    virtual void synthesize() = 0;   
+    // this means that this function needs to be overwritten by children that inherit this class  
+        
 public:
     string  _name;    
     
-    // event notification / callbacks
-    ofEvent<string> _acquire_cb;
+    // event
     ofEvent<string> _synthesize_cb;    
 
 protected:    

src/AnalysisAdaptor.h

@@ -31,10 +31,8 @@ public:
         _worker.join();
     }
     
-public:    
+protected:
     AbstractAnalysis*                   _analysis;
-    
-protected:    
     Thread                              _worker;    //   
     RunnableAdapter<AbstractAnalysis>*  _runnable;    
 };