commit for david tues 21st 17:51

example/main.cpp

@@ -12,8 +12,8 @@ int main() {
    
     bool fullscreen;
     
-    fullscreen = true; 
+    //fullscreen = true; 
-    //fullscreen = false;
+    fullscreen = false;
     
     cout << "> display configuration" << endl;
     cout << "* fullscreen: " << (fullscreen ? "yes" : "no") << endl;

src/CamNoiseAnalysis.cpp

@@ -18,8 +18,9 @@ void CamNoiseAnalysis::setup(int camWidth, int camHeight)
     
     int acq_run_time = 20;   // 20 seconds of acquiring per run
     
-    DELTA_T_SAVE = 10*acq_run_time/2; // for 20 seconds, we want this to be around 200 files
+    DELTA_T_SAVE = 2*(10*acq_run_time/2);
-    // or 10 times per second = every 100 ms
+                                                // for 20 seconds, we want this to be around 200 files
+                                                // or 10 times per second = every 100 ms
     
     _frame_cnt_max = acq_run_time*ofGetFrameRate();  // e.g.: 30 frames per second * 20 seconds = 600 frames
     
@@ -303,6 +304,8 @@ void CamNoiseAnalysis::save_cb(Timer& timer)
     if (RefractiveIndex::_vidGrabber.isFrameNew())
     {
         RefractiveIndex::_pixels = RefractiveIndex::_vidGrabber.getPixelsRef(); //get ofPixels from the camera
+    } else {
+        return;
     }
     
     //cout << "CamNoiseAnalysis::saving...\n";

src/ColorMultiAnalysis.cpp

@@ -19,7 +19,7 @@ void ColorMultiAnalysis::setup(int camWidth, int camHeight)
     
     int acq_run_time = 35;  
     
-    DELTA_T_SAVE = 10*acq_run_time/2; // for 20 seconds, we want this to be around 200 files
+    DELTA_T_SAVE = 2*(10*acq_run_time/2); // for 20 seconds, we want this to be around 200 files
     // or 10 times per second = every 100 ms
     
     _frame_cnt_max = acq_run_time*ofGetFrameRate();  // e.g.: 30 frames per second * 20 seconds = 600 frames
@@ -298,6 +298,8 @@ void ColorMultiAnalysis::save_cb(Timer& timer)
     if (RefractiveIndex::_vidGrabber.isFrameNew())
     {
         RefractiveIndex::_pixels = RefractiveIndex::_vidGrabber.getPixelsRef(); //get ofPixels from the camera
+    } else {
+        return;
     }
     
     //cout << "ColorMultiAnalysis::saving...\n";

src/ColorSingleAnalysis.cpp

@@ -18,7 +18,7 @@ void ColorSingleAnalysis::setup(int camWidth, int camHeight)
     
     int acq_run_time = 20;   // 20 seconds of acquiring per run
     
-    DELTA_T_SAVE = 10*acq_run_time/2; // for 20 seconds, we want this to be around 200 files
+    DELTA_T_SAVE = 2*(10*acq_run_time/2); // for 20 seconds, we want this to be around 200 files
     // or 10 times per second = every 100 ms
     
     _frame_cnt_max = acq_run_time*ofGetFrameRate();  // e.g.: 30 frames per second * 20 seconds = 600 frames
@@ -311,6 +311,8 @@ void ColorSingleAnalysis::save_cb(Timer& timer)
     if (RefractiveIndex::_vidGrabber.isFrameNew())
     {
         RefractiveIndex::_pixels = RefractiveIndex::_vidGrabber.getPixelsRef(); //get ofPixels from the camera
+    } else {
+        return;
     }
     
     //cout << "ColorSingleAnalysis::saving...\n";

src/DiffNoiseAnalysis.cpp

@@ -18,7 +18,7 @@ void DiffNoiseAnalysis::setup(int camWidth, int camHeight)
     
     int acq_run_time = 20;   // 20 seconds of acquiring per run
     
-    DELTA_T_SAVE = 10*acq_run_time/2; // for 20 seconds, we want this to be around 200 files
+    DELTA_T_SAVE = 2*(10*acq_run_time/2); // for 20 seconds, we want this to be around 200 files
     // or 10 times per second = every 100 ms
     
     _frame_cnt_max = acq_run_time*ofGetFrameRate();  // e.g.: 30 frames per second * 20 seconds = 600 frames
@@ -317,6 +317,8 @@ void DiffNoiseAnalysis::save_cb(Timer& timer)
     if (RefractiveIndex::_vidGrabber.isFrameNew())
     {
         RefractiveIndex::_pixels = RefractiveIndex::_vidGrabber.getPixelsRef(); //get ofPixels from the camera
+    } else {
+        return;
     }
     
     //cout << "DiffNoiseAnalysis::saving...\n";

src/IResponseAnalysis.cpp

@@ -17,7 +17,7 @@ void IResponseAnalysis::setup(int camWidth, int camHeight)
     
     int acq_run_time = 20;   // 20 seconds of acquiring per run
     
-    DELTA_T_SAVE = 10*acq_run_time/2; // for 20 seconds, we want this to be around 200 files
+    DELTA_T_SAVE = 2*(10*acq_run_time/2); // for 20 seconds, we want this to be around 200 files
     // or 10 times per second = every 100 ms
     
     _frame_cnt_max = acq_run_time*ofGetFrameRate();  // e.g.: 30 frames per second * 20 seconds = 600 frames

src/RelaxRateAnalysis.cpp

@@ -17,7 +17,7 @@ void RelaxRateAnalysis::setup(int camWidth, int camHeight)
     
     int acq_run_time = 20;   // 20 seconds of acquiring per run
     
-    DELTA_T_SAVE = 10*acq_run_time/2; // for 20 seconds, we want this to be around 200 files
+    DELTA_T_SAVE = 2*(10*acq_run_time/2); // for 20 seconds, we want this to be around 200 files
     // or 10 times per second = every 100 ms
     
     _frame_cnt_max = acq_run_time*ofGetFrameRate();  // e.g.: 30 frames per second * 20 seconds = 600 frames
@@ -279,8 +279,9 @@ void RelaxRateAnalysis::save_cb(Timer& timer)
     if (RefractiveIndex::_vidGrabber.isFrameNew())
     {
         RefractiveIndex::_pixels = RefractiveIndex::_vidGrabber.getPixelsRef(); //get ofPixels from the camera
+    } else {
+        return;
     }
-    
     //cout << "RelaxRateAnalysis::saving...\n";
     
     string file_name = ofToString(_save_cnt,2)+"_"+ ofToString(c,2)+"_"+ofToString(_run_cnt,2)+".jpg";

src/ShadowScapesAnalysis.cpp

@@ -16,7 +16,7 @@ void ShadowScapesAnalysis::setup(int camWidth, int camHeight)
 {
     NUM_RUN = 1;
     
-    int acq_run_time = 15;   // 10 seconds of acquiring per run
+    int acq_run_time = 20;   // 10 seconds of acquiring per run
     
     int screenSpan;
     if (_dir == V) screenSpan = ofGetHeight();
@@ -28,7 +28,7 @@ void ShadowScapesAnalysis::setup(int camWidth, int camHeight)
     
     // 40 pixels per second should give us a 20 second scan at 800 pixels wide
 
-    DELTA_T_SAVE = 10*acq_run_time/2; // for 20 seconds, we want this to be around 200 files
+    DELTA_T_SAVE = 2*(10*acq_run_time/2); // for 20 seconds, we want this to be around 200 files
     // or 10 times per second = every 100 ms
         
     create_dir();
@@ -78,7 +78,6 @@ void ShadowScapesAnalysis::acquire()
 
 void ShadowScapesAnalysis::synthesise()
 {
-    
     //cvImage1.allocate(image2.getWidth(), image2.getHeight());  
     //cvImage1.setFromPixels(image2);
     
@@ -337,6 +336,8 @@ void ShadowScapesAnalysis::save_cb(Timer& timer)
     if (RefractiveIndex::_vidGrabber.isFrameNew())
     {
         RefractiveIndex::_pixels = RefractiveIndex::_vidGrabber.getPixelsRef(); //get ofPixels from the camera
+    } else {
+        return;
     }
     
     //cout << "ShadowScapesAnalysis::saving...\n";

src/ShapeFromShadingAnalysis.cpp

@@ -16,7 +16,7 @@ void ShapeFromShadingAnalysis::setup(int camWidth, int camHeight)
     
     int acq_run_time = 20;   // 20 seconds of acquiring per run
     
-    DELTA_T_SAVE = 10*acq_run_time/2; // for 20 seconds, we want this to be around 200 files
+    DELTA_T_SAVE = 2*(10*acq_run_time/2); // for 20 seconds, we want this to be around 200 files
     // or 10 times per second = every 100 ms
     
     _frame_cnt_max = acq_run_time*ofGetFrameRate();  // e.g.: 30 frames per second * 20 seconds = 600 frames
@@ -470,6 +470,8 @@ void ShapeFromShadingAnalysis::save_cb(Timer& timer)
     if (RefractiveIndex::_vidGrabber.isFrameNew())
     {
         RefractiveIndex::_pixels = RefractiveIndex::_vidGrabber.getPixelsRef(); //get ofPixels from the camera
+    } else {
+        return;
     }
     
     //cout << "ShapeFromShadingAnalysis::saving...\n";

src/StrobeAnalysis.cpp

@@ -16,8 +16,8 @@ void StrobeAnalysis::setup(int camWidth, int camHeight)
     
     int acq_run_time = 20;   // 20 seconds of acquiring per run
     
-    DELTA_T_SAVE = 10*acq_run_time/2; // for 20 seconds, we want this to be around 200 files
+    DELTA_T_SAVE = 2*(10*acq_run_time/2); // for 20 seconds, we want this to be around 200 files
-                                      // or 10 times per second = every 100 ms
+                                          // or 10 times per second = every 100 ms
    
     _frame_cnt_max = acq_run_time*ofGetFrameRate();  // e.g.: 30 frames per second * 20 seconds = 600 frames
     
@@ -301,6 +301,8 @@ void StrobeAnalysis::save_cb(Timer& timer)
     if (RefractiveIndex::_vidGrabber.isFrameNew())
     {
         RefractiveIndex::_pixels = RefractiveIndex::_vidGrabber.getPixelsRef(); //get ofPixels from the camera
+    } else {
+        return;
     }
     
     //cout << "StrobeAnalysis::saving...\n";