From b5cebe93045d5e578a7a2354093a7f07411d5e42 Mon Sep 17 00:00:00 2001 From: dviid Date: Mon, 20 Feb 2012 14:08:58 +0100 Subject: [PATCH] mid-commit AbstractAnalysis::saveimage --- src/AbstractAnalysis.cpp | 10 ++++++++++ src/AbstractAnalysis.h | 1 + src/ShapeFromShadingAnalysis.cpp | 8 ++++---- 3 files changed, 15 insertions(+), 4 deletions(-) diff --git a/src/AbstractAnalysis.cpp b/src/AbstractAnalysis.cpp index 16f8144..aa556a0 100644 --- a/src/AbstractAnalysis.cpp +++ b/src/AbstractAnalysis.cpp @@ -316,3 +316,13 @@ int AbstractAnalysis::getRecordedValueFromFileName(string str){ } +void AbstractAnalysis::saveimage(string filename) +{ + if(RefractiveIndex::_pixels.isAllocated()) { + ofSaveImage(RefractiveIndex::_pixels, filename, OF_IMAGE_QUALITY_BEST); + _saved_filenames.push_back(filename); + } else { + ofLog(OF_LOG_ERROR) << "RefractiveIndex::_pixels NOT allocated..."; + } +} + diff --git a/src/AbstractAnalysis.h b/src/AbstractAnalysis.h index 5131112..c949c16 100755 --- a/src/AbstractAnalysis.h +++ b/src/AbstractAnalysis.h @@ -39,6 +39,7 @@ public: protected: virtual void create_dir(); + virtual void saveimage(string filename); // acquire images - all the children (see - do_synthesize) virtual void acquire() = 0; diff --git a/src/ShapeFromShadingAnalysis.cpp b/src/ShapeFromShadingAnalysis.cpp index 882a14a..148bcdc 100755 --- a/src/ShapeFromShadingAnalysis.cpp +++ b/src/ShapeFromShadingAnalysis.cpp @@ -419,10 +419,10 @@ void ShapeFromShadingAnalysis::save_cb(Timer& timer) { //cout << "ShapeFromShadingAnalysis::saving...\n"; - string file_name = ofToString(_save_cnt,2)+"_"+ quad +"_"+ofToString(_run_cnt,2)+".jpg"; - _saved_filenames.push_back(ofToDataPath("")+_whole_file_path+"/"+file_name); - - ofSaveImage(RefractiveIndex::_pixels, _whole_file_path+"/"+file_name, OF_IMAGE_QUALITY_BEST); + string file_name = ofToString(_save_cnt,2)+"_"+ quad +"_"+ofToString(_run_cnt,2)+".jpg"; + + saveimage(file_name); + _save_cnt++; //if(_save_cnt >= NUM_SAVE_PER_RUN)