Skip to content

O
opencv_contrib
Commit e4e1a07d authored by nmoutinho's avatar nmoutinho
Browse files
Options

Changed class structure to OpenCV structure, using an 'abstract interface -… 

Changed class structure to OpenCV structure, using an 'abstract interface - hidden implementation concept'.
parent 9569970a
Show whitespace changes
Inline Side-by-side
Showing with 265 additions and 241 deletions
modules/plot/include/opencv2/plot.hpp
View file @ e4e1a07d
...@@ -54,6 +54,7 @@ ...@@ -54,6 +54,7 @@
#include <iostream> #include <iostream>
#include <stdio.h> #include <stdio.h>
#include <vector> #include <vector>
#include <algorithm>
/** /**
@defgroup plot Plot function for Mat data @defgroup plot Plot function for Mat data
...@@ -63,236 +64,28 @@ namespace cv ...@@ -63,236 +64,28 @@ namespace cv
{ {
namespace plot namespace plot
{ {
class CV_EXPORTS_W Plot2d : public Algorithm
class CV_EXPORTS Plot
{
protected:
Mat plotDataX;
Mat plotDataY;
Mat plotDataX_plusZero;
Mat plotDataY_plusZero;
const char * plotName;
//dimensions and limits of the plot
int plotSizeWidth;
int plotSizeHeight;
double plotMinX;
double plotMaxX;
double plotMinY;
double plotMaxY;
double plotMinX_plusZero;
double plotMaxX_plusZero;
double plotMinY_plusZero;
double plotMaxY_plusZero;
int plotLineWidth;
//colors of each plot element
Scalar plotLineColor;
Scalar plotBackgroundColor;
Scalar plotAxisColor;
Scalar plotGridColor;
Scalar plotTextColor;
//the final plot result
Mat plotResult;
public:
//constructor accepting only Y data to be plotted
Plot(Mat _plotData)
{
//if the matrix is not Nx1 or 1xN
if(_plotData.cols > 1 && _plotData.rows > 1)
{
std::cout << "ERROR: Plot data must be a 1xN or Nx1 matrix." << std::endl;
exit(0);
}
//if the matrix type is not CV_64F
if(_plotData.type() != CV_64F)
{
std::cout << "ERROR: Plot data type must be double (CV_64F)." << std::endl;
exit(0);
}
//in case we have a row matrix than needs to be transposed
if(_plotData.cols > _plotData.rows)
{
_plotData = _plotData.t();
}
plotDataY=_plotData;
plotDataX = plotDataY*0;
for (int i=0; i<plotDataY.rows; i++)
{
plotDataX.at<double>(i,0) = i;
}
//calling the main constructor
plotHelper(plotDataX, plotDataY);
}
//constructor accepting X data and Y data to be plotted
Plot(Mat _plotDataX, Mat _plotDataY)
{
//f the matrix is not Nx1 or 1xN
if((_plotDataX.cols > 1 && _plotDataX.rows > 1) || (_plotDataY.cols > 1 && _plotDataY.rows > 1))
{
std::cout << "ERROR: Plot data must be a 1xN or Nx1 matrix." << std::endl;
exit(0);
}
//if the matrix type is not CV_64F
if(_plotDataX.type() != CV_64F || _plotDataY.type() != CV_64F)
{
std::cout << "ERROR: Plot data type must be double (CV_64F)." << std::endl;
exit(0);
}
//in case we have a row matrix than needs to be transposed
if(_plotDataX.cols > _plotDataX.rows)
{
_plotDataX = _plotDataX.t();
}
if(_plotDataY.cols > _plotDataY.rows)
{
_plotDataY = _plotDataY.t();
}
plotHelper(_plotDataX, _plotDataY);
}
//set functions
void setMinX(double _plotMinX)
{
plotMinX = _plotMinX;
plotMinX_plusZero = _plotMinX;
}
void setMaxX(double _plotMaxX)
{ {
plotMaxX = _plotMaxX; public:
plotMaxX_plusZero = _plotMaxX;
}
void setMinY(double _plotMinY)
{
plotMinY = _plotMinY;
plotMinY_plusZero = _plotMinY;
}
void setMaxY(double _plotMaxY)
{
plotMaxY = _plotMaxY;
plotMaxY_plusZero = _plotMaxY;
}
void setPlotLineWidth(int _plotLineWidth)
{
plotLineWidth=_plotLineWidth;
}
void setPlotLineColor(Scalar _plotLineColor)
{
plotLineColor=_plotLineColor;
}
void setPlotBackgroundColor(Scalar _plotBackgroundColor)
{
plotBackgroundColor=_plotBackgroundColor;
}
void setPlotAxisColor(Scalar _plotAxisColor)
{
plotAxisColor=_plotAxisColor;
}
void setPlotGridColor(Scalar _plotGridColor)
{
plotGridColor=_plotGridColor;
}
void setPlotTextColor(Scalar _plotTextColor)
{
plotTextColor=_plotTextColor;
}
void setPlotSize(int _plotSizeWidth, int _plotSizeHeight)
{
if(_plotSizeWidth > 400)
plotSizeWidth = _plotSizeWidth;
else
plotSizeWidth = 400;
if(_plotSizeHeight > 300)
plotSizeHeight = _plotSizeHeight;
else
plotSizeHeight = 300;
}
//render the plotResult to a Mat
void render(Mat &_plotResult);
protected:
//a helper method to be used in the constructor
void plotHelper(Mat _plotDataX, Mat _plotDataY)
{
plotDataX=_plotDataX;
plotDataY=_plotDataY;
int NumVecElements = plotDataX.rows;
plotDataX_plusZero = Mat::zeros(NumVecElements+1,1,CV_64F);
plotDataY_plusZero = Mat::zeros(NumVecElements+1,1,CV_64F);
for(int i=0; i<NumVecElements; i++){
plotDataX_plusZero.at<double>(i,0) = plotDataX.at<double>(i,0);
plotDataY_plusZero.at<double>(i,0) = plotDataY.at<double>(i,0);
}
double MinX;
double MaxX;
double MinY;
double MaxY;
double MinX_plusZero;
double MaxX_plusZero;
double MinY_plusZero;
double MaxY_plusZero;
//Obtain the minimum and maximum values of Xdata
minMaxLoc(plotDataX,&MinX,&MaxX);
//Obtain the minimum and maximum values of Ydata
minMaxLoc(plotDataY,&MinY,&MaxY);
//Obtain the minimum and maximum values of Xdata plus zero
minMaxLoc(plotDataX_plusZero,&MinX_plusZero,&MaxX_plusZero);
//Obtain the minimum and maximum values of Ydata plus zero
minMaxLoc(plotDataY_plusZero,&MinY_plusZero,&MaxY_plusZero);
//setting the min and max values for each axis
plotMinX = MinX;
plotMaxX = MaxX;
plotMinY = MinY;
plotMaxY = MaxY;
plotMinX_plusZero = MinX_plusZero;
plotMaxX_plusZero = MaxX_plusZero;
plotMinY_plusZero = MinY_plusZero;
plotMaxY_plusZero = MaxY_plusZero;
//setting the default size of a plot figure
setPlotSize(600, 400);
//setting the default plot line size
setPlotLineWidth(1);
//setting default colors for the different elements of the plot CV_WRAP virtual void setMinX(double _plotMinX) = 0;
setPlotAxisColor(Scalar(0, 0, 255)); CV_WRAP virtual void setMinY(double _plotMinY) = 0;
setPlotGridColor(Scalar(255, 255, 255)); CV_WRAP virtual void setMaxX(double _plotMaxX) = 0;
setPlotBackgroundColor(Scalar(0, 0, 0)); CV_WRAP virtual void setMaxY(double _plotMaxY) = 0;
setPlotLineColor(Scalar(0, 255, 255)); CV_WRAP virtual void setPlotLineWidth(int _plotLineWidth) = 0;
setPlotTextColor(Scalar(255, 255, 255)); CV_WRAP virtual void setPlotLineColor(Scalar _plotLineColor) = 0;
CV_WRAP virtual void setPlotBackgroundColor(Scalar _plotBackgroundColor) = 0;
CV_WRAP virtual void setPlotAxisColor(Scalar _plotAxisColor) = 0;
CV_WRAP virtual void setPlotGridColor(Scalar _plotGridColor) = 0;
CV_WRAP virtual void setPlotTextColor(Scalar _plotTextColor) = 0;
CV_WRAP virtual void setPlotSize(int _plotSizeWidth, int _plotSizeHeight) = 0;
CV_WRAP virtual void render(Mat &_plotResult) = 0;
CV_WRAP virtual void plotHelper(Mat _plotDataX, Mat _plotDataY) = 0;
};
CV_EXPORTS_W Ptr<Plot2d> createPlot2d(Mat data);
CV_EXPORTS_W Ptr<Plot2d> createPlot2d(Mat dataX, Mat dataY);
} }
Mat linearInterpolation(double Xa, double Xb, double Ya, double Yb, Mat Xdata);
void drawAxis(int ImageXzero, int ImageYzero, double CurrentX, double CurrentY, Scalar axisColor, Scalar gridColor);
void drawValuesAsText(double Value, int Xloc, int Yloc, int XMargin, int YMargin);
void drawValuesAsText(const char * Text, double Value, int Xloc, int Yloc, int XMargin, int YMargin);
void drawLine(int Xstart, int Xend, int Ystart, int Yend, Scalar lineColor);
};
}
} }
#endif #endif
......
modules/plot/src/plot.cpp
View file @ e4e1a07d
...@@ -51,9 +51,138 @@ using namespace cv; ...@@ -51,9 +51,138 @@ using namespace cv;
using namespace cv::plot; using namespace cv::plot;
using namespace std; using namespace std;
//render the plotResult to a Mat namespace cv
void Plot::render(Mat &_plotResult){ {
namespace plot
{
class Plot2dImpl : public Plot2d
{
public:
Plot2dImpl(Mat _plotData)
{
//if the matrix is not Nx1 or 1xN
if(_plotData.cols > 1 && _plotData.rows > 1)
{
std::cout << "ERROR: Plot data must be a 1xN or Nx1 matrix." << std::endl;
exit(0);
}
//if the matrix type is not CV_64F
if(_plotData.type() != CV_64F)
{
std::cout << "ERROR: Plot data type must be double (CV_64F)." << std::endl;
exit(0);
}
//in case we have a row matrix than needs to be transposed
if(_plotData.cols > _plotData.rows)
{
_plotData = _plotData.t();
}
plotDataY=_plotData;
plotDataX = plotDataY*0;
for (int i=0; i<plotDataY.rows; i++)
{
plotDataX.at<double>(i,0) = i;
}
//calling the main constructor
plotHelper(plotDataX, plotDataY);
}
Plot2dImpl(Mat _plotDataX, Mat _plotDataY)
{
//f the matrix is not Nx1 or 1xN
if((_plotDataX.cols > 1 && _plotDataX.rows > 1) || (_plotDataY.cols > 1 && _plotDataY.rows > 1))
{
std::cout << "ERROR: Plot data must be a 1xN or Nx1 matrix." << std::endl;
exit(0);
}
//if the matrix type is not CV_64F
if(_plotDataX.type() != CV_64F || _plotDataY.type() != CV_64F)
{
std::cout << "ERROR: Plot data type must be double (CV_64F)." << std::endl;
exit(0);
}
//in case we have a row matrix than needs to be transposed
if(_plotDataX.cols > _plotDataX.rows)
{
_plotDataX = _plotDataX.t();
}
if(_plotDataY.cols > _plotDataY.rows)
{
_plotDataY = _plotDataY.t();
}
plotHelper(_plotDataX, _plotDataY);
}
//set functions
void setMinX(double _plotMinX)
{
plotMinX = _plotMinX;
plotMinX_plusZero = _plotMinX;
}
void setMaxX(double _plotMaxX)
{
plotMaxX = _plotMaxX;
plotMaxX_plusZero = _plotMaxX;
}
void setMinY(double _plotMinY)
{
plotMinY = _plotMinY;
plotMinY_plusZero = _plotMinY;
}
void setMaxY(double _plotMaxY)
{
plotMaxY = _plotMaxY;
plotMaxY_plusZero = _plotMaxY;
}
void setPlotLineWidth(int _plotLineWidth)
{
plotLineWidth=_plotLineWidth;
}
void setPlotLineColor(Scalar _plotLineColor)
{
plotLineColor=_plotLineColor;
}
void setPlotBackgroundColor(Scalar _plotBackgroundColor)
{
plotBackgroundColor=_plotBackgroundColor;
}
void setPlotAxisColor(Scalar _plotAxisColor)
{
plotAxisColor=_plotAxisColor;
}
void setPlotGridColor(Scalar _plotGridColor)
{
plotGridColor=_plotGridColor;
}
void setPlotTextColor(Scalar _plotTextColor)
{
plotTextColor=_plotTextColor;
}
void setPlotSize(int _plotSizeWidth, int _plotSizeHeight)
{
if(_plotSizeWidth > 400)
plotSizeWidth = _plotSizeWidth;
else
plotSizeWidth = 400;
if(_plotSizeHeight > 300)
plotSizeHeight = _plotSizeHeight;
else
plotSizeHeight = 300;
}
//render the plotResult to a Mat
void render(Mat &_plotResult)
{
//create the plot result //create the plot result
plotResult = Mat::zeros(plotSizeHeight, plotSizeWidth, CV_8UC3); plotResult = Mat::zeros(plotSizeHeight, plotSizeWidth, CV_8UC3);
...@@ -92,11 +221,101 @@ void Plot::render(Mat &_plotResult){ ...@@ -92,11 +221,101 @@ void Plot::render(Mat &_plotResult){
} }
_plotResult = plotResult.clone(); _plotResult = plotResult.clone();
}
} protected:
Mat plotDataX;
Mat plotDataY;
Mat plotDataX_plusZero;
Mat plotDataY_plusZero;
const char * plotName;
//dimensions and limits of the plot
int plotSizeWidth;
int plotSizeHeight;
double plotMinX;
double plotMaxX;
double plotMinY;
double plotMaxY;
double plotMinX_plusZero;
double plotMaxX_plusZero;
double plotMinY_plusZero;
double plotMaxY_plusZero;
int plotLineWidth;
//colors of each plot element
Scalar plotLineColor;
Scalar plotBackgroundColor;
Scalar plotAxisColor;
Scalar plotGridColor;
Scalar plotTextColor;
//the final plot result
Mat plotResult;
void plotHelper(Mat _plotDataX, Mat _plotDataY)
{
plotDataX=_plotDataX;
plotDataY=_plotDataY;
int NumVecElements = plotDataX.rows;
void Plot::drawAxis(int ImageXzero, int ImageYzero, double CurrentX, double CurrentY, Scalar axisColor, Scalar gridColor){ plotDataX_plusZero = Mat::zeros(NumVecElements+1,1,CV_64F);
plotDataY_plusZero = Mat::zeros(NumVecElements+1,1,CV_64F);
for(int i=0; i<NumVecElements; i++){
plotDataX_plusZero.at<double>(i,0) = plotDataX.at<double>(i,0);
plotDataY_plusZero.at<double>(i,0) = plotDataY.at<double>(i,0);
}
double MinX;
double MaxX;
double MinY;
double MaxY;
double MinX_plusZero;
double MaxX_plusZero;
double MinY_plusZero;
double MaxY_plusZero;
//Obtain the minimum and maximum values of Xdata
minMaxLoc(plotDataX,&MinX,&MaxX);
//Obtain the minimum and maximum values of Ydata
minMaxLoc(plotDataY,&MinY,&MaxY);
//Obtain the minimum and maximum values of Xdata plus zero
minMaxLoc(plotDataX_plusZero,&MinX_plusZero,&MaxX_plusZero);
//Obtain the minimum and maximum values of Ydata plus zero
minMaxLoc(plotDataY_plusZero,&MinY_plusZero,&MaxY_plusZero);
//setting the min and max values for each axis
plotMinX = MinX;
plotMaxX = MaxX;
plotMinY = MinY;
plotMaxY = MaxY;
plotMinX_plusZero = MinX_plusZero;
plotMaxX_plusZero = MaxX_plusZero;
plotMinY_plusZero = MinY_plusZero;
plotMaxY_plusZero = MaxY_plusZero;
//setting the default size of a plot figure
setPlotSize(600, 400);
//setting the default plot line size
setPlotLineWidth(1);
//setting default colors for the different elements of the plot
setPlotAxisColor(Scalar(0, 0, 255));
setPlotGridColor(Scalar(255, 255, 255));
setPlotBackgroundColor(Scalar(0, 0, 0));
setPlotLineColor(Scalar(0, 255, 255));
setPlotTextColor(Scalar(255, 255, 255));
}
void drawAxis(int ImageXzero, int ImageYzero, double CurrentX, double CurrentY, Scalar axisColor, Scalar gridColor)
{
drawValuesAsText(0, ImageXzero, ImageYzero, 10, 20); drawValuesAsText(0, ImageXzero, ImageYzero, 10, 20);
drawValuesAsText(0, ImageXzero, ImageYzero, -20, 20); drawValuesAsText(0, ImageXzero, ImageYzero, -20, 20);
drawValuesAsText(0, ImageXzero, ImageYzero, 10, -10); drawValuesAsText(0, ImageXzero, ImageYzero, 10, -10);
...@@ -134,9 +353,9 @@ void Plot::drawAxis(int ImageXzero, int ImageYzero, double CurrentX, double Curr ...@@ -134,9 +353,9 @@ void Plot::drawAxis(int ImageXzero, int ImageYzero, double CurrentX, double Curr
} }
} }
} }
} }
Mat Plot::linearInterpolation(double Xa, double Xb, double Ya, double Yb, Mat Xdata){ Mat linearInterpolation(double Xa, double Xb, double Ya, double Yb, Mat Xdata){
Mat Ydata = Xdata*0; Mat Ydata = Xdata*0;
...@@ -151,10 +370,9 @@ Mat Plot::linearInterpolation(double Xa, double Xb, double Ya, double Yb, Mat Xd ...@@ -151,10 +370,9 @@ Mat Plot::linearInterpolation(double Xa, double Xb, double Ya, double Yb, Mat Xd
} }
return Ydata; return Ydata;
}
} void drawValuesAsText(double Value, int Xloc, int Yloc, int XMargin, int YMargin){
void Plot::drawValuesAsText(double Value, int Xloc, int Yloc, int XMargin, int YMargin){
char AxisX_Min_Text[20]; char AxisX_Min_Text[20];
double TextSize = 1; double TextSize = 1;
...@@ -165,9 +383,9 @@ void Plot::drawValuesAsText(double Value, int Xloc, int Yloc, int XMargin, int Y ...@@ -165,9 +383,9 @@ void Plot::drawValuesAsText(double Value, int Xloc, int Yloc, int XMargin, int Y
AxisX_Min_Loc.y = Yloc+YMargin; AxisX_Min_Loc.y = Yloc+YMargin;
putText(plotResult,AxisX_Min_Text, AxisX_Min_Loc, FONT_HERSHEY_COMPLEX_SMALL, TextSize, plotTextColor, 1, 8); putText(plotResult,AxisX_Min_Text, AxisX_Min_Loc, FONT_HERSHEY_COMPLEX_SMALL, TextSize, plotTextColor, 1, 8);
} }
void Plot::drawValuesAsText(const char *Text, double Value, int Xloc, int Yloc, int XMargin, int YMargin){ void drawValuesAsText(const char *Text, double Value, int Xloc, int Yloc, int XMargin, int YMargin){
char AxisX_Min_Text[20]; char AxisX_Min_Text[20];
int TextSize = 1; int TextSize = 1;
...@@ -178,11 +396,10 @@ void Plot::drawValuesAsText(const char *Text, double Value, int Xloc, int Yloc, ...@@ -178,11 +396,10 @@ void Plot::drawValuesAsText(const char *Text, double Value, int Xloc, int Yloc,
AxisX_Min_Loc.y = Yloc+YMargin; AxisX_Min_Loc.y = Yloc+YMargin;
putText(plotResult,AxisX_Min_Text, AxisX_Min_Loc, FONT_HERSHEY_COMPLEX_SMALL, TextSize, plotTextColor, 1, 8); putText(plotResult,AxisX_Min_Text, AxisX_Min_Loc, FONT_HERSHEY_COMPLEX_SMALL, TextSize, plotTextColor, 1, 8);
}
}
void Plot::drawLine(int Xstart, int Xend, int Ystart, int Yend, Scalar lineColor){ void drawLine(int Xstart, int Xend, int Ystart, int Yend, Scalar lineColor){
Point Axis_start; Point Axis_start;
Point Axis_end; Point Axis_end;
...@@ -192,5 +409,19 @@ void Plot::drawLine(int Xstart, int Xend, int Ystart, int Yend, Scalar lineColor ...@@ -192,5 +409,19 @@ void Plot::drawLine(int Xstart, int Xend, int Ystart, int Yend, Scalar lineColor
Axis_end.y = Yend; Axis_end.y = Yend;
line(plotResult, Axis_start, Axis_end, lineColor, plotLineWidth, 8, 0); line(plotResult, Axis_start, Axis_end, lineColor, plotLineWidth, 8, 0);
}
};
Ptr<Plot2d> createPlot2d(Mat _plotData)
{
return Ptr<Plot2dImpl> (new Plot2dImpl (_plotData));
}
Ptr<Plot2d> createPlot2d(Mat _plotDataX, Mat _plotDataY)
{
return Ptr<Plot2dImpl> (new Plot2dImpl (_plotDataX, _plotDataY));
}
}
} }
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment