diff --git a/example/main.cpp b/example/main.cpp index 100210b..5235338 100755 --- a/example/main.cpp +++ b/example/main.cpp @@ -13,8 +13,7 @@ int main() { bool fullscreen; fullscreen = true; - - fullscreen = false; + //fullscreen = false; cout << "> display configuration" << endl; cout << "* fullscreen: " << (fullscreen ? "yes" : "no") << endl; diff --git a/src/CamNoiseAnalysis.h b/src/CamNoiseAnalysis.h index 1320067..ae4a202 100755 --- a/src/CamNoiseAnalysis.h +++ b/src/CamNoiseAnalysis.h @@ -9,6 +9,9 @@ #include "Poco/Timer.h" +#include "ofxOpenCv.h" + + class CamNoiseAnalysis : public AbstractAnalysis { public: diff --git a/src/ColorMultiAnalysis.h b/src/ColorMultiAnalysis.h index 86cbf92..9799ee4 100755 --- a/src/ColorMultiAnalysis.h +++ b/src/ColorMultiAnalysis.h @@ -4,6 +4,9 @@ #include "Poco/Timer.h" +#include "ofxOpenCv.h" + + class ColorMultiAnalysis : public AbstractAnalysis { public: diff --git a/src/ColorSingleAnalysis.h b/src/ColorSingleAnalysis.h index 1a43cbb..78dadad 100755 --- a/src/ColorSingleAnalysis.h +++ b/src/ColorSingleAnalysis.h @@ -9,6 +9,9 @@ #include "Poco/Timer.h" +#include "ofxOpenCv.h" + + class ColorSingleAnalysis : public AbstractAnalysis { public: diff --git a/src/DiffNoiseAnalysis.h b/src/DiffNoiseAnalysis.h index cfb5288..837409b 100755 --- a/src/DiffNoiseAnalysis.h +++ b/src/DiffNoiseAnalysis.h @@ -9,6 +9,9 @@ #include "Poco/Timer.h" +#include "ofxOpenCv.h" + + class DiffNoiseAnalysis : public AbstractAnalysis { public: diff --git a/src/IResponseAnalysis.h b/src/IResponseAnalysis.h index 4d428ec..72677bf 100755 --- a/src/IResponseAnalysis.h +++ b/src/IResponseAnalysis.h @@ -9,6 +9,8 @@ #include "Poco/Timer.h" +#include "ofxOpenCv.h" + class IResponseAnalysis : public AbstractAnalysis { public: diff --git a/src/RelaxRateAnalysis.cpp b/src/RelaxRateAnalysis.cpp index ccb5888..3998f59 100755 --- a/src/RelaxRateAnalysis.cpp +++ b/src/RelaxRateAnalysis.cpp @@ -72,6 +72,7 @@ void RelaxRateAnalysis::acquire() void RelaxRateAnalysis::synthesise() { + // _saved_filenames has all the file names of all the saved images while(!_RUN_DONE) Thread::sleep(3); @@ -250,6 +251,7 @@ void RelaxRateAnalysis::draw() ofEnableAlphaBlending(); ofSetColor(255, 255, 255, 255); + image2.setFromPixels(image1.getPixels(),image1.width,image1.height, OF_IMAGE_COLOR); image2.draw(0,0, ofGetWidth(), ofGetHeight()); @@ -261,13 +263,10 @@ void RelaxRateAnalysis::draw() break; } - default: break; } - - } // this runs at save_cb timer rate = DELTA_T_SAVE diff --git a/src/RelaxRateAnalysis.h b/src/RelaxRateAnalysis.h index 07185f0..c85cf11 100755 --- a/src/RelaxRateAnalysis.h +++ b/src/RelaxRateAnalysis.h @@ -5,6 +5,7 @@ #include "Poco/Timer.h" +#include "ofxOpenCv.h" class RelaxRateAnalysis : public AbstractAnalysis { diff --git a/src/ShadowScapesAnalysis.cpp b/src/ShadowScapesAnalysis.cpp index 3a1b454..a67c834 100755 --- a/src/ShadowScapesAnalysis.cpp +++ b/src/ShadowScapesAnalysis.cpp @@ -78,6 +78,10 @@ void ShadowScapesAnalysis::acquire() void ShadowScapesAnalysis::synthesise() { + + //cvImage1.allocate(image2.getWidth(), image2.getHeight()); + //cvImage1.setFromPixels(image2); + // _saved_filenames has all the file names of all the saved images while(!_RUN_DONE) Thread::sleep(3); diff --git a/src/ShadowScapesAnalysis.h b/src/ShadowScapesAnalysis.h index aada4a3..74e11a2 100755 --- a/src/ShadowScapesAnalysis.h +++ b/src/ShadowScapesAnalysis.h @@ -6,6 +6,8 @@ #include "Poco/Timer.h" +#include "ofxOpenCv.h" + enum shadow_type { H, V, D, }; @@ -40,8 +42,8 @@ protected: float c, _frame_cnt, _frame_cnt_max, _anim_cnt_max; bool _show_image, _image_shown; - ofImage image1; - ofImage image2; - ofxCvColorImage colorImg; + ofImage image1; + ofImage image2; + ofxCvColorImage cvImage1; }; \ No newline at end of file diff --git a/src/ShapeFromShadingAnalysis.h b/src/ShapeFromShadingAnalysis.h index 3a11aa4..7f3498e 100755 --- a/src/ShapeFromShadingAnalysis.h +++ b/src/ShapeFromShadingAnalysis.h @@ -6,8 +6,11 @@ #pragma once #include "AbstractAnalysis.h" + #include "Poco/Timer.h" +#include "ofxOpenCv.h" + class ShapeFromShadingAnalysis : public AbstractAnalysis { diff --git a/src/StrobeAnalysis.h b/src/StrobeAnalysis.h index d45a92c..8eab5fc 100755 --- a/src/StrobeAnalysis.h +++ b/src/StrobeAnalysis.h @@ -9,6 +9,8 @@ #include "Poco/Timer.h" +#include "ofxOpenCv.h" + class StrobeAnalysis : public AbstractAnalysis {