Revert "Revert ebe29d2c8a6544abf5acd8d94be130ec02748f34^..HEAD"

This reverts commit b39f191936.
This commit is contained in:
Jamie Allen
2012-03-01 00:30:40 +01:00
parent b39f191936
commit a0483636ac
2 changed files with 2 additions and 2 deletions
-1
View File
@@ -199,7 +199,6 @@ void RefractiveIndex::draw()
// black
ofBackground(0, 0, 0);
ofEnableSmoothing();
if(_currentAnalysis)
_currentAnalysis->draw();
}
+2 -1
View File
@@ -162,11 +162,12 @@ void RelaxRateAnalysis::displayresults()
{
cvContourFinderVectDisplay.clear();
for(int i=1;i<cvContourFinderVect.size();i++){
if(_state == STATE_STOP) return;
//cout << "_saved_filenames_analysis[i] - " << _saved_filenames_synthesis[i] << endl;
while(!_image_shown){