diff --git a/src/AbstractAnalysis.cpp b/src/AbstractAnalysis.cpp index 9e4009f..16f8144 100644 --- a/src/AbstractAnalysis.cpp +++ b/src/AbstractAnalysis.cpp @@ -34,6 +34,9 @@ #include "RefractiveIndex.h" #include "ofxFileHelper.h" + +vector AbstractAnalysis::meshes; + // this is the main threaded loop for a given analysis void AbstractAnalysis::do_synthesize() { _state = STATE_ACQUIRING; diff --git a/src/AbstractAnalysis.h b/src/AbstractAnalysis.h index 1b79490..5131112 100755 --- a/src/AbstractAnalysis.h +++ b/src/AbstractAnalysis.h @@ -64,6 +64,9 @@ protected: //EG FILENAME : DIFF_NOISE_7_85.7322.jpg RETURNS : 85.7322 virtual int getRecordedValueFromFileName(string str); + static vectormeshes; + + public: string _name; @@ -84,7 +87,7 @@ protected: //added Tom S 19/2/12 //each mesh in the vector is a seperate 3D point cloud which is coloured with pixel data and shifted in the z plane according to the specified type of colour difference eg red value or hue - vectormeshes; + //make this vector were static //how fast to move from one mesh to the next float speed; //the index (inside the vector of meshes) of the current mesh being displayed diff --git a/src/ColorMultiAnalysis.cpp b/src/ColorMultiAnalysis.cpp index e342752..6c57f22 100755 --- a/src/ColorMultiAnalysis.cpp +++ b/src/ColorMultiAnalysis.cpp @@ -45,7 +45,7 @@ using Poco::Thread; void ColorMultiAnalysis::setup(int camWidth, int camHeight) { - DELTA_T_SAVE = 150; // the right number is about 300 + DELTA_T_SAVE = 100;//150; // the right number is about 300 NUM_PHASE = 1; NUM_RUN = 1; NUM_SAVE_PER_RUN = 100;//; diff --git a/src/ColorSingleAnalysis.cpp b/src/ColorSingleAnalysis.cpp index 4e27392..f4845e4 100755 --- a/src/ColorSingleAnalysis.cpp +++ b/src/ColorSingleAnalysis.cpp @@ -18,7 +18,7 @@ using Poco::Thread; void ColorSingleAnalysis::setup(int camWidth, int camHeight) { - DELTA_T_SAVE = 300; + DELTA_T_SAVE = 100;//300; NUM_PHASE = 1; NUM_RUN = 1; NUM_SAVE_PER_RUN = 100;