EDF 2281: Transaltions

[modules/geom.git] / src / ShapeRecognition / ShapeRec_FeatureDetector.cxx

diff --git a/src/ShapeRecognition/ShapeRec_FeatureDetector.cxx b/src/ShapeRecognition/ShapeRec_FeatureDetector.cxx
index b9a341e604d78c916b148aa27438996cd1448063..b405135e571c4dd0f7707b08c84a0bc840497508 100644 (file)
--- a/src/ShapeRecognition/ShapeRec_FeatureDetector.cxx
+++ b/src/ShapeRecognition/ShapeRec_FeatureDetector.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -18,6 +18,7 @@
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
 //
 // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//
 
 // File   : ShapeRec_FeatureDetector.cxx
 // Author : Renaud NEDELEC, Open CASCADE S.A.S.
@@ -50,7 +51,7 @@ ShapeRec_FeatureDetector::ShapeRec_FeatureDetector():
 }
 
 /*!
-  Sets the path of the image file to be proccesed
+  Sets the path of the image file to be processed
   \param thePath - Location of the image file 
 */
 void ShapeRec_FeatureDetector::SetPath( const std::string& thePath )
@@ -205,13 +206,13 @@ std::string ShapeRec_FeatureDetector::CroppImage()
 
 /*!
   Performs contours detection and store them in contours 
-  \param src - src image to find contours of 
+  \param binaryImg - src image to find contours of 
 */
-void ShapeRec_FeatureDetector::_detectAndRetrieveContours( Mat src )
+void ShapeRec_FeatureDetector::_detectAndRetrieveContours( Mat binaryImg )
 {
-  src = src > 1; 
+  binaryImg = binaryImg > 1; 
   int method = CV_CHAIN_APPROX_NONE;
-  findContours( src, contours, hierarchy,CV_RETR_CCOMP, method);
+  findContours( binaryImg, contours, hierarchy,CV_RETR_CCOMP, method);
   // Other possible approximations CV_CHAIN_APPROX_TC89_KCOS, CV_CHAIN_APPROX_TC89_L1, CV_CHAIN_APPROX_SIMPLE cf. OpenCV documentation 
   // for precise information
 }
@@ -240,20 +241,25 @@ Mat ShapeRec_FeatureDetector::_colorFiltering()
   cvResetImageROI(find_image);
   
   IplImage* test_hsv = cvCreateImage(cvGetSize(test_image),8,3);
-  IplImage* test_hue = cvCreateImage(cvGetSize(test_image),8,1);
+  IplImage* h_plane = cvCreateImage( cvGetSize(test_image), 8, 1 );
+  IplImage* s_plane = cvCreateImage( cvGetSize(test_image), 8, 1 );
   CvHistogram* hist;
 
   cvCvtColor(test_image, test_hsv, CV_BGR2HSV);
-  cvCvtPixToPlane(test_hsv, test_hue, 0, 0, 0);
+  
+  cvCvtPixToPlane(test_hsv, h_plane, s_plane, 0, 0);
+  IplImage* planes[] = { h_plane, s_plane };
   
   //create hist
-  int size_hist = 10;
-  float hranges[] = {0, 180};
-  float* ranges = hranges;
-  hist = cvCreateHist(1, &size_hist, CV_HIST_ARRAY, &ranges, 1);
+  int hbins = 30, sbins = 32;                        // TODO think to the best values here
+  int   hist_size[] = { hbins, sbins };
+  float hranges[] = { 0, 180 };
+  float sranges[] = { 0, 255 };
+  float* ranges[] = { hranges, sranges };
+  hist = cvCreateHist(2, hist_size, CV_HIST_ARRAY, ranges, 1);
   
-  //calculate hue` histogram
-  cvCalcHist(&test_hue, hist, 0 ,0);
+  //calculate hue /saturation histogram
+  cvCalcHist(planes, hist, 0 ,0);
 
 //   // TEST print of the histogram for debugging
 //   IplImage* hist_image = cvCreateImage(cvSize(320,300),8,3);
@@ -279,21 +285,28 @@ Mat ShapeRec_FeatureDetector::_colorFiltering()
 //   cvNamedWindow("hist", 1); cvShowImage("hist",hist_image);
   
   
-  //calculate back projection of hue plane of input image
+  //calculate back projection of hue and saturation planes of input image
   IplImage* backproject = cvCreateImage(cvGetSize(find_image), 8, 1);
   IplImage* binary_backproject = cvCreateImage(cvGetSize(find_image), 8, 1);
   IplImage* find_hsv = cvCreateImage(cvGetSize(find_image),8,3);
-  IplImage* find_hue = cvCreateImage(cvGetSize(find_image),8,1);
+  IplImage* find_hplane = cvCreateImage(cvGetSize(find_image),8,1);
+  IplImage* find_splane = cvCreateImage(cvGetSize(find_image),8,1);
   
   cvCvtColor(find_image, find_hsv, CV_BGR2HSV);
-  cvCvtPixToPlane(find_hsv, find_hue, 0, 0, 0);
-  cvCalcBackProject(&find_hue, backproject, hist);
+  cvCvtPixToPlane(find_hsv, find_hplane, find_splane, 0, 0);
+  IplImage* find_planes[] = { find_hplane, find_splane };
+  cvCalcBackProject(find_planes, backproject, hist);
   
   // Threshold in order to obtain binary image
   cvThreshold(backproject, binary_backproject, 1, 255, CV_THRESH_BINARY);  // NOTE it would be good to think about the best threshold to use (it's 1 for now)
   cvReleaseImage(&test_image);
   cvReleaseImage(&test_hsv);
-  cvReleaseImage(&test_hue);
+  cvReleaseImage(&h_plane);
+  cvReleaseImage(&s_plane);
+  cvReleaseImage(&find_image);
+  cvReleaseImage(&find_hsv);
+  cvReleaseImage(&find_hplane);
+  cvReleaseImage(&find_splane);
   cvReleaseImage(&backproject);
   
   return Mat(binary_backproject);