Moved method to make more public available and created a method.

Author: klanderfri

ReadMagicCard/ImageHelper.cpp

@@ -61,6 +61,28 @@ Mat ImageHelper::ToColourImage(const Mat imageToConvert) {
 	return changeImageMode(imageToConvert, COLOR_GRAY2BGR);
 }
 
+LetterAreas ImageHelper::ToLetterAreas(Contours contours) {
+
+	LetterAreas allAreas;
+
+	for (size_t i = 0; i < contours.size(); i++) {
+
+		Contour letterContour = ImageHelper::ContoursConvexHull({ contours[i] });
+		RotatedRect letterBox = minAreaRect(letterContour);
+
+		LetterArea area;
+		area.TightContour = contours[i];
+		area.OuterContour = letterContour;
+		area.Box = letterBox;
+
+		allAreas.push_back(area);
+	}
+
+	sort(allAreas.begin(), allAreas.end(), LetterArea::CompareLetterAreaByLeftBorderXAscending);
+
+	return allAreas;
+}
+
 RotatedRect ImageHelper::GetRotatedRectangle(vector<TrendLine> verticalBorders, vector<TrendLine> horizontalBorders, double angleAdjustment) {
 
 	//Make sure the borders are correct.
@@ -246,6 +268,11 @@ Mat ImageHelper::DrawCenterPoint(const Mat image, const Point imageCenter, Scala
 	return workingImage;
 }
 
+void ImageHelper::FillContour(Mat& image, const Contour contour, const Scalar colour) {
+
+	fillConvexPoly(image, contour, colour);
+}
+
 double ImageHelper::GetAnglesToStrightenUp(const RotatedRect rotatedRectangle, bool enforcePortraitMode) {
 
 	if (enforcePortraitMode) {

ReadMagicCard/ImageHelper.h

@@ -18,6 +18,8 @@ class ImageHelper
 	static cv::Mat ToGreyImage(const cv::Mat imageToConvert);
 	//Creates a colour image out of the provided image. Note: This method doesn't add any colours to the image.
 	static cv::Mat ToColourImage(const cv::Mat imageToConvert);
+	//Gets letter area data from a set of contours.
+	static LetterAreas ToLetterAreas(Contours contours);
 	//Creates the rectangle bound by the the specified borders.
 	static cv::RotatedRect GetRotatedRectangle(std::vector<TrendLine> verticalBorders, std::vector<TrendLine> horizontalBorders, double angleAdjustment = 0.0);
 	//Displays a specified image in a window.
@@ -36,6 +38,8 @@ class ImageHelper
 	static cv::Mat DrawLimits(const cv::Mat image, const LetterAreas letters, int letterCenterRadius);
 	//Draws the specified center point to the image.
 	static cv::Mat DrawCenterPoint(const cv::Mat image, const cv::Point imageCenter, cv::Scalar colour = cv::Scalar(0, 0, 255), int radius = 3);
+	//Fills a contour in the image with the specified colour.
+	static void FillContour(cv::Mat& image, const Contour contour, const cv::Scalar colour);
 	//Gets how many degrees the rectangle needs to be rotated in positive direction (counter-clockwise) to be straight.
 	static double GetAnglesToStrightenUp(const cv::RotatedRect rotatedRectangle, bool enforcePortraitMode = true);
 	//Gets the center point of an image.

ReadMagicCard/LetterFilter.cpp

@@ -33,7 +33,7 @@ LetterAreas LetterFilter::RunFilter(Contours contours, int numberOfTries) {
 	textBaseLine = textCenterLine = TrendLine(0, originalImageData.rows / 2);
 
 	//Do a crude filtering of the the letters.
-	LetterAreas allPossibleLetters = getPossibleLetterAreas(contours);
+	LetterAreas allPossibleLetters = ImageHelper::ToLetterAreas(contours);
 	LetterAreas letters = filterOutNonTitleSymbols(allPossibleLetters);
 
 	//Check if there was any letters at all.
@@ -135,28 +135,6 @@ TrendLine LetterFilter::findBaseLine(LetterAreas letters) {
 	return baseLine;
 }
 
-LetterAreas LetterFilter::getPossibleLetterAreas(Contours contours) {
-
-	LetterAreas possibleLetterAreas;
-
-	for (size_t i = 0; i < contours.size(); i++) {
-
-		Contour letterContour = ImageHelper::ContoursConvexHull({ contours[i] });
-		RotatedRect letterBox = minAreaRect(letterContour);
-
-		LetterArea area;
-		area.TightContour = contours[i];
-		area.OuterContour = letterContour;
-		area.Box = letterBox;
-
-		possibleLetterAreas.push_back(area);
-	}
-
-	sort(possibleLetterAreas.begin(), possibleLetterAreas.end(), LetterArea::CompareLetterAreaByLeftBorderXAscending);
-
-	return possibleLetterAreas;
-}
-
 LetterAreas LetterFilter::filterOutNonTitleSymbols(LetterAreas lettersToFilter) {
 
 	LetterAreas letters;

ReadMagicCard/LetterFilter.h

@@ -22,8 +22,6 @@ class LetterFilter :
 	TrendLine findCenterLine(LetterAreas letters);
 	//Finds the base line (the line marking the bottom) for a set of letters.
 	TrendLine findBaseLine(LetterAreas letters);
-	//Gets the areas that might contain a title letter.
-	LetterAreas getPossibleLetterAreas(Contours contours);
 	//Filter out letter areas that are identical, ie letter areas pointing at the same letter.
 	LetterAreas filterOutDuplicates(LetterAreas lettersToFilter);
 	//Removes the areas that are noise.