Moved up method within class.

Author: klanderfri

ReadMagicCard/DrawingHelper.cpp

@@ -19,25 +19,6 @@ DrawingHelper::~DrawingHelper()
 	delete converter;
 }
 
-Mat DrawingHelper::DrawLine(const Mat image, Point point1, Point point2, Colour colour, int borderThickness) {
-
-	//Create a working RGB image so the border lines are colour even if the image isn't.
-	Mat outImage = converter->ToColourImage(image);
-	Scalar sColour = converter->ToScalarColour(colour);
-
-	line(outImage, point1, point2, sColour, borderThickness, DEFAULT_BORDER_THICKNESS);
-
-	return outImage;
-}
-
-Mat DrawingHelper::DrawLine(const Mat image, TrendLine line, Colour colour, int borderThickness) {
-
-	vector<Point2d> points = line.GetEndPoints(0, image.cols);
-	Mat outImage = DrawLine(image, points[0], points[1], colour, borderThickness);
-
-	return outImage;
-}
-
 Mat DrawingHelper::DrawLimits(const Mat image, const Contour contourLimit, const RotatedRect rotatedRectangleLimit, const Rect straightRectangleLimit)
 {
 	//Create a working RGB image so the border lines are colour even if the image isn't.
@@ -61,6 +42,25 @@ Mat DrawingHelper::DrawLimits(const Mat image, const Contour contourLimit, const
 	return workingImage;
 }
 
+Mat DrawingHelper::DrawLine(const Mat image, Point point1, Point point2, Colour colour, int borderThickness) {
+
+	//Create a working RGB image so the border lines are colour even if the image isn't.
+	Mat outImage = converter->ToColourImage(image);
+	Scalar sColour = converter->ToScalarColour(colour);
+
+	line(outImage, point1, point2, sColour, borderThickness, DEFAULT_BORDER_THICKNESS);
+
+	return outImage;
+}
+
+Mat DrawingHelper::DrawLine(const Mat image, TrendLine line, Colour colour, int borderThickness) {
+
+	vector<Point2d> points = line.GetEndPoints(0, image.cols);
+	Mat outImage = DrawLine(image, points[0], points[1], colour, borderThickness);
+
+	return outImage;
+}
+
 Mat DrawingHelper::DrawRectangle(const Mat image, const RotatedRect rectangle, Colour colour) {
 
 	Mat workingImage = converter->ToColourImage(image);

ReadMagicCard/DrawingHelper.h

@@ -15,12 +15,12 @@ class DrawingHelper
 	//The line type (8-connected line, aka "solid") of borders drawn on images for debugging.
 	static const int DEFAULT_BORDER_LINE_TYPE;
 
+	//Draws the specified limits on an image.
+	cv::Mat DrawLimits(const cv::Mat image, const Contour contourLimit = Contour(), const cv::RotatedRect rotatedRectangleLimit = cv::RotatedRect(), const cv::Rect straightRectangleLimit = cv::Rect());
 	//Draws a line between two points on an image.
 	cv::Mat DrawLine(const cv::Mat image, cv::Point point1, cv::Point point2, Colour colour = Orange, int borderThickness = DEFAULT_BORDER_THICKNESS);
 	//Draws a line on an image.
 	cv::Mat DrawLine(const cv::Mat image, TrendLine line, Colour colour = Orange, int borderThickness = DEFAULT_BORDER_THICKNESS);
-	//Draws the specified limits on an image.
-	cv::Mat DrawLimits(const cv::Mat image, const Contour contourLimit = Contour(), const cv::RotatedRect rotatedRectangleLimit = cv::RotatedRect(), const cv::Rect straightRectangleLimit = cv::Rect());
 	//Draws a rectangle on an image.
 	cv::Mat DrawRectangle(const cv::Mat image, const cv::RotatedRect rectangle, Colour colour = DarkBlue);
 	//Draws a rectangle on an image.