key presses working for all - still working on opencv imagery
This commit is contained in:
parent
b0464c5632
commit
763d88b115
@ -94,9 +94,9 @@ void RefractiveIndex::setup()
|
||||
|
||||
//TODO: whichever one of these is first - it always runs twice ?
|
||||
|
||||
//_analysisVector.push_back(new ShadowScapesAnalysis(V));
|
||||
//_analysisVector.push_back(new ShadowScapesAnalysis(H));
|
||||
//_analysisVector.push_back(new ShadowScapesAnalysis(D));
|
||||
_analysisVector.push_back(new ShadowScapesAnalysis(V));
|
||||
_analysisVector.push_back(new ShadowScapesAnalysis(H));
|
||||
_analysisVector.push_back(new ShadowScapesAnalysis(D));
|
||||
|
||||
_analysisVector.push_back(new RelaxRateAnalysis());
|
||||
|
||||
|
||||
@ -79,7 +79,7 @@ void ShadowScapesAnalysis::acquire()
|
||||
|
||||
save_timer.start(save_callback);
|
||||
|
||||
while(!_RUN_DONE)
|
||||
while(!_RUN_DONE && _state != STATE_STOP)
|
||||
Thread::sleep(3);
|
||||
|
||||
save_timer.stop();
|
||||
@ -93,7 +93,7 @@ void ShadowScapesAnalysis::synthesise()
|
||||
{
|
||||
|
||||
// _saved_filenames has all the file names of all the saved images
|
||||
while(!_RUN_DONE)
|
||||
while(!_RUN_DONE && _state != STATE_STOP)
|
||||
Thread::sleep(3);
|
||||
}
|
||||
|
||||
@ -105,6 +105,8 @@ void ShadowScapesAnalysis::displayresults()
|
||||
|
||||
// cout << "_saved_filenames[i]" << _saved_filenames[i] << endl;
|
||||
|
||||
if(_state == STATE_STOP) return;
|
||||
|
||||
while(!_image_shown){
|
||||
Thread::sleep(2);
|
||||
//cout << "!_image_shown" << endl;
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user