From dcdee469fe0621ab99c5c31713f760f615f55daf Mon Sep 17 00:00:00 2001 From: jkriege2 Date: Sat, 5 Sep 2020 13:16:26 +0200 Subject: [PATCH] rename JKQTPFunctionLineGraphBase -> JKQTPEvaluatedFunctionGraphBase --- .../graphs/jkqtpevaluatedfunction.cpp | 2 +- .../graphs/jkqtpevaluatedfunction.h | 2 +- .../graphs/jkqtpevaluatedfunctionbase.cpp | 34 +++++++++---------- .../graphs/jkqtpevaluatedfunctionbase.h | 8 ++--- .../graphs/jkqtpevaluatedparametriccurve.cpp | 2 +- .../graphs/jkqtpevaluatedparametriccurve.h | 2 +- 6 files changed, 25 insertions(+), 25 deletions(-) diff --git a/lib/jkqtplotter/graphs/jkqtpevaluatedfunction.cpp b/lib/jkqtplotter/graphs/jkqtpevaluatedfunction.cpp index b9a9ee4169..c920752352 100644 --- a/lib/jkqtplotter/graphs/jkqtpevaluatedfunction.cpp +++ b/lib/jkqtplotter/graphs/jkqtpevaluatedfunction.cpp @@ -34,7 +34,7 @@ JKQTPXFunctionLineGraph::JKQTPXFunctionLineGraph(JKQTBasePlotter* parent): - JKQTPFunctionLineGraphBase(parent) + JKQTPEvaluatedFunctionGraphBase(parent) { functionType=SpecialFunction::UserFunction; drawLine=true; diff --git a/lib/jkqtplotter/graphs/jkqtpevaluatedfunction.h b/lib/jkqtplotter/graphs/jkqtpevaluatedfunction.h index 6719cae5fa..d26e38f48c 100644 --- a/lib/jkqtplotter/graphs/jkqtpevaluatedfunction.h +++ b/lib/jkqtplotter/graphs/jkqtpevaluatedfunction.h @@ -74,7 +74,7 @@ typedef std::function jkqtpSimplePlotFunctionType; \see \ref JKQTPlotterFunctionPlots, JKQTPAdaptiveFunctionGraphEvaluator, JKQTPYFunctionLineGraph, JKQTPXYFunctionLineGraph, jkqtpstatAddPolyFit(), jkqtpstatAddWeightedRegression(), jkqtpstatAddRobustIRLSRegression(), jkqtpstatAddRegression(), jkqtpstatAddLinearWeightedRegression(), jkqtpstatAddRobustIRLSLinearRegression(), jkqtpstatAddLinearRegression() */ -class JKQTPLOTTER_LIB_EXPORT JKQTPXFunctionLineGraph: public JKQTPFunctionLineGraphBase, public JKQTPGraphLineStyleMixin, public JKQTPGraphFillStyleMixin { +class JKQTPLOTTER_LIB_EXPORT JKQTPXFunctionLineGraph: public JKQTPEvaluatedFunctionGraphBase, public JKQTPGraphLineStyleMixin, public JKQTPGraphFillStyleMixin { Q_OBJECT public: diff --git a/lib/jkqtplotter/graphs/jkqtpevaluatedfunctionbase.cpp b/lib/jkqtplotter/graphs/jkqtpevaluatedfunctionbase.cpp index 4588d26cb8..66b339cc8d 100644 --- a/lib/jkqtplotter/graphs/jkqtpevaluatedfunctionbase.cpp +++ b/lib/jkqtplotter/graphs/jkqtpevaluatedfunctionbase.cpp @@ -33,7 +33,7 @@ -JKQTPFunctionLineGraphBase::JKQTPFunctionLineGraphBase(JKQTBasePlotter* parent): +JKQTPEvaluatedFunctionGraphBase::JKQTPEvaluatedFunctionGraphBase(JKQTBasePlotter* parent): JKQTPGraph(parent) { minSamples=50; @@ -46,19 +46,19 @@ JKQTPFunctionLineGraphBase::JKQTPFunctionLineGraphBase(JKQTBasePlotter* parent): } -JKQTPFunctionLineGraphBase::JKQTPFunctionLineGraphBase(JKQTPlotter* parent): - JKQTPFunctionLineGraphBase(parent->getPlotter()) +JKQTPEvaluatedFunctionGraphBase::JKQTPEvaluatedFunctionGraphBase(JKQTPlotter* parent): + JKQTPEvaluatedFunctionGraphBase(parent->getPlotter()) { } -JKQTPFunctionLineGraphBase::~JKQTPFunctionLineGraphBase() +JKQTPEvaluatedFunctionGraphBase::~JKQTPEvaluatedFunctionGraphBase() { data.clear(); } -void JKQTPFunctionLineGraphBase::drawSamplePoints(JKQTPEnhancedPainter& painter, QColor graphColor) { +void JKQTPEvaluatedFunctionGraphBase::drawSamplePoints(JKQTPEnhancedPainter& painter, QColor graphColor) { QColor c=graphColor; c.setHsv(fmod(c.hue()+90, 360), c.saturation(), c.value()); painter.save(); auto __finalpaintsamplepoints=JKQTPFinally([&painter]() {painter.restore();}); @@ -71,62 +71,62 @@ void JKQTPFunctionLineGraphBase::drawSamplePoints(JKQTPEnhancedPainter& painter, -void JKQTPFunctionLineGraphBase::setMinSamples(const unsigned int &__value) +void JKQTPEvaluatedFunctionGraphBase::setMinSamples(const unsigned int &__value) { this->minSamples = __value; } -unsigned int JKQTPFunctionLineGraphBase::getMinSamples() const +unsigned int JKQTPEvaluatedFunctionGraphBase::getMinSamples() const { return this->minSamples; } -void JKQTPFunctionLineGraphBase::setMaxRefinementDegree(const unsigned int &__value) +void JKQTPEvaluatedFunctionGraphBase::setMaxRefinementDegree(const unsigned int &__value) { this->maxRefinementDegree = __value; } -unsigned int JKQTPFunctionLineGraphBase::getMaxRefinementDegree() const +unsigned int JKQTPEvaluatedFunctionGraphBase::getMaxRefinementDegree() const { return this->maxRefinementDegree; } -void JKQTPFunctionLineGraphBase::setSlopeTolerance(double __value) +void JKQTPEvaluatedFunctionGraphBase::setSlopeTolerance(double __value) { this->slopeTolerance = __value; } -double JKQTPFunctionLineGraphBase::getSlopeTolerance() const +double JKQTPEvaluatedFunctionGraphBase::getSlopeTolerance() const { return this->slopeTolerance; } -void JKQTPFunctionLineGraphBase::setMinPixelPerSample(double __value) +void JKQTPEvaluatedFunctionGraphBase::setMinPixelPerSample(double __value) { this->minPixelPerSample = __value; } -double JKQTPFunctionLineGraphBase::getMinPixelPerSample() const +double JKQTPEvaluatedFunctionGraphBase::getMinPixelPerSample() const { return this->minPixelPerSample; } -void JKQTPFunctionLineGraphBase::setDataCleanupMaxAllowedAngleDegree(double __value) +void JKQTPEvaluatedFunctionGraphBase::setDataCleanupMaxAllowedAngleDegree(double __value) { dataCleanupMaxAllowedAngleDegree=__value; } -double JKQTPFunctionLineGraphBase::getDataCleanupMaxAllowedAngleDegree() const +double JKQTPEvaluatedFunctionGraphBase::getDataCleanupMaxAllowedAngleDegree() const { return dataCleanupMaxAllowedAngleDegree; } -void JKQTPFunctionLineGraphBase::setDisplaySamplePoints(bool __value) +void JKQTPEvaluatedFunctionGraphBase::setDisplaySamplePoints(bool __value) { this->displaySamplePoints = __value; } -bool JKQTPFunctionLineGraphBase::getDisplaySamplePoints() const +bool JKQTPEvaluatedFunctionGraphBase::getDisplaySamplePoints() const { return this->displaySamplePoints; } diff --git a/lib/jkqtplotter/graphs/jkqtpevaluatedfunctionbase.h b/lib/jkqtplotter/graphs/jkqtpevaluatedfunctionbase.h index 6ab4e88689..7ac273c470 100644 --- a/lib/jkqtplotter/graphs/jkqtpevaluatedfunctionbase.h +++ b/lib/jkqtplotter/graphs/jkqtpevaluatedfunctionbase.h @@ -52,18 +52,18 @@ \see JKQTPAdaptiveFunctionGraphEvaluator, JKQTPXFunctionLineGraph, JKQTPYFunctionLineGraph, JKQTPXYFunctionLineGraph */ -class JKQTPLOTTER_LIB_EXPORT JKQTPFunctionLineGraphBase: public JKQTPGraph { +class JKQTPLOTTER_LIB_EXPORT JKQTPEvaluatedFunctionGraphBase: public JKQTPGraph { Q_OBJECT public: /** \brief class constructor */ - JKQTPFunctionLineGraphBase(JKQTBasePlotter* parent=nullptr); + JKQTPEvaluatedFunctionGraphBase(JKQTBasePlotter* parent=nullptr); /** \brief class constructor */ - JKQTPFunctionLineGraphBase(JKQTPlotter* parent); + JKQTPEvaluatedFunctionGraphBase(JKQTPlotter* parent); /** \brief class destructor */ - virtual ~JKQTPFunctionLineGraphBase() ; + virtual ~JKQTPEvaluatedFunctionGraphBase() ; /*! \copydoc minSamples */ diff --git a/lib/jkqtplotter/graphs/jkqtpevaluatedparametriccurve.cpp b/lib/jkqtplotter/graphs/jkqtpevaluatedparametriccurve.cpp index 8601cc5c3e..99394d522c 100644 --- a/lib/jkqtplotter/graphs/jkqtpevaluatedparametriccurve.cpp +++ b/lib/jkqtplotter/graphs/jkqtpevaluatedparametriccurve.cpp @@ -35,7 +35,7 @@ JKQTPXYFunctionLineGraph::JKQTPXYFunctionLineGraph(JKQTBasePlotter* parent): - JKQTPFunctionLineGraphBase(parent) + JKQTPEvaluatedFunctionGraphBase(parent) { tmin=0.0; tmax=1.0; diff --git a/lib/jkqtplotter/graphs/jkqtpevaluatedparametriccurve.h b/lib/jkqtplotter/graphs/jkqtpevaluatedparametriccurve.h index 6a4df3b76c..904f567176 100644 --- a/lib/jkqtplotter/graphs/jkqtpevaluatedparametriccurve.h +++ b/lib/jkqtplotter/graphs/jkqtpevaluatedparametriccurve.h @@ -88,7 +88,7 @@ typedef std::function jkqtpSimpleParametricCurveFunctionType; \see \ref JKQTPlotterEvalCurves , JKQTPAdaptiveFunctionGraphEvaluator, JKQTPXFunctionLineGraph, JKQTPYFunctionLineGraph */ -class JKQTPLOTTER_LIB_EXPORT JKQTPXYFunctionLineGraph: public JKQTPFunctionLineGraphBase, public JKQTPGraphLineStyleMixin { +class JKQTPLOTTER_LIB_EXPORT JKQTPXYFunctionLineGraph: public JKQTPEvaluatedFunctionGraphBase, public JKQTPGraphLineStyleMixin { Q_OBJECT public: