State Machine APP with exit

> fixed #defines
> fixed ::exit(1);

src/AbstractAnalysis.h

@@ -7,10 +7,8 @@
 
 #include "ofMain.h"
 #include "ofEvents.h"
-
 #include <string>
 
-//#define ANALYSIS_PATH "data/analysis/"
 #define ANALYSIS_PATH "analysis/"
 
 #define STATE_STOP  0xDEADBEEF
@@ -34,9 +32,8 @@ protected:
     
     // 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   
-    
-    
+    // this means that this function needs to be overwritten by children that inherit this class  
+        
 public:
     string  _name;    
     
@@ -48,5 +45,10 @@ protected:
     int                 _state;    
     string              _whole_file_path;
     
+    float   DELTA_T_SAVE;
+    int     NUM_PHASE;
+    int     NUM_RUN;
+    int     NUM_SAVE_PER_RUN;    
+    
     friend class AnalysisAdaptor;
 };

src/CamFrameRateAnalysis.cpp

@@ -18,6 +18,11 @@ using Poco::Thread;
 
 void CamFrameRateAnalysis::setup(int camWidth, int camHeight)
 {
+    DELTA_T_SAVE = 1000/30;
+    NUM_PHASE = 1;
+    NUM_RUN = 1;
+    NUM_SAVE_PER_RUN = 100;    
+    
     create_dir();
     
     _frame_cnt = 0;

src/CamFrameRateAnalysis.h

@@ -9,13 +9,6 @@
 
 #include "Poco/Timer.h"
 
-#define DELTA_T_SAVE        1000/30  //timer call back needs to be at main app frame rate ie 1000/30
-#define NUM_PHASE           1
-//#define TIME_PER_RUN        3*1000
-#define NUM_RUN             1
-//#define SYNTH_TIME          TIME_PER_RUN *NUM_RUN //the number of millis it takes for the whole sequence
-#define NUM_SAVE_PER_RUN    100    //this must be equal to the number of frames it takes for the whole analysis to draw - ie  _frame_cnt_max
-
 
 class CamFrameRateAnalysis : public AbstractAnalysis
 {

src/CamNoiseAnalysis.cpp

@@ -18,6 +18,11 @@ using Poco::Thread;
 
 void CamNoiseAnalysis::setup(int camWidth, int camHeight)
 {
+    DELTA_T_SAVE = 100;
+    NUM_PHASE = 1;
+    NUM_RUN = 1;
+    NUM_SAVE_PER_RUN = 100;    
+    
     create_dir();
 
     _frame_cnt = 0;

src/CamNoiseAnalysis.h

@@ -9,12 +9,6 @@
 
 #include "Poco/Timer.h"
 
-#define DELTA_T_SAVE        100  //the milisecond timing 
-#define NUM_PHASE           1
-#define NUM_RUN             1
-#define NUM_SAVE_PER_RUN    100
-
-
 class CamNoiseAnalysis : public AbstractAnalysis
 {
 public:

src/ColorMultiAnalysis.cpp

@@ -45,6 +45,11 @@ using Poco::Thread;
 
 void ColorMultiAnalysis::setup(int camWidth, int camHeight)
 {
+    DELTA_T_SAVE = 100;
+    NUM_PHASE = 1;
+    NUM_RUN = 1;
+    NUM_SAVE_PER_RUN = 100;    
+    
     create_dir();
     _frame_cnt = 0;
     _frame_cnt_max = ofGetFrameRate() * ((DELTA_T_SAVE * NUM_SAVE_PER_RUN) / 1000);
@@ -81,19 +86,15 @@ void ColorMultiAnalysis::synthesize()
 void ColorMultiAnalysis::draw()
 {
 
-
-        if (_frame_cnt < _frame_cnt_max)
-        {
-            ofColor aColor;
-            aColor.setHsb(c, 255, 255);
-            ofSetColor(aColor);
-            ofRect(0, 0, ofGetWidth(), ofGetHeight());
-            //how far are we as a percent of _frame_count_max
-            c  = 255.0 * (_frame_cnt_max - _frame_cnt)/(_frame_cnt_max);
-        }
-        _frame_cnt++;
-
-
+    if (_frame_cnt < _frame_cnt_max) {
+        ofColor aColor;
+        aColor.setHsb(c, 255, 255);
+        ofSetColor(aColor);
+        ofRect(0, 0, ofGetWidth(), ofGetHeight());
+        //how far are we as a percent of _frame_count_max
+        c  = 255.0 * (_frame_cnt_max - _frame_cnt)/(_frame_cnt_max);
+    }
+    _frame_cnt++;
 }
 
 

src/ColorMultiAnalysis.h

@@ -1,7 +1,3 @@
-#define DELTA_T_SAVE        100  //the milisecond timing 
-#define NUM_PHASE           1
-#define NUM_RUN             1
-#define NUM_SAVE_PER_RUN    100
 #pragma once
 
 #include "AbstractAnalysis.h"

src/ColorSingleAnalysis.cpp

@@ -18,6 +18,11 @@ using Poco::Thread;
 
 void ColorSingleAnalysis::setup(int camWidth, int camHeight)
 {
+    DELTA_T_SAVE = 100;
+    NUM_PHASE = 1;
+    NUM_RUN = 1;
+    NUM_SAVE_PER_RUN = 100;    
+    
     create_dir();
     _frame_cnt = 0;
     _frame_cnt_max = ofGetFrameRate() * ((DELTA_T_SAVE * NUM_SAVE_PER_RUN) / 1000);

src/ColorSingleAnalysis.h

@@ -9,12 +9,6 @@
 
 #include "Poco/Timer.h"
 
-#define DELTA_T_SAVE        100  //the milisecond timing 
-#define NUM_PHASE           1
-#define NUM_RUN             1
-#define NUM_SAVE_PER_RUN    100
-
-
 class ColorSingleAnalysis : public AbstractAnalysis
 {
 public:

src/DiffNoiseAnalysis.cpp

@@ -18,6 +18,11 @@ using Poco::Thread;
 
 void DiffNoiseAnalysis::setup(int camWidth, int camHeight)
 {
+    DELTA_T_SAVE = 100;
+    NUM_PHASE = 1;
+    NUM_RUN = 1;
+    NUM_SAVE_PER_RUN = 100;    
+    
     create_dir();
     _frame_cnt = 0;
     _frame_cnt_max = ofGetFrameRate() * ((DELTA_T_SAVE * NUM_SAVE_PER_RUN) / 1000);

src/DiffNoiseAnalysis.h

@@ -9,12 +9,6 @@
 
 #include "Poco/Timer.h"
 
-#define DELTA_T_SAVE        1000/30  //timer call back needs to be at main app frame rate ie 1000/30
-#define NUM_PHASE           1
-#define NUM_RUN             1
-#define NUM_SAVE_PER_RUN    100 //this analysis actually necessarily saves a random quantity of frames = about half this number
-
-
 class DiffNoiseAnalysis : public AbstractAnalysis
 {
 public:

src/IResponseAnalysis.cpp

@@ -15,9 +15,13 @@ using Poco::Timer;
 using Poco::TimerCallback;
 using Poco::Thread;
 
-
 void IResponseAnalysis::setup(int camWidth, int camHeight)
 {
+    DELTA_T_SAVE = 100;
+    NUM_PHASE = 1;
+    NUM_RUN = 1;
+    NUM_SAVE_PER_RUN = 100;    
+    
     create_dir();
     _frame_cnt = 0;
     _frame_cnt_max = ofGetFrameRate() * ((DELTA_T_SAVE * NUM_SAVE_PER_RUN) / 1000);

src/IResponseAnalysis.h

@@ -9,12 +9,6 @@
 
 #include "Poco/Timer.h"
 
-#define DELTA_T_SAVE        100  //the milisecond timing 
-#define NUM_PHASE           1
-#define NUM_RUN             1
-#define NUM_SAVE_PER_RUN    100
-
-
 class IResponseAnalysis : public AbstractAnalysis
 {
 public:

src/LatencyTestAnalysis.cpp

@@ -18,6 +18,11 @@ using Poco::Thread;
 
 void LatencyTestAnalysis::setup(int camWidth, int camHeight)
 {
+    DELTA_T_SAVE = 100;
+    NUM_PHASE = 1;
+    NUM_RUN = 1;
+    NUM_SAVE_PER_RUN = 100;    
+    
     create_dir();
     _frame_cnt = 0;
     _frame_cnt_max = ofGetFrameRate() * ((DELTA_T_SAVE * NUM_SAVE_PER_RUN) / 1000);

src/LatencyTestAnalysis.h

@@ -8,15 +8,9 @@
 #include "AbstractAnalysis.h"
 
 #include "Poco/Timer.h"
-
-#define DELTA_T_SAVE        100  //the milisecond timing 
-#define NUM_PHASE           1
-#define NUM_RUN             1
-#define NUM_SAVE_PER_RUN    100
-
-
+   
 class LatencyTestAnalysis : public AbstractAnalysis
-{
+{   
 public:
     LatencyTestAnalysis(): AbstractAnalysis("LATENCY_TEST"){;}
     virtual ~LatencyTestAnalysis(){;}