final check and commit before merge with master
This commit is contained in:
parent
bf8c630add
commit
d798394793
@ -101,19 +101,19 @@ void RefractiveIndex::setup()
|
|||||||
// _analysisVector.push_back(new ShadowScapesAnalysis(H));
|
// _analysisVector.push_back(new ShadowScapesAnalysis(H));
|
||||||
// _analysisVector.push_back(new ShadowScapesAnalysis(D));
|
// _analysisVector.push_back(new ShadowScapesAnalysis(D));
|
||||||
|
|
||||||
// _analysisVector.push_back(new RelaxRateAnalysis());
|
_analysisVector.push_back(new RelaxRateAnalysis());
|
||||||
|
|
||||||
// _analysisVector.push_back(new IResponseAnalysis());
|
_analysisVector.push_back(new IResponseAnalysis());
|
||||||
|
|
||||||
_analysisVector.push_back(new ShapeFromShadingAnalysis());
|
_analysisVector.push_back(new ShapeFromShadingAnalysis());
|
||||||
|
|
||||||
// _analysisVector.push_back(new StrobeAnalysis());
|
// _analysisVector.push_back(new StrobeAnalysis());
|
||||||
|
|
||||||
// _analysisVector.push_back(new CamNoiseAnalysis());
|
_analysisVector.push_back(new CamNoiseAnalysis());
|
||||||
|
|
||||||
// _analysisVector.push_back(new ColorSingleAnalysis());
|
_analysisVector.push_back(new ColorSingleAnalysis());
|
||||||
|
|
||||||
// _analysisVector.push_back(new ColorMultiAnalysis());
|
_analysisVector.push_back(new ColorMultiAnalysis());
|
||||||
|
|
||||||
_analysisVector.push_back(new DiffNoiseAnalysis());
|
_analysisVector.push_back(new DiffNoiseAnalysis());
|
||||||
|
|
||||||
|
|||||||
@ -65,17 +65,23 @@ void CamNoiseAnalysis::synthesise()
|
|||||||
whichMesh=0;
|
whichMesh=0;
|
||||||
|
|
||||||
int index=0;
|
int index=0;
|
||||||
|
float iterator=1;
|
||||||
//if you want to see what this looks like with real data ignore the new filenames and load teh old ones.
|
//if you want to see what this looks like with real data ignore the new filenames and load teh old ones.
|
||||||
bool debug=false;
|
bool debug=true;
|
||||||
if(debug){
|
if(debug){
|
||||||
_saved_filenames.clear();
|
_saved_filenames.clear();
|
||||||
_saved_filenames=getListOfImageFilePaths("MIDDLESBOROUGH", _name);
|
_saved_filenames=getListOfImageFilePaths("MIDDLESBOROUGH", _name);
|
||||||
|
|
||||||
|
//hack to limit number of meshes.
|
||||||
|
if(_saved_filenames.size()>100){
|
||||||
|
iterator= _saved_filenames.size() /100;
|
||||||
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
//clear vector so we don't add to it on successive runs
|
//clear vector so we don't add to it on successive runs
|
||||||
meshes.clear();
|
meshes.clear();
|
||||||
|
|
||||||
for(int i=0;i<_saved_filenames.size()-1;i++){
|
for(float i=0;i<_saved_filenames.size()-1;i+=iterator){
|
||||||
|
|
||||||
|
|
||||||
ofImage image1;
|
ofImage image1;
|
||||||
|
|||||||
@ -92,16 +92,22 @@ void ColorMultiAnalysis::synthesise()
|
|||||||
whichMesh=0;
|
whichMesh=0;
|
||||||
|
|
||||||
int index=0;
|
int index=0;
|
||||||
|
float iterator=1;
|
||||||
//if you want to see what this looks like with real data ignore the new filenames and load teh old ones.
|
|
||||||
bool debug=false;
|
bool debug=false;
|
||||||
if(debug){
|
if(debug){
|
||||||
_saved_filenames.clear();
|
_saved_filenames.clear();
|
||||||
_saved_filenames=getListOfImageFilePaths("MIDDLESBOROUGH", _name);
|
_saved_filenames=getListOfImageFilePaths("MIDDLESBOROUGH", _name);
|
||||||
|
|
||||||
|
//hack to limit number of meshes.
|
||||||
|
if(_saved_filenames.size()>100){
|
||||||
|
iterator= _saved_filenames.size() /100;
|
||||||
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
//clear vector so we don't add to it on successive runs
|
//clear vector so we don't add to it on successive runs
|
||||||
meshes.clear();
|
meshes.clear();
|
||||||
for(int i=0;i<_saved_filenames.size()-2;i+=2){
|
|
||||||
|
for(float i=0;i<_saved_filenames.size()-1;i+=iterator){
|
||||||
|
|
||||||
ofImage image1;
|
ofImage image1;
|
||||||
ofImage image2;
|
ofImage image2;
|
||||||
|
|||||||
@ -70,16 +70,22 @@ void ColorSingleAnalysis::synthesise()
|
|||||||
whichMesh=0;
|
whichMesh=0;
|
||||||
|
|
||||||
int index=0;
|
int index=0;
|
||||||
|
float iterator=1;
|
||||||
//if you want to see what this looks like with real data ignore the new filenames and load teh old ones.
|
|
||||||
bool debug=false;
|
bool debug=false;
|
||||||
if(debug){
|
if(debug){
|
||||||
_saved_filenames.clear();
|
_saved_filenames.clear();
|
||||||
_saved_filenames=getListOfImageFilePaths("MIDDLESBOROUGH", _name);
|
_saved_filenames=getListOfImageFilePaths("MIDDLESBOROUGH", _name);
|
||||||
|
|
||||||
|
//hack to limit number of meshes.
|
||||||
|
if(_saved_filenames.size()>100){
|
||||||
|
iterator= _saved_filenames.size() /100;
|
||||||
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
//clear vector so we don't add to it on successive runs
|
//clear vector so we don't add to it on successive runs
|
||||||
meshes.clear();
|
meshes.clear();
|
||||||
for(int i=1;i<_saved_filenames.size()-2;i+=2){
|
|
||||||
|
for(float i=0;i<_saved_filenames.size()-1;i+=iterator){
|
||||||
|
|
||||||
ofImage image1;
|
ofImage image1;
|
||||||
ofImage image2;
|
ofImage image2;
|
||||||
|
|||||||
@ -65,17 +65,22 @@ void DiffNoiseAnalysis::synthesise()
|
|||||||
whichMesh=0;
|
whichMesh=0;
|
||||||
|
|
||||||
int index=0;
|
int index=0;
|
||||||
|
float iterator=1;
|
||||||
//if you want to see what this looks like with real data ignore the new filenames and load teh old ones.
|
|
||||||
bool debug=false;
|
bool debug=false;
|
||||||
if(debug){
|
if(debug){
|
||||||
_saved_filenames.clear();
|
_saved_filenames.clear();
|
||||||
_saved_filenames=getListOfImageFilePaths("MIDDLESBOROUGH", _name);
|
_saved_filenames=getListOfImageFilePaths("MIDDLESBOROUGH", _name);
|
||||||
|
|
||||||
|
//hack to limit number of meshes.
|
||||||
|
if(_saved_filenames.size()>100){
|
||||||
|
iterator= _saved_filenames.size() /100;
|
||||||
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
//clear vector so we don't add to it on successive runs
|
//clear vector so we don't add to it on successive runs
|
||||||
meshes.clear();
|
meshes.clear();
|
||||||
|
|
||||||
for(int i=0;i<_saved_filenames.size()-1;i++){
|
for(float i=0;i<_saved_filenames.size()-1;i+=iterator){
|
||||||
|
|
||||||
|
|
||||||
ofImage image1;
|
ofImage image1;
|
||||||
|
|||||||
@ -66,17 +66,22 @@ void IResponseAnalysis::synthesise()
|
|||||||
whichMesh=0;
|
whichMesh=0;
|
||||||
|
|
||||||
int index=0;
|
int index=0;
|
||||||
|
float iterator=1;
|
||||||
//if you want to see what this looks like with real data ignore the new filenames and load teh old ones.
|
|
||||||
bool debug=false;
|
bool debug=false;
|
||||||
if(debug){
|
if(debug){
|
||||||
_saved_filenames.clear();
|
_saved_filenames.clear();
|
||||||
_saved_filenames=getListOfImageFilePaths("MIDDLESBOROUGH", _name);
|
_saved_filenames=getListOfImageFilePaths("MIDDLESBOROUGH", _name);
|
||||||
|
|
||||||
|
//hack to limit number of meshes.
|
||||||
|
if(_saved_filenames.size()>100){
|
||||||
|
iterator= _saved_filenames.size() /100;
|
||||||
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
//clear vector so we don't add to it on successive runs
|
//clear vector so we don't add to it on successive runs
|
||||||
meshes.clear();
|
meshes.clear();
|
||||||
|
|
||||||
for(int i=0;i<_saved_filenames.size()-1;i++){
|
for(float i=0;i<_saved_filenames.size()-1;i+=iterator){
|
||||||
|
|
||||||
|
|
||||||
ofImage image1;
|
ofImage image1;
|
||||||
|
|||||||
@ -18,7 +18,7 @@ using Poco::Thread;
|
|||||||
|
|
||||||
void RelaxRateAnalysis::setup(int camWidth, int camHeight)
|
void RelaxRateAnalysis::setup(int camWidth, int camHeight)
|
||||||
{
|
{
|
||||||
DELTA_T_SAVE = 1300;
|
DELTA_T_SAVE = 130;
|
||||||
NUM_PHASE = 1;
|
NUM_PHASE = 1;
|
||||||
NUM_RUN = 1;
|
NUM_RUN = 1;
|
||||||
NUM_SAVE_PER_RUN = 100;
|
NUM_SAVE_PER_RUN = 100;
|
||||||
@ -67,17 +67,22 @@ void RelaxRateAnalysis::synthesise()
|
|||||||
whichMesh=0;
|
whichMesh=0;
|
||||||
|
|
||||||
int index=0;
|
int index=0;
|
||||||
|
float iterator=1;
|
||||||
//if you want to see what this looks like with real data ignore the new filenames and load teh old ones.
|
|
||||||
bool debug=false;
|
bool debug=false;
|
||||||
if(debug){
|
if(debug){
|
||||||
_saved_filenames.clear();
|
_saved_filenames.clear();
|
||||||
_saved_filenames=getListOfImageFilePaths("MIDDLESBOROUGH", _name);
|
_saved_filenames=getListOfImageFilePaths("MIDDLESBOROUGH", _name);
|
||||||
|
|
||||||
|
//hack to limit number of meshes.
|
||||||
|
if(_saved_filenames.size()>100){
|
||||||
|
iterator= _saved_filenames.size() /100;
|
||||||
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
//clear vector so we don't add to it on successive runs
|
//clear vector so we don't add to it on successive runs
|
||||||
meshes.clear();
|
meshes.clear();
|
||||||
|
|
||||||
for(int i=0;i<_saved_filenames.size()-1;i++){
|
for(float i=0;i<_saved_filenames.size()-1;i+=iterator){
|
||||||
|
|
||||||
|
|
||||||
ofImage image1;
|
ofImage image1;
|
||||||
|
|||||||
@ -95,17 +95,22 @@ void ShadowScapesAnalysis::synthesise()
|
|||||||
whichMesh=0;
|
whichMesh=0;
|
||||||
|
|
||||||
int index=0;
|
int index=0;
|
||||||
|
float iterator=1;
|
||||||
//if you want to see what this looks like with real data ignore the new filenames and load teh old ones.
|
|
||||||
bool debug=false;
|
bool debug=false;
|
||||||
if(debug){
|
if(debug){
|
||||||
_saved_filenames.clear();
|
_saved_filenames.clear();
|
||||||
_saved_filenames=getListOfImageFilePaths("MIDDLESBOROUGH", _name);
|
_saved_filenames=getListOfImageFilePaths("MIDDLESBOROUGH", _name);
|
||||||
|
|
||||||
|
//hack to limit number of meshes.
|
||||||
|
if(_saved_filenames.size()>100){
|
||||||
|
iterator= _saved_filenames.size() /100;
|
||||||
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
//clear vector so we don't add to it on successive runs
|
//clear vector so we don't add to it on successive runs
|
||||||
meshes.clear();
|
meshes.clear();
|
||||||
|
|
||||||
for(int i=0;i<_saved_filenames.size()-1;i++){
|
for(float i=0;i<_saved_filenames.size()-1;i+=iterator){
|
||||||
|
|
||||||
|
|
||||||
ofImage image1;
|
ofImage image1;
|
||||||
|
|||||||
@ -86,17 +86,22 @@ void ShapeFromShadingAnalysis::synthesise()
|
|||||||
whichMesh=0;
|
whichMesh=0;
|
||||||
|
|
||||||
int index=0;
|
int index=0;
|
||||||
|
float iterator=1;
|
||||||
//if you want to see what this looks like with real data ignore the new filenames and load teh old ones.
|
|
||||||
bool debug=false;
|
bool debug=false;
|
||||||
if(debug){
|
if(debug){
|
||||||
_saved_filenames.clear();
|
_saved_filenames.clear();
|
||||||
_saved_filenames=getListOfImageFilePaths("MIDDLESBOROUGH", _name);
|
_saved_filenames=getListOfImageFilePaths("MIDDLESBOROUGH", _name);
|
||||||
|
|
||||||
|
//hack to limit number of meshes.
|
||||||
|
if(_saved_filenames.size()>100){
|
||||||
|
iterator= _saved_filenames.size() /100;
|
||||||
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
//clear vector so we don't add to it on successive runs
|
//clear vector so we don't add to it on successive runs
|
||||||
meshes.clear();
|
meshes.clear();
|
||||||
|
|
||||||
for(int i=0;i<_saved_filenames.size()-1;i++){
|
for(float i=0;i<_saved_filenames.size()-1;i+=iterator){
|
||||||
|
|
||||||
|
|
||||||
ofImage image1;
|
ofImage image1;
|
||||||
|
|||||||
@ -70,17 +70,22 @@ void StrobeAnalysis::synthesise()
|
|||||||
whichMesh=0;
|
whichMesh=0;
|
||||||
|
|
||||||
int index=0;
|
int index=0;
|
||||||
|
float iterator=1;
|
||||||
//if you want to see what this looks like with real data ignore the new filenames and load teh old ones.
|
|
||||||
bool debug=false;
|
bool debug=false;
|
||||||
if(debug){
|
if(debug){
|
||||||
_saved_filenames.clear();
|
_saved_filenames.clear();
|
||||||
_saved_filenames=getListOfImageFilePaths("MIDDLESBOROUGH", _name);
|
_saved_filenames=getListOfImageFilePaths("MIDDLESBOROUGH", _name);
|
||||||
|
|
||||||
|
//hack to limit number of meshes.
|
||||||
|
if(_saved_filenames.size()>100){
|
||||||
|
iterator= _saved_filenames.size() /100;
|
||||||
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
//clear vector so we don't add to it on successive runs
|
//clear vector so we don't add to it on successive runs
|
||||||
meshes.clear();
|
meshes.clear();
|
||||||
|
|
||||||
for(int i=0;i<_saved_filenames.size()-1;i++){
|
for(float i=0;i<_saved_filenames.size()-1;i+=iterator){
|
||||||
|
|
||||||
|
|
||||||
ofImage image1;
|
ofImage image1;
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user