diff --git a/src/AbstractAnalysis.cpp b/src/AbstractAnalysis.cpp index a9a658f..4989f2b 100644 --- a/src/AbstractAnalysis.cpp +++ b/src/AbstractAnalysis.cpp @@ -111,7 +111,7 @@ void AbstractAnalysis::create_dir_allocate_images() myGrayImage1.clear(); myGrayImage1.setUseTexture(false); myGrayImage1.allocate(RefractiveIndex::_vid_w, RefractiveIndex::_vid_h, OF_IMAGE_GRAYSCALE); - + //////////////////////////////END ALLOCATE IMAGES ////////////////////////////////////////////////// } @@ -153,17 +153,16 @@ void AbstractAnalysis::saveImageAnalysis(string filename) void AbstractAnalysis::saveImageSynthesis(string filename, ofxCvImage* newPixels, ofImageType newType) { -//#ifdef TARGET_OSX +#ifdef TARGET_OSX // ofSaveImage(newPixels->getPixelsRef(), _whole_file_path_synthesis+"/"+filename, OF_IMAGE_QUALITY_BEST); -//#elif defined(TARGET_WIN32) +#elif defined(TARGET_WIN32) if (newType == OF_IMAGE_COLOR){ myColorImage2.setUseTexture(false); myColorImage2.setFromPixels(newPixels->getPixels(), newPixels->getWidth(), newPixels->getHeight(), OF_IMAGE_COLOR); myColorImage2.saveImage(_whole_file_path_synthesis+"/"+filename); - myColorImage2.clear(); } if (newType == OF_IMAGE_GRAYSCALE){ @@ -171,16 +170,16 @@ void AbstractAnalysis::saveImageSynthesis(string filename, ofxCvImage* newPixels // THIS IS HOW YOU HAVE TO SAVE OUT THE GREYSCALE IMAGES on WINDOWS FOR SOME REASON --> i.e.: as an OF_IMAGE_COLOR // But they don't save properly - they're spatially translated and generally f'd up - myGrayImage1.setFromPixels(newPixels->getPixels(), newPixels->getWidth(), newPixels->getHeight()); - + myGrayImage1.setFromPixels(newPixels->getPixels(), newPixels->getWidth(), newPixels->getHeight(), OF_IMAGE_GRAYSCALE); + myGrayImage1.setImageType(OF_IMAGE_COLOR); + // THIS DOESN' SEEM TO SAVE OUT IMAGES AT ALL ON WINDOWS //myGrayImage1.setFromPixels(newPixels->getPixels(), newPixels->getWidth(), newPixels->getHeight(), OF_IMAGE_GRAYSCALE); myGrayImage1.saveImage(_whole_file_path_synthesis+"/"+filename); - myGrayImage1.clear(); } -//#endif +#endif _saved_filenames_synthesis.push_back(_whole_file_path_synthesis+"/"+filename); diff --git a/src/CamNoiseAnalysis.cpp b/src/CamNoiseAnalysis.cpp index 265050e..76d2ec0 100755 --- a/src/CamNoiseAnalysis.cpp +++ b/src/CamNoiseAnalysis.cpp @@ -146,8 +146,8 @@ void CamNoiseAnalysis::synthesise() cvColorImage1.setFromPixels(image1.getPixels(), image1.width, image1.height); //cvColorImage2.setFromPixels(image5.getPixels(), image5.width, image5.height); - cvGrayImage1 = cvColorImage1; - //cvGrayImage2 = cvColorImage2; + cvColorImage1.convertToGrayscalePlanarImage(cvGrayImage1, 1); + // cvColorImage2.convertToGrayscalePlanarImage(cvGrayImage2, 1); //cvGrayDiff1.absDiff(cvGrayImage2, cvGrayImage1); cvGrayImage1.erode(); diff --git a/src/ColorSingleAnalysis.cpp b/src/ColorSingleAnalysis.cpp index 76aa678..a9e4d30 100755 --- a/src/ColorSingleAnalysis.cpp +++ b/src/ColorSingleAnalysis.cpp @@ -151,16 +151,6 @@ void ColorSingleAnalysis::synthesise() cvColorImage1.setFromPixels(image1.getPixels(), image1.width, image1.height); //cvColorImage2.setFromPixels(image5.getPixels(), image5.width, image5.height); - //cvGrayImage1 = cvColorImage1; - //cvGrayImage2 = cvColorImage2; - - //cvGrayDiff1.absDiff(cvGrayImage2, cvGrayImage1); - //cvGrayDiff1.erode(); - //cvGrayDiff1.contrastStretch(); - //cvGrayDiff1.blur(5); - //cvGrayDiff1.dilate(); - //cvGrayDiff1.contrastStretch(); - cvColorImage1.blur(5); cvColorImage1.erode(); cvColorImage1.erode(); diff --git a/src/IResponseAnalysis.cpp b/src/IResponseAnalysis.cpp index e9d7211..937519a 100755 --- a/src/IResponseAnalysis.cpp +++ b/src/IResponseAnalysis.cpp @@ -146,8 +146,8 @@ void IResponseAnalysis::synthesise() cvColorImage1.setFromPixels(image1.getPixels(), image1.width, image1.height); cvColorImage2.setFromPixels(image5.getPixels(), image5.width, image5.height); - cvGrayImage1 = cvColorImage1; - cvGrayImage2 = cvColorImage2; + cvColorImage1.convertToGrayscalePlanarImage(cvGrayImage1, 1); + cvColorImage2.convertToGrayscalePlanarImage(cvGrayImage2, 1); cvGrayDiff1.absDiff(cvGrayImage2, cvGrayImage1); cvGrayDiff1.erode(); diff --git a/src/RelaxRateAnalysis.cpp b/src/RelaxRateAnalysis.cpp index f636b9e..8ef163f 100755 --- a/src/RelaxRateAnalysis.cpp +++ b/src/RelaxRateAnalysis.cpp @@ -139,7 +139,9 @@ void RelaxRateAnalysis::synthesise() ///////////////////////// PROCESS THE SAVED CAMERA IMAGES OF SHIT TO THE IMAGES ////////////////////////// cvColorImage1.setFromPixels(image1.getPixels(), image1.width, image1.height); - cvGrayDiff1 = cvColorImage1; + + cvColorImage1.convertToGrayscalePlanarImage(cvGrayImage1, 1); + cvGrayDiff1.threshold(_treshold); rfiCvContourFinder* cf = new rfiCvContourFinder(); diff --git a/src/ShadowScapesAnalysis.cpp b/src/ShadowScapesAnalysis.cpp index 3197cb3..584e33c 100755 --- a/src/ShadowScapesAnalysis.cpp +++ b/src/ShadowScapesAnalysis.cpp @@ -143,9 +143,9 @@ void ShadowScapesAnalysis::synthesise() cvColorImage1.setFromPixels(image1.getPixels(), image1.width, image1.height); cvColorImage2.setFromPixels(image5.getPixels(), image5.width, image5.height); - cvGrayImage1 = cvColorImage1; - cvGrayImage2 = cvColorImage2; - + cvColorImage1.convertToGrayscalePlanarImage(cvGrayImage1, 1); + cvColorImage2.convertToGrayscalePlanarImage(cvGrayImage2, 1); + cvGrayDiff1.absDiff(cvGrayImage2, cvGrayImage1); cvGrayDiff1.erode(); cvGrayDiff1.contrastStretch(); diff --git a/src/ShapeFromShadingAnalysis.cpp b/src/ShapeFromShadingAnalysis.cpp index d34bbd0..b5d085e 100755 --- a/src/ShapeFromShadingAnalysis.cpp +++ b/src/ShapeFromShadingAnalysis.cpp @@ -165,8 +165,8 @@ void ShapeFromShadingAnalysis::synthesise() cvColorImage1.setFromPixels(image1.getPixels(), image1.width, image1.height); cvColorImage2.setFromPixels(image5.getPixels(), image5.width, image5.height); - cvGrayImage1 = cvColorImage1; - cvGrayImage2 = cvColorImage2; + cvColorImage1.convertToGrayscalePlanarImage(cvGrayImage1, 1); + cvColorImage2.convertToGrayscalePlanarImage(cvGrayImage2, 1); cvGrayDiff1.absDiff(cvGrayImage2, cvGrayImage1); cvGrayDiff1.erode(); diff --git a/src/StrobeAnalysis.cpp b/src/StrobeAnalysis.cpp index e2b81b6..b671893 100755 --- a/src/StrobeAnalysis.cpp +++ b/src/StrobeAnalysis.cpp @@ -147,9 +147,9 @@ void StrobeAnalysis::synthesise() cvColorImage1.setFromPixels(image1.getPixels(), image1.width, image1.height); cvColorImage2.setFromPixels(image5.getPixels(), image5.width, image5.height); - cvGrayImage1 = cvColorImage1; - cvGrayImage2 = cvColorImage2; - + cvColorImage1.convertToGrayscalePlanarImage(cvGrayImage1, 1); + cvColorImage2.convertToGrayscalePlanarImage(cvGrayImage2, 1); + cvGrayDiff1.absDiff(cvGrayImage2, cvGrayImage1); cvGrayDiff1.dilate(); cvGrayDiff1.dilate();