mirrors/JKQtPlotter
1
0
Fork 0
mirror of https://github.com/jkriege2/JKQtPlotter.git synced 2024-12-25 10:01:38 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

JKQTPXFunctionLineGraph: further simplification

Browse Source
This commit is contained in:
jkriege2 2020-09-05 12:50:46 +02:00
parent 8c0c8bf62e
commit 48a24a85d0
2 changed files with 19 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
lib/jkqtplotter/graphs/jkqtpevaluatedfunction.cpp
View File

@ -44,7 +44,7 @@ JKQTPXFunctionLineGraph::JKQTPXFunctionLineGraph(JKQTBasePlotter* parent):
maxRefinementDegree=5; maxRefinementDegree=5;
slopeTolerance=0.005; slopeTolerance=0.005;
minPixelPerSample=32; minPixelPerSample=32;
plotRefinement=true; dataCleanupMaxAllowedAngleDegree=0.2;
displaySamplePoints=false; displaySamplePoints=false;
data.clear(); data.clear();
@ -253,7 +253,7 @@ void JKQTPXFunctionLineGraph::createPlotData(bool collectParams) {
JKQTPAdaptiveFunctionGraphEvaluator evaluator(fTransformedFunc, minSamples, maxRefinementDegree, slopeTolerance, minPixelPerSample); JKQTPAdaptiveFunctionGraphEvaluator evaluator(fTransformedFunc, minSamples, maxRefinementDegree, slopeTolerance, minPixelPerSample);
data=evaluator.evaluate(xmin, xmax); data=evaluator.evaluate(xmin, xmax);
data=JKQTPSimplyfyLineSegemnts(data); data=JKQTPSimplyfyLineSegemnts(data, dataCleanupMaxAllowedAngleDegree);
} }
void JKQTPXFunctionLineGraph::collectParameters() void JKQTPXFunctionLineGraph::collectParameters()
@ -645,7 +645,7 @@ void JKQTPYFunctionLineGraph::createPlotData(bool collectParams) {
JKQTPAdaptiveFunctionGraphEvaluator evaluator(fTransformedFunc, minSamples, maxRefinementDegree, slopeTolerance, minPixelPerSample); JKQTPAdaptiveFunctionGraphEvaluator evaluator(fTransformedFunc, minSamples, maxRefinementDegree, slopeTolerance, minPixelPerSample);
data=evaluator.evaluate(ymin, ymax); data=evaluator.evaluate(ymin, ymax);
data=JKQTPSimplyfyLineSegemnts(data); data=JKQTPSimplyfyLineSegemnts(data, dataCleanupMaxAllowedAngleDegree);
} }
@ -898,14 +898,14 @@ double JKQTPXFunctionLineGraph::getMinPixelPerSample() const
return this->minPixelPerSample; return this->minPixelPerSample;
} }
void JKQTPXFunctionLineGraph::setPlotRefinement(bool __value) void JKQTPXFunctionLineGraph::setDataCleanupMaxAllowedAngleDegree(double __value)
{ {
this->plotRefinement = __value; dataCleanupMaxAllowedAngleDegree=__value;
} }
bool JKQTPXFunctionLineGraph::getPlotRefinement() const double JKQTPXFunctionLineGraph::getDataCleanupMaxAllowedAngleDegree() const
{ {
return this->plotRefinement; return dataCleanupMaxAllowedAngleDegree;
} }
void JKQTPXFunctionLineGraph::setDisplaySamplePoints(bool __value) void JKQTPXFunctionLineGraph::setDisplaySamplePoints(bool __value)

20
lib/jkqtplotter/graphs/jkqtpevaluatedfunction.h
View File

@ -56,14 +56,17 @@ typedef std::function<double(double)> jkqtpSimplePlotFunctionType;
/*! \brief This implements line plots where the data is taken from a user supplied function \f$ y=f(x) \f$ /*! \brief This implements line plots where the data is taken from a user supplied function \f$ y=f(x) \f$
\ingroup jkqtplotter_functiongraphs \ingroup jkqtplotter_functiongraphs
This class implements an intelligent plotting algorithm for functions. It starts by sampling This class uses the intelligent plotting algorithm for functions, implemented in JKQTPAdaptiveFunctionGraphEvaluator.
the function at minSamples positions. Then each function interval is bisected recursively if It starts by sampling the function at minSamples positions. Then each function interval is bisected recursively if
necessary. To do so the function is evaluated at the mid point and the slopes \f$ \alpha_{\mbox{left}} \f$ necessary. To do so the function is evaluated at the mid point and the slopes \f$ \alpha_{\mbox{left}} \f$
and \f$ \alpha_{\mbox{right}} \f$ of the two linear segments are compared. the midpoint is added and \f$ \alpha_{\mbox{right}} \f$ of the two linear segments are compared. the midpoint is added
to the graph if \f[ \left|\alpha_{\mbox{right}}-\alpha_{\mbox{left}}\right|>\mbox{slopeTolerance} \f] to the graph if \f[ \left|\alpha_{\mbox{right}}-\alpha_{\mbox{left}}\right|>\mbox{slopeTolerance} \f]
In addition all sampling points except minimum and maximum are beeing shifted by a random fraction their In addition all sampling points except minimum and maximum are beeing shifted by a random fraction their
distance to the other points. This helps to prevent beats when sampling periodic functions. distance to the other points. This helps to prevent beats when sampling periodic functions.
Finally the obtained data is cleaned up to reduce the amount of points, by deleting a point, when it leads to an
angle between consecutive line-segments of less than dataCleanupMaxAllowedAngleDegree.
The following image shows some example graphs: The following image shows some example graphs:
\image html plot_functionplots.png \image html plot_functionplots.png
@ -193,10 +196,10 @@ class JKQTPLOTTER_LIB_EXPORT JKQTPXFunctionLineGraph: public JKQTPGraph, public
void setMinPixelPerSample(double __value); void setMinPixelPerSample(double __value);
/*! \copydoc minPixelPerSample */ /*! \copydoc minPixelPerSample */
double getMinPixelPerSample() const; double getMinPixelPerSample() const;
/*! \copydoc plotRefinement */ /*! \copydoc dataCleanupMaxAllowedAngleDegree */
void setPlotRefinement(bool __value); void setDataCleanupMaxAllowedAngleDegree(double __value);
/*! \copydoc plotRefinement */ /*! \copydoc dataCleanupMaxAllowedAngleDegree */
bool getPlotRefinement() const; double getDataCleanupMaxAllowedAngleDegree() const;
/*! \copydoc displaySamplePoints */ /*! \copydoc displaySamplePoints */
void setDisplaySamplePoints(bool __value); void setDisplaySamplePoints(bool __value);
/*! \copydoc displaySamplePoints */ /*! \copydoc displaySamplePoints */
@ -324,8 +327,9 @@ class JKQTPLOTTER_LIB_EXPORT JKQTPXFunctionLineGraph: public JKQTPGraph, public
double slopeTolerance; double slopeTolerance;
/** \brief create one sample at least every \a minPixelPerSample pixels */ /** \brief create one sample at least every \a minPixelPerSample pixels */
double minPixelPerSample; double minPixelPerSample;
/** \brief switch on or off [default: on] the plot refinement algorithm */ /** \brief in the clean-up step of plot-data creation, a point is removed from the data, if
bool plotRefinement; * it caused its neighboring line-segments to form an angle less than this value, given in degrees. */
double dataCleanupMaxAllowedAngleDegree;
/** \brief if true [default: off] display the points where the function has been sampled */ /** \brief if true [default: off] display the points where the function has been sampled */
bool displaySamplePoints; bool displaySamplePoints;
/** \brief indicates whether an error polygon should be drawn */ /** \brief indicates whether an error polygon should be drawn */