diff --git a/example/RefractiveIndex.cpp b/example/RefractiveIndex.cpp index 57df9c2..b8090c2 100644 --- a/example/RefractiveIndex.cpp +++ b/example/RefractiveIndex.cpp @@ -189,13 +189,15 @@ void RefractiveIndex::state_analysis() void RefractiveIndex::update() { state_analysis(); - + /* RefractiveIndex::_vidGrabber.grabFrame(); // get a new frame from the camera if (_vidGrabber.isFrameNew()) { _pixels = _vidGrabber.getPixelsRef(); //get ofPixels from the camera } + */ + } void RefractiveIndex::draw() @@ -213,7 +215,8 @@ void RefractiveIndex::setup_camera() ofLog(OF_LOG_ERROR) << "RefractiveIndex::setup_camera - could not initialise grabber"; return; } - + + _vidGrabber.setUseTexture(false); _vidGrabber.listDevices(); _vidGrabber.setVerbose(true); _vid_stream_open = true; diff --git a/src/CamNoiseAnalysis.cpp b/src/CamNoiseAnalysis.cpp index c6f9584..d561d1a 100755 --- a/src/CamNoiseAnalysis.cpp +++ b/src/CamNoiseAnalysis.cpp @@ -240,8 +240,14 @@ void CamNoiseAnalysis::draw() // this runs at save_cb timer rate = DELTA_T_SAVE void CamNoiseAnalysis::save_cb(Timer& timer) { - _save_cnt++; + + RefractiveIndex::_vidGrabber.grabFrame(); // get a new frame from the camera + + if (RefractiveIndex::_vidGrabber.isFrameNew()) + { + RefractiveIndex::_pixels = RefractiveIndex::_vidGrabber.getPixelsRef(); //get ofPixels from the camera + } cout << "CamNoiseAnalysis::saving...\n"; diff --git a/src/ColorMultiAnalysis.cpp b/src/ColorMultiAnalysis.cpp index de3ba4d..50e645e 100755 --- a/src/ColorMultiAnalysis.cpp +++ b/src/ColorMultiAnalysis.cpp @@ -235,6 +235,13 @@ void ColorMultiAnalysis::save_cb(Timer& timer) _save_cnt++; + RefractiveIndex::_vidGrabber.grabFrame(); // get a new frame from the camera + + if (RefractiveIndex::_vidGrabber.isFrameNew()) + { + RefractiveIndex::_pixels = RefractiveIndex::_vidGrabber.getPixelsRef(); //get ofPixels from the camera + } + cout << "ColorMultiAnalysis::saving...\n"; string file_name = ofToString(_save_cnt,2)+"_"+ofToString(c,2)+"_"+ofToString(_run_cnt,2)+".jpg"; diff --git a/src/ColorSingleAnalysis.cpp b/src/ColorSingleAnalysis.cpp index 2756d81..6716def 100755 --- a/src/ColorSingleAnalysis.cpp +++ b/src/ColorSingleAnalysis.cpp @@ -249,6 +249,13 @@ void ColorSingleAnalysis::save_cb(Timer& timer) { _save_cnt++; + RefractiveIndex::_vidGrabber.grabFrame(); // get a new frame from the camera + + if (RefractiveIndex::_vidGrabber.isFrameNew()) + { + RefractiveIndex::_pixels = RefractiveIndex::_vidGrabber.getPixelsRef(); //get ofPixels from the camera + } + cout << "ColorSingleAnalysis::saving...\n"; string file_name =ofToString(_save_cnt,2)+"_"+fileNameTag+"_"+ofToString(_run_cnt,2)+".jpg"; diff --git a/src/DiffNoiseAnalysis.cpp b/src/DiffNoiseAnalysis.cpp index 6932280..7b3681c 100755 --- a/src/DiffNoiseAnalysis.cpp +++ b/src/DiffNoiseAnalysis.cpp @@ -254,6 +254,13 @@ void DiffNoiseAnalysis::save_cb(Timer& timer) { _save_cnt++; + RefractiveIndex::_vidGrabber.grabFrame(); // get a new frame from the camera + + if (RefractiveIndex::_vidGrabber.isFrameNew()) + { + RefractiveIndex::_pixels = RefractiveIndex::_vidGrabber.getPixelsRef(); //get ofPixels from the camera + } + cout << "DiffNoiseAnalysis::saving...\n"; string file_name = ofToString(_save_cnt,2)+"_"+ ofToString(c,2)+"_"+ofToString(_run_cnt,2)+".jpg"; diff --git a/src/RelaxRateAnalysis.cpp b/src/RelaxRateAnalysis.cpp index d8d0254..86964f2 100755 --- a/src/RelaxRateAnalysis.cpp +++ b/src/RelaxRateAnalysis.cpp @@ -220,6 +220,13 @@ void RelaxRateAnalysis::save_cb(Timer& timer) { _save_cnt++; + RefractiveIndex::_vidGrabber.grabFrame(); // get a new frame from the camera + + if (RefractiveIndex::_vidGrabber.isFrameNew()) + { + RefractiveIndex::_pixels = RefractiveIndex::_vidGrabber.getPixelsRef(); //get ofPixels from the camera + } + cout << "RelaxRateAnalysis::saving...\n"; string file_name = ofToString(_save_cnt,2)+"_"+ ofToString(c,2)+"_"+ofToString(_run_cnt,2)+".jpg"; diff --git a/src/ShadowScapesAnalysis.cpp b/src/ShadowScapesAnalysis.cpp index ba28e0a..19b09df 100755 --- a/src/ShadowScapesAnalysis.cpp +++ b/src/ShadowScapesAnalysis.cpp @@ -271,6 +271,14 @@ void ShadowScapesAnalysis::save_cb(Timer& timer) _save_cnt++; + RefractiveIndex::_vidGrabber.grabFrame(); // get a new frame from the camera + + if (RefractiveIndex::_vidGrabber.isFrameNew()) + { + RefractiveIndex::_pixels = RefractiveIndex::_vidGrabber.getPixelsRef(); //get ofPixels from the camera + } + + cout << "ShadowScapesAnalysis::saving...\n"; string file_name; diff --git a/src/ShapeFromShadingAnalysis.cpp b/src/ShapeFromShadingAnalysis.cpp index 8dc57b6..6749a7f 100755 --- a/src/ShapeFromShadingAnalysis.cpp +++ b/src/ShapeFromShadingAnalysis.cpp @@ -427,6 +427,13 @@ void ShapeFromShadingAnalysis::draw() void ShapeFromShadingAnalysis::save_cb(Timer& timer) { _save_cnt++; + + RefractiveIndex::_vidGrabber.grabFrame(); // get a new frame from the camera + + if (RefractiveIndex::_vidGrabber.isFrameNew()) + { + RefractiveIndex::_pixels = RefractiveIndex::_vidGrabber.getPixelsRef(); //get ofPixels from the camera + } cout << "ShapeFromShadingAnalysis::saving...\n"; diff --git a/src/StrobeAnalysis.cpp b/src/StrobeAnalysis.cpp index db05c0a..0f887bb 100755 --- a/src/StrobeAnalysis.cpp +++ b/src/StrobeAnalysis.cpp @@ -235,9 +235,15 @@ void StrobeAnalysis::draw() // this runs at save_cb timer rate = DELTA_T_SAVE void StrobeAnalysis::save_cb(Timer& timer) { - _save_cnt++; + RefractiveIndex::_vidGrabber.grabFrame(); // get a new frame from the camera + + if (RefractiveIndex::_vidGrabber.isFrameNew()) + { + RefractiveIndex::_pixels = RefractiveIndex::_vidGrabber.getPixelsRef(); //get ofPixels from the camera + } + cout << "StrobeAnalysis::saving...\n"; string file_name = ofToString(_save_cnt,2)+"_"+ ofToString(_strobe_on) +"_"+ofToString(_run_cnt,2)+".jpg";