From 089ce4bf08b944e715f61b78f2078ac63254d8b0 Mon Sep 17 00:00:00 2001 From: GuillBernard Date: Wed, 7 Dec 2011 11:51:27 +0100 Subject: [PATCH] Reindent --- main.cpp | 322 +++++++++++++++++++++++++++---------------------------- 1 file changed, 161 insertions(+), 161 deletions(-) diff --git a/main.cpp b/main.cpp index d89c873..2d162d9 100644 --- a/main.cpp +++ b/main.cpp @@ -49,202 +49,202 @@ Main *******************************************************************************/ int main() { - CImg imgLena("lena.bmp"); + CImg imgLena("lena.bmp"); - CImgDisplay dispBase(imgLena,"Image de base"); + CImgDisplay dispBase(imgLena,"Image de base"); - std::vector vectEMax, vectEMin; - std::vector w; + std::vector vectEMax, vectEMin; + std::vector w; - /////////////////////////////////////////////////////////////////////////////// - // Part 1: Finding minimas and maximas // - /////////////////////////////////////////////////////////////////////////////// - CImg imgMax = imgLena.channel(0); - CImg imgMin = imgLena.channel(0); + /////////////////////////////////////////////////////////////////////////////// + // Part 1: Finding minimas and maximas // + /////////////////////////////////////////////////////////////////////////////// + CImg imgMax = imgLena.channel(0); + CImg imgMin = imgLena.channel(0); - for (int i = 0; i= min)&&(l!=ymin &&k!=xmin)) { - imgMin(k,l) = 0; - } else { - min = imgMin(k,l); - imgMin(xmin,ymin) = 0; - xmin = k; - ymin = l; + // Min + if ((imgMin(k,l) >= min)&&(l!=ymin &&k!=xmin)) { + imgMin(k,l) = 0; + } else { + min = imgMin(k,l); + imgMin(xmin,ymin) = 0; + xmin = k; + ymin = l; - eMin.setX(k); - eMin.setY(l); - } - } - } + eMin.setX(k); + eMin.setY(l); + } + } + } - vectEMax.push_back(eMax); - vectEMin.push_back(eMin); - } - } + vectEMax.push_back(eMax); + vectEMin.push_back(eMin); + } + } - // Array of Euclidean distance to the nearest non zero element - std::vector::iterator it1, it2; + // Array of Euclidean distance to the nearest non zero element + std::vector::iterator it1, it2; - for (it1 = vectEMax.begin(); it1 != vectEMax.end(); it1++) { - for (it2 = it1 + 1; it2 != vectEMax.end(); it2++) { - double dist = (*it1).computeDistanceFrom(*it2); + for (it1 = vectEMax.begin(); it1 != vectEMax.end(); it1++) { + for (it2 = it1 + 1; it2 != vectEMax.end(); it2++) { + double dist = (*it1).computeDistanceFrom(*it2); - if (0 == (*it1).getDistance() || dist < (*it1).getDistance()) { - (*it1).setDistance(dist); - (*it1).setNearest(*it2); - } + if (0 == (*it1).getDistance() || dist < (*it1).getDistance()) { + (*it1).setDistance(dist); + (*it1).setNearest(*it2); + } - if (0 == (*it2).getDistance() || dist < (*it2).getDistance()) { - (*it2).setDistance(dist); - (*it2).setNearest(*it1); - } - } - } + if (0 == (*it2).getDistance() || dist < (*it2).getDistance()) { + (*it2).setDistance(dist); + (*it2).setNearest(*it1); + } + } + } - for (it1 = vectEMin.begin(); it1 != vectEMin.end(); it1++) { - for (it2 = it1 + 1; it2 != vectEMin.end(); it2++) { - double dist = (*it1).computeDistanceFrom(*it2); + for (it1 = vectEMin.begin(); it1 != vectEMin.end(); it1++) { + for (it2 = it1 + 1; it2 != vectEMin.end(); it2++) { + double dist = (*it1).computeDistanceFrom(*it2); - if (0 == (*it1).getDistance() || dist < (*it1).getDistance()) { - (*it1).setDistance(dist); - (*it1).setNearest(*it2); - } + if (0 == (*it1).getDistance() || dist < (*it1).getDistance()) { + (*it1).setDistance(dist); + (*it1).setNearest(*it2); + } - if (0 == (*it2).getDistance() || dist < (*it2).getDistance()) { - (*it2).setDistance(dist); - (*it2).setNearest(*it1); - } - } - } + if (0 == (*it2).getDistance() || dist < (*it2).getDistance()) { + (*it2).setDistance(dist); + (*it2).setNearest(*it1); + } + } + } - // Calculate the windows sizes - for(unsigned int i = 0; i < vectEMin.size(); i++) { - double d1 = MIN(vectEMax[i].getDistance(), vectEMin[i].getDistance()); - double d2 = MAX(vectEMax[i].getDistance(), vectEMin[i].getDistance()); - double d3 = MIN(vectEMax[i].getDistance(), vectEMin[i].getDistance()); - double d4 = MAX(vectEMax[i].getDistance(), vectEMin[i].getDistance()); + // Calculate the windows sizes + for(unsigned int i = 0; i < vectEMin.size(); i++) { + double d1 = MIN(vectEMax[i].getDistance(), vectEMin[i].getDistance()); + double d2 = MAX(vectEMax[i].getDistance(), vectEMin[i].getDistance()); + double d3 = MIN(vectEMax[i].getDistance(), vectEMin[i].getDistance()); + double d4 = MAX(vectEMax[i].getDistance(), vectEMin[i].getDistance()); - int wi = (int)ceil(MIN(MIN(d1, d2), MIN(d3, d4))); - wi = wi % 2 ? wi + 1 : wi; - w.push_back(wi); - } + int wi = (int)ceil(MIN(MIN(d1, d2), MIN(d3, d4))); + wi = wi % 2 ? wi + 1 : wi; + w.push_back(wi); + } - CImg imgSource = imgLena.channel(0); + CImg imgSource = imgLena.channel(0); - // Order filters with source image - std::vector vectFilterMax, vectFilterMin; + // Order filters with source image + std::vector vectFilterMax, vectFilterMin; - for(unsigned int i = 0; i < vectEMax.size(); i++) { - unsigned char max = 0; - for (int k = vectEMax[i].getX() - ((w[i] - 1) / 2); k < vectEMax[i].getX() + ((w[i] + 1) / 2); k++) { - for (int l = vectEMax[i].getY() - ((w[i] - 1) / 2); l < vectEMax[i].getY() + ((w[i] + 1) / 2); l++) { - if (imgSource(k, l) > max) { - max = imgSource(k, l); - } - } - } - vectFilterMax.push_back(max); - } + for(unsigned int i = 0; i < vectEMax.size(); i++) { + unsigned char max = 0; + for (int k = vectEMax[i].getX() - ((w[i] - 1) / 2); k < vectEMax[i].getX() + ((w[i] + 1) / 2); k++) { + for (int l = vectEMax[i].getY() - ((w[i] - 1) / 2); l < vectEMax[i].getY() + ((w[i] + 1) / 2); l++) { + if (imgSource(k, l) > max) { + max = imgSource(k, l); + } + } + } + vectFilterMax.push_back(max); + } - for(unsigned int i = 0; i < vectEMin.size(); i++) { - unsigned char min = 199; - for (int k = vectEMin[i].getX() - ((w[i] - 1) / 2); k < vectEMin[i].getX() + ((w[i] + 1) / 2); k++) { - for (int l = vectEMin[i].getY() - ((w[i] - 1) / 2); l < vectEMin[i].getY() + ((w[i] + 1) / 2); l++) { - if (imgSource(k, l) < min) { - min = imgSource(k, l); - } - } - } - vectFilterMin.push_back(min); - } + for(unsigned int i = 0; i < vectEMin.size(); i++) { + unsigned char min = 199; + for (int k = vectEMin[i].getX() - ((w[i] - 1) / 2); k < vectEMin[i].getX() + ((w[i] + 1) / 2); k++) { + for (int l = vectEMin[i].getY() - ((w[i] - 1) / 2); l < vectEMin[i].getY() + ((w[i] + 1) / 2); l++) { + if (imgSource(k, l) < min) { + min = imgSource(k, l); + } + } + } + vectFilterMin.push_back(min); + } - CImg newImgMax(imgMax.width(), imgMax.height()); + CImg newImgMax(imgMax.width(), imgMax.height()); - // Calculate the upper envelope - for(unsigned int i = 0; i < vectEMax.size(); i++) { - for (int k = vectEMax[i].getX() - ((w[i] - 1) / 2); k < vectEMax[i].getX() + ((w[i] + 1) / 2); k++) { - for (int l = vectEMax[i].getY() - ((w[i] - 1) / 2); l < vectEMax[i].getY() + ((w[i] + 1) / 2); l++) { - if( (k == vectEMax[i].getX() && l == vectEMax[i].getY()) || imgMax(k, l) == 0 ) { - newImgMax(k, l) = vectFilterMax[i]; - } - else { - newImgMax(k, l) = (imgMax(k, l) + vectFilterMax[i]) / 2; - } - } - } - } + // Calculate the upper envelope + for(unsigned int i = 0; i < vectEMax.size(); i++) { + for (int k = vectEMax[i].getX() - ((w[i] - 1) / 2); k < vectEMax[i].getX() + ((w[i] + 1) / 2); k++) { + for (int l = vectEMax[i].getY() - ((w[i] - 1) / 2); l < vectEMax[i].getY() + ((w[i] + 1) / 2); l++) { + if( (k == vectEMax[i].getX() && l == vectEMax[i].getY()) || imgMax(k, l) == 0 ) { + newImgMax(k, l) = vectFilterMax[i]; + } + else { + newImgMax(k, l) = (imgMax(k, l) + vectFilterMax[i]) / 2; + } + } + } + } - CImg newImgMin(imgMin.width(), imgMin.height()); + CImg newImgMin(imgMin.width(), imgMin.height()); - // Calculate the lower envelope - for(unsigned int i = 0; i < vectEMin.size(); i++) { - for (int k = vectEMin[i].getX() - ((w[i] - 1) / 2); k < vectEMin[i].getX() + ((w[i] + 1) / 2); k++) { - for (int l = vectEMin[i].getY() - ((w[i] - 1) / 2); l < vectEMin[i].getY() + ((w[i] + 1) / 2); l++) { - if( (k == vectEMin[i].getX() && l == vectEMin[i].getY()) || imgMin(k, l) == 0 ) { - newImgMin(k, l) = vectFilterMin[i]; - } - else { - newImgMin(k, l) = (imgMin(k, l) + vectFilterMin[i]) / 2; - } - } - } - } + // Calculate the lower envelope + for(unsigned int i = 0; i < vectEMin.size(); i++) { + for (int k = vectEMin[i].getX() - ((w[i] - 1) / 2); k < vectEMin[i].getX() + ((w[i] + 1) / 2); k++) { + for (int l = vectEMin[i].getY() - ((w[i] - 1) / 2); l < vectEMin[i].getY() + ((w[i] + 1) / 2); l++) { + if( (k == vectEMin[i].getX() && l == vectEMin[i].getY()) || imgMin(k, l) == 0 ) { + newImgMin(k, l) = vectFilterMin[i]; + } + else { + newImgMin(k, l) = (imgMin(k, l) + vectFilterMin[i]) / 2; + } + } + } + } - // Display images for max and min - CImgDisplay dispMax(newImgMax,"Image de Max"); - CImgDisplay dispMin(newImgMin,"Image de Min"); + // Display images for max and min + CImgDisplay dispMax(newImgMax,"Image de Max"); + CImgDisplay dispMin(newImgMin,"Image de Min"); - /////////////////////////////////////////////////////////////////////////////// - // Part 2: Average // - /////////////////////////////////////////////////////////////////////////////// + /////////////////////////////////////////////////////////////////////////////// + // Part 2: Average // + /////////////////////////////////////////////////////////////////////////////// - // Calculate the Average - CImg imgMoyenne = (newImgMax+newImgMin)/2; - CImgDisplay dispMoyenne(imgMoyenne,"Image Moyenne"); + // Calculate the Average + CImg imgMoyenne = (newImgMax+newImgMin)/2; + CImgDisplay dispMoyenne(imgMoyenne,"Image Moyenne"); - /////////////////////////////////////////////////////////////////////////////// - // Partie 3: Deletion // - /////////////////////////////////////////////////////////////////////////////// + /////////////////////////////////////////////////////////////////////////////// + // Partie 3: Deletion // + /////////////////////////////////////////////////////////////////////////////// - CImg imgFin = imgLena - imgMoyenne; - CImgDisplay dispFin(imgFin,"Image Finale"); + CImg imgFin = imgLena - imgMoyenne; + CImgDisplay dispFin(imgFin,"Image Finale"); - while (!dispBase.is_closed()) { - dispBase.wait(); - } + while (!dispBase.is_closed()) { + dispBase.wait(); + } - return 0; + return 0; }