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

rename JKQTPFunctionLineGraphBase -> JKQTPEvaluatedFunctionGraphBase

Browse Source
This commit is contained in:
jkriege2 2020-09-05 13:16:26 +02:00
parent 29ee1aa376
commit dcdee469fe
6 changed files with 25 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -34,7 +34,7 @@
JKQTPXFunctionLineGraph::JKQTPXFunctionLineGraph(JKQTBasePlotter* parent): JKQTPXFunctionLineGraph::JKQTPXFunctionLineGraph(JKQTBasePlotter* parent):
JKQTPFunctionLineGraphBase(parent) JKQTPEvaluatedFunctionGraphBase(parent)
{ {
functionType=SpecialFunction::UserFunction; functionType=SpecialFunction::UserFunction;
drawLine=true; drawLine=true;

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

@ -74,7 +74,7 @@ typedef std::function<double(double)> jkqtpSimplePlotFunctionType;
\see \ref JKQTPlotterFunctionPlots, JKQTPAdaptiveFunctionGraphEvaluator, JKQTPYFunctionLineGraph, JKQTPXYFunctionLineGraph, jkqtpstatAddPolyFit(), jkqtpstatAddWeightedRegression(), jkqtpstatAddRobustIRLSRegression(), jkqtpstatAddRegression(), jkqtpstatAddLinearWeightedRegression(), jkqtpstatAddRobustIRLSLinearRegression(), jkqtpstatAddLinearRegression() \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 Q_OBJECT
public: public:

34
lib/jkqtplotter/graphs/jkqtpevaluatedfunctionbase.cpp
View File

@ -33,7 +33,7 @@
JKQTPFunctionLineGraphBase::JKQTPFunctionLineGraphBase(JKQTBasePlotter* parent): JKQTPEvaluatedFunctionGraphBase::JKQTPEvaluatedFunctionGraphBase(JKQTBasePlotter* parent):
JKQTPGraph(parent) JKQTPGraph(parent)
{ {
minSamples=50; minSamples=50;
@ -46,19 +46,19 @@ JKQTPFunctionLineGraphBase::JKQTPFunctionLineGraphBase(JKQTBasePlotter* parent):
} }
JKQTPFunctionLineGraphBase::JKQTPFunctionLineGraphBase(JKQTPlotter* parent): JKQTPEvaluatedFunctionGraphBase::JKQTPEvaluatedFunctionGraphBase(JKQTPlotter* parent):
JKQTPFunctionLineGraphBase(parent->getPlotter()) JKQTPEvaluatedFunctionGraphBase(parent->getPlotter())
{ {
} }
JKQTPFunctionLineGraphBase::~JKQTPFunctionLineGraphBase() JKQTPEvaluatedFunctionGraphBase::~JKQTPEvaluatedFunctionGraphBase()
{ {
data.clear(); data.clear();
} }
void JKQTPFunctionLineGraphBase::drawSamplePoints(JKQTPEnhancedPainter& painter, QColor graphColor) { void JKQTPEvaluatedFunctionGraphBase::drawSamplePoints(JKQTPEnhancedPainter& painter, QColor graphColor) {
QColor c=graphColor; QColor c=graphColor;
c.setHsv(fmod(c.hue()+90, 360), c.saturation(), c.value()); c.setHsv(fmod(c.hue()+90, 360), c.saturation(), c.value());
painter.save(); auto __finalpaintsamplepoints=JKQTPFinally([&painter]() {painter.restore();}); 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; this->minSamples = __value;
} }
unsigned int JKQTPFunctionLineGraphBase::getMinSamples() const unsigned int JKQTPEvaluatedFunctionGraphBase::getMinSamples() const
{ {
return this->minSamples; return this->minSamples;
} }
void JKQTPFunctionLineGraphBase::setMaxRefinementDegree(const unsigned int &__value) void JKQTPEvaluatedFunctionGraphBase::setMaxRefinementDegree(const unsigned int &__value)
{ {
this->maxRefinementDegree = __value; this->maxRefinementDegree = __value;
} }
unsigned int JKQTPFunctionLineGraphBase::getMaxRefinementDegree() const unsigned int JKQTPEvaluatedFunctionGraphBase::getMaxRefinementDegree() const
{ {
return this->maxRefinementDegree; return this->maxRefinementDegree;
} }
void JKQTPFunctionLineGraphBase::setSlopeTolerance(double __value) void JKQTPEvaluatedFunctionGraphBase::setSlopeTolerance(double __value)
{ {
this->slopeTolerance = __value; this->slopeTolerance = __value;
} }
double JKQTPFunctionLineGraphBase::getSlopeTolerance() const double JKQTPEvaluatedFunctionGraphBase::getSlopeTolerance() const
{ {
return this->slopeTolerance; return this->slopeTolerance;
} }
void JKQTPFunctionLineGraphBase::setMinPixelPerSample(double __value) void JKQTPEvaluatedFunctionGraphBase::setMinPixelPerSample(double __value)
{ {
this->minPixelPerSample = __value; this->minPixelPerSample = __value;
} }
double JKQTPFunctionLineGraphBase::getMinPixelPerSample() const double JKQTPEvaluatedFunctionGraphBase::getMinPixelPerSample() const
{ {
return this->minPixelPerSample; return this->minPixelPerSample;
} }
void JKQTPFunctionLineGraphBase::setDataCleanupMaxAllowedAngleDegree(double __value) void JKQTPEvaluatedFunctionGraphBase::setDataCleanupMaxAllowedAngleDegree(double __value)
{ {
dataCleanupMaxAllowedAngleDegree=__value; dataCleanupMaxAllowedAngleDegree=__value;
} }
double JKQTPFunctionLineGraphBase::getDataCleanupMaxAllowedAngleDegree() const double JKQTPEvaluatedFunctionGraphBase::getDataCleanupMaxAllowedAngleDegree() const
{ {
return dataCleanupMaxAllowedAngleDegree; return dataCleanupMaxAllowedAngleDegree;
} }
void JKQTPFunctionLineGraphBase::setDisplaySamplePoints(bool __value) void JKQTPEvaluatedFunctionGraphBase::setDisplaySamplePoints(bool __value)
{ {
this->displaySamplePoints = __value; this->displaySamplePoints = __value;
} }
bool JKQTPFunctionLineGraphBase::getDisplaySamplePoints() const bool JKQTPEvaluatedFunctionGraphBase::getDisplaySamplePoints() const
{ {
return this->displaySamplePoints; return this->displaySamplePoints;
} }

8
lib/jkqtplotter/graphs/jkqtpevaluatedfunctionbase.h
View File

@ -52,18 +52,18 @@
\see JKQTPAdaptiveFunctionGraphEvaluator, JKQTPXFunctionLineGraph, JKQTPYFunctionLineGraph, JKQTPXYFunctionLineGraph \see JKQTPAdaptiveFunctionGraphEvaluator, JKQTPXFunctionLineGraph, JKQTPYFunctionLineGraph, JKQTPXYFunctionLineGraph
*/ */
class JKQTPLOTTER_LIB_EXPORT JKQTPFunctionLineGraphBase: public JKQTPGraph { class JKQTPLOTTER_LIB_EXPORT JKQTPEvaluatedFunctionGraphBase: public JKQTPGraph {
Q_OBJECT Q_OBJECT
public: public:
/** \brief class constructor */ /** \brief class constructor */
JKQTPFunctionLineGraphBase(JKQTBasePlotter* parent=nullptr); JKQTPEvaluatedFunctionGraphBase(JKQTBasePlotter* parent=nullptr);
/** \brief class constructor */ /** \brief class constructor */
JKQTPFunctionLineGraphBase(JKQTPlotter* parent); JKQTPEvaluatedFunctionGraphBase(JKQTPlotter* parent);
/** \brief class destructor */ /** \brief class destructor */
virtual ~JKQTPFunctionLineGraphBase() ; virtual ~JKQTPEvaluatedFunctionGraphBase() ;
/*! \copydoc minSamples */ /*! \copydoc minSamples */

2
lib/jkqtplotter/graphs/jkqtpevaluatedparametriccurve.cpp
View File

@ -35,7 +35,7 @@
JKQTPXYFunctionLineGraph::JKQTPXYFunctionLineGraph(JKQTBasePlotter* parent): JKQTPXYFunctionLineGraph::JKQTPXYFunctionLineGraph(JKQTBasePlotter* parent):
JKQTPFunctionLineGraphBase(parent) JKQTPEvaluatedFunctionGraphBase(parent)
{ {
tmin=0.0; tmin=0.0;
tmax=1.0; tmax=1.0;

2
lib/jkqtplotter/graphs/jkqtpevaluatedparametriccurve.h
View File

@ -88,7 +88,7 @@ typedef std::function<QPointF(double)> jkqtpSimpleParametricCurveFunctionType;
\see \ref JKQTPlotterEvalCurves , JKQTPAdaptiveFunctionGraphEvaluator, JKQTPXFunctionLineGraph, JKQTPYFunctionLineGraph \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 Q_OBJECT
public: public: