diff --git a/src/CamNoiseAnalysis.cpp b/src/CamNoiseAnalysis.cpp index ca4dc27..68d39b4 100755 --- a/src/CamNoiseAnalysis.cpp +++ b/src/CamNoiseAnalysis.cpp @@ -25,6 +25,7 @@ void CamNoiseAnalysis::setup(int camWidth, int camHeight) _frame_cnt = 0; _run_cnt = 0; + _synth_save_cnt = 0; c = 0; diff --git a/src/ColorMultiAnalysis.cpp b/src/ColorMultiAnalysis.cpp index 43d37c9..8fdc805 100755 --- a/src/ColorMultiAnalysis.cpp +++ b/src/ColorMultiAnalysis.cpp @@ -26,6 +26,7 @@ void ColorMultiAnalysis::setup(int camWidth, int camHeight) _frame_cnt = 0; _run_cnt = 0; + _synth_save_cnt = 0; c = 0; int anim_time = 10; // 10 seconds diff --git a/src/ColorSingleAnalysis.cpp b/src/ColorSingleAnalysis.cpp index 91101cb..8dcf728 100755 --- a/src/ColorSingleAnalysis.cpp +++ b/src/ColorSingleAnalysis.cpp @@ -27,6 +27,7 @@ void ColorSingleAnalysis::setup(int camWidth, int camHeight) _run_cnt = 0; _frame_cnt = 0; + _synth_save_cnt = 0; c = 0; int anim_time = 10; // 10 seconds diff --git a/src/DiffNoiseAnalysis.cpp b/src/DiffNoiseAnalysis.cpp index d092244..6f6c2f1 100755 --- a/src/DiffNoiseAnalysis.cpp +++ b/src/DiffNoiseAnalysis.cpp @@ -27,6 +27,7 @@ void DiffNoiseAnalysis::setup(int camWidth, int camHeight) _run_cnt = 0; _frame_cnt = 0; + _synth_save_cnt = 0; c = 0; int anim_time = 10; // 10 seconds diff --git a/src/IResponseAnalysis.cpp b/src/IResponseAnalysis.cpp index 2214191..da37661 100755 --- a/src/IResponseAnalysis.cpp +++ b/src/IResponseAnalysis.cpp @@ -23,7 +23,7 @@ void IResponseAnalysis::setup(int camWidth, int camHeight) _frame_cnt_max = acq_run_time*ofGetFrameRate(); // e.g.: 30 frames per second * 20 seconds = 600 frames //create_dir(); - + _synth_save_cnt = 0; _run_cnt = 0; _frame_cnt = 0; c = 0; diff --git a/src/RelaxRateAnalysis.cpp b/src/RelaxRateAnalysis.cpp index dad4a8e..7951dbd 100755 --- a/src/RelaxRateAnalysis.cpp +++ b/src/RelaxRateAnalysis.cpp @@ -29,7 +29,8 @@ void RelaxRateAnalysis::setup(int camWidth, int camHeight) _flip = 1; _frame_cnt = 0; c = 0; - + _synth_save_cnt = 0; + int anim_time = 5; // 10 seconds _anim_cnt_max = anim_time*ofGetFrameRate(); // e.g.: 30 frames per second = 150 frames diff --git a/src/ShadowScapesAnalysis.cpp b/src/ShadowScapesAnalysis.cpp index e9c4090..b653095 100755 --- a/src/ShadowScapesAnalysis.cpp +++ b/src/ShadowScapesAnalysis.cpp @@ -133,15 +133,15 @@ void ShadowScapesAnalysis::synthesise() string file_name; if(_dir == H) { - file_name = ofToString(_synth_save_cnt, 2)+"_H_ShadowScapesSynthesis"+ofToString(_run_cnt,2)+".jpg"; + file_name = ofToString(_synth_save_cnt, 2)+"_H_ShadowScapesSynthesis_"+ofToString(_run_cnt,2)+".jpg"; } if(_dir == V) { - file_name = ofToString(_synth_save_cnt, 2)+"_V_ShadowScapesSynthesis"+ofToString(_run_cnt,2)+".jpg"; + file_name = ofToString(_synth_save_cnt, 2)+"_V_ShadowScapesSynthesis_"+ofToString(_run_cnt,2)+".jpg"; } if(_dir == D) { - file_name = ofToString(_synth_save_cnt, 2)+"_D_ShadowScapesSynthesis"+ofToString(_run_cnt,2)+".jpg"; + file_name = ofToString(_synth_save_cnt, 2)+"_D_ShadowScapesSynthesis_"+ofToString(_run_cnt,2)+".jpg"; } //image4.setFromPixels(cvColorImage1.getPixelsRef(),image3.width, image3.height, OF_IMAGE_COLOR); diff --git a/src/ShapeFromShadingAnalysis.cpp b/src/ShapeFromShadingAnalysis.cpp index 9eedbe3..740857c 100755 --- a/src/ShapeFromShadingAnalysis.cpp +++ b/src/ShapeFromShadingAnalysis.cpp @@ -22,6 +22,7 @@ void ShapeFromShadingAnalysis::setup(int camWidth, int camHeight) _frame_cnt_max = acq_run_time*ofGetFrameRate(); // e.g.: 30 frames per second * 20 seconds = 600 frames //create_dir(); + _synth_save_cnt = 0; _run_cnt = 0; _frame_cnt = 0; c = 0; diff --git a/src/StrobeAnalysis.cpp b/src/StrobeAnalysis.cpp index 2079e7b..965543f 100755 --- a/src/StrobeAnalysis.cpp +++ b/src/StrobeAnalysis.cpp @@ -26,7 +26,7 @@ void StrobeAnalysis::setup(int camWidth, int camHeight) // The British Health and Safety Executive recommend that a net flash rate for a bank of strobe lights does not exceed 5 flashes per second, at which only 5% of photosensitive epileptics are at risk. It also recommends that no strobing effect continue for more than 30 seconds, due to the potential for discomfort and disorientation. //create_dir(); - + _synth_save_cnt = 0; _run_cnt = 0; int anim_time = 5; // 5 seconds for the animation