gauthiier/RefractiveIndex
1
0
Fork 0
Code Issues 1 Pull Requests Releases Wiki Activity

Revert 060dee771a9a8c7f5d6257d054e6717fa729182d^..HEAD

Browse Source
This commit is contained in:
dviid 2012-02-15 07:58:30 +01:00
parent dc99776508
commit 65c625ad1e
7 changed files with 71 additions and 157 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
README
View File

@ -6,6 +6,5 @@ configuring OpenFrameworks
these files are configured according to OpenFrameworks addons - http://ofxaddons.com/howto these files are configured according to OpenFrameworks addons - http://ofxaddons.com/howto
(1) drag-drop "ReflectiveIndex" folder into your OpenFrameworks project (1) drag-drop "ReflectiveIndex" folder into your OpenFrameworks project
(2) Install depedencies: {ofxDirList, ofxXmlSettings}; (2) Install depedencies: {ofxDirList, ofxControlPanel, ofxXmlSettings};
(3) Make sure that the config file config/config.refindx is in your "data" folder (3) Press Play!
(4) Press Play!

16
config/config.refindx
View File

@ -1,16 +0,0 @@
<config>
<camera>
<id>1</id>
<width>640</width>
<height>480</height>
</camera>
<display>
<fps>30</fps>
<fullscreen>true</fullscreen>
<width>800</width>
<height>800</height>
</display>
<locale>
<name>MIDDLESBOROUGH</name>
</locale>
</config>

139
example/RefractiveIndex.cpp
View File

@ -26,21 +26,16 @@
#define CAMERA_ACQU_WIDTH 640 #define CAMERA_ACQU_WIDTH 640
#define CAMERA_ACQU_HEIGHT 480 #define CAMERA_ACQU_HEIGHT 480
#define LOCATION "????-not-config-???" #define LOCATION "MIDDLESBOROUGH"
#define ISTATE_ACQU_START 0xAAAA #define ISTATE_UNDEF 0xEEEE
#define ISTATE_ACQU_STOP 0xBBBB #define ISTATE_START 0xAAAA
#define ISTATE_SYNTH_START 0xCCCC #define ISTATE_STOP 0xBBBB
#define ISTATE_SYNTH_STOP 0xDDDD #define ISTATE_TRANSITION 0xCCCC
#define ISTATE_END 0xDDDD
#define ISTATE_TRANSITION 0xFFFF
#define ISTATE_UNDEF 0xEEEE
#define ISTATE_END 0x1111
int _state = ISTATE_UNDEF; int _state = ISTATE_UNDEF;
bool _in_acquisition = true;
ofPixels RefractiveIndex::_pixels; ofPixels RefractiveIndex::_pixels;
ofVideoGrabber RefractiveIndex::_vidGrabber; ofVideoGrabber RefractiveIndex::_vidGrabber;
int RefractiveIndex::_vid_w, RefractiveIndex::_vid_h, RefractiveIndex::_vid_id; int RefractiveIndex::_vid_w, RefractiveIndex::_vid_h, RefractiveIndex::_vid_id;
@ -94,119 +89,77 @@ void RefractiveIndex::setup()
cout << "RRRRRREADY!" << endl; cout << "RRRRRREADY!" << endl;
_analysisAdapator = NULL;
//getting a warning from the OFlog that the pixels aren't allocated //getting a warning from the OFlog that the pixels aren't allocated
//void ofPixels::allocate(int w, int h, ofImageType type) //void ofPixels::allocate(int w, int h, ofImageType type)
// setup analysis // setup analysis
AnalysisAdaptor* adpt;
adpt = new AnalysisAdaptor(new ShadowScapesAnalysis()); _analysisVector.push_back(new ShadowScapesAnalysis());
_acquisitionMap[adpt->_analysis->_name]; _analysisVector.push_back(new StrobeAnalysis());
adpt = new AnalysisAdaptor(new StrobeAnalysis()); _analysisVector.push_back(new IResponseAnalysis());
_acquisitionMap[adpt->_analysis->_name]; _analysisVector.push_back(new ColorMultiAnalysis());
adpt = new AnalysisAdaptor(new IResponseAnalysis()); _analysisVector.push_back(new CamFrameRateAnalysis());
_acquisitionMap[adpt->_analysis->_name]; _analysisVector.push_back(new CamNoiseAnalysis());
adpt = new AnalysisAdaptor(new ColorMultiAnalysis()); _analysisVector.push_back(new ColorSingleAnalysis());
_acquisitionMap[adpt->_analysis->_name]; _analysisVector.push_back(new LatencyTestAnalysis());
adpt = new AnalysisAdaptor(new CamFrameRateAnalysis()); _analysisVector.push_back(new DiffNoiseAnalysis());
_acquisitionMap[adpt->_analysis->_name];
adpt = new AnalysisAdaptor(new CamNoiseAnalysis());
_acquisitionMap[adpt->_analysis->_name];
adpt = new AnalysisAdaptor(new ColorSingleAnalysis());
_acquisitionMap[adpt->_analysis->_name];
adpt = new AnalysisAdaptor(new LatencyTestAnalysis());
_acquisitionMap[adpt->_analysis->_name];
adpt = new AnalysisAdaptor(new DiffNoiseAnalysis());
_acquisitionMap[adpt->_analysis->_name];
_currentAnalysisIndx = _acquisitionMap.begin(); _currentAnalysisIndx = 0;
_currentAnalysisAdaptor = _currentAnalysisIndx->second; _currentAnalysis = _analysisVector.at(_currentAnalysisIndx);
_currentAnalysis = _currentAnalysisAdaptor->_analysis;
_state = ISTATE_ACQU_START; _state = ISTATE_START;
} }
void RefractiveIndex::acquire_cb(string & analysis) void RefractiveIndex::analysis_cb(string & analysis)
{ {
assert(analysis == _currentAnalysis->_name); assert(analysis == _currentAnalysis->_name);
_state = ISTATE_ACQU_STOP;
}
void RefractiveIndex::synthesize_cb(string & analysis)
{
TAnalysisMap::iterator it = _synthesisMap.find(analysis);
if(it != _synthesisMap.end()) {
AnalysisAdaptor* adpt = it->second;
AbstractAnalysis* a = adpt->_analysis;
adpt->stop();
ofRemoveListener(a->_acquire_cb, this, &RefractiveIndex::acquire_cb);
ofRemoveListener(a->_synthesize_cb, this, &RefractiveIndex::synthesize_cb);
}
//_state = ISTATE_SYNTH_STOP; _state = ISTATE_STOP;
} }
void RefractiveIndex::start_analysis() void RefractiveIndex::start_analysis()
{ {
ofAddListener(_currentAnalysis->_acquire_cb, this, &RefractiveIndex::acquire_cb); ofAddListener(_currentAnalysis->_synthesize_cb, this, &RefractiveIndex::analysis_cb);
ofAddListener(_currentAnalysis->_synthesize_cb, this, &RefractiveIndex::synthesize_cb); _analysisAdapator = new AnalysisAdaptor(_currentAnalysis);
_currentAnalysis->setup(_vid_w, _vid_h); _currentAnalysis->setup(_vid_w, _vid_h);
_currentAnalysisAdaptor->start(); _analysisAdapator->start();
} }
void RefractiveIndex::stop_analysis() void RefractiveIndex::stop_analysis()
{ {
if(_currentAnalysisAdaptor == NULL) return; if(_analysisAdapator == NULL) return;
_currentAnalysisAdaptor->stop(); //blocking _analysisAdapator->stop(); //blocking
ofRemoveListener(_currentAnalysis->_acquire_cb, this, &RefractiveIndex::acquire_cb); ofRemoveListener(_currentAnalysis->_synthesize_cb, this, &RefractiveIndex::analysis_cb);
ofRemoveListener(_currentAnalysis->_synthesize_cb, this, &RefractiveIndex::synthesize_cb);
_currentAnalysis = NULL; _currentAnalysis = NULL;
_currentAnalysisAdaptor = NULL; delete _analysisAdapator;
_analysisAdapator = NULL;
} }
void RefractiveIndex::state_machine_analysis() void RefractiveIndex::state_analysis()
{ {
static int synth_cnt = 0;
switch (_state) { switch (_state) {
case ISTATE_ACQU_START: case ISTATE_START:
start_analysis(); start_analysis();
_state = ISTATE_UNDEF; _state = ISTATE_UNDEF;
break; break;
case ISTATE_ACQU_STOP: case ISTATE_TRANSITION:
// continue to synthesis if(_currentAnalysisIndx >= _analysisVector.size()) {
_acquisitionMap.erase(_currentAnalysisIndx); _currentAnalysisIndx = 0;
_synthesisMap[_currentAnalysis->_name] = _currentAnalysisAdaptor; _state = ISTATE_END;
_state = ISTATE_TRANSITION;
break;
case ISTATE_TRANSITION:
if(_currentAnalysisIndx != _acquisitionMap.end()) {
_currentAnalysisIndx++;
_currentAnalysisAdaptor = _currentAnalysisIndx->second;
_currentAnalysis = _currentAnalysisAdaptor->_analysis;
} else { } else {
if(_synthesisMap.size() > 0) { _currentAnalysis = _analysisVector.at(_currentAnalysisIndx++);
if(_in_acquisition) { _state = ISTATE_START;
_currentAnalysisIndx = _synthesisMap.begin();
_in_acquisition = false;
}
if(!_acquisitionMap.empty() && _currentAnalysisIndx != _synthesisMap.end()) {
_currentAnalysisIndx++;
_currentAnalysisAdaptor = _currentAnalysisIndx->second;
_currentAnalysis = _currentAnalysisAdaptor->_analysis;
_state = ISTATE_UNDEF;
} else if(_acquisitionMap.empty()) {
_state = ISTATE_END;
}
}
} }
break; break;
case ISTATE_SYNTH_STOP: case ISTATE_STOP:
stop_analysis(); // blocking
_state = ISTATE_TRANSITION;
break;
case ISTATE_END: case ISTATE_END:
stop_camera(); stop_camera();
::exit(1); ::exit(1);
@ -220,7 +173,7 @@ void RefractiveIndex::state_machine_analysis()
void RefractiveIndex::update() void RefractiveIndex::update()
{ {
state_machine_analysis(); state_analysis();
RefractiveIndex::_vidGrabber.grabFrame(); // get a new frame from the camera RefractiveIndex::_vidGrabber.grabFrame(); // get a new frame from the camera
@ -266,7 +219,7 @@ void RefractiveIndex::keyPressed (int key)
ofToggleFullscreen(); ofToggleFullscreen();
} }
void RefractiveIndex::exit() void RefractiveIndex::exit()
{ {
stop_camera(); stop_camera();
} }

42
example/RefractiveIndex.h
View File

@ -8,14 +8,12 @@
#include "ofMain.h" #include "ofMain.h"
#include "ofEvents.h" #include "ofEvents.h"
//#include "ofxControlPanel.h"
#include "AbstractAnalysis.h" #include "AbstractAnalysis.h"
#include "AnalysisAdaptor.h" #include "AnalysisAdaptor.h"
typedef map<string, AnalysisAdaptor*> TAnalysisMap;
typedef vector<AnalysisAdaptor*> TAnalysisVec;
class RefractiveIndex : public ofBaseApp class RefractiveIndex : public ofBaseApp
{ {
public: public:
@ -26,22 +24,13 @@ public:
void draw(); void draw();
void exit(); void exit();
// camera // refindx
void setup_camera(); void setup_camera();
void stop_camera(); void stop_camera();
void analysis_cb(string & analysis);
// starts the whole process
void start_analysis(); void start_analysis();
// stops the whole process
void stop_analysis(); void stop_analysis();
void state_analysis();
// callbacks
void acquire_cb(string & analysis);
void synthesize_cb(string & analysis);
// state machine
void state_machine_analysis();
// ofx // ofx
void keyPressed (int key); void keyPressed (int key);
@ -53,17 +42,17 @@ public:
void windowResized(int w, int h){;} void windowResized(int w, int h){;}
protected: protected:
//void eventsIn(guiCallbackData & data);
//void grabBackgroundEvent(guiCallbackData & data);
// gui
//ofxControlPanel _gui;
AbstractAnalysis* _currentAnalysis; AbstractAnalysis* _currentAnalysis;
AnalysisAdaptor* _currentAnalysisAdaptor; int _currentAnalysisIndx;
AnalysisAdaptor* _currentSynthesisAdaptor; AnalysisAdaptor* _analysisAdapator;
TAnalysisMap::iterator _currentAnalysisIndx; vector<AbstractAnalysis*> _analysisVector;
TAnalysisMap _acquisitionMap;
TAnalysisMap _synthesisMap;
TAnalysisVec _display_results_vector;
public: public:
// acquisition // acquisition
@ -75,6 +64,7 @@ public:
static bool _vid_toggle_on; static bool _vid_toggle_on;
// this should be in xml // this should be in xml
static string _location; static string _location;
}; };

6
src/AbstractAnalysis.cpp
View File

@ -34,13 +34,7 @@
#include "RefractiveIndex.h" #include "RefractiveIndex.h"
void AbstractAnalysis::do_synthesize() { 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();
// synthesize notify obeservers
ofNotifyEvent(_synthesize_cb, _name); ofNotifyEvent(_synthesize_cb, _name);
} }

16
src/AbstractAnalysis.h
View File

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

4
src/AnalysisAdaptor.h
View File

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