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

some code refactoring (removed all remaining macro-defined getter/setter-functions and properties ...)

Browse Source
This commit is contained in:
jkriege2 2019-01-09 21:23:24 +01:00
parent 8ae0e20892
commit 1e0b37853c
28 changed files with 9174 additions and 1717 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

80
lib/jkqtfastplotter/jkqtfastplotter.cpp
View File

@ -29,12 +29,34 @@
#include <QApplication> #include <QApplication>
#include <QClipboard> #include <QClipboard>
/**
* \brief saves the given property (for which also a def_property exists) into the given settings object
* \ingroup jkqtfastplotter
* \internal
*/
#define JKQTFPPROPERTYsave(settings, group, var, varname) \
if (var!=def_##var) settings.setValue(group+varname, var);
/**
* \brief loads the given property from the given settings object
* \ingroup jkqtfastplotter
* \internal
*/
#define JKQTFPPROPERTYload(settings, group, var, varname, varconvert) \
var=settings.value(group+varname, var).varconvert;
JKQTFPPlot::JKQTFPPlot(JKQTFastPlotter* parent): JKQTFPPlot::JKQTFPPlot(JKQTFastPlotter* parent):
QObject(parent) QObject(parent)
{ {
this->parent=parent; this->parent=parent;
this->visible=true; this->visible=true;
}
JKQTFPPlot::~JKQTFPPlot()
{
}; };
void JKQTFPPlot::replot() { void JKQTFPPlot::replot() {
@ -61,8 +83,8 @@ JKQTFastPlotter::JKQTFastPlotter(QWidget *parent) :
plotBorderTop=def_plotBorderTop=5; plotBorderTop=def_plotBorderTop=5;
plotBorderBottom=def_plotBorderBottom=30; plotBorderBottom=def_plotBorderBottom=30;
synchronizeX=NULL; synchronizeX=nullptr;
synchronizeY=NULL; synchronizeY=nullptr;
backgroundColor=def_backgroundColor=palette().color(QPalette::Window); backgroundColor=def_backgroundColor=palette().color(QPalette::Window);
plotBackgroundColor=def_plotBackgroundColor=QColor("white"); plotBackgroundColor=def_plotBackgroundColor=QColor("white");
@ -701,7 +723,7 @@ void JKQTFastPlotter::calcPlotScaling() {
//////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////
// PLOTTER SYNCHRONIZATION // PLOTTER SYNCHRONIZATION
//////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////
if (synchronizeX!=NULL) { if (synchronizeX!=nullptr) {
internalPlotBorderLeft=synchronizeX->get_internalPlotBorderLeft(); internalPlotBorderLeft=synchronizeX->get_internalPlotBorderLeft();
internalPlotBorderRight=synchronizeX->get_internalPlotBorderRight(); internalPlotBorderRight=synchronizeX->get_internalPlotBorderRight();
xMin=synchronizeX->get_xMin(); xMin=synchronizeX->get_xMin();
@ -709,7 +731,7 @@ void JKQTFastPlotter::calcPlotScaling() {
xAxisLog=synchronizeX->get_xAxisLog(); xAxisLog=synchronizeX->get_xAxisLog();
xAxisLabel=synchronizeX->get_xAxisLabel(); xAxisLabel=synchronizeX->get_xAxisLabel();
} }
if (synchronizeY!=NULL) { if (synchronizeY!=nullptr) {
internalPlotBorderTop=synchronizeY->get_internalPlotBorderTop(); internalPlotBorderTop=synchronizeY->get_internalPlotBorderTop();
internalPlotBorderBottom=synchronizeY->get_internalPlotBorderBottom(); internalPlotBorderBottom=synchronizeY->get_internalPlotBorderBottom();
yMin=synchronizeY->get_yMin(); yMin=synchronizeY->get_yMin();
@ -820,10 +842,10 @@ JKQTFPLinePlot::JKQTFPLinePlot(JKQTFastPlotter* parent, unsigned int N, double*
this->N=N; this->N=N;
this->x=x; this->x=x;
this->y=y; this->y=y;
this->yerr=NULL; this->yerr=nullptr;
this->xv=NULL; this->xv=nullptr;
this->yv=NULL; this->yv=nullptr;
this->yerrv=NULL; this->yerrv=nullptr;
this->color=color; this->color=color;
this->errorColor=color.lighter(); this->errorColor=color.lighter();
this->errorStyle=this->style=style; this->errorStyle=this->style=style;
@ -836,12 +858,12 @@ JKQTFPLinePlot::JKQTFPLinePlot(JKQTFastPlotter* parent, QVector<double>* x, QVec
JKQTFPPlot(parent) JKQTFPPlot(parent)
{ {
this->N=x->size(); this->N=x->size();
this->x=NULL; this->x=nullptr;
this->y=NULL; this->y=nullptr;
this->yerr=NULL; this->yerr=nullptr;
this->xv=x; this->xv=x;
this->yv=y; this->yv=y;
this->yerrv=NULL; this->yerrv=nullptr;
this->color=color; this->color=color;
this->errorColor=color.lighter(); this->errorColor=color.lighter();
this->errorStyle=this->style=style; this->errorStyle=this->style=style;
@ -874,7 +896,7 @@ void JKQTFPLinePlot::drawGraph(QPainter& painter) {
path.lineTo(parent->x2p(x[i]), parent->y2p(y[i])); path.lineTo(parent->x2p(x[i]), parent->y2p(y[i]));
//std::cout<<"-> ("<<parent->x2p(x[i])<<", "<<parent->y2p(y[i])<<")\n"; //std::cout<<"-> ("<<parent->x2p(x[i])<<", "<<parent->y2p(y[i])<<")\n";
} }
if (yerr!=NULL) { if (yerr!=nullptr) {
if (N>0){ if (N>0){
epath.moveTo(parent->x2p(x[0]), parent->y2p(y[0]+yerr[0])); epath.moveTo(parent->x2p(x[0]), parent->y2p(y[0]+yerr[0]));
} }
@ -897,7 +919,7 @@ void JKQTFPLinePlot::drawGraph(QPainter& painter) {
//std::cout<<"-> ("<<parent->x2p(x[i])<<", "<<parent->y2p(y[i])<<")\n"; //std::cout<<"-> ("<<parent->x2p(x[i])<<", "<<parent->y2p(y[i])<<")\n";
} }
} }
if (yerrv!=NULL) { if (yerrv!=nullptr) {
if (yerrv->size()>1 && (xv->size()>=yerrv->size()) && (yv->size()>=yerrv->size())){ if (yerrv->size()>1 && (xv->size()>=yerrv->size()) && (yv->size()>=yerrv->size())){
epath.moveTo(parent->x2p((*xv)[0]), parent->y2p((*yv)[0]+(*yerrv)[0])); epath.moveTo(parent->x2p((*xv)[0]), parent->y2p((*yv)[0]+(*yerrv)[0]));
//std::cout<<"plotting graph, starting @ ("<<parent->x2p(x[0])<<", "<<parent->y2p(y[0])<<")\n"; //std::cout<<"plotting graph, starting @ ("<<parent->x2p(x[0])<<", "<<parent->y2p(y[0])<<")\n";
@ -959,7 +981,7 @@ void JKQTFPVCrossPlot::drawGraph(QPainter& painter) {
path.lineTo(QPointF(parent->x2p(x[i]), parent->y2p(y[i])+crossWidth/2.0)); path.lineTo(QPointF(parent->x2p(x[i]), parent->y2p(y[i])+crossWidth/2.0));
//std::cout<<"-> ("<<parent->x2p(x[i])<<", "<<parent->y2p(y[i])<<")\n"; //std::cout<<"-> ("<<parent->x2p(x[i])<<", "<<parent->y2p(y[i])<<")\n";
} }
if (yerr!=NULL) { if (yerr!=nullptr) {
if (N>0){ if (N>0){
epath.moveTo(parent->x2p(x[0]), parent->y2p(y[0]+yerr[0])); epath.moveTo(parent->x2p(x[0]), parent->y2p(y[0]+yerr[0]));
} }
@ -983,7 +1005,7 @@ void JKQTFPVCrossPlot::drawGraph(QPainter& painter) {
//std::cout<<"-> ("<<parent->x2p(x[i])<<", "<<parent->y2p(y[i])<<")\n"; //std::cout<<"-> ("<<parent->x2p(x[i])<<", "<<parent->y2p(y[i])<<")\n";
} }
} }
if (yerrv!=NULL) { if (yerrv!=nullptr) {
if (yerrv->size()>0 && (xv->size()>=yerrv->size()) && (yv->size()>=yerrv->size())){ if (yerrv->size()>0 && (xv->size()>=yerrv->size()) && (yv->size()>=yerrv->size())){
epath.moveTo(parent->x2p((*xv)[0]), parent->y2p((*yv)[0]+(*yerrv)[0])); epath.moveTo(parent->x2p((*xv)[0]), parent->y2p((*yv)[0]+(*yerrv)[0]));
//std::cout<<"plotting graph, starting @ ("<<parent->x2p(x[0])<<", "<<parent->y2p(y[0])<<")\n"; //std::cout<<"plotting graph, starting @ ("<<parent->x2p(x[0])<<", "<<parent->y2p(y[0])<<")\n";
@ -1541,11 +1563,11 @@ JKQTFPRGBImageOverlayPlot::JKQTFPRGBImageOverlayPlot(JKQTFastPlotter *parent, vo
this->imageFormatRed=imageFormat; this->imageFormatRed=imageFormat;
colorMinGreen=0; colorMinGreen=0;
colorMaxGreen=0; colorMaxGreen=0;
this->imageGreen=NULL; this->imageGreen=nullptr;
this->imageFormatGreen=JKQTFP_uint16; this->imageFormatGreen=JKQTFP_uint16;
colorMinBlue=0; colorMinBlue=0;
colorMaxBlue=0; colorMaxBlue=0;
this->imageBlue=NULL; this->imageBlue=nullptr;
this->imageFormatBlue=JKQTFP_uint16; this->imageFormatBlue=JKQTFP_uint16;
this->rotation=0; this->rotation=0;
} }
@ -1565,11 +1587,11 @@ JKQTFPRGBImageOverlayPlot::JKQTFPRGBImageOverlayPlot(JKQTFastPlotter *parent, vo
this->imageFormatRed=imageFormat; this->imageFormatRed=imageFormat;
colorMinGreen=0; colorMinGreen=0;
colorMaxGreen=0; colorMaxGreen=0;
this->imageGreen=NULL; this->imageGreen=nullptr;
this->imageFormatGreen=JKQTFP_uint16; this->imageFormatGreen=JKQTFP_uint16;
colorMinBlue=0; colorMinBlue=0;
colorMaxBlue=0; colorMaxBlue=0;
this->imageBlue=NULL; this->imageBlue=nullptr;
this->imageFormatBlue=JKQTFP_uint16; this->imageFormatBlue=JKQTFP_uint16;
this->rotation=0; this->rotation=0;
} }
@ -1585,15 +1607,15 @@ JKQTFPRGBImageOverlayPlot::JKQTFPRGBImageOverlayPlot(JKQTFastPlotter *parent):
this->ymax=height-1; this->ymax=height-1;
colorMinRed=0; colorMinRed=0;
colorMaxRed=0; colorMaxRed=0;
this->imageRed=NULL; this->imageRed=nullptr;
this->imageFormatRed=JKQTFP_uint16; this->imageFormatRed=JKQTFP_uint16;
colorMinGreen=0; colorMinGreen=0;
colorMaxGreen=0; colorMaxGreen=0;
this->imageGreen=NULL; this->imageGreen=nullptr;
this->imageFormatGreen=JKQTFP_uint16; this->imageFormatGreen=JKQTFP_uint16;
colorMinBlue=0; colorMinBlue=0;
colorMaxBlue=0; colorMaxBlue=0;
this->imageBlue=NULL; this->imageBlue=nullptr;
this->imageFormatBlue=JKQTFP_uint16; this->imageFormatBlue=JKQTFP_uint16;
this->rotation=0; this->rotation=0;
} }
@ -1650,8 +1672,8 @@ void JKQTFPRGBImageOverlayPlot::drawGraph(QPainter &painter) {
void JKQTFPRGBImageOverlayPlot::set_image(void* imageRed, JKQTFPImageFormat imageFormatRed, unsigned int width, unsigned int height){ void JKQTFPRGBImageOverlayPlot::set_image(void* imageRed, JKQTFPImageFormat imageFormatRed, unsigned int width, unsigned int height){
this->imageRed=imageRed; this->imageRed=imageRed;
this->imageFormatRed=imageFormatRed; this->imageFormatRed=imageFormatRed;
this->imageGreen=NULL; this->imageGreen=nullptr;
this->imageBlue=NULL; this->imageBlue=nullptr;
this->width=width; this->width=width;
this->height=height; this->height=height;
this->xmin=0; this->xmin=0;
@ -1666,7 +1688,7 @@ void JKQTFPRGBImageOverlayPlot::set_image(void* imageRed, JKQTFPImageFormat imag
this->imageFormatRed=imageFormatRed; this->imageFormatRed=imageFormatRed;
this->imageGreen=imageGreen; this->imageGreen=imageGreen;
this->imageFormatGreen=imageFormatGreen; this->imageFormatGreen=imageFormatGreen;
this->imageBlue=NULL; this->imageBlue=nullptr;
this->width=width; this->width=width;
this->height=height; this->height=height;
this->xmin=0; this->xmin=0;
@ -1697,8 +1719,8 @@ void JKQTFPRGBImageOverlayPlot::set_image(void* imageRed, JKQTFPImageFormat imag
void JKQTFPRGBImageOverlayPlot::set_image(void* imageRed, JKQTFPImageFormat imageFormatRed, unsigned int width, unsigned int height, double xmin, double xmax, double ymin, double ymax){ void JKQTFPRGBImageOverlayPlot::set_image(void* imageRed, JKQTFPImageFormat imageFormatRed, unsigned int width, unsigned int height, double xmin, double xmax, double ymin, double ymax){
this->imageRed=imageRed; this->imageRed=imageRed;
this->imageFormatRed=imageFormatRed; this->imageFormatRed=imageFormatRed;
this->imageRed=NULL; this->imageRed=nullptr;
this->imageBlue=NULL; this->imageBlue=nullptr;
this->width=width; this->width=width;
this->height=height; this->height=height;
this->xmin=xmin; this->xmin=xmin;
@ -1713,7 +1735,7 @@ void JKQTFPRGBImageOverlayPlot::set_image(void* imageRed, JKQTFPImageFormat imag
this->imageFormatRed=imageFormatRed; this->imageFormatRed=imageFormatRed;
this->imageGreen=imageGreen; this->imageGreen=imageGreen;
this->imageFormatGreen=imageFormatGreen; this->imageFormatGreen=imageFormatGreen;
this->imageBlue=NULL; this->imageBlue=nullptr;
this->width=width; this->width=width;
this->height=height; this->height=height;
this->xmin=xmin; this->xmin=xmin;

2306
lib/jkqtfastplotter/jkqtfastplotter.h
View File

File diff suppressed because it is too large Load Diff

20
lib/jkqtmathtext/jkqtmathtext.cpp
View File

@ -27,6 +27,21 @@
#include <QApplication> #include <QApplication>
//#define JKQTP_QColor2String(color) QString(jkqtp_rgbtostring((color).red(), (color).green(), (color).blue(), (color).alpha()).c_str()) //#define JKQTP_QColor2String(color) QString(jkqtp_rgbtostring((color).red(), (color).green(), (color).blue(), (color).alpha()).c_str())
/**
* \brief saves the given property (for which also a def_property exists) into the given settings object
* \ingroup jkqtmathtext
* \internal
*/
#define JKQTMTPROPERTYsave(settings, group, var, varname) \
if (var!=def_##var) settings.setValue(group+varname, var);
/**
* \brief loads the given property from the given settings object
* \ingroup jkqtmathtext
* \internal
*/
#define JKQTMTPROPERTYload(settings, group, var, varname, varconvert) \
var=settings.value(group+varname, var).varconvert;
QPainterPath makeHBracePath(double x, double ybrace, double width, double bw, double cubicshrink=0.5, double cubiccontrolfac=0.3) { QPainterPath makeHBracePath(double x, double ybrace, double width, double bw, double cubicshrink=0.5, double cubiccontrolfac=0.3) {
double xl1=x-(width)*cubicshrink+bw*cubicshrink; double xl1=x-(width)*cubicshrink+bw*cubicshrink;
@ -179,6 +194,11 @@ JKQTmathText::MTnode::MTnode(JKQTmathText* parent) {
drawBoxes=false; drawBoxes=false;
} }
JKQTmathText::MTnode::~MTnode()
{
}
void JKQTmathText::MTnode::getSize(QPainter &painter, JKQTmathText::MTenvironment currentEv, double &width, double &baselineHeight, double &overallHeight, double &strikeoutPos) void JKQTmathText::MTnode::getSize(QPainter &painter, JKQTmathText::MTenvironment currentEv, double &width, double &baselineHeight, double &overallHeight, double &strikeoutPos)
{ {
double w=width, b=baselineHeight, o=overallHeight, s=strikeoutPos; double w=width, b=baselineHeight, o=overallHeight, s=strikeoutPos;

888
lib/jkqtmathtext/jkqtmathtext.h
View File

File diff suppressed because it is too large Load Diff

208
lib/jkqtplotter/jkqtpbaseelements.h
View File

@ -227,101 +227,127 @@ class LIB_EXPORT JKQTPcoordinateAxis: public QObject {
virtual void drawGrids(JKQTPEnhancedPainter& painter)=0; virtual void drawGrids(JKQTPEnhancedPainter& painter)=0;
/** \brief returns the property tickSpacing. \details Description of the parameter tickSpacing is: <CENTER>\copybrief tickSpacing.</CENTER>. \see tickSpacing for more information */ /*! \brief returns the property tickSpacing. \details Description of the parameter tickSpacing is: <CENTER>\copybrief tickSpacing.</CENTER>. \see tickSpacing for more information */
inline double get_tickSpacing() const { return this->tickSpacing; } inline double get_tickSpacing() const { return this->tickSpacing; }
/** \brief returns the property labelDigits. \details Description of the parameter labelDigits is: <CENTER>\copybrief labelDigits.</CENTER>. \see labelDigits for more information */ /*! \brief returns the property labelDigits. \details Description of the parameter labelDigits is: <CENTER>\copybrief labelDigits.</CENTER>. \see labelDigits for more information */
inline int get_labelDigits() const { return this->labelDigits; } inline int get_labelDigits() const { return this->labelDigits; }
/** \brief returns the property autoAxisSpacing. \details Description of the parameter autoAxisSpacing is: <CENTER>\copybrief autoAxisSpacing.</CENTER>. \see autoAxisSpacing for more information */ /*! \brief returns the property autoAxisSpacing. \details Description of the parameter autoAxisSpacing is: <CENTER>\copybrief autoAxisSpacing.</CENTER>. \see autoAxisSpacing for more information */
inline bool get_autoAxisSpacing() const { return this->autoAxisSpacing; } inline bool get_autoAxisSpacing() const { return this->autoAxisSpacing; }
/** \brief returns the property minorTickLabelsEnabled. \details Description of the parameter minorTickLabelsEnabled is: <CENTER>\copybrief minorTickLabelsEnabled.</CENTER>. \see minorTickLabelsEnabled for more information */ /*! \brief returns the property minorTickLabelsEnabled. \details Description of the parameter minorTickLabelsEnabled is: <CENTER>\copybrief minorTickLabelsEnabled.</CENTER>. \see minorTickLabelsEnabled for more information */
inline bool get_minorTickLabelsEnabled() const { return this->minorTickLabelsEnabled; } inline bool get_minorTickLabelsEnabled() const { return this->minorTickLabelsEnabled; }
/** \brief returns the property logAxis. \details Description of the parameter logAxis is: <CENTER>\copybrief logAxis.</CENTER>. \see logAxis for more information */ /*! \brief returns the property logAxis. \details Description of the parameter logAxis is: <CENTER>\copybrief logAxis.</CENTER>. \see logAxis for more information */
inline bool get_logAxis() const { return this->logAxis; } inline bool get_logAxis() const { return this->logAxis; }
/** \brief returns the property inverted. \details Description of the parameter inverted is: <CENTER>\copybrief inverted.</CENTER>. \see inverted for more information */ /*! \brief returns the property inverted. \details Description of the parameter inverted is: <CENTER>\copybrief inverted.</CENTER>. \see inverted for more information */
inline bool get_inverted() const { return this->inverted; } inline bool get_inverted() const { return this->inverted; }
/** \brief returns the property logAxisBase. \details Description of the parameter logAxisBase is: <CENTER>\copybrief logAxisBase.</CENTER>. \see logAxisBase for more information */ /*! \brief returns the property logAxisBase. \details Description of the parameter logAxisBase is: <CENTER>\copybrief logAxisBase.</CENTER>. \see logAxisBase for more information */
inline double get_logAxisBase() const { return this->logAxisBase; } inline double get_logAxisBase() const { return this->logAxisBase; }
/** \brief returns the property userTickSpacing. \details Description of the parameter userTickSpacing is: <CENTER>\copybrief userTickSpacing.</CENTER>. \see userTickSpacing for more information */ /*! \brief returns the property userTickSpacing. \details Description of the parameter userTickSpacing is: <CENTER>\copybrief userTickSpacing.</CENTER>. \see userTickSpacing for more information */
inline double get_userTickSpacing() const { return this->userTickSpacing; } inline double get_userTickSpacing() const { return this->userTickSpacing; }
/** \brief returns the property userLogTickSpacing. \details Description of the parameter userLogTickSpacing is: <CENTER>\copybrief userLogTickSpacing.</CENTER>. \see userLogTickSpacing for more information */ /*! \brief returns the property userLogTickSpacing. \details Description of the parameter userLogTickSpacing is: <CENTER>\copybrief userLogTickSpacing.</CENTER>. \see userLogTickSpacing for more information */
inline double get_userLogTickSpacing() const { return this->userLogTickSpacing; } inline double get_userLogTickSpacing() const { return this->userLogTickSpacing; }
/** \brief returns the property labelType. \details Description of the parameter labelType is: <CENTER>\copybrief labelType.</CENTER>. \see labelType for more information */ /*! \brief returns the property labelType. \details Description of the parameter labelType is: <CENTER>\copybrief labelType.</CENTER>. \see labelType for more information */
inline JKQTPCAlabelType get_labelType() const { return this->labelType; } inline JKQTPCAlabelType get_labelType() const { return this->labelType; }
/** \brief returns the property axisLabel. \details Description of the parameter axisLabel is: <CENTER>\copybrief axisLabel.</CENTER>. \see axisLabel for more information */ /*! \brief returns the property axisLabel. \details Description of the parameter axisLabel is: <CENTER>\copybrief axisLabel.</CENTER>. \see axisLabel for more information */
inline QString get_axisLabel() const { return this->axisLabel; } inline QString get_axisLabel() const { return this->axisLabel; }
/** \brief returns the property labelPosition. \details Description of the parameter labelPosition is: <CENTER>\copybrief labelPosition.</CENTER>. \see labelPosition for more information */ /*! \brief returns the property labelPosition. \details Description of the parameter labelPosition is: <CENTER>\copybrief labelPosition.</CENTER>. \see labelPosition for more information */
inline JKQTPlabelPosition get_labelPosition() const { return this->labelPosition; } inline JKQTPlabelPosition get_labelPosition() const { return this->labelPosition; }
/** \brief returns the property labelFont. \details Description of the parameter labelFont is: <CENTER>\copybrief labelFont.</CENTER>. \see labelFont for more information */ /*! \brief returns the property labelFont. \details Description of the parameter labelFont is: <CENTER>\copybrief labelFont.</CENTER>. \see labelFont for more information */
inline QString get_labelFont() const { return this->labelFont; } inline QString get_labelFont() const { return this->labelFont; }
/** \brief returns the property labelFontSize. \details Description of the parameter labelFontSize is: <CENTER>\copybrief labelFontSize.</CENTER>. \see labelFontSize for more information */ /*! \brief returns the property labelFontSize. \details Description of the parameter labelFontSize is: <CENTER>\copybrief labelFontSize.</CENTER>. \see labelFontSize for more information */
inline double get_labelFontSize() const { return this->labelFontSize; } inline double get_labelFontSize() const { return this->labelFontSize; }
/** \brief returns the property tickLabelFont. \details Description of the parameter tickLabelFont is: <CENTER>\copybrief tickLabelFont.</CENTER>. \see tickLabelFont for more information */ /*! \brief returns the property tickLabelFont. \details Description of the parameter tickLabelFont is: <CENTER>\copybrief tickLabelFont.</CENTER>. \see tickLabelFont for more information */
inline QString get_tickLabelFont() const { return this->tickLabelFont; } inline QString get_tickLabelFont() const { return this->tickLabelFont; }
/** \brief returns the property tickLabelFontSize. \details Description of the parameter tickLabelFontSize is: <CENTER>\copybrief tickLabelFontSize.</CENTER>. \see tickLabelFontSize for more information */ /*! \brief returns the property tickLabelFontSize. \details Description of the parameter tickLabelFontSize is: <CENTER>\copybrief tickLabelFontSize.</CENTER>. \see tickLabelFontSize for more information */
inline double get_tickLabelFontSize() const { return this->tickLabelFontSize; } inline double get_tickLabelFontSize() const { return this->tickLabelFontSize; }
/** \brief returns the property minorTickLabelFontSize. \details Description of the parameter minorTickLabelFontSize is: <CENTER>\copybrief minorTickLabelFontSize.</CENTER>. \see minorTickLabelFontSize for more information */ /*! \brief returns the property minorTickLabelFontSize. \details Description of the parameter minorTickLabelFontSize is: <CENTER>\copybrief minorTickLabelFontSize.</CENTER>. \see minorTickLabelFontSize for more information */
inline double get_minorTickLabelFontSize() const { return this->minorTickLabelFontSize; } inline double get_minorTickLabelFontSize() const { return this->minorTickLabelFontSize; }
/** \brief returns the property minorTickLabelFullNumber. \details Description of the parameter minorTickLabelFullNumber is: <CENTER>\copybrief minorTickLabelFullNumber.</CENTER>. \see minorTickLabelFullNumber for more information */ /*! \brief returns the property minorTickLabelFullNumber. \details Description of the parameter minorTickLabelFullNumber is: <CENTER>\copybrief minorTickLabelFullNumber.</CENTER>. \see minorTickLabelFullNumber for more information */
inline bool get_minorTickLabelFullNumber() const { return this->minorTickLabelFullNumber; } inline bool get_minorTickLabelFullNumber() const { return this->minorTickLabelFullNumber; }
/** \brief returns the property tickLabelAngle. \details Description of the parameter tickLabelAngle is: <CENTER>\copybrief tickLabelAngle.</CENTER>. \see tickLabelAngle for more information */ /*! \brief returns the property tickLabelAngle. \details Description of the parameter tickLabelAngle is: <CENTER>\copybrief tickLabelAngle.</CENTER>. \see tickLabelAngle for more information */
inline double get_tickLabelAngle() const { return this->tickLabelAngle; } inline double get_tickLabelAngle() const { return this->tickLabelAngle; }
/** \brief returns the property minTicks. \details Description of the parameter minTicks is: <CENTER>\copybrief minTicks.</CENTER>. \see minTicks for more information */ /*! \brief returns the property minTicks. \details Description of the parameter minTicks is: <CENTER>\copybrief minTicks.</CENTER>. \see minTicks for more information */
inline unsigned int get_minTicks() const { return this->minTicks; } inline unsigned int get_minTicks() const { return this->minTicks; }
/** \brief returns the property minorTicks. \details Description of the parameter minorTicks is: <CENTER>\copybrief minorTicks.</CENTER>. \see minorTicks for more information */ /*! \brief returns the property minorTicks. \details Description of the parameter minorTicks is: <CENTER>\copybrief minorTicks.</CENTER>. \see minorTicks for more information */
inline unsigned int get_minorTicks() const { return this->minorTicks; } inline unsigned int get_minorTicks() const { return this->minorTicks; }
/** \brief returns the property tickOutsideLength. \details Description of the parameter tickOutsideLength is: <CENTER>\copybrief tickOutsideLength.</CENTER>. \see tickOutsideLength for more information */ /*! \brief returns the property tickOutsideLength. \details Description of the parameter tickOutsideLength is: <CENTER>\copybrief tickOutsideLength.</CENTER>. \see tickOutsideLength for more information */
inline double get_tickOutsideLength() const { return this->tickOutsideLength; } inline double get_tickOutsideLength() const { return this->tickOutsideLength; }
/** \brief returns the property minorTickOutsideLength. \details Description of the parameter minorTickOutsideLength is: <CENTER>\copybrief minorTickOutsideLength.</CENTER>. \see minorTickOutsideLength for more information */ /*! \brief returns the property minorTickOutsideLength. \details Description of the parameter minorTickOutsideLength is: <CENTER>\copybrief minorTickOutsideLength.</CENTER>. \see minorTickOutsideLength for more information */
inline double get_minorTickOutsideLength() const { return this->minorTickOutsideLength; } inline double get_minorTickOutsideLength() const { return this->minorTickOutsideLength; }
/** \brief returns the property axisColor. \details Description of the parameter axisColor is: <CENTER>\copybrief axisColor.</CENTER>. \see axisColor for more information */ /*! \brief returns the property axisColor. \details Description of the parameter axisColor is: <CENTER>\copybrief axisColor.</CENTER>. \see axisColor for more information */
inline QColor get_axisColor() const { return this->axisColor; } inline QColor get_axisColor() const { return this->axisColor; }
/** \brief returns the property showZeroAxis. \details Description of the parameter showZeroAxis is: <CENTER>\copybrief showZeroAxis.</CENTER>. \see showZeroAxis for more information */ /*! \brief returns the property showZeroAxis. \details Description of the parameter showZeroAxis is: <CENTER>\copybrief showZeroAxis.</CENTER>. \see showZeroAxis for more information */
inline bool get_showZeroAxis() const { return this->showZeroAxis; } inline bool get_showZeroAxis() const { return this->showZeroAxis; }
/** \brief returns the property gridColor. \details Description of the parameter gridColor is: <CENTER>\copybrief gridColor.</CENTER>. \see gridColor for more information */ /*! \brief returns the property gridColor. \details Description of the parameter gridColor is: <CENTER>\copybrief gridColor.</CENTER>. \see gridColor for more information */
inline QColor get_gridColor() const { return this->gridColor; } inline QColor get_gridColor() const { return this->gridColor; }
/** \brief returns the property minorGridColor. \details Description of the parameter minorGridColor is: <CENTER>\copybrief minorGridColor.</CENTER>. \see minorGridColor for more information */ /*! \brief returns the property minorGridColor. \details Description of the parameter minorGridColor is: <CENTER>\copybrief minorGridColor.</CENTER>. \see minorGridColor for more information */
inline QColor get_minorGridColor() const { return this->minorGridColor; } inline QColor get_minorGridColor() const { return this->minorGridColor; }
/** \brief returns the property gridWidth. \details Description of the parameter gridWidth is: <CENTER>\copybrief gridWidth.</CENTER>. \see gridWidth for more information */ /*! \brief returns the property gridWidth. \details Description of the parameter gridWidth is: <CENTER>\copybrief gridWidth.</CENTER>. \see gridWidth for more information */
inline double get_gridWidth() const { return this->gridWidth; } inline double get_gridWidth() const { return this->gridWidth; }
/** \brief returns the property gridStyle. \details Description of the parameter gridStyle is: <CENTER>\copybrief gridStyle.</CENTER>. \see gridStyle for more information */ /*! \brief returns the property gridStyle. \details Description of the parameter gridStyle is: <CENTER>\copybrief gridStyle.</CENTER>. \see gridStyle for more information */
inline Qt::PenStyle get_gridStyle() const { return this->gridStyle; } inline Qt::PenStyle get_gridStyle() const { return this->gridStyle; }
/** \brief returns the property minorGridWidth. \details Description of the parameter minorGridWidth is: <CENTER>\copybrief minorGridWidth.</CENTER>. \see minorGridWidth for more information */ /*! \brief returns the property minorGridWidth. \details Description of the parameter minorGridWidth is: <CENTER>\copybrief minorGridWidth.</CENTER>. \see minorGridWidth for more information */
inline double get_minorGridWidth() const { return this->minorGridWidth; } inline double get_minorGridWidth() const { return this->minorGridWidth; }
/** \brief returns the property minorGridStyle. \details Description of the parameter minorGridStyle is: <CENTER>\copybrief minorGridStyle.</CENTER>. \see minorGridStyle for more information */ /*! \brief returns the property minorGridStyle. \details Description of the parameter minorGridStyle is: <CENTER>\copybrief minorGridStyle.</CENTER>. \see minorGridStyle for more information */
inline Qt::PenStyle get_minorGridStyle() const { return this->minorGridStyle; } inline Qt::PenStyle get_minorGridStyle() const { return this->minorGridStyle; }
/** \brief returns the property tickTimeFormat. \details Description of the parameter tickTimeFormat is: <CENTER>\copybrief tickTimeFormat.</CENTER>. \see tickTimeFormat for more information */ /*! \brief returns the property tickTimeFormat. \details Description of the parameter tickTimeFormat is: <CENTER>\copybrief tickTimeFormat.</CENTER>. \see tickTimeFormat for more information */
inline QString get_tickTimeFormat() const { return this->tickTimeFormat; } inline QString get_tickTimeFormat() const { return this->tickTimeFormat; }
/** \brief returns the property tickDateFormat. \details Description of the parameter tickDateFormat is: <CENTER>\copybrief tickDateFormat.</CENTER>. \see tickDateFormat for more information */ /*! \brief returns the property tickDateFormat. \details Description of the parameter tickDateFormat is: <CENTER>\copybrief tickDateFormat.</CENTER>. \see tickDateFormat for more information */
inline QString get_tickDateFormat() const { return this->tickDateFormat; } inline QString get_tickDateFormat() const { return this->tickDateFormat; }
/** \brief returns the property tickDateTimeFormat. \details Description of the parameter tickDateTimeFormat is: <CENTER>\copybrief tickDateTimeFormat.</CENTER>. \see tickDateTimeFormat for more information */ /*! \brief returns the property tickDateTimeFormat. \details Description of the parameter tickDateTimeFormat is: <CENTER>\copybrief tickDateTimeFormat.</CENTER>. \see tickDateTimeFormat for more information */
inline QString get_tickDateTimeFormat() const { return this->tickDateTimeFormat; } inline QString get_tickDateTimeFormat() const { return this->tickDateTimeFormat; }
/** \brief returns the property tickMode. \details Description of the parameter tickMode is: <CENTER>\copybrief tickMode.</CENTER>. \see tickMode for more information */ /*! \brief returns the property tickMode. \details Description of the parameter tickMode is: <CENTER>\copybrief tickMode.</CENTER>. \see tickMode for more information */
inline JKQTPLabelTickMode get_tickMode() const { return this->tickMode; } inline JKQTPLabelTickMode get_tickMode() const { return this->tickMode; }
/** \brief returns the property drawMode1. \details Description of the parameter drawMode1 is: <CENTER>\copybrief drawMode1.</CENTER>. \see drawMode1 for more information */ /*! \brief returns the property drawMode1. \details Description of the parameter drawMode1 is: <CENTER>\copybrief drawMode1.</CENTER>. \see drawMode1 for more information */
inline JKQTPCAdrawMode get_drawMode1() const { return this->drawMode1; } inline JKQTPCAdrawMode get_drawMode1() const { return this->drawMode1; }
/** \brief returns the property drawMode2. \details Description of the parameter drawMode2 is: <CENTER>\copybrief drawMode2.</CENTER>. \see drawMode2 for more information */ /*! \brief returns the property drawMode2. \details Description of the parameter drawMode2 is: <CENTER>\copybrief drawMode2.</CENTER>. \see drawMode2 for more information */
inline JKQTPCAdrawMode get_drawMode2() const { return this->drawMode2; } inline JKQTPCAdrawMode get_drawMode2() const { return this->drawMode2; }
/** \brief returns the property minorTickWidth. \details Description of the parameter minorTickWidth is: <CENTER>\copybrief minorTickWidth.</CENTER>. \see minorTickWidth for more information */ /*! \brief returns the property minorTickWidth. \details Description of the parameter minorTickWidth is: <CENTER>\copybrief minorTickWidth.</CENTER>. \see minorTickWidth for more information */
inline double get_minorTickWidth() const { return this->minorTickWidth; } inline double get_minorTickWidth() const { return this->minorTickWidth; }
/** \brief returns the property tickWidth. \details Description of the parameter tickWidth is: <CENTER>\copybrief tickWidth.</CENTER>. \see tickWidth for more information */ /*! \brief returns the property tickWidth. \details Description of the parameter tickWidth is: <CENTER>\copybrief tickWidth.</CENTER>. \see tickWidth for more information */
inline double get_tickWidth() const { return this->tickWidth; } inline double get_tickWidth() const { return this->tickWidth; }
/** \brief returns the property lineWidth. \details Description of the parameter lineWidth is: <CENTER>\copybrief lineWidth.</CENTER>. \see lineWidth for more information */ /*! \brief returns the property lineWidth. \details Description of the parameter lineWidth is: <CENTER>\copybrief lineWidth.</CENTER>. \see lineWidth for more information */
inline double get_lineWidth() const { return this->lineWidth; } inline double get_lineWidth() const { return this->lineWidth; }
/** \brief returns the property lineWidthZeroAxis. \details Description of the parameter lineWidthZeroAxis is: <CENTER>\copybrief lineWidthZeroAxis.</CENTER>. \see lineWidthZeroAxis for more information */ /*! \brief returns the property lineWidthZeroAxis. \details Description of the parameter lineWidthZeroAxis is: <CENTER>\copybrief lineWidthZeroAxis.</CENTER>. \see lineWidthZeroAxis for more information */
inline double get_lineWidthZeroAxis() const { return this->lineWidthZeroAxis; } inline double get_lineWidthZeroAxis() const { return this->lineWidthZeroAxis; }
/** \brief returns the property tickLabelDistance. \details Description of the parameter tickLabelDistance is: <CENTER>\copybrief tickLabelDistance.</CENTER>. \see tickLabelDistance for more information */ /*! \brief returns the property tickLabelDistance. \details Description of the parameter tickLabelDistance is: <CENTER>\copybrief tickLabelDistance.</CENTER>. \see tickLabelDistance for more information */
inline double get_tickLabelDistance() const { return this->tickLabelDistance; } inline double get_tickLabelDistance() const { return this->tickLabelDistance; }
/** \brief returns the property labelDistance. \details Description of the parameter labelDistance is: <CENTER>\copybrief labelDistance.</CENTER>. \see labelDistance for more information */ /*! \brief returns the property labelDistance. \details Description of the parameter labelDistance is: <CENTER>\copybrief labelDistance.</CENTER>. \see labelDistance for more information */
inline double get_labelDistance() const { return this->labelDistance; } inline double get_labelDistance() const { return this->labelDistance; }
/** \brief returns the property drawGrid. \details Description of the parameter drawGrid is: <CENTER>\copybrief drawGrid.</CENTER>. \see drawGrid for more information */ /*! \brief returns the property drawGrid. \details Description of the parameter drawGrid is: <CENTER>\copybrief drawGrid.</CENTER>. \see drawGrid for more information */
inline bool get_drawGrid() const { return this->drawGrid; } inline bool get_drawGrid() const { return this->drawGrid; }
/** \brief returns the property drawMinorGrid. \details Description of the parameter drawMinorGrid is: <CENTER>\copybrief drawMinorGrid.</CENTER>. \see drawMinorGrid for more information */ /*! \brief returns the property drawMinorGrid. \details Description of the parameter drawMinorGrid is: <CENTER>\copybrief drawMinorGrid.</CENTER>. \see drawMinorGrid for more information */
inline bool get_drawMinorGrid() const { return this->drawMinorGrid; } inline bool get_drawMinorGrid() const { return this->drawMinorGrid; }
JKQTPGET_SET_MACRO(bool, autoLabelDigits) /*! \brief sets the property autoLabelDigits to the specified \a __value.
/** \brief returns the property parent. \details Description of the parameter parent is: <CENTER>\copybrief parent.</CENTER>. \see parent for more information */ \details Description of the parameter autoLabelDigits is: <CENTER>\copybrief autoLabelDigits.</CENTER>
\see autoLabelDigits for more information */
inline virtual void set_autoLabelDigits(bool __value)
{
this->autoLabelDigits = __value;
}
/*! \brief returns the property autoLabelDigits.
\details Description of the parameter autoLabelDigits is: <CENTER>\copybrief autoLabelDigits.</CENTER>
\see autoLabelDigits for more information */
inline virtual bool get_autoLabelDigits() const
{
return this->autoLabelDigits;
}
/*! \brief returns the property parent. \details Description of the parameter parent is: <CENTER>\copybrief parent.</CENTER>. \see parent for more information */
inline JKQtBasePlotter* get_parent() const { return this->parent; } inline JKQtBasePlotter* get_parent() const { return this->parent; }
JKQTPGET_SET_MACRO(bool, doUpdateScaling) /*! \brief sets the property doUpdateScaling to the specified \a __value.
\details Description of the parameter doUpdateScaling is: <CENTER>\copybrief doUpdateScaling.</CENTER>
\see doUpdateScaling for more information */
inline virtual void set_doUpdateScaling(bool __value)
{
this->doUpdateScaling = __value;
}
/*! \brief returns the property doUpdateScaling.
\details Description of the parameter doUpdateScaling is: <CENTER>\copybrief doUpdateScaling.</CENTER>
\see doUpdateScaling for more information */
inline virtual bool get_doUpdateScaling() const
{
return this->doUpdateScaling;
}
/** \brief returns the current min */ /** \brief returns the current min */
@ -640,41 +666,41 @@ class LIB_EXPORT JKQTPcoordinateAxis: public QObject {
bool autoLabelDigits; bool autoLabelDigits;
/** \brief indicates whether the object should use automatic tick spacing for the x axis (calculated by calcPlotScaling() ) */ /** \brief indicates whether the object should use automatic tick spacing for the x axis (calculated by calcPlotScaling() ) */
bool autoAxisSpacing; bool autoAxisSpacing;
/** \brief default value for property property varname. \see autoAxisSpacing for more information */ /*! \brief default value for property property varname. \see autoAxisSpacing for more information */
bool def_autoAxisSpacing; bool def_autoAxisSpacing;
/** \brief if \c true, the plotter displays minor axis labels as number between 1 and 10 in some cases */ /** \brief if \c true, the plotter displays minor axis labels as number between 1 and 10 in some cases */
bool minorTickLabelsEnabled; bool minorTickLabelsEnabled;
/** \brief default value for property property varname. \see minorTickLabelsEnabled for more information */ /*! \brief default value for property property varname. \see minorTickLabelsEnabled for more information */
bool def_minorTickLabelsEnabled; bool def_minorTickLabelsEnabled;
/** \brief indicates whether the y axis has a logarithmic scale */ /** \brief indicates whether the y axis has a logarithmic scale */
bool logAxis; bool logAxis;
/** \brief default value for property property varname. \see logAxis for more information */ /*! \brief default value for property property varname. \see logAxis for more information */
bool def_logAxis; bool def_logAxis;
/** \brief the base for a logarithmic x axis */ /** \brief the base for a logarithmic x axis */
double logAxisBase; double logAxisBase;
/** \brief default value for property property varname. \see logAxisBase for more information */ /*! \brief default value for property property varname. \see logAxisBase for more information */
double def_logAxisBase; double def_logAxisBase;
/** \brief if autoXAxisSpacing is \c false then this value is used for xTickSpacing. So this is the property which /** \brief if autoXAxisSpacing is \c false then this value is used for xTickSpacing. So this is the property which
* is editable by use of public access methods. * is editable by use of public access methods.
*/ */
double userTickSpacing; double userTickSpacing;
/** \brief default value for property property varname. \see userTickSpacing for more information */ /*! \brief default value for property property varname. \see userTickSpacing for more information */
double def_userTickSpacing; double def_userTickSpacing;
/** \brief if autoXAxisSpacing is \c false then this value is used for xTickSpacing. So this is the property which /** \brief if autoXAxisSpacing is \c false then this value is used for xTickSpacing. So this is the property which
* is editable by use of public access methods. * is editable by use of public access methods.
*/ */
double userLogTickSpacing; double userLogTickSpacing;
/** \brief default value for property property varname. \see userLogTickSpacing for more information */ /*! \brief default value for property property varname. \see userLogTickSpacing for more information */
double def_userLogTickSpacing; double def_userLogTickSpacing;
/** \brief indicates how to draw the labels */ /** \brief indicates how to draw the labels */
JKQTPCAlabelType labelType; JKQTPCAlabelType labelType;
/** \brief default value for property property varname. \see labelType for more information */ /*! \brief default value for property property varname. \see labelType for more information */
JKQTPCAlabelType def_labelType; JKQTPCAlabelType def_labelType;
/** \brief mode of the major ticks */ /** \brief mode of the major ticks */
JKQTPLabelTickMode tickMode; JKQTPLabelTickMode tickMode;
/** \brief default value for property property varname. \see tickMode for more information */ /*! \brief default value for property property varname. \see tickMode for more information */
JKQTPLabelTickMode def_tickMode; JKQTPLabelTickMode def_tickMode;
/** \brief axis label of the axis */ /** \brief axis label of the axis */
@ -682,75 +708,75 @@ class LIB_EXPORT JKQTPcoordinateAxis: public QObject {
/** \brief position of the axis label */ /** \brief position of the axis label */
JKQTPlabelPosition labelPosition; JKQTPlabelPosition labelPosition;
/** \brief default value for property property varname. \see labelPosition for more information */ /*! \brief default value for property property varname. \see labelPosition for more information */
JKQTPlabelPosition def_labelPosition; JKQTPlabelPosition def_labelPosition;
/** \brief font of the axis labels */ /** \brief font of the axis labels */
QString labelFont; QString labelFont;
/** \brief default value for property property varname. \see labelFont for more information */ /*! \brief default value for property property varname. \see labelFont for more information */
QString def_labelFont; QString def_labelFont;
/** \brief fontsize of the axis labels */ /** \brief fontsize of the axis labels */
double labelFontSize; double labelFontSize;
/** \brief default value for property property varname. \see labelFontSize for more information */ /*! \brief default value for property property varname. \see labelFontSize for more information */
double def_labelFontSize; double def_labelFontSize;
/** \brief font of the axis tick labels */ /** \brief font of the axis tick labels */
QString tickLabelFont; QString tickLabelFont;
/** \brief default value for property property varname. \see tickLabelFont for more information */ /*! \brief default value for property property varname. \see tickLabelFont for more information */
QString def_tickLabelFont; QString def_tickLabelFont;
/** \brief fontsize of the axis tick labels */ /** \brief fontsize of the axis tick labels */
double tickLabelFontSize; double tickLabelFontSize;
/** \brief default value for property property varname. \see tickLabelFontSize for more information */ /*! \brief default value for property property varname. \see tickLabelFontSize for more information */
double def_tickLabelFontSize; double def_tickLabelFontSize;
/** \brief fontsize of the minor axis tick labels */ /** \brief fontsize of the minor axis tick labels */
double minorTickLabelFontSize; double minorTickLabelFontSize;
/** \brief default value for property property varname. \see minorTickLabelFontSize for more information */ /*! \brief default value for property property varname. \see minorTickLabelFontSize for more information */
double def_minorTickLabelFontSize; double def_minorTickLabelFontSize;
/** \brief indicates whether to draw a thick axis line at x=0 (zero axis) */ /** \brief indicates whether to draw a thick axis line at x=0 (zero axis) */
bool showZeroAxis; bool showZeroAxis;
/** \brief default value for property property varname. \see showZeroAxis for more information */ /*! \brief default value for property property varname. \see showZeroAxis for more information */
bool def_showZeroAxis; bool def_showZeroAxis;
/** \brief indicates whether the minor tick labels should be full numbers, or just a number between 0..10 */ /** \brief indicates whether the minor tick labels should be full numbers, or just a number between 0..10 */
bool minorTickLabelFullNumber; bool minorTickLabelFullNumber;
/** \brief default value for property property varname. \see minorTickLabelFullNumber for more information */ /*! \brief default value for property property varname. \see minorTickLabelFullNumber for more information */
bool def_minorTickLabelFullNumber; bool def_minorTickLabelFullNumber;
/** \brief draw mode of the main (left/bottom) axis */ /** \brief draw mode of the main (left/bottom) axis */
JKQTPCAdrawMode drawMode1; JKQTPCAdrawMode drawMode1;
/** \brief default value for property property varname. \see drawMode1 for more information */ /*! \brief default value for property property varname. \see drawMode1 for more information */
JKQTPCAdrawMode def_drawMode1; JKQTPCAdrawMode def_drawMode1;
/** \brief draw mode of the secondary (right/top) axis */ /** \brief draw mode of the secondary (right/top) axis */
JKQTPCAdrawMode drawMode2; JKQTPCAdrawMode drawMode2;
/** \brief default value for property property varname. \see drawMode2 for more information */ /*! \brief default value for property property varname. \see drawMode2 for more information */
JKQTPCAdrawMode def_drawMode2; JKQTPCAdrawMode def_drawMode2;
/** \brief line width of minor ticks in pixels */ /** \brief line width of minor ticks in pixels */
double minorTickWidth; double minorTickWidth;
/** \brief default value for property property varname. \see minorTickWidth for more information */ /*! \brief default value for property property varname. \see minorTickWidth for more information */
double def_minorTickWidth; double def_minorTickWidth;
/** \brief line width of ticks in pixels */ /** \brief line width of ticks in pixels */
double tickWidth; double tickWidth;
/** \brief default value for property property varname. \see tickWidth for more information */ /*! \brief default value for property property varname. \see tickWidth for more information */
double def_tickWidth; double def_tickWidth;
/** \brief line width of axis in pixels */ /** \brief line width of axis in pixels */
double lineWidth; double lineWidth;
/** \brief default value for property property varname. \see lineWidth for more information */ /*! \brief default value for property property varname. \see lineWidth for more information */
double def_lineWidth; double def_lineWidth;
/** \brief line width of 0-line in pixels */ /** \brief line width of 0-line in pixels */
double lineWidthZeroAxis; double lineWidthZeroAxis;
/** \brief default value for property property varname. \see lineWidthZeroAxis for more information */ /*! \brief default value for property property varname. \see lineWidthZeroAxis for more information */
double def_lineWidthZeroAxis; double def_lineWidthZeroAxis;
/** \brief format string for time tick labels, see see QDateTime::toString() documentation for details on format strings */ /** \brief format string for time tick labels, see see QDateTime::toString() documentation for details on format strings */
QString tickTimeFormat; QString tickTimeFormat;
/** \brief default value for property property varname. \see tickTimeFormat for more information */ /*! \brief default value for property property varname. \see tickTimeFormat for more information */
QString def_tickTimeFormat; QString def_tickTimeFormat;
/** \brief format string for date tick labels, see see QDateTime::toString() documentation for details on format strings */ /** \brief format string for date tick labels, see see QDateTime::toString() documentation for details on format strings */
QString tickDateFormat; QString tickDateFormat;
/** \brief default value for property property varname. \see tickDateFormat for more information */ /*! \brief default value for property property varname. \see tickDateFormat for more information */
QString def_tickDateFormat; QString def_tickDateFormat;
/** \brief format string for datetime tick labels, see see QDateTime::toString() documentation for details on format strings */ /** \brief format string for datetime tick labels, see see QDateTime::toString() documentation for details on format strings */
QString tickDateTimeFormat; QString tickDateTimeFormat;
/** \brief default value for property property varname. \see tickDateTimeFormat for more information */ /*! \brief default value for property property varname. \see tickDateTimeFormat for more information */
QString def_tickDateTimeFormat; QString def_tickDateTimeFormat;
/** \brief calculates the tick spacing for a linear axis that spans \a awidth and that should /** \brief calculates the tick spacing for a linear axis that spans \a awidth and that should
@ -788,76 +814,76 @@ class LIB_EXPORT JKQTPcoordinateAxis: public QObject {
/** \brief minimum number of axis ticks */ /** \brief minimum number of axis ticks */
unsigned int minTicks; unsigned int minTicks;
/** \brief default value for property property varname. \see minTicks for more information */ /*! \brief default value for property property varname. \see minTicks for more information */
unsigned int def_minTicks; unsigned int def_minTicks;
/** \brief number of minor grid lines per axis tick interval */ /** \brief number of minor grid lines per axis tick interval */
unsigned int minorTicks; unsigned int minorTicks;
/** \brief default value for property property varname. \see minorTicks for more information */ /*! \brief default value for property property varname. \see minorTicks for more information */
unsigned int def_minorTicks; unsigned int def_minorTicks;
/** \brief length of an axis tick outside the plot border in pt */ /** \brief length of an axis tick outside the plot border in pt */
double tickOutsideLength; double tickOutsideLength;
/** \brief default value for property property varname. \see tickOutsideLength for more information */ /*! \brief default value for property property varname. \see tickOutsideLength for more information */
double def_tickOutsideLength; double def_tickOutsideLength;
/** \brief length of a minor axis tick outside the plot border in pt */ /** \brief length of a minor axis tick outside the plot border in pt */
double minorTickOutsideLength; double minorTickOutsideLength;
/** \brief default value for property property varname. \see minorTickOutsideLength for more information */ /*! \brief default value for property property varname. \see minorTickOutsideLength for more information */
double def_minorTickOutsideLength; double def_minorTickOutsideLength;
/** \brief length of an axis tick inside the plot border in pt */ /** \brief length of an axis tick inside the plot border in pt */
double tickInsideLength; double tickInsideLength;
/** \brief default value for property property varname. \see tickInsideLength for more information */ /*! \brief default value for property property varname. \see tickInsideLength for more information */
double def_tickInsideLength; double def_tickInsideLength;
/** \brief length of a minor axis tick inside the plot border in pt */ /** \brief length of a minor axis tick inside the plot border in pt */
double minorTickInsideLength; double minorTickInsideLength;
/** \brief default value for property property varname. \see minorTickInsideLength for more information */ /*! \brief default value for property property varname. \see minorTickInsideLength for more information */
double def_minorTickInsideLength; double def_minorTickInsideLength;
/** \brief color of the axis (labels, ticks, axis itself ...) */ /** \brief color of the axis (labels, ticks, axis itself ...) */
QColor axisColor; QColor axisColor;
/** \brief default value for property property varname. \see axisColor for more information */ /*! \brief default value for property property varname. \see axisColor for more information */
QColor def_axisColor; QColor def_axisColor;
/** \brief distance between tick end and label start in pt */ /** \brief distance between tick end and label start in pt */
double tickLabelDistance; double tickLabelDistance;
/** \brief default value for property property varname. \see tickLabelDistance for more information */ /*! \brief default value for property property varname. \see tickLabelDistance for more information */
double def_tickLabelDistance; double def_tickLabelDistance;
/** \brief distance between tick label and axis label in pt */ /** \brief distance between tick label and axis label in pt */
double labelDistance; double labelDistance;
/** \brief default value for property property varname. \see labelDistance for more information */ /*! \brief default value for property property varname. \see labelDistance for more information */
double def_labelDistance; double def_labelDistance;
/** \brief rotation angle of tick labels [-180..180], i.e. given in degrees, default is 0 (horizontal) */ /** \brief rotation angle of tick labels [-180..180], i.e. given in degrees, default is 0 (horizontal) */
double tickLabelAngle; double tickLabelAngle;
/** \brief default value for property property varname. \see tickLabelAngle for more information */ /*! \brief default value for property property varname. \see tickLabelAngle for more information */
double def_tickLabelAngle; double def_tickLabelAngle;
/** \brief indicates whether to draw the major grid lines */ /** \brief indicates whether to draw the major grid lines */
bool drawGrid; bool drawGrid;
/** \brief default value for property property varname. \see drawGrid for more information */ /*! \brief default value for property property varname. \see drawGrid for more information */
bool def_drawGrid; bool def_drawGrid;
/** \brief indicates whether to draw the minor grid lines */ /** \brief indicates whether to draw the minor grid lines */
bool drawMinorGrid; bool drawMinorGrid;
/** \brief default value for property property varname. \see drawMinorGrid for more information */ /*! \brief default value for property property varname. \see drawMinorGrid for more information */
bool def_drawMinorGrid; bool def_drawMinorGrid;
/** \brief color of the grid*/ /** \brief color of the grid*/
QColor gridColor; QColor gridColor;
/** \brief default value for property property varname. \see gridColor for more information */ /*! \brief default value for property property varname. \see gridColor for more information */
QColor def_gridColor; QColor def_gridColor;
/** \brief color of the minor grid lines */ /** \brief color of the minor grid lines */
QColor minorGridColor; QColor minorGridColor;
/** \brief default value for property property varname. \see minorGridColor for more information */ /*! \brief default value for property property varname. \see minorGridColor for more information */
QColor def_minorGridColor; QColor def_minorGridColor;
/** \brief width of the grid lines (in pixel) */ /** \brief width of the grid lines (in pixel) */
double gridWidth; double gridWidth;
/** \brief default value for property property varname. \see gridWidth for more information */ /*! \brief default value for property property varname. \see gridWidth for more information */
double def_gridWidth; double def_gridWidth;
/** \brief line stye of the grid lines */ /** \brief line stye of the grid lines */
Qt::PenStyle gridStyle; Qt::PenStyle gridStyle;
/** \brief default value for property property varname. \see gridStyle for more information */ /*! \brief default value for property property varname. \see gridStyle for more information */
Qt::PenStyle def_gridStyle; Qt::PenStyle def_gridStyle;
/** \brief width of the minor grid lines (in pixel) */ /** \brief width of the minor grid lines (in pixel) */
double minorGridWidth; double minorGridWidth;
/** \brief default value for property property varname. \see minorGridWidth for more information */ /*! \brief default value for property property varname. \see minorGridWidth for more information */
double def_minorGridWidth; double def_minorGridWidth;
/** \brief line stye of the minor grid lines */ /** \brief line stye of the minor grid lines */
Qt::PenStyle minorGridStyle; Qt::PenStyle minorGridStyle;
/** \brief default value for property property varname. \see minorGridStyle for more information */ /*! \brief default value for property property varname. \see minorGridStyle for more information */
Qt::PenStyle def_minorGridStyle; Qt::PenStyle def_minorGridStyle;
/** \brief axis prefix for storage of parameters */ /** \brief axis prefix for storage of parameters */

938
lib/jkqtplotter/jkqtpbaseplotter.h
View File

File diff suppressed because it is too large Load Diff

12
lib/jkqtplotter/jkqtpdatastorage.h
View File

@ -637,12 +637,12 @@ class LIB_EXPORT JKQTPcolumn {
/** \brief class destructor */ /** \brief class destructor */
~JKQTPcolumn() ; ~JKQTPcolumn() ;
/** \brief sets the property name to the specified \a __value. \details Description of the parameter name is: <CENTER>\copybrief name.</CENTER> \see name for more information */ /*! \brief sets the property name to the specified \a __value. \details Description of the parameter name is: <CENTER>\copybrief name.</CENTER> \see name for more information */
inline void set_name (const QString& __value) inline void set_name (const QString& __value)
{ {
this->name = __value; this->name = __value;
} }
/** \brief returns the property name. \see name for more information */ /*! \brief returns the property name. \see name for more information */
inline QString get_name () const inline QString get_name () const
{ {
return this->name; return this->name;
@ -724,10 +724,10 @@ class LIB_EXPORT JKQTPcolumn {
void setAll(double value); void setAll(double value);
/** \brief returns the property datastoreItem. \details Description of the parameter datastoreItem is: <CENTER>\copybrief datastoreItem.</CENTER>. \see datastoreItem for more information */ \ /*! \brief returns the property datastoreItem. \details Description of the parameter datastoreItem is: <CENTER>\copybrief datastoreItem.</CENTER>. \see datastoreItem for more information */ \
inline size_t get_datastoreItem() const \ inline size_t get_datastoreItem() const \
{ return this->datastoreItem; } { return this->datastoreItem; }
/** \brief returns the property datastoreOffset. \details Description of the parameter datastoreOffset is: <CENTER>\copybrief datastoreOffset.</CENTER>. \see datastoreOffset for more information */ \ /*! \brief returns the property datastoreOffset. \details Description of the parameter datastoreOffset is: <CENTER>\copybrief datastoreOffset.</CENTER>. \see datastoreOffset for more information */ \
inline size_t get_datastoreOffset() const \ inline size_t get_datastoreOffset() const \
{ return this->datastoreOffset; } { return this->datastoreOffset; }
}; };
@ -784,10 +784,10 @@ class LIB_EXPORT JKQTPdatastoreItem {
/** \brief change the size of all columns to the givne number of rows. The data will be lost */ /** \brief change the size of all columns to the givne number of rows. The data will be lost */
void resizeColumns(size_t rows); void resizeColumns(size_t rows);
/** \brief returns the property rows. \details Description of the parameter rows is: <CENTER>\copybrief rows.</CENTER>. \see rows for more information */ \ /*! \brief returns the property rows. \details Description of the parameter rows is: <CENTER>\copybrief rows.</CENTER>. \see rows for more information */ \
inline size_t get_rows() const inline size_t get_rows() const
{ return rows; } { return rows; }
/** \brief returns the property columns. \details Description of the parameter columns is: <CENTER>\copybrief columns.</CENTER>. \see columns for more information */ \ /*! \brief returns the property columns. \details Description of the parameter columns is: <CENTER>\copybrief columns.</CENTER>. \see columns for more information */ \
inline size_t get_columns() const inline size_t get_columns() const
{ return columns; } { return columns; }

255
lib/jkqtplotter/jkqtpelementsoverlay.h
View File

@ -61,15 +61,132 @@ class LIB_EXPORT JKQTPoverlayElement : public QObject {
/** \brief sets the parent painter class */ /** \brief sets the parent painter class */
virtual void setParent(JKQtBasePlotter* parent); virtual void setParent(JKQtBasePlotter* parent);
JKQTPGET_SET_MACRO(QColor, color) /*! \brief sets the property color to the specified \a __value.
JKQTPGET_SET_MACRO(QColor, fillColor) \details Description of the parameter color is: <CENTER>\copybrief color.</CENTER>
JKQTPGET_SET_MACRO(Qt::PenStyle, lineStyle) \see color for more information */
JKQTPGET_SET_MACRO(Qt::BrushStyle, fillStyle) inline virtual void set_color(const QColor & __value)
JKQTPGET_SET_MACRO(double, lineWidth) {
JKQTPGET_SET_MACRO(QString, text) this->color = __value;
JKQTPGET_SET_MACRO(QString, fontName) }
JKQTPGET_SET_MACRO(double, fontSize) /*! \brief returns the property color.
JKQTPGET_SET_MACRO(bool, visible) \details Description of the parameter color is: <CENTER>\copybrief color.</CENTER>
\see color for more information */
inline virtual QColor get_color() const
{
return this->color;
}
/*! \brief sets the property fillColor to the specified \a __value.
\details Description of the parameter fillColor is: <CENTER>\copybrief fillColor.</CENTER>
\see fillColor for more information */
inline virtual void set_fillColor(const QColor & __value)
{
this->fillColor = __value;
}
/*! \brief returns the property fillColor.
\details Description of the parameter fillColor is: <CENTER>\copybrief fillColor.</CENTER>
\see fillColor for more information */
inline virtual QColor get_fillColor() const
{
return this->fillColor;
}
/*! \brief sets the property lineStyle to the specified \a __value.
\details Description of the parameter lineStyle is: <CENTER>\copybrief lineStyle.</CENTER>
\see lineStyle for more information */
inline virtual void set_lineStyle(const Qt::PenStyle & __value)
{
this->lineStyle = __value;
}
/*! \brief returns the property lineStyle.
\details Description of the parameter lineStyle is: <CENTER>\copybrief lineStyle.</CENTER>
\see lineStyle for more information */
inline virtual Qt::PenStyle get_lineStyle() const
{
return this->lineStyle;
}
/*! \brief sets the property fillStyle to the specified \a __value.
\details Description of the parameter fillStyle is: <CENTER>\copybrief fillStyle.</CENTER>
\see fillStyle for more information */
inline virtual void set_fillStyle(const Qt::BrushStyle & __value)
{
this->fillStyle = __value;
}
/*! \brief returns the property fillStyle.
\details Description of the parameter fillStyle is: <CENTER>\copybrief fillStyle.</CENTER>
\see fillStyle for more information */
inline virtual Qt::BrushStyle get_fillStyle() const
{
return this->fillStyle;
}
/*! \brief sets the property lineWidth to the specified \a __value.
\details Description of the parameter lineWidth is: <CENTER>\copybrief lineWidth.</CENTER>
\see lineWidth for more information */
inline virtual void set_lineWidth(double __value)
{
this->lineWidth = __value;
}
/*! \brief returns the property lineWidth.
\details Description of the parameter lineWidth is: <CENTER>\copybrief lineWidth.</CENTER>
\see lineWidth for more information */
inline virtual double get_lineWidth() const
{
return this->lineWidth;
}
/*! \brief sets the property text to the specified \a __value.
\details Description of the parameter text is: <CENTER>\copybrief text.</CENTER>
\see text for more information */
inline virtual void set_text(const QString & __value)
{
this->text = __value;
}
/*! \brief returns the property text.
\details Description of the parameter text is: <CENTER>\copybrief text.</CENTER>
\see text for more information */
inline virtual QString get_text() const
{
return this->text;
}
/*! \brief sets the property fontName to the specified \a __value.
\details Description of the parameter fontName is: <CENTER>\copybrief fontName.</CENTER>
\see fontName for more information */
inline virtual void set_fontName(const QString & __value)
{
this->fontName = __value;
}
/*! \brief returns the property fontName.
\details Description of the parameter fontName is: <CENTER>\copybrief fontName.</CENTER>
\see fontName for more information */
inline virtual QString get_fontName() const
{
return this->fontName;
}
/*! \brief sets the property fontSize to the specified \a __value.
\details Description of the parameter fontSize is: <CENTER>\copybrief fontSize.</CENTER>
\see fontSize for more information */
inline virtual void set_fontSize(double __value)
{
this->fontSize = __value;
}
/*! \brief returns the property fontSize.
\details Description of the parameter fontSize is: <CENTER>\copybrief fontSize.</CENTER>
\see fontSize for more information */
inline virtual double get_fontSize() const
{
return this->fontSize;
}
/*! \brief sets the property visible to the specified \a __value.
\details Description of the parameter visible is: <CENTER>\copybrief visible.</CENTER>
\see visible for more information */
inline virtual void set_visible(bool __value)
{
this->visible = __value;
}
/*! \brief returns the property visible.
\details Description of the parameter visible is: <CENTER>\copybrief visible.</CENTER>
\see visible for more information */
inline virtual bool get_visible() const
{
return this->visible;
}
protected: protected:
/** \brief the plotter object this object belongs to */ /** \brief the plotter object this object belongs to */
@ -132,10 +249,62 @@ class LIB_EXPORT JKQTPoverlayTwoPositionOverlay : public JKQTPoverlayElement {
public: public:
explicit JKQTPoverlayTwoPositionOverlay(double x1, double y1, double x2, double y2, JKQtBasePlotter *parent = 0); explicit JKQTPoverlayTwoPositionOverlay(double x1, double y1, double x2, double y2, JKQtBasePlotter *parent = 0);
JKQTPGET_SET_MACRO(double, x1) /*! \brief sets the property x1 to the specified \a __value.
JKQTPGET_SET_MACRO(double, x2) \details Description of the parameter x1 is: <CENTER>\copybrief x1.</CENTER>
JKQTPGET_SET_MACRO(double, y1) \see x1 for more information */
JKQTPGET_SET_MACRO(double, y2) inline virtual void set_x1(double __value)
{
this->x1 = __value;
}
/*! \brief returns the property x1.
\details Description of the parameter x1 is: <CENTER>\copybrief x1.</CENTER>
\see x1 for more information */
inline virtual double get_x1() const
{
return this->x1;
}
/*! \brief sets the property x2 to the specified \a __value.
\details Description of the parameter x2 is: <CENTER>\copybrief x2.</CENTER>
\see x2 for more information */
inline virtual void set_x2(double __value)
{
this->x2 = __value;
}
/*! \brief returns the property x2.
\details Description of the parameter x2 is: <CENTER>\copybrief x2.</CENTER>
\see x2 for more information */
inline virtual double get_x2() const
{
return this->x2;
}
/*! \brief sets the property y1 to the specified \a __value.
\details Description of the parameter y1 is: <CENTER>\copybrief y1.</CENTER>
\see y1 for more information */
inline virtual void set_y1(double __value)
{
this->y1 = __value;
}
/*! \brief returns the property y1.
\details Description of the parameter y1 is: <CENTER>\copybrief y1.</CENTER>
\see y1 for more information */
inline virtual double get_y1() const
{
return this->y1;
}
/*! \brief sets the property y2 to the specified \a __value.
\details Description of the parameter y2 is: <CENTER>\copybrief y2.</CENTER>
\see y2 for more information */
inline virtual void set_y2(double __value)
{
this->y2 = __value;
}
/*! \brief returns the property y2.
\details Description of the parameter y2 is: <CENTER>\copybrief y2.</CENTER>
\see y2 for more information */
inline virtual double get_y2() const
{
return this->y2;
}
protected: protected:
double x1; double x1;
double y1; double y1;
@ -153,7 +322,20 @@ class LIB_EXPORT JKQTPoverlayOneCoordOverlay : public JKQTPoverlayElement {
public: public:
explicit JKQTPoverlayOneCoordOverlay(double pos, JKQtBasePlotter *parent = 0); explicit JKQTPoverlayOneCoordOverlay(double pos, JKQtBasePlotter *parent = 0);
JKQTPGET_SET_MACRO(double, position) /*! \brief sets the property position to the specified \a __value.
\details Description of the parameter position is: <CENTER>\copybrief position.</CENTER>
\see position for more information */
inline virtual void set_position(double __value)
{
this->position = __value;
}
/*! \brief returns the property position.
\details Description of the parameter position is: <CENTER>\copybrief position.</CENTER>
\see position for more information */
inline virtual double get_position() const
{
return this->position;
}
protected: protected:
double position; double position;
}; };
@ -168,7 +350,20 @@ class LIB_EXPORT JKQTPoverlayTwoCoordOverlay : public JKQTPoverlayOneCoordOverla
public: public:
explicit JKQTPoverlayTwoCoordOverlay(double pos, double pos2, JKQtBasePlotter *parent = 0); explicit JKQTPoverlayTwoCoordOverlay(double pos, double pos2, JKQtBasePlotter *parent = 0);
JKQTPGET_SET_MACRO(double, position2) /*! \brief sets the property position2 to the specified \a __value.
\details Description of the parameter position2 is: <CENTER>\copybrief position2.</CENTER>
\see position2 for more information */
inline virtual void set_position2(double __value)
{
this->position2 = __value;
}
/*! \brief returns the property position2.
\details Description of the parameter position2 is: <CENTER>\copybrief position2.</CENTER>
\see position2 for more information */
inline virtual double get_position2() const
{
return this->position2;
}
protected: protected:
double position2; double position2;
}; };
@ -207,7 +402,20 @@ class LIB_EXPORT JKQTPoverlayVerticalRange : public JKQTPoverlayTwoCoordOverlay
/** \brief plots the graph to the plotter object specified as parent */ /** \brief plots the graph to the plotter object specified as parent */
virtual void draw(JKQTPEnhancedPainter& painter); virtual void draw(JKQTPEnhancedPainter& painter);
JKQTPGET_SET_MACRO(bool, inverted) /*! \brief sets the property inverted to the specified \a __value.
\details Description of the parameter inverted is: <CENTER>\copybrief inverted.</CENTER>
\see inverted for more information */
inline virtual void set_inverted(bool __value)
{
this->inverted = __value;
}
/*! \brief returns the property inverted.
\details Description of the parameter inverted is: <CENTER>\copybrief inverted.</CENTER>
\see inverted for more information */
inline virtual bool get_inverted() const
{
return this->inverted;
}
protected: protected:
/** \brief if set \c false, the range is filled, otherwise everything outside the range is filled */ /** \brief if set \c false, the range is filled, otherwise everything outside the range is filled */
bool inverted; bool inverted;
@ -225,7 +433,20 @@ class LIB_EXPORT JKQTPoverlayLine : public JKQTPoverlayTwoPositionOverlay {
/** \brief plots the graph to the plotter object specified as parent */ /** \brief plots the graph to the plotter object specified as parent */
virtual void draw(JKQTPEnhancedPainter& painter); virtual void draw(JKQTPEnhancedPainter& painter);
JKQTPGET_SET_MACRO(bool, infinite) /*! \brief sets the property infinite to the specified \a __value.
\details Description of the parameter infinite is: <CENTER>\copybrief infinite.</CENTER>
\see infinite for more information */
inline virtual void set_infinite(bool __value)
{
this->infinite = __value;
}
/*! \brief returns the property infinite.
\details Description of the parameter infinite is: <CENTER>\copybrief infinite.</CENTER>
\see infinite for more information */
inline virtual bool get_infinite() const
{
return this->infinite;
}
protected: protected:
/** \brief the line goes on infinitely */ /** \brief the line goes on infinitely */
bool infinite; bool infinite;

725
lib/jkqtplotter/jkqtpgraphs.h
View File

@ -74,16 +74,146 @@ class LIB_EXPORT JKQTPxyLineGraph: public JKQTPxyGraph {
/** \brief returns the color to be used for the key label */ /** \brief returns the color to be used for the key label */
virtual QColor getKeyLabelColor() override; virtual QColor getKeyLabelColor() override;
JKQTPGET_SET_MACRO(QColor, color) /*! \brief sets the property color to the specified \a __value.
JKQTPGET_SET_MACRO(QColor, fillColor) \details Description of the parameter color is: <CENTER>\copybrief color.</CENTER>
JKQTPGET_SET_MACRO(Qt::PenStyle, style) \see color for more information */
JKQTPGET_SET_MACRO(double, lineWidth) inline virtual void set_color(const QColor & __value)
JKQTPGET_SET_MACRO(JKQTPgraphSymbols, symbol) {
JKQTPGET_SET_MACRO(double, symbolWidth) this->color = __value;
JKQTPGET_SET_MACRO(double, symbolSize) }
JKQTPGET_SET_MACRO(bool, drawLine) /*! \brief returns the property color.
JKQTPGET_SET_MACRO(bool, drawSelectionLine) \details Description of the parameter color is: <CENTER>\copybrief color.</CENTER>
JKQTPGET_SET_MACRO(QColor, selectionLineColor) \see color for more information */
inline virtual QColor get_color() const
{
return this->color;
}
/*! \brief sets the property fillColor to the specified \a __value.
\details Description of the parameter fillColor is: <CENTER>\copybrief fillColor.</CENTER>
\see fillColor for more information */
inline virtual void set_fillColor(const QColor & __value)
{
this->fillColor = __value;
}
/*! \brief returns the property fillColor.
\details Description of the parameter fillColor is: <CENTER>\copybrief fillColor.</CENTER>
\see fillColor for more information */
inline virtual QColor get_fillColor() const
{
return this->fillColor;
}
/*! \brief sets the property style to the specified \a __value.
\details Description of the parameter style is: <CENTER>\copybrief style.</CENTER>
\see style for more information */
inline virtual void set_style(const Qt::PenStyle & __value)
{
this->style = __value;
}
/*! \brief returns the property style.
\details Description of the parameter style is: <CENTER>\copybrief style.</CENTER>
\see style for more information */
inline virtual Qt::PenStyle get_style() const
{
return this->style;
}
/*! \brief sets the property lineWidth to the specified \a __value.
\details Description of the parameter lineWidth is: <CENTER>\copybrief lineWidth.</CENTER>
\see lineWidth for more information */
inline virtual void set_lineWidth(double __value)
{
this->lineWidth = __value;
}
/*! \brief returns the property lineWidth.
\details Description of the parameter lineWidth is: <CENTER>\copybrief lineWidth.</CENTER>
\see lineWidth for more information */
inline virtual double get_lineWidth() const
{
return this->lineWidth;
}
/*! \brief sets the property symbol to the specified \a __value.
\details Description of the parameter symbol is: <CENTER>\copybrief symbol.</CENTER>
\see symbol for more information */
inline virtual void set_symbol(const JKQTPgraphSymbols & __value)
{
this->symbol = __value;
}
/*! \brief returns the property symbol.
\details Description of the parameter symbol is: <CENTER>\copybrief symbol.</CENTER>
\see symbol for more information */
inline virtual JKQTPgraphSymbols get_symbol() const
{
return this->symbol;
}
/*! \brief sets the property symbolWidth to the specified \a __value.
\details Description of the parameter symbolWidth is: <CENTER>\copybrief symbolWidth.</CENTER>
\see symbolWidth for more information */
inline virtual void set_symbolWidth(double __value)
{
this->symbolWidth = __value;
}
/*! \brief returns the property symbolWidth.
\details Description of the parameter symbolWidth is: <CENTER>\copybrief symbolWidth.</CENTER>
\see symbolWidth for more information */
inline virtual double get_symbolWidth() const
{
return this->symbolWidth;
}
/*! \brief sets the property symbolSize to the specified \a __value.
\details Description of the parameter symbolSize is: <CENTER>\copybrief symbolSize.</CENTER>
\see symbolSize for more information */
inline virtual void set_symbolSize(double __value)
{
this->symbolSize = __value;
}
/*! \brief returns the property symbolSize.
\details Description of the parameter symbolSize is: <CENTER>\copybrief symbolSize.</CENTER>
\see symbolSize for more information */
inline virtual double get_symbolSize() const
{
return this->symbolSize;
}
/*! \brief sets the property drawLine to the specified \a __value.
\details Description of the parameter drawLine is: <CENTER>\copybrief drawLine.</CENTER>
\see drawLine for more information */
inline virtual void set_drawLine(bool __value)
{
this->drawLine = __value;
}
/*! \brief returns the property drawLine.
\details Description of the parameter drawLine is: <CENTER>\copybrief drawLine.</CENTER>
\see drawLine for more information */
inline virtual bool get_drawLine() const
{
return this->drawLine;
}
/*! \brief sets the property drawSelectionLine to the specified \a __value.
\details Description of the parameter drawSelectionLine is: <CENTER>\copybrief drawSelectionLine.</CENTER>
\see drawSelectionLine for more information */
inline virtual void set_drawSelectionLine(bool __value)
{
this->drawSelectionLine = __value;
}
/*! \brief returns the property drawSelectionLine.
\details Description of the parameter drawSelectionLine is: <CENTER>\copybrief drawSelectionLine.</CENTER>
\see drawSelectionLine for more information */
inline virtual bool get_drawSelectionLine() const
{
return this->drawSelectionLine;
}
/*! \brief sets the property selectionLineColor to the specified \a __value.
\details Description of the parameter selectionLineColor is: <CENTER>\copybrief selectionLineColor.</CENTER>
\see selectionLineColor for more information */
inline virtual void set_selectionLineColor(const QColor & __value)
{
this->selectionLineColor = __value;
}
/*! \brief returns the property selectionLineColor.
\details Description of the parameter selectionLineColor is: <CENTER>\copybrief selectionLineColor.</CENTER>
\see selectionLineColor for more information */
inline virtual QColor get_selectionLineColor() const
{
return this->selectionLineColor;
}
protected: protected:
@ -148,19 +278,148 @@ class LIB_EXPORT JKQTPxyParametrizedScatterGraph: public JKQTPxyLineGraph, publi
/** \brief returns the color to be used for the key label */ /** \brief returns the color to be used for the key label */
virtual QColor getKeyLabelColor() override; virtual QColor getKeyLabelColor() override;
JKQTPGET_SET_MACRO(int, sizeColumn) /*! \brief sets the property sizeColumn to the specified \a __value.
JKQTPSET_CAST_MACRO(size_t, int, sizeColumn) \details Description of the parameter sizeColumn is: <CENTER>\copybrief sizeColumn.</CENTER>
JKQTPGET_SET_MACRO(int, colorColumn) \see sizeColumn for more information */
JKQTPSET_CAST_MACRO(size_t, int, colorColumn) inline virtual void set_sizeColumn(int __value)
JKQTPGET_SET_MACRO(int, symbolColumn) {
JKQTPSET_CAST_MACRO(size_t, int, symbolColumn) this->sizeColumn = __value;
JKQTPGET_SET_MACRO(int, linewidthColumn) }
JKQTPSET_CAST_MACRO(size_t, int, linewidthColumn) /*! \brief returns the property sizeColumn.
JKQTPGET_SET_MACRO(bool, colorColumnContainsRGB) \details Description of the parameter sizeColumn is: <CENTER>\copybrief sizeColumn.</CENTER>
JKQTPGET_SET_MACRO(bool, gridModeForSymbolSize) \see sizeColumn for more information */
JKQTPGET_SET_MACRO(double, gridDeltaX) inline virtual int get_sizeColumn() const
JKQTPGET_SET_MACRO(double, gridDeltaY) {
JKQTPGET_SET_MACRO(double, gridSymbolFractionSize) return this->sizeColumn;
}
/*! \brief sets the property sizeColumn to the specified \a __value, where __value is static_cast'ed from size_t to int.
\details Description of the parameter sizeColumn is: <CENTER>\copybrief sizeColumn.</CENTER>
\see sizeColumn for more information */
inline virtual void set_sizeColumn (size_t __value) { this->sizeColumn = static_cast<int>(__value); }
/*! \brief sets the property colorColumn to the specified \a __value.
\details Description of the parameter colorColumn is: <CENTER>\copybrief colorColumn.</CENTER>
\see colorColumn for more information */
inline virtual void set_colorColumn(int __value)
{
this->colorColumn = __value;
}
/*! \brief returns the property colorColumn.
\details Description of the parameter colorColumn is: <CENTER>\copybrief colorColumn.</CENTER>
\see colorColumn for more information */
inline virtual int get_colorColumn() const
{
return this->colorColumn;
}
/*! \brief sets the property colorColumn to the specified \a __value, where __value is static_cast'ed from size_t to int.
\details Description of the parameter colorColumn is: <CENTER>\copybrief colorColumn.</CENTER>
\see colorColumn for more information */
inline virtual void set_colorColumn (size_t __value) { this->colorColumn = static_cast<int>(__value); }
/*! \brief sets the property symbolColumn to the specified \a __value.
\details Description of the parameter symbolColumn is: <CENTER>\copybrief symbolColumn.</CENTER>
\see symbolColumn for more information */
inline virtual void set_symbolColumn(int __value)
{
this->symbolColumn = __value;
}
/*! \brief returns the property symbolColumn.
\details Description of the parameter symbolColumn is: <CENTER>\copybrief symbolColumn.</CENTER>
\see symbolColumn for more information */
inline virtual int get_symbolColumn() const
{
return this->symbolColumn;
}
/*! \brief sets the property symbolColumn to the specified \a __value, where __value is static_cast'ed from size_t to int.
\details Description of the parameter symbolColumn is: <CENTER>\copybrief symbolColumn.</CENTER>
\see symbolColumn for more information */
inline virtual void set_symbolColumn (size_t __value) { this->symbolColumn = static_cast<int>(__value); }
/*! \brief sets the property linewidthColumn to the specified \a __value.
\details Description of the parameter linewidthColumn is: <CENTER>\copybrief linewidthColumn.</CENTER>
\see linewidthColumn for more information */
inline virtual void set_linewidthColumn(int __value)
{
this->linewidthColumn = __value;
}
/*! \brief returns the property linewidthColumn.
\details Description of the parameter linewidthColumn is: <CENTER>\copybrief linewidthColumn.</CENTER>
\see linewidthColumn for more information */
inline virtual int get_linewidthColumn() const
{
return this->linewidthColumn;
}
/*! \brief sets the property linewidthColumn to the specified \a __value, where __value is static_cast'ed from size_t to int.
\details Description of the parameter linewidthColumn is: <CENTER>\copybrief linewidthColumn.</CENTER>
\see linewidthColumn for more information */
inline virtual void set_linewidthColumn( size_t __value) { this->linewidthColumn = static_cast<int>(__value); }
/*! \brief sets the property colorColumnContainsRGB to the specified \a __value.
\details Description of the parameter colorColumnContainsRGB is: <CENTER>\copybrief colorColumnContainsRGB.</CENTER>
\see colorColumnContainsRGB for more information */
inline virtual void set_colorColumnContainsRGB(bool __value)
{
this->colorColumnContainsRGB = __value;
}
/*! \brief returns the property colorColumnContainsRGB.
\details Description of the parameter colorColumnContainsRGB is: <CENTER>\copybrief colorColumnContainsRGB.</CENTER>
\see colorColumnContainsRGB for more information */
inline virtual bool get_colorColumnContainsRGB() const
{
return this->colorColumnContainsRGB;
}
/*! \brief sets the property gridModeForSymbolSize to the specified \a __value.
\details Description of the parameter gridModeForSymbolSize is: <CENTER>\copybrief gridModeForSymbolSize.</CENTER>
\see gridModeForSymbolSize for more information */
inline virtual void set_gridModeForSymbolSize(bool __value)
{
this->gridModeForSymbolSize = __value;
}
/*! \brief returns the property gridModeForSymbolSize.
\details Description of the parameter gridModeForSymbolSize is: <CENTER>\copybrief gridModeForSymbolSize.</CENTER>
\see gridModeForSymbolSize for more information */
inline virtual bool get_gridModeForSymbolSize() const
{
return this->gridModeForSymbolSize;
}
/*! \brief sets the property gridDeltaX to the specified \a __value.
\details Description of the parameter gridDeltaX is: <CENTER>\copybrief gridDeltaX.</CENTER>
\see gridDeltaX for more information */
inline virtual void set_gridDeltaX(double __value)
{
this->gridDeltaX = __value;
}
/*! \brief returns the property gridDeltaX.
\details Description of the parameter gridDeltaX is: <CENTER>\copybrief gridDeltaX.</CENTER>
\see gridDeltaX for more information */
inline virtual double get_gridDeltaX() const
{
return this->gridDeltaX;
}
/*! \brief sets the property gridDeltaY to the specified \a __value.
\details Description of the parameter gridDeltaY is: <CENTER>\copybrief gridDeltaY.</CENTER>
\see gridDeltaY for more information */
inline virtual void set_gridDeltaY(double __value)
{
this->gridDeltaY = __value;
}
/*! \brief returns the property gridDeltaY.
\details Description of the parameter gridDeltaY is: <CENTER>\copybrief gridDeltaY.</CENTER>
\see gridDeltaY for more information */
inline virtual double get_gridDeltaY() const
{
return this->gridDeltaY;
}
/*! \brief sets the property gridSymbolFractionSize to the specified \a __value.
\details Description of the parameter gridSymbolFractionSize is: <CENTER>\copybrief gridSymbolFractionSize.</CENTER>
\see gridSymbolFractionSize for more information */
inline virtual void set_gridSymbolFractionSize(double __value)
{
this->gridSymbolFractionSize = __value;
}
/*! \brief returns the property gridSymbolFractionSize.
\details Description of the parameter gridSymbolFractionSize is: <CENTER>\copybrief gridSymbolFractionSize.</CENTER>
\see gridSymbolFractionSize for more information */
inline virtual double get_gridSymbolFractionSize() const
{
return this->gridSymbolFractionSize;
}
virtual void setParent(JKQtBasePlotter* parent) override; virtual void setParent(JKQtBasePlotter* parent) override;
@ -333,14 +592,118 @@ class LIB_EXPORT JKQTPstepHorizontalGraph: public JKQTPxyGraph {
/** \brief returns the color to be used for the key label */ /** \brief returns the color to be used for the key label */
virtual QColor getKeyLabelColor() override; virtual QColor getKeyLabelColor() override;
JKQTPGET_SET_MACRO(QColor, color) /*! \brief sets the property color to the specified \a __value.
JKQTPGET_SET_MACRO(QColor, fillColor) \details Description of the parameter color is: <CENTER>\copybrief color.</CENTER>
JKQTPGET_SET_MACRO(Qt::BrushStyle, fillStyle) \see color for more information */
JKQTPGET_SET_MACRO(Qt::PenStyle, style) inline virtual void set_color(const QColor & __value)
JKQTPGET_SET_MACRO(double, lineWidth) {
JKQTPGET_SET_MACRO(bool, drawLine) this->color = __value;
JKQTPGET_SET_MACRO(bool, fillCurve) }
JKQTPGET_SET_MACRO(JKQTPstepType, stepType) /*! \brief returns the property color.
\details Description of the parameter color is: <CENTER>\copybrief color.</CENTER>
\see color for more information */
inline virtual QColor get_color() const
{
return this->color;
}
/*! \brief sets the property fillColor to the specified \a __value.
\details Description of the parameter fillColor is: <CENTER>\copybrief fillColor.</CENTER>
\see fillColor for more information */
inline virtual void set_fillColor(const QColor & __value)
{
this->fillColor = __value;
}
/*! \brief returns the property fillColor.
\details Description of the parameter fillColor is: <CENTER>\copybrief fillColor.</CENTER>
\see fillColor for more information */
inline virtual QColor get_fillColor() const
{
return this->fillColor;
}
/*! \brief sets the property fillStyle to the specified \a __value.
\details Description of the parameter fillStyle is: <CENTER>\copybrief fillStyle.</CENTER>
\see fillStyle for more information */
inline virtual void set_fillStyle(const Qt::BrushStyle & __value)
{
this->fillStyle = __value;
}
/*! \brief returns the property fillStyle.
\details Description of the parameter fillStyle is: <CENTER>\copybrief fillStyle.</CENTER>
\see fillStyle for more information */
inline virtual Qt::BrushStyle get_fillStyle() const
{
return this->fillStyle;
}
/*! \brief sets the property style to the specified \a __value.
\details Description of the parameter style is: <CENTER>\copybrief style.</CENTER>
\see style for more information */
inline virtual void set_style(const Qt::PenStyle & __value)
{
this->style = __value;
}
/*! \brief returns the property style.
\details Description of the parameter style is: <CENTER>\copybrief style.</CENTER>
\see style for more information */
inline virtual Qt::PenStyle get_style() const
{
return this->style;
}
/*! \brief sets the property lineWidth to the specified \a __value.
\details Description of the parameter lineWidth is: <CENTER>\copybrief lineWidth.</CENTER>
\see lineWidth for more information */
inline virtual void set_lineWidth(double __value)
{
this->lineWidth = __value;
}
/*! \brief returns the property lineWidth.
\details Description of the parameter lineWidth is: <CENTER>\copybrief lineWidth.</CENTER>
\see lineWidth for more information */
inline virtual double get_lineWidth() const
{
return this->lineWidth;
}
/*! \brief sets the property drawLine to the specified \a __value.
\details Description of the parameter drawLine is: <CENTER>\copybrief drawLine.</CENTER>
\see drawLine for more information */
inline virtual void set_drawLine(bool __value)
{
this->drawLine = __value;
}
/*! \brief returns the property drawLine.
\details Description of the parameter drawLine is: <CENTER>\copybrief drawLine.</CENTER>
\see drawLine for more information */
inline virtual bool get_drawLine() const
{
return this->drawLine;
}
/*! \brief sets the property fillCurve to the specified \a __value.
\details Description of the parameter fillCurve is: <CENTER>\copybrief fillCurve.</CENTER>
\see fillCurve for more information */
inline virtual void set_fillCurve(bool __value)
{
this->fillCurve = __value;
}
/*! \brief returns the property fillCurve.
\details Description of the parameter fillCurve is: <CENTER>\copybrief fillCurve.</CENTER>
\see fillCurve for more information */
inline virtual bool get_fillCurve() const
{
return this->fillCurve;
}
/*! \brief sets the property stepType to the specified \a __value.
\details Description of the parameter stepType is: <CENTER>\copybrief stepType.</CENTER>
\see stepType for more information */
inline virtual void set_stepType(const JKQTPstepType & __value)
{
this->stepType = __value;
}
/*! \brief returns the property stepType.
\details Description of the parameter stepType is: <CENTER>\copybrief stepType.</CENTER>
\see stepType for more information */
inline virtual JKQTPstepType get_stepType() const
{
return this->stepType;
}
protected: protected:
/** \brief color of the graph */ /** \brief color of the graph */
QColor color; QColor color;
@ -440,27 +803,287 @@ class LIB_EXPORT JKQTPhorizontalRange: public JKQTPgraph {
void setDrawCenterLineOnly(); void setDrawCenterLineOnly();
JKQTPGET_SET_MACRO(QColor, color) /*! \brief sets the property color to the specified \a __value.
JKQTPGET_SET_MACRO(QColor, fillColor) \details Description of the parameter color is: <CENTER>\copybrief color.</CENTER>
JKQTPGET_SET_MACRO(Qt::BrushStyle, fillStyle) \see color for more information */
JKQTPGET_SET_MACRO(Qt::PenStyle, style) inline virtual void set_color(const QColor & __value)
JKQTPGET_SET_MACRO(double, lineWidth) {
JKQTPGET_SET_MACRO(QColor, centerColor) this->color = __value;
JKQTPGET_SET_MACRO(Qt::PenStyle, centerStyle) }
JKQTPGET_SET_MACRO(double, centerLineWidth) /*! \brief returns the property color.
JKQTPGET_SET_MACRO(double, rangeMin) \details Description of the parameter color is: <CENTER>\copybrief color.</CENTER>
JKQTPGET_SET_MACRO(double, rangeMax) \see color for more information */
JKQTPGET_SET_MACRO(double, sizeMin) inline virtual QColor get_color() const
JKQTPGET_SET_MACRO(double, sizeMax) {
JKQTPGET_SET_MACRO(bool, unlimitedSizeMin) return this->color;
JKQTPGET_SET_MACRO(bool, unlimitedSizeMax) }
/*! \brief sets the property fillColor to the specified \a __value.
\details Description of the parameter fillColor is: <CENTER>\copybrief fillColor.</CENTER>
\see fillColor for more information */
inline virtual void set_fillColor(const QColor & __value)
{
this->fillColor = __value;
}
/*! \brief returns the property fillColor.
\details Description of the parameter fillColor is: <CENTER>\copybrief fillColor.</CENTER>
\see fillColor for more information */
inline virtual QColor get_fillColor() const
{
return this->fillColor;
}
/*! \brief sets the property fillStyle to the specified \a __value.
\details Description of the parameter fillStyle is: <CENTER>\copybrief fillStyle.</CENTER>
\see fillStyle for more information */
inline virtual void set_fillStyle(const Qt::BrushStyle & __value)
{
this->fillStyle = __value;
}
/*! \brief returns the property fillStyle.
\details Description of the parameter fillStyle is: <CENTER>\copybrief fillStyle.</CENTER>
\see fillStyle for more information */
inline virtual Qt::BrushStyle get_fillStyle() const
{
return this->fillStyle;
}
/*! \brief sets the property style to the specified \a __value.
\details Description of the parameter style is: <CENTER>\copybrief style.</CENTER>
\see style for more information */
inline virtual void set_style(const Qt::PenStyle & __value)
{
this->style = __value;
}
/*! \brief returns the property style.
\details Description of the parameter style is: <CENTER>\copybrief style.</CENTER>
\see style for more information */
inline virtual Qt::PenStyle get_style() const
{
return this->style;
}
/*! \brief sets the property lineWidth to the specified \a __value.
\details Description of the parameter lineWidth is: <CENTER>\copybrief lineWidth.</CENTER>
\see lineWidth for more information */
inline virtual void set_lineWidth(double __value)
{
this->lineWidth = __value;
}
/*! \brief returns the property lineWidth.
\details Description of the parameter lineWidth is: <CENTER>\copybrief lineWidth.</CENTER>
\see lineWidth for more information */
inline virtual double get_lineWidth() const
{
return this->lineWidth;
}
/*! \brief sets the property centerColor to the specified \a __value.
\details Description of the parameter centerColor is: <CENTER>\copybrief centerColor.</CENTER>
\see centerColor for more information */
inline virtual void set_centerColor(const QColor & __value)
{
this->centerColor = __value;
}
/*! \brief returns the property centerColor.
\details Description of the parameter centerColor is: <CENTER>\copybrief centerColor.</CENTER>
\see centerColor for more information */
inline virtual QColor get_centerColor() const
{
return this->centerColor;
}
/*! \brief sets the property centerStyle to the specified \a __value.
\details Description of the parameter centerStyle is: <CENTER>\copybrief centerStyle.</CENTER>
\see centerStyle for more information */
inline virtual void set_centerStyle(const Qt::PenStyle & __value)
{
this->centerStyle = __value;
}
/*! \brief returns the property centerStyle.
\details Description of the parameter centerStyle is: <CENTER>\copybrief centerStyle.</CENTER>
\see centerStyle for more information */
inline virtual Qt::PenStyle get_centerStyle() const
{
return this->centerStyle;
}
/*! \brief sets the property centerLineWidth to the specified \a __value.
\details Description of the parameter centerLineWidth is: <CENTER>\copybrief centerLineWidth.</CENTER>
\see centerLineWidth for more information */
inline virtual void set_centerLineWidth(double __value)
{
this->centerLineWidth = __value;
}
/*! \brief returns the property centerLineWidth.
\details Description of the parameter centerLineWidth is: <CENTER>\copybrief centerLineWidth.</CENTER>
\see centerLineWidth for more information */
inline virtual double get_centerLineWidth() const
{
return this->centerLineWidth;
}
/*! \brief sets the property rangeMin to the specified \a __value.
\details Description of the parameter rangeMin is: <CENTER>\copybrief rangeMin.</CENTER>
\see rangeMin for more information */
inline virtual void set_rangeMin(double __value)
{
this->rangeMin = __value;
}
/*! \brief returns the property rangeMin.
\details Description of the parameter rangeMin is: <CENTER>\copybrief rangeMin.</CENTER>
\see rangeMin for more information */
inline virtual double get_rangeMin() const
{
return this->rangeMin;
}
/*! \brief sets the property rangeMax to the specified \a __value.
\details Description of the parameter rangeMax is: <CENTER>\copybrief rangeMax.</CENTER>
\see rangeMax for more information */
inline virtual void set_rangeMax(double __value)
{
this->rangeMax = __value;
}
/*! \brief returns the property rangeMax.
\details Description of the parameter rangeMax is: <CENTER>\copybrief rangeMax.</CENTER>
\see rangeMax for more information */
inline virtual double get_rangeMax() const
{
return this->rangeMax;
}
/*! \brief sets the property sizeMin to the specified \a __value.
\details Description of the parameter sizeMin is: <CENTER>\copybrief sizeMin.</CENTER>
\see sizeMin for more information */
inline virtual void set_sizeMin(double __value)
{
this->sizeMin = __value;
}
/*! \brief returns the property sizeMin.
\details Description of the parameter sizeMin is: <CENTER>\copybrief sizeMin.</CENTER>
\see sizeMin for more information */
inline virtual double get_sizeMin() const
{
return this->sizeMin;
}
/*! \brief sets the property sizeMax to the specified \a __value.
\details Description of the parameter sizeMax is: <CENTER>\copybrief sizeMax.</CENTER>
\see sizeMax for more information */
inline virtual void set_sizeMax(double __value)
{
this->sizeMax = __value;
}
/*! \brief returns the property sizeMax.
\details Description of the parameter sizeMax is: <CENTER>\copybrief sizeMax.</CENTER>
\see sizeMax for more information */
inline virtual double get_sizeMax() const
{
return this->sizeMax;
}
/*! \brief sets the property unlimitedSizeMin to the specified \a __value.
\details Description of the parameter unlimitedSizeMin is: <CENTER>\copybrief unlimitedSizeMin.</CENTER>
\see unlimitedSizeMin for more information */
inline virtual void set_unlimitedSizeMin(bool __value)
{
this->unlimitedSizeMin = __value;
}
/*! \brief returns the property unlimitedSizeMin.
\details Description of the parameter unlimitedSizeMin is: <CENTER>\copybrief unlimitedSizeMin.</CENTER>
\see unlimitedSizeMin for more information */
inline virtual bool get_unlimitedSizeMin() const
{
return this->unlimitedSizeMin;
}
/*! \brief sets the property unlimitedSizeMax to the specified \a __value.
\details Description of the parameter unlimitedSizeMax is: <CENTER>\copybrief unlimitedSizeMax.</CENTER>
\see unlimitedSizeMax for more information */
inline virtual void set_unlimitedSizeMax(bool __value)
{
this->unlimitedSizeMax = __value;
}
/*! \brief returns the property unlimitedSizeMax.
\details Description of the parameter unlimitedSizeMax is: <CENTER>\copybrief unlimitedSizeMax.</CENTER>
\see unlimitedSizeMax for more information */
inline virtual bool get_unlimitedSizeMax() const
{
return this->unlimitedSizeMax;
}
JKQTPGET_SET_MACRO(double, rangeCenter) /*! \brief sets the property rangeCenter to the specified \a __value.
JKQTPGET_SET_MACRO(bool, plotCenterLine) \details Description of the parameter rangeCenter is: <CENTER>\copybrief rangeCenter.</CENTER>
JKQTPGET_SET_MACRO(bool, invertedRange) \see rangeCenter for more information */
JKQTPGET_SET_MACRO(bool, plotRange) inline virtual void set_rangeCenter(double __value)
JKQTPGET_SET_MACRO(bool, fillRange) {
JKQTPGET_SET_MACRO(bool, plotRangeLines) this->rangeCenter = __value;
}
/*! \brief returns the property rangeCenter.
\details Description of the parameter rangeCenter is: <CENTER>\copybrief rangeCenter.</CENTER>
\see rangeCenter for more information */
inline virtual double get_rangeCenter() const
{
return this->rangeCenter;
}
/*! \brief sets the property plotCenterLine to the specified \a __value.
\details Description of the parameter plotCenterLine is: <CENTER>\copybrief plotCenterLine.</CENTER>
\see plotCenterLine for more information */
inline virtual void set_plotCenterLine(bool __value)
{
this->plotCenterLine = __value;
}
/*! \brief returns the property plotCenterLine.
\details Description of the parameter plotCenterLine is: <CENTER>\copybrief plotCenterLine.</CENTER>
\see plotCenterLine for more information */
inline virtual bool get_plotCenterLine() const
{
return this->plotCenterLine;
}
/*! \brief sets the property invertedRange to the specified \a __value.
\details Description of the parameter invertedRange is: <CENTER>\copybrief invertedRange.</CENTER>
\see invertedRange for more information */
inline virtual void set_invertedRange(bool __value)
{
this->invertedRange = __value;
}
/*! \brief returns the property invertedRange.
\details Description of the parameter invertedRange is: <CENTER>\copybrief invertedRange.</CENTER>
\see invertedRange for more information */
inline virtual bool get_invertedRange() const
{
return this->invertedRange;
}
/*! \brief sets the property plotRange to the specified \a __value.
\details Description of the parameter plotRange is: <CENTER>\copybrief plotRange.</CENTER>
\see plotRange for more information */
inline virtual void set_plotRange(bool __value)
{
this->plotRange = __value;
}
/*! \brief returns the property plotRange.
\details Description of the parameter plotRange is: <CENTER>\copybrief plotRange.</CENTER>
\see plotRange for more information */
inline virtual bool get_plotRange() const
{
return this->plotRange;
}
/*! \brief sets the property fillRange to the specified \a __value.
\details Description of the parameter fillRange is: <CENTER>\copybrief fillRange.</CENTER>
\see fillRange for more information */
inline virtual void set_fillRange(bool __value)
{
this->fillRange = __value;
}
/*! \brief returns the property fillRange.
\details Description of the parameter fillRange is: <CENTER>\copybrief fillRange.</CENTER>
\see fillRange for more information */
inline virtual bool get_fillRange() const
{
return this->fillRange;
}
/*! \brief sets the property plotRangeLines to the specified \a __value.
\details Description of the parameter plotRangeLines is: <CENTER>\copybrief plotRangeLines.</CENTER>
\see plotRangeLines for more information */
inline virtual void set_plotRangeLines(bool __value)
{
this->plotRangeLines = __value;
}
/*! \brief returns the property plotRangeLines.
\details Description of the parameter plotRangeLines is: <CENTER>\copybrief plotRangeLines.</CENTER>
\see plotRangeLines for more information */
inline virtual bool get_plotRangeLines() const
{
return this->plotRangeLines;
}
protected: protected:
/** \brief min-value of range */ /** \brief min-value of range */
double rangeMin; double rangeMin;

120
lib/jkqtplotter/jkqtpgraphsbarchart.h
View File

@ -106,14 +106,118 @@ class LIB_EXPORT JKQTPbarVerticalGraph: public JKQTPxyGraph {
virtual bool isHorizontal() const; virtual bool isHorizontal() const;
JKQTPGET_SET_MACRO(QColor, color) /*! \brief sets the property color to the specified \a __value.
JKQTPGET_SET_MACRO(QColor, fillColor) \details Description of the parameter color is: <CENTER>\copybrief color.</CENTER>
JKQTPGET_SET_MACRO(Qt::BrushStyle, fillStyle) \see color for more information */
JKQTPGET_SET_MACRO(Qt::PenStyle, style) inline virtual void set_color(const QColor & __value)
JKQTPGET_SET_MACRO(double, lineWidth) {
JKQTPGET_SET_MACRO(double, shift) this->color = __value;
JKQTPGET_SET_MACRO(double, width) }
JKQTPGET_SET_MACRO(double, baseline) /*! \brief returns the property color.
\details Description of the parameter color is: <CENTER>\copybrief color.</CENTER>
\see color for more information */
inline virtual QColor get_color() const
{
return this->color;
}
/*! \brief sets the property fillColor to the specified \a __value.
\details Description of the parameter fillColor is: <CENTER>\copybrief fillColor.</CENTER>
\see fillColor for more information */
inline virtual void set_fillColor(const QColor & __value)
{
this->fillColor = __value;
}
/*! \brief returns the property fillColor.
\details Description of the parameter fillColor is: <CENTER>\copybrief fillColor.</CENTER>
\see fillColor for more information */
inline virtual QColor get_fillColor() const
{
return this->fillColor;
}
/*! \brief sets the property fillStyle to the specified \a __value.
\details Description of the parameter fillStyle is: <CENTER>\copybrief fillStyle.</CENTER>
\see fillStyle for more information */
inline virtual void set_fillStyle(const Qt::BrushStyle & __value)
{
this->fillStyle = __value;
}
/*! \brief returns the property fillStyle.
\details Description of the parameter fillStyle is: <CENTER>\copybrief fillStyle.</CENTER>
\see fillStyle for more information */
inline virtual Qt::BrushStyle get_fillStyle() const
{
return this->fillStyle;
}
/*! \brief sets the property style to the specified \a __value.
\details Description of the parameter style is: <CENTER>\copybrief style.</CENTER>
\see style for more information */
inline virtual void set_style(const Qt::PenStyle & __value)
{
this->style = __value;
}
/*! \brief returns the property style.
\details Description of the parameter style is: <CENTER>\copybrief style.</CENTER>
\see style for more information */
inline virtual Qt::PenStyle get_style() const
{
return this->style;
}
/*! \brief sets the property lineWidth to the specified \a __value.
\details Description of the parameter lineWidth is: <CENTER>\copybrief lineWidth.</CENTER>
\see lineWidth for more information */
inline virtual void set_lineWidth(double __value)
{
this->lineWidth = __value;
}
/*! \brief returns the property lineWidth.
\details Description of the parameter lineWidth is: <CENTER>\copybrief lineWidth.</CENTER>
\see lineWidth for more information */
inline virtual double get_lineWidth() const
{
return this->lineWidth;
}
/*! \brief sets the property shift to the specified \a __value.
\details Description of the parameter shift is: <CENTER>\copybrief shift.</CENTER>
\see shift for more information */
inline virtual void set_shift(double __value)
{
this->shift = __value;
}
/*! \brief returns the property shift.
\details Description of the parameter shift is: <CENTER>\copybrief shift.</CENTER>
\see shift for more information */
inline virtual double get_shift() const
{
return this->shift;
}
/*! \brief sets the property width to the specified \a __value.
\details Description of the parameter width is: <CENTER>\copybrief width.</CENTER>
\see width for more information */
inline virtual void set_width(double __value)
{
this->width = __value;
}
/*! \brief returns the property width.
\details Description of the parameter width is: <CENTER>\copybrief width.</CENTER>
\see width for more information */
inline virtual double get_width() const
{
return this->width;
}
/*! \brief sets the property baseline to the specified \a __value.
\details Description of the parameter baseline is: <CENTER>\copybrief baseline.</CENTER>
\see baseline for more information */
inline virtual void set_baseline(double __value)
{
this->baseline = __value;
}
/*! \brief returns the property baseline.
\details Description of the parameter baseline is: <CENTER>\copybrief baseline.</CENTER>
\see baseline for more information */
inline virtual double get_baseline() const
{
return this->baseline;
}
/** \brief sets the fill color and the color together, where fillColor is set to \a fill and the line-color is set to \c fill.darker(colorDarker) */ /** \brief sets the fill color and the color together, where fillColor is set to \a fill and the line-color is set to \c fill.darker(colorDarker) */
void set_fillColor_and_darkenedColor(QColor fill, int colorDarker=200); void set_fillColor_and_darkenedColor(QColor fill, int colorDarker=200);
protected: protected:

425
lib/jkqtplotter/jkqtpgraphsbase.h
View File

@ -99,8 +99,34 @@ class LIB_EXPORT JKQTPplotElement: public QObject {
/** \brief returns the color to be used for the key label */ /** \brief returns the color to be used for the key label */
virtual QColor getKeyLabelColor()=0; virtual QColor getKeyLabelColor()=0;
JKQTPGET_SET_VMACRO(QString, title) /*! \brief sets the property title to the specified \a __value.
JKQTPGET_SET_MACRO(bool, visible) \details Description of the parameter title is: <CENTER>\copybrief title.</CENTER>
\see title for more information */
inline virtual void set_title(const QString & __value)
{
this->title = __value;
}
/*! \brief returns the property title.
\details Description of the parameter title is: <CENTER>\copybrief title.</CENTER>
\see title for more information */
inline virtual QString get_title() const
{
return this->title;
}
/*! \brief sets the property visible to the specified \a __value.
\details Description of the parameter visible is: <CENTER>\copybrief visible.</CENTER>
\see visible for more information */
inline virtual void set_visible(bool __value)
{
this->visible = __value;
}
/*! \brief returns the property visible.
\details Description of the parameter visible is: <CENTER>\copybrief visible.</CENTER>
\see visible for more information */
inline virtual bool get_visible() const
{
return this->visible;
}
/** \brief returns the parent painter class */ /** \brief returns the parent painter class */
inline JKQtBasePlotter* getParent() { return parent; } inline JKQtBasePlotter* getParent() { return parent; }
@ -207,8 +233,34 @@ class LIB_EXPORT JKQTPgraph: public JKQTPplotElement {
virtual ~JKQTPgraph() ; virtual ~JKQTPgraph() ;
JKQTPGET_SET_MACRO(int, datarange_start) /*! \brief sets the property datarange_start to the specified \a __value.
JKQTPGET_SET_MACRO(int, datarange_end) \details Description of the parameter datarange_start is: <CENTER>\copybrief datarange_start.</CENTER>
\see datarange_start for more information */
inline virtual void set_datarange_start(int __value)
{
this->datarange_start = __value;
}
/*! \brief returns the property datarange_start.
\details Description of the parameter datarange_start is: <CENTER>\copybrief datarange_start.</CENTER>
\see datarange_start for more information */
inline virtual int get_datarange_start() const
{
return this->datarange_start;
}
/*! \brief sets the property datarange_end to the specified \a __value.
\details Description of the parameter datarange_end is: <CENTER>\copybrief datarange_end.</CENTER>
\see datarange_end for more information */
inline virtual void set_datarange_end(int __value)
{
this->datarange_end = __value;
}
/*! \brief returns the property datarange_end.
\details Description of the parameter datarange_end is: <CENTER>\copybrief datarange_end.</CENTER>
\see datarange_end for more information */
inline virtual int get_datarange_end() const
{
return this->datarange_end;
}
/** \brief returns \c true if the given column is used by the graph */ /** \brief returns \c true if the given column is used by the graph */
virtual bool usesColumn(int column) const; virtual bool usesColumn(int column) const;
@ -312,12 +364,57 @@ class LIB_EXPORT JKQTPxyGraph: public JKQTPgraph {
/** \copydoc JKQTPgraph::usesColumn() */ /** \copydoc JKQTPgraph::usesColumn() */
virtual bool usesColumn(int column) const override; virtual bool usesColumn(int column) const override;
JKQTPGET_SET_MACRO(int, xColumn) /*! \brief sets the property xColumn to the specified \a __value.
JKQTPSET_CAST_MACRO(size_t, int, xColumn) \details Description of the parameter xColumn is: <CENTER>\copybrief xColumn.</CENTER>
JKQTPGET_SET_MACRO(int, yColumn) \see xColumn for more information */
JKQTPSET_CAST_MACRO(size_t, int, yColumn) inline virtual void set_xColumn(int __value)
JKQTPGET_SET_MACRO(DataSortOrder, sortData) {
/** \brief sets the property sortData to the specified \a __value. \details Description of the parameter sortData is: <CENTER>\copybrief sortData.</CENTER> \see sortData for more information */ this->xColumn = __value;
}
/*! \brief returns the property xColumn.
\details Description of the parameter xColumn is: <CENTER>\copybrief xColumn.</CENTER>
\see xColumn for more information */
inline virtual int get_xColumn() const
{
return this->xColumn;
}
/*! \brief sets the property xColumn to the specified \a __value, where __value is static_cast'ed from size_t to int.
\details Description of the parameter xColumn is: <CENTER>\copybrief xColumn.</CENTER>
\see xColumn for more information */
inline virtual void set_xColumn (size_t __value) { this->xColumn = static_cast<int>(__value); }
/*! \brief sets the property yColumn to the specified \a __value.
\details Description of the parameter yColumn is: <CENTER>\copybrief yColumn.</CENTER>
\see yColumn for more information */
inline virtual void set_yColumn(int __value)
{
this->yColumn = __value;
}
/*! \brief returns the property yColumn.
\details Description of the parameter yColumn is: <CENTER>\copybrief yColumn.</CENTER>
\see yColumn for more information */
inline virtual int get_yColumn() const
{
return this->yColumn;
}
/*! \brief sets the property yColumn to the specified \a __value, where __value is static_cast'ed from size_t to int.
\details Description of the parameter yColumn is: <CENTER>\copybrief yColumn.</CENTER>
\see yColumn for more information */
inline virtual void set_yColumn (size_t __value) { this->yColumn = static_cast<int>(__value); }
/*! \brief sets the property sortData to the specified \a __value.
\details Description of the parameter sortData is: <CENTER>\copybrief sortData.</CENTER>
\see sortData for more information */
inline virtual void set_sortData(const DataSortOrder & __value)
{
this->sortData = __value;
}
/*! \brief returns the property sortData.
\details Description of the parameter sortData is: <CENTER>\copybrief sortData.</CENTER>
\see sortData for more information */
inline virtual DataSortOrder get_sortData() const
{
return this->sortData;
}
/*! \brief sets the property sortData to the specified \a __value. \details Description of the parameter sortData is: <CENTER>\copybrief sortData.</CENTER> \see sortData for more information */
void set_sortData(int __value); void set_sortData(int __value);
protected: protected:
@ -369,13 +466,81 @@ class LIB_EXPORT JKQTPsingleColumnGraph: public JKQTPgraph {
/** \brief returns the color to be used for the key label */ /** \brief returns the color to be used for the key label */
virtual QColor getKeyLabelColor(); virtual QColor getKeyLabelColor();
JKQTPGET_SET_MACRO(int, dataColumn) /*! \brief sets the property dataColumn to the specified \a __value.
JKQTPSET_CAST_MACRO(size_t, int, dataColumn) \details Description of the parameter dataColumn is: <CENTER>\copybrief dataColumn.</CENTER>
JKQTPGET_SET_MACRO(QColor, color) \see dataColumn for more information */
JKQTPGET_SET_MACRO(Qt::PenStyle, style) inline virtual void set_dataColumn(int __value)
JKQTPGET_SET_MACRO(double, lineWidth) {
JKQTPGET_SET_MACRO(DataSortOrder, sortData) this->dataColumn = __value;
/** \brief sets the property sortData to the specified \a __value. \details Description of the parameter sortData is: <CENTER>\copybrief sortData.</CENTER> \see sortData for more information */ }
/*! \brief returns the property dataColumn.
\details Description of the parameter dataColumn is: <CENTER>\copybrief dataColumn.</CENTER>
\see dataColumn for more information */
inline virtual int get_dataColumn() const
{
return this->dataColumn;
}
/*! \brief sets the property dataColumn to the specified \a __value, where __value is static_cast'ed from size_t to int.
\details Description of the parameter dataColumn is: <CENTER>\copybrief dataColumn.</CENTER>
\see dataColumn for more information */
inline virtual void set_dataColumn (size_t __value) { this->dataColumn = static_cast<int>(__value); }
/*! \brief sets the property color to the specified \a __value.
\details Description of the parameter color is: <CENTER>\copybrief color.</CENTER>
\see color for more information */
inline virtual void set_color(const QColor & __value)
{
this->color = __value;
}
/*! \brief returns the property color.
\details Description of the parameter color is: <CENTER>\copybrief color.</CENTER>
\see color for more information */
inline virtual QColor get_color() const
{
return this->color;
}
/*! \brief sets the property style to the specified \a __value.
\details Description of the parameter style is: <CENTER>\copybrief style.</CENTER>
\see style for more information */
inline virtual void set_style(const Qt::PenStyle & __value)
{
this->style = __value;
}
/*! \brief returns the property style.
\details Description of the parameter style is: <CENTER>\copybrief style.</CENTER>
\see style for more information */
inline virtual Qt::PenStyle get_style() const
{
return this->style;
}
/*! \brief sets the property lineWidth to the specified \a __value.
\details Description of the parameter lineWidth is: <CENTER>\copybrief lineWidth.</CENTER>
\see lineWidth for more information */
inline virtual void set_lineWidth(double __value)
{
this->lineWidth = __value;
}
/*! \brief returns the property lineWidth.
\details Description of the parameter lineWidth is: <CENTER>\copybrief lineWidth.</CENTER>
\see lineWidth for more information */
inline virtual double get_lineWidth() const
{
return this->lineWidth;
}
/*! \brief sets the property sortData to the specified \a __value.
\details Description of the parameter sortData is: <CENTER>\copybrief sortData.</CENTER>
\see sortData for more information */
inline virtual void set_sortData(const DataSortOrder & __value)
{
this->sortData = __value;
}
/*! \brief returns the property sortData.
\details Description of the parameter sortData is: <CENTER>\copybrief sortData.</CENTER>
\see sortData for more information */
inline virtual DataSortOrder get_sortData() const
{
return this->sortData;
}
/*! \brief sets the property sortData to the specified \a __value. \details Description of the parameter sortData is: <CENTER>\copybrief sortData.</CENTER> \see sortData for more information */
void set_sortData(int __value); void set_sortData(int __value);
/** \copydoc JKQTPgraph::usesColumn() */ /** \copydoc JKQTPgraph::usesColumn() */
@ -436,12 +601,90 @@ class LIB_EXPORT JKQTPgraphErrors {
JKQTPgraphErrors(QColor graphColor=QColor("black")); JKQTPgraphErrors(QColor graphColor=QColor("black"));
virtual ~JKQTPgraphErrors(); virtual ~JKQTPgraphErrors();
JKQTPGET_SET_MACRO(QColor, errorColor) /*! \brief sets the property errorColor to the specified \a __value.
JKQTPGET_SET_MACRO(Qt::PenStyle, errorStyle) \details Description of the parameter errorColor is: <CENTER>\copybrief errorColor.</CENTER>
JKQTPGET_SET_MACRO(double, errorWidth) \see errorColor for more information */
JKQTPGET_SET_MACRO(QColor, errorFillColor) inline virtual void set_errorColor(const QColor & __value)
JKQTPGET_SET_MACRO(Qt::BrushStyle, errorFillStyle) {
JKQTPGET_SET_MACRO(double, errorbarSize) this->errorColor = __value;
}
/*! \brief returns the property errorColor.
\details Description of the parameter errorColor is: <CENTER>\copybrief errorColor.</CENTER>
\see errorColor for more information */
inline virtual QColor get_errorColor() const
{
return this->errorColor;
}
/*! \brief sets the property errorStyle to the specified \a __value.
\details Description of the parameter errorStyle is: <CENTER>\copybrief errorStyle.</CENTER>
\see errorStyle for more information */
inline virtual void set_errorStyle(const Qt::PenStyle & __value)
{
this->errorStyle = __value;
}
/*! \brief returns the property errorStyle.
\details Description of the parameter errorStyle is: <CENTER>\copybrief errorStyle.</CENTER>
\see errorStyle for more information */
inline virtual Qt::PenStyle get_errorStyle() const
{
return this->errorStyle;
}
/*! \brief sets the property errorWidth to the specified \a __value.
\details Description of the parameter errorWidth is: <CENTER>\copybrief errorWidth.</CENTER>
\see errorWidth for more information */
inline virtual void set_errorWidth(double __value)
{
this->errorWidth = __value;
}
/*! \brief returns the property errorWidth.
\details Description of the parameter errorWidth is: <CENTER>\copybrief errorWidth.</CENTER>
\see errorWidth for more information */
inline virtual double get_errorWidth() const
{
return this->errorWidth;
}
/*! \brief sets the property errorFillColor to the specified \a __value.
\details Description of the parameter errorFillColor is: <CENTER>\copybrief errorFillColor.</CENTER>
\see errorFillColor for more information */
inline virtual void set_errorFillColor(const QColor & __value)
{
this->errorFillColor = __value;
}
/*! \brief returns the property errorFillColor.
\details Description of the parameter errorFillColor is: <CENTER>\copybrief errorFillColor.</CENTER>
\see errorFillColor for more information */
inline virtual QColor get_errorFillColor() const
{
return this->errorFillColor;
}
/*! \brief sets the property errorFillStyle to the specified \a __value.
\details Description of the parameter errorFillStyle is: <CENTER>\copybrief errorFillStyle.</CENTER>
\see errorFillStyle for more information */
inline virtual void set_errorFillStyle(const Qt::BrushStyle & __value)
{
this->errorFillStyle = __value;
}
/*! \brief returns the property errorFillStyle.
\details Description of the parameter errorFillStyle is: <CENTER>\copybrief errorFillStyle.</CENTER>
\see errorFillStyle for more information */
inline virtual Qt::BrushStyle get_errorFillStyle() const
{
return this->errorFillStyle;
}
/*! \brief sets the property errorbarSize to the specified \a __value.
\details Description of the parameter errorbarSize is: <CENTER>\copybrief errorbarSize.</CENTER>
\see errorbarSize for more information */
inline virtual void set_errorbarSize(double __value)
{
this->errorbarSize = __value;
}
/*! \brief returns the property errorbarSize.
\details Description of the parameter errorbarSize is: <CENTER>\copybrief errorbarSize.</CENTER>
\see errorbarSize for more information */
inline virtual double get_errorbarSize() const
{
return this->errorbarSize;
}
/** \brief returns true, if the error plots use the given column */ /** \brief returns true, if the error plots use the given column */
virtual bool errorUsesColumn(int c) const; virtual bool errorUsesColumn(int c) const;
@ -495,12 +738,38 @@ class LIB_EXPORT JKQTPxGraphErrors: public JKQTPgraphErrors {
/** \brief class contructor */ /** \brief class contructor */
JKQTPxGraphErrors(QColor graphColor=QColor("black")); JKQTPxGraphErrors(QColor graphColor=QColor("black"));
JKQTPGET_SET_MACRO(bool, xErrorSymmetric) /*! \brief sets the property xErrorSymmetric to the specified \a __value.
/** \brief returns the property xErrorColumnLower. \details Description of the parameter xErrorColumnLower is: <CENTER>\copybrief xErrorColumnLower.</CENTER>. \see xErrorColumnLower for more information */ \details Description of the parameter xErrorSymmetric is: <CENTER>\copybrief xErrorSymmetric.</CENTER>
\see xErrorSymmetric for more information */
inline virtual void set_xErrorSymmetric(bool __value)
{
this->xErrorSymmetric = __value;
}
/*! \brief returns the property xErrorSymmetric.
\details Description of the parameter xErrorSymmetric is: <CENTER>\copybrief xErrorSymmetric.</CENTER>
\see xErrorSymmetric for more information */
inline virtual bool get_xErrorSymmetric() const
{
return this->xErrorSymmetric;
}
/*! \brief returns the property xErrorColumnLower. \details Description of the parameter xErrorColumnLower is: <CENTER>\copybrief xErrorColumnLower.</CENTER>. \see xErrorColumnLower for more information */
inline int get_xErrorColumnLower() const { return this->xErrorColumnLower; } inline int get_xErrorColumnLower() const { return this->xErrorColumnLower; }
/** \brief returns the property xErrorColumn. \details Description of the parameter xErrorColumn is: <CENTER>\copybrief xErrorColumn.</CENTER>. \see xErrorColumn for more information */ /*! \brief returns the property xErrorColumn. \details Description of the parameter xErrorColumn is: <CENTER>\copybrief xErrorColumn.</CENTER>. \see xErrorColumn for more information */
inline int get_xErrorColumn() const { return this->xErrorColumn; } inline int get_xErrorColumn() const { return this->xErrorColumn; }
JKQTPGET_SET_MACRO(JKQTPerrorPlotstyle, xErrorStyle) /*! \brief sets the property xErrorStyle to the specified \a __value.
\details Description of the parameter xErrorStyle is: <CENTER>\copybrief xErrorStyle.</CENTER>
\see xErrorStyle for more information */
inline virtual void set_xErrorStyle(const JKQTPerrorPlotstyle & __value)
{
this->xErrorStyle = __value;
}
/*! \brief returns the property xErrorStyle.
\details Description of the parameter xErrorStyle is: <CENTER>\copybrief xErrorStyle.</CENTER>
\see xErrorStyle for more information */
inline virtual JKQTPerrorPlotstyle get_xErrorStyle() const
{
return this->xErrorStyle;
}
/** \brief set the column from which to read the error values for x-error indicators */ /** \brief set the column from which to read the error values for x-error indicators */
void set_xErrorColumn(int __value); void set_xErrorColumn(int __value);
/** \brief set the column from which to read the error values for lower x-error indicators (if not set [=-1], the xErrorColumn-values will be used for upper and lower error indicators) */ /** \brief set the column from which to read the error values for lower x-error indicators (if not set [=-1], the xErrorColumn-values will be used for upper and lower error indicators) */
@ -539,12 +808,38 @@ class LIB_EXPORT JKQTPyGraphErrors: public JKQTPgraphErrors {
/** \brief class contructor */ /** \brief class contructor */
JKQTPyGraphErrors(QColor graphColor=QColor("black")); JKQTPyGraphErrors(QColor graphColor=QColor("black"));
JKQTPGET_SET_MACRO(bool, yErrorSymmetric) /*! \brief sets the property yErrorSymmetric to the specified \a __value.
/** \brief returns the property yErrorColumnLower. \details Description of the parameter yErrorColumnLower is: <CENTER>\copybrief yErrorColumnLower.</CENTER>. \see yErrorColumnLower for more information */ \details Description of the parameter yErrorSymmetric is: <CENTER>\copybrief yErrorSymmetric.</CENTER>
\see yErrorSymmetric for more information */
inline virtual void set_yErrorSymmetric(bool __value)
{
this->yErrorSymmetric = __value;
}
/*! \brief returns the property yErrorSymmetric.
\details Description of the parameter yErrorSymmetric is: <CENTER>\copybrief yErrorSymmetric.</CENTER>
\see yErrorSymmetric for more information */
inline virtual bool get_yErrorSymmetric() const
{
return this->yErrorSymmetric;
}
/*! \brief returns the property yErrorColumnLower. \details Description of the parameter yErrorColumnLower is: <CENTER>\copybrief yErrorColumnLower.</CENTER>. \see yErrorColumnLower for more information */
inline int get_yErrorColumnLower() const { return this->yErrorColumnLower; } inline int get_yErrorColumnLower() const { return this->yErrorColumnLower; }
/** \brief returns the property yErrorColumn. \details Description of the parameter yErrorColumn is: <CENTER>\copybrief yErrorColumn.</CENTER>. \see yErrorColumn for more information */ /*! \brief returns the property yErrorColumn. \details Description of the parameter yErrorColumn is: <CENTER>\copybrief yErrorColumn.</CENTER>. \see yErrorColumn for more information */
inline int get_yErrorColumn() const { return this->yErrorColumn; } inline int get_yErrorColumn() const { return this->yErrorColumn; }
JKQTPGET_SET_MACRO(JKQTPerrorPlotstyle, yErrorStyle) /*! \brief sets the property yErrorStyle to the specified \a __value.
\details Description of the parameter yErrorStyle is: <CENTER>\copybrief yErrorStyle.</CENTER>
\see yErrorStyle for more information */
inline virtual void set_yErrorStyle(const JKQTPerrorPlotstyle & __value)
{
this->yErrorStyle = __value;
}
/*! \brief returns the property yErrorStyle.
\details Description of the parameter yErrorStyle is: <CENTER>\copybrief yErrorStyle.</CENTER>
\see yErrorStyle for more information */
inline virtual JKQTPerrorPlotstyle get_yErrorStyle() const
{
return this->yErrorStyle;
}
/** \copydoc JKQTPgraphErrors::errorUsesColumn() */ /** \copydoc JKQTPgraphErrors::errorUsesColumn() */
virtual bool errorUsesColumn(int c) const override; virtual bool errorUsesColumn(int c) const override;
@ -580,18 +875,70 @@ class LIB_EXPORT JKQTPxyGraphErrors: public JKQTPgraphErrors {
public: public:
/** \brief class contructor */ /** \brief class contructor */
JKQTPxyGraphErrors(QColor graphColor=QColor("black")); JKQTPxyGraphErrors(QColor graphColor=QColor("black"));
JKQTPGET_SET_MACRO(bool, xErrorSymmetric) /*! \brief sets the property xErrorSymmetric to the specified \a __value.
JKQTPGET_SET_MACRO(bool, yErrorSymmetric) \details Description of the parameter xErrorSymmetric is: <CENTER>\copybrief xErrorSymmetric.</CENTER>
/** \brief returns the property xErrorColumnLower. \details Description of the parameter xErrorColumnLower is: <CENTER>\copybrief xErrorColumnLower.</CENTER>. \see xErrorColumnLower for more information */ \see xErrorSymmetric for more information */
inline virtual void set_xErrorSymmetric(bool __value)
{
this->xErrorSymmetric = __value;
}
/*! \brief returns the property xErrorSymmetric.
\details Description of the parameter xErrorSymmetric is: <CENTER>\copybrief xErrorSymmetric.</CENTER>
\see xErrorSymmetric for more information */
inline virtual bool get_xErrorSymmetric() const
{
return this->xErrorSymmetric;
}
/*! \brief sets the property yErrorSymmetric to the specified \a __value.
\details Description of the parameter yErrorSymmetric is: <CENTER>\copybrief yErrorSymmetric.</CENTER>
\see yErrorSymmetric for more information */
inline virtual void set_yErrorSymmetric(bool __value)
{
this->yErrorSymmetric = __value;
}
/*! \brief returns the property yErrorSymmetric.
\details Description of the parameter yErrorSymmetric is: <CENTER>\copybrief yErrorSymmetric.</CENTER>
\see yErrorSymmetric for more information */
inline virtual bool get_yErrorSymmetric() const
{
return this->yErrorSymmetric;
}
/*! \brief returns the property xErrorColumnLower. \details Description of the parameter xErrorColumnLower is: <CENTER>\copybrief xErrorColumnLower.</CENTER>. \see xErrorColumnLower for more information */
inline int get_xErrorColumnLower() const { return this->xErrorColumnLower; } inline int get_xErrorColumnLower() const { return this->xErrorColumnLower; }
/** \brief returns the property xErrorColumn. \details Description of the parameter xErrorColumn is: <CENTER>\copybrief xErrorColumn.</CENTER>. \see xErrorColumn for more information */ /*! \brief returns the property xErrorColumn. \details Description of the parameter xErrorColumn is: <CENTER>\copybrief xErrorColumn.</CENTER>. \see xErrorColumn for more information */
inline int get_xErrorColumn() const { return this->xErrorColumn; } inline int get_xErrorColumn() const { return this->xErrorColumn; }
/** \brief returns the property yErrorColumnLower. \details Description of the parameter yErrorColumnLower is: <CENTER>\copybrief yErrorColumnLower.</CENTER>. \see yErrorColumnLower for more information */ /*! \brief returns the property yErrorColumnLower. \details Description of the parameter yErrorColumnLower is: <CENTER>\copybrief yErrorColumnLower.</CENTER>. \see yErrorColumnLower for more information */
inline int get_yErrorColumnLower() const { return this->yErrorColumnLower; } inline int get_yErrorColumnLower() const { return this->yErrorColumnLower; }
/** \brief returns the property yErrorColumn. \details Description of the parameter yErrorColumn is: <CENTER>\copybrief yErrorColumn.</CENTER>. \see yErrorColumn for more information */ /*! \brief returns the property yErrorColumn. \details Description of the parameter yErrorColumn is: <CENTER>\copybrief yErrorColumn.</CENTER>. \see yErrorColumn for more information */
inline int get_yErrorColumn() const { return this->yErrorColumn; } inline int get_yErrorColumn() const { return this->yErrorColumn; }
JKQTPGET_SET_MACRO(JKQTPerrorPlotstyle, yErrorStyle) /*! \brief sets the property yErrorStyle to the specified \a __value.
JKQTPGET_SET_MACRO(JKQTPerrorPlotstyle, xErrorStyle) \details Description of the parameter yErrorStyle is: <CENTER>\copybrief yErrorStyle.</CENTER>
\see yErrorStyle for more information */
inline virtual void set_yErrorStyle(const JKQTPerrorPlotstyle & __value)
{
this->yErrorStyle = __value;
}
/*! \brief returns the property yErrorStyle.
\details Description of the parameter yErrorStyle is: <CENTER>\copybrief yErrorStyle.</CENTER>
\see yErrorStyle for more information */
inline virtual JKQTPerrorPlotstyle get_yErrorStyle() const
{
return this->yErrorStyle;
}
/*! \brief sets the property xErrorStyle to the specified \a __value.
\details Description of the parameter xErrorStyle is: <CENTER>\copybrief xErrorStyle.</CENTER>
\see xErrorStyle for more information */
inline virtual void set_xErrorStyle(const JKQTPerrorPlotstyle & __value)
{
this->xErrorStyle = __value;
}
/*! \brief returns the property xErrorStyle.
\details Description of the parameter xErrorStyle is: <CENTER>\copybrief xErrorStyle.</CENTER>
\see xErrorStyle for more information */
inline virtual JKQTPerrorPlotstyle get_xErrorStyle() const
{
return this->xErrorStyle;
}
/** \copydoc JKQTPgraphErrors::errorUsesColumn() */ /** \copydoc JKQTPgraphErrors::errorUsesColumn() */
virtual bool errorUsesColumn(int c) const override; virtual bool errorUsesColumn(int c) const override;

574
lib/jkqtplotter/jkqtpgraphsboxplot.h
View File

@ -90,33 +90,275 @@ class LIB_EXPORT JKQTPboxplotVerticalGraph: public JKQTPgraph {
/** \copydoc JKQTPgraph::usesColumn() */ /** \copydoc JKQTPgraph::usesColumn() */
virtual bool usesColumn(int c) const override; virtual bool usesColumn(int c) const override;
JKQTPGET_SET_MACRO(DataSortOrder, sortData) /*! \brief sets the property sortData to the specified \a __value.
/** \brief sets the property sortData to the specified \a __value. \details Description of the parameter sortData is: <CENTER>\copybrief sortData.</CENTER> \see sortData for more information */ \details Description of the parameter sortData is: <CENTER>\copybrief sortData.</CENTER>
\see sortData for more information */
inline virtual void set_sortData(const DataSortOrder & __value)
{
this->sortData = __value;
}
/*! \brief returns the property sortData.
\details Description of the parameter sortData is: <CENTER>\copybrief sortData.</CENTER>
\see sortData for more information */
inline virtual DataSortOrder get_sortData() const
{
return this->sortData;
}
/*! \brief sets the property sortData to the specified \a __value. \details Description of the parameter sortData is: <CENTER>\copybrief sortData.</CENTER> \see sortData for more information */
void set_sortData(int __value); void set_sortData(int __value);
JKQTPGET_SET_MACRO(int, posColumn) /*! \brief sets the property posColumn to the specified \a __value.
JKQTPSET_CAST_MACRO(size_t, int, posColumn) \details Description of the parameter posColumn is: <CENTER>\copybrief posColumn.</CENTER>
JKQTPGET_SET_MACRO(int, medianColumn) \see posColumn for more information */
JKQTPSET_CAST_MACRO(size_t, int, medianColumn) inline virtual void set_posColumn(int __value)
JKQTPGET_SET_MACRO(int, meanColumn) {
JKQTPSET_CAST_MACRO(size_t, int, meanColumn) this->posColumn = __value;
JKQTPGET_SET_MACRO(int, minColumn) }
JKQTPSET_CAST_MACRO(size_t, int, minColumn) /*! \brief returns the property posColumn.
JKQTPGET_SET_MACRO(int, maxColumn) \details Description of the parameter posColumn is: <CENTER>\copybrief posColumn.</CENTER>
JKQTPSET_CAST_MACRO(size_t, int, maxColumn) \see posColumn for more information */
JKQTPGET_SET_MACRO(int, percentile25Column) inline virtual int get_posColumn() const
JKQTPSET_CAST_MACRO(size_t, int, percentile25Column) {
JKQTPGET_SET_MACRO(int, percentile75Column) return this->posColumn;
JKQTPSET_CAST_MACRO(size_t, int, percentile75Column) }
JKQTPGET_SET_MACRO(QColor, color) /*! \brief sets the property posColumn to the specified \a __value, where __value is static_cast'ed from size_t to int.
JKQTPGET_SET_MACRO(QColor, fillColor) \details Description of the parameter posColumn is: <CENTER>\copybrief posColumn.</CENTER>
JKQTPGET_SET_MACRO(Qt::PenStyle, whiskerStyle) \see posColumn for more information */
JKQTPGET_SET_MACRO(Qt::BrushStyle, fillStyle) inline virtual void set_posColumn (size_t __value) { this->posColumn = static_cast<int>(__value); }
JKQTPGET_SET_MACRO(double, lineWidth) /*! \brief sets the property medianColumn to the specified \a __value.
JKQTPGET_SET_MACRO(double, boxWidth) \details Description of the parameter medianColumn is: <CENTER>\copybrief medianColumn.</CENTER>
\see medianColumn for more information */
inline virtual void set_medianColumn(int __value)
{
this->medianColumn = __value;
}
/*! \brief returns the property medianColumn.
\details Description of the parameter medianColumn is: <CENTER>\copybrief medianColumn.</CENTER>
\see medianColumn for more information */
inline virtual int get_medianColumn() const
{
return this->medianColumn;
}
/*! \brief sets the property medianColumn to the specified \a __value, where __value is static_cast'ed from size_t to int.
\details Description of the parameter medianColumn is: <CENTER>\copybrief medianColumn.</CENTER>
\see medianColumn for more information */
inline virtual void set_medianColumn (size_t __value) { this->medianColumn = static_cast<int>(__value); }
/*! \brief sets the property meanColumn to the specified \a __value.
\details Description of the parameter meanColumn is: <CENTER>\copybrief meanColumn.</CENTER>
\see meanColumn for more information */
inline virtual void set_meanColumn(int __value)
{
this->meanColumn = __value;
}
/*! \brief returns the property meanColumn.
\details Description of the parameter meanColumn is: <CENTER>\copybrief meanColumn.</CENTER>
\see meanColumn for more information */
inline virtual int get_meanColumn() const
{
return this->meanColumn;
}
/*! \brief sets the property meanColumn to the specified \a __value, where __value is static_cast'ed from size_t to int.
\details Description of the parameter meanColumn is: <CENTER>\copybrief meanColumn.</CENTER>
\see meanColumn for more information */
inline virtual void set_meanColumn (size_t __value) { this->meanColumn = static_cast<int>(__value); }
/*! \brief sets the property minColumn to the specified \a __value.
\details Description of the parameter minColumn is: <CENTER>\copybrief minColumn.</CENTER>
\see minColumn for more information */
inline virtual void set_minColumn(int __value)
{
this->minColumn = __value;
}
/*! \brief returns the property minColumn.
\details Description of the parameter minColumn is: <CENTER>\copybrief minColumn.</CENTER>
\see minColumn for more information */
inline virtual int get_minColumn() const
{
return this->minColumn;
}
/*! \brief sets the property minColumn to the specified \a __value, where __value is static_cast'ed from size_t to int.
\details Description of the parameter minColumn is: <CENTER>\copybrief minColumn.</CENTER>
\see minColumn for more information */
inline virtual void set_minColumn( size_t __value) { this->minColumn = static_cast<int>(__value); }
/*! \brief sets the property maxColumn to the specified \a __value.
\details Description of the parameter maxColumn is: <CENTER>\copybrief maxColumn.</CENTER>
\see maxColumn for more information */
inline virtual void set_maxColumn(int __value)
{
this->maxColumn = __value;
}
/*! \brief returns the property maxColumn.
\details Description of the parameter maxColumn is: <CENTER>\copybrief maxColumn.</CENTER>
\see maxColumn for more information */
inline virtual int get_maxColumn() const
{
return this->maxColumn;
}
/*! \brief sets the property maxColumn to the specified \a __value, where __value is static_cast'ed from size_t to int.
\details Description of the parameter maxColumn is: <CENTER>\copybrief maxColumn.</CENTER>
\see maxColumn for more information */
inline virtual void set_maxColumn (size_t __value) { this->maxColumn = static_cast<int>(__value); }
/*! \brief sets the property percentile25Column to the specified \a __value.
\details Description of the parameter percentile25Column is: <CENTER>\copybrief percentile25Column.</CENTER>
\see percentile25Column for more information */
inline virtual void set_percentile25Column(int __value)
{
this->percentile25Column = __value;
}
/*! \brief returns the property percentile25Column.
\details Description of the parameter percentile25Column is: <CENTER>\copybrief percentile25Column.</CENTER>
\see percentile25Column for more information */
inline virtual int get_percentile25Column() const
{
return this->percentile25Column;
}
/*! \brief sets the property percentile25Column to the specified \a __value, where __value is static_cast'ed from size_t to int.
\details Description of the parameter percentile25Column is: <CENTER>\copybrief percentile25Column.</CENTER>
\see percentile25Column for more information */
inline virtual void set_percentile25Column (size_t __value) { this->percentile25Column = static_cast<int>(__value); }
/*! \brief sets the property percentile75Column to the specified \a __value.
\details Description of the parameter percentile75Column is: <CENTER>\copybrief percentile75Column.</CENTER>
\see percentile75Column for more information */
inline virtual void set_percentile75Column(int __value)
{
this->percentile75Column = __value;
}
/*! \brief returns the property percentile75Column.
\details Description of the parameter percentile75Column is: <CENTER>\copybrief percentile75Column.</CENTER>
\see percentile75Column for more information */
inline virtual int get_percentile75Column() const
{
return this->percentile75Column;
}
/*! \brief sets the property percentile75Column to the specified \a __value, where __value is static_cast'ed from size_t to int.
\details Description of the parameter percentile75Column is: <CENTER>\copybrief percentile75Column.</CENTER>
\see percentile75Column for more information */
inline virtual void set_percentile75Column (size_t __value) { this->percentile75Column = static_cast<int>(__value); }
/*! \brief sets the property color to the specified \a __value.
\details Description of the parameter color is: <CENTER>\copybrief color.</CENTER>
\see color for more information */
inline virtual void set_color(const QColor & __value)
{
this->color = __value;
}
/*! \brief returns the property color.
\details Description of the parameter color is: <CENTER>\copybrief color.</CENTER>
\see color for more information */
inline virtual QColor get_color() const
{
return this->color;
}
/*! \brief sets the property fillColor to the specified \a __value.
\details Description of the parameter fillColor is: <CENTER>\copybrief fillColor.</CENTER>
\see fillColor for more information */
inline virtual void set_fillColor(const QColor & __value)
{
this->fillColor = __value;
}
/*! \brief returns the property fillColor.
\details Description of the parameter fillColor is: <CENTER>\copybrief fillColor.</CENTER>
\see fillColor for more information */
inline virtual QColor get_fillColor() const
{
return this->fillColor;
}
/*! \brief sets the property whiskerStyle to the specified \a __value.
\details Description of the parameter whiskerStyle is: <CENTER>\copybrief whiskerStyle.</CENTER>
\see whiskerStyle for more information */
inline virtual void set_whiskerStyle(const Qt::PenStyle & __value)
{
this->whiskerStyle = __value;
}
/*! \brief returns the property whiskerStyle.
\details Description of the parameter whiskerStyle is: <CENTER>\copybrief whiskerStyle.</CENTER>
\see whiskerStyle for more information */
inline virtual Qt::PenStyle get_whiskerStyle() const
{
return this->whiskerStyle;
}
/*! \brief sets the property fillStyle to the specified \a __value.
\details Description of the parameter fillStyle is: <CENTER>\copybrief fillStyle.</CENTER>
\see fillStyle for more information */
inline virtual void set_fillStyle(const Qt::BrushStyle & __value)
{
this->fillStyle = __value;
}
/*! \brief returns the property fillStyle.
\details Description of the parameter fillStyle is: <CENTER>\copybrief fillStyle.</CENTER>
\see fillStyle for more information */
inline virtual Qt::BrushStyle get_fillStyle() const
{
return this->fillStyle;
}
/*! \brief sets the property lineWidth to the specified \a __value.
\details Description of the parameter lineWidth is: <CENTER>\copybrief lineWidth.</CENTER>
\see lineWidth for more information */
inline virtual void set_lineWidth(double __value)
{
this->lineWidth = __value;
}
/*! \brief returns the property lineWidth.
\details Description of the parameter lineWidth is: <CENTER>\copybrief lineWidth.</CENTER>
\see lineWidth for more information */
inline virtual double get_lineWidth() const
{
return this->lineWidth;
}
/*! \brief sets the property boxWidth to the specified \a __value.
\details Description of the parameter boxWidth is: <CENTER>\copybrief boxWidth.</CENTER>
\see boxWidth for more information */
inline virtual void set_boxWidth(double __value)
{
this->boxWidth = __value;
}
/*! \brief returns the property boxWidth.
\details Description of the parameter boxWidth is: <CENTER>\copybrief boxWidth.</CENTER>
\see boxWidth for more information */
inline virtual double get_boxWidth() const
{
return this->boxWidth;
}
JKQTPGET_SET_MACRO(JKQTPgraphSymbols, meanSymbol) /*! \brief sets the property meanSymbol to the specified \a __value.
JKQTPGET_SET_MACRO(double, meanSymbolWidth) \details Description of the parameter meanSymbol is: <CENTER>\copybrief meanSymbol.</CENTER>
JKQTPGET_SET_MACRO(double, meanSymbolSize) \see meanSymbol for more information */
inline virtual void set_meanSymbol(const JKQTPgraphSymbols & __value)
{
this->meanSymbol = __value;
}
/*! \brief returns the property meanSymbol.
\details Description of the parameter meanSymbol is: <CENTER>\copybrief meanSymbol.</CENTER>
\see meanSymbol for more information */
inline virtual JKQTPgraphSymbols get_meanSymbol() const
{
return this->meanSymbol;
}
/*! \brief sets the property meanSymbolWidth to the specified \a __value.
\details Description of the parameter meanSymbolWidth is: <CENTER>\copybrief meanSymbolWidth.</CENTER>
\see meanSymbolWidth for more information */
inline virtual void set_meanSymbolWidth(double __value)
{
this->meanSymbolWidth = __value;
}
/*! \brief returns the property meanSymbolWidth.
\details Description of the parameter meanSymbolWidth is: <CENTER>\copybrief meanSymbolWidth.</CENTER>
\see meanSymbolWidth for more information */
inline virtual double get_meanSymbolWidth() const
{
return this->meanSymbolWidth;
}
/*! \brief sets the property meanSymbolSize to the specified \a __value.
\details Description of the parameter meanSymbolSize is: <CENTER>\copybrief meanSymbolSize.</CENTER>
\see meanSymbolSize for more information */
inline virtual void set_meanSymbolSize(double __value)
{
this->meanSymbolSize = __value;
}
/*! \brief returns the property meanSymbolSize.
\details Description of the parameter meanSymbolSize is: <CENTER>\copybrief meanSymbolSize.</CENTER>
\see meanSymbolSize for more information */
inline virtual double get_meanSymbolSize() const
{
return this->meanSymbolSize;
}
protected: protected:
/** \brief which plot style to use from the parent plotter (via JKQtPlotterBase::getPlotStyle() and JKQtPlotterBase::getNextStyle() ) */ /** \brief which plot style to use from the parent plotter (via JKQtPlotterBase::getPlotStyle() and JKQtPlotterBase::getNextStyle() ) */
@ -248,25 +490,271 @@ class LIB_EXPORT JKQTPboxplotVerticalElement: public JKQTPgraph {
virtual bool getYMinMax(double& miny, double& maxy, double& smallestGreaterZero) override; virtual bool getYMinMax(double& miny, double& maxy, double& smallestGreaterZero) override;
JKQTPGET_SET_MACRO(double, pos) /*! \brief sets the property pos to the specified \a __value.
JKQTPGET_SET_MACRO_I(double, median, drawMedian=true) \details Description of the parameter pos is: <CENTER>\copybrief pos.</CENTER>
JKQTPGET_SET_MACRO_I(double, mean, drawMean=true) \see pos for more information */
JKQTPGET_SET_MACRO_I(double, min, drawMinMax=true) inline virtual void set_pos(double __value)
JKQTPGET_SET_MACRO_I(double, max, drawMinMax=true) {
JKQTPGET_SET_MACRO(double, percentile25) this->pos = __value;
JKQTPGET_SET_MACRO(double, percentile75) }
JKQTPGET_SET_MACRO(QColor, color) /*! \brief returns the property pos.
JKQTPGET_SET_MACRO(QColor, fillColor) \details Description of the parameter pos is: <CENTER>\copybrief pos.</CENTER>
JKQTPGET_SET_MACRO(Qt::PenStyle, whiskerStyle) \see pos for more information */
JKQTPGET_SET_MACRO(double, lineWidth) inline virtual double get_pos() const
JKQTPGET_SET_MACRO(double, boxWidth) {
return this->pos;
}
/*! \brief sets the property median to the specified \a __value.
\details Description of the parameter median is: <CENTER>\copybrief median.</CENTER>
\see median for more information */
inline virtual void set_median(double __value)
{
if (this->median != __value) {
this->median = __value;
drawMedian=true;
}
}
/*! \brief returns the property median.
\details Description of the parameter median is: <CENTER>\copybrief median.</CENTER>
\see median for more information */
inline virtual double get_median() const
{
return this->median;
}
/*! \brief sets the property mean to the specified \a __value.
\details Description of the parameter mean is: <CENTER>\copybrief mean.</CENTER>
\see mean for more information */
inline virtual void set_mean(double __value)
{
if (this->mean != __value) {
this->mean = __value;
drawMean=true;
}
}
/*! \brief returns the property mean.
\details Description of the parameter mean is: <CENTER>\copybrief mean.</CENTER>
\see mean for more information */
inline virtual double get_mean() const
{
return this->mean;
}
/*! \brief sets the property min to the specified \a __value.
\details Description of the parameter min is: <CENTER>\copybrief min.</CENTER>
\see min for more information */
inline virtual void set_min(double __value)
{
if (this->min != __value) {
this->min = __value;
drawMinMax=true;
}
}
/*! \brief returns the property min.
\details Description of the parameter min is: <CENTER>\copybrief min.</CENTER>
\see min for more information */
inline virtual double get_min() const
{
return this->min;
}
/*! \brief sets the property max to the specified \a __value.
\details Description of the parameter max is: <CENTER>\copybrief max.</CENTER>
\see max for more information */
inline virtual void set_max(double __value)
{
if (this->max != __value) {
this->max = __value;
drawMinMax=true;
}
}
/*! \brief returns the property max.
\details Description of the parameter max is: <CENTER>\copybrief max.</CENTER>
\see max for more information */
inline virtual double get_max() const
{
return this->max;
}
/*! \brief sets the property percentile25 to the specified \a __value.
\details Description of the parameter percentile25 is: <CENTER>\copybrief percentile25.</CENTER>
\see percentile25 for more information */
inline virtual void set_percentile25(double __value)
{
this->percentile25 = __value;
}
/*! \brief returns the property percentile25.
\details Description of the parameter percentile25 is: <CENTER>\copybrief percentile25.</CENTER>
\see percentile25 for more information */
inline virtual double get_percentile25() const
{
return this->percentile25;
}
/*! \brief sets the property percentile75 to the specified \a __value.
\details Description of the parameter percentile75 is: <CENTER>\copybrief percentile75.</CENTER>
\see percentile75 for more information */
inline virtual void set_percentile75(double __value)
{
this->percentile75 = __value;
}
/*! \brief returns the property percentile75.
\details Description of the parameter percentile75 is: <CENTER>\copybrief percentile75.</CENTER>
\see percentile75 for more information */
inline virtual double get_percentile75() const
{
return this->percentile75;
}
/*! \brief sets the property color to the specified \a __value.
\details Description of the parameter color is: <CENTER>\copybrief color.</CENTER>
\see color for more information */
inline virtual void set_color(const QColor & __value)
{
this->color = __value;
}
/*! \brief returns the property color.
\details Description of the parameter color is: <CENTER>\copybrief color.</CENTER>
\see color for more information */
inline virtual QColor get_color() const
{
return this->color;
}
/*! \brief sets the property fillColor to the specified \a __value.
\details Description of the parameter fillColor is: <CENTER>\copybrief fillColor.</CENTER>
\see fillColor for more information */
inline virtual void set_fillColor(const QColor & __value)
{
this->fillColor = __value;
}
/*! \brief returns the property fillColor.
\details Description of the parameter fillColor is: <CENTER>\copybrief fillColor.</CENTER>
\see fillColor for more information */
inline virtual QColor get_fillColor() const
{
return this->fillColor;
}
/*! \brief sets the property whiskerStyle to the specified \a __value.
\details Description of the parameter whiskerStyle is: <CENTER>\copybrief whiskerStyle.</CENTER>
\see whiskerStyle for more information */
inline virtual void set_whiskerStyle(const Qt::PenStyle & __value)
{
this->whiskerStyle = __value;
}
/*! \brief returns the property whiskerStyle.
\details Description of the parameter whiskerStyle is: <CENTER>\copybrief whiskerStyle.</CENTER>
\see whiskerStyle for more information */
inline virtual Qt::PenStyle get_whiskerStyle() const
{
return this->whiskerStyle;
}
/*! \brief sets the property lineWidth to the specified \a __value.
\details Description of the parameter lineWidth is: <CENTER>\copybrief lineWidth.</CENTER>
\see lineWidth for more information */
inline virtual void set_lineWidth(double __value)
{
this->lineWidth = __value;
}
/*! \brief returns the property lineWidth.
\details Description of the parameter lineWidth is: <CENTER>\copybrief lineWidth.</CENTER>
\see lineWidth for more information */
inline virtual double get_lineWidth() const
{
return this->lineWidth;
}
/*! \brief sets the property boxWidth to the specified \a __value.
\details Description of the parameter boxWidth is: <CENTER>\copybrief boxWidth.</CENTER>
\see boxWidth for more information */
inline virtual void set_boxWidth(double __value)
{
this->boxWidth = __value;
}
/*! \brief returns the property boxWidth.
\details Description of the parameter boxWidth is: <CENTER>\copybrief boxWidth.</CENTER>
\see boxWidth for more information */
inline virtual double get_boxWidth() const
{
return this->boxWidth;
}
JKQTPGET_SET_MACRO(JKQTPgraphSymbols, meanSymbol) /*! \brief sets the property meanSymbol to the specified \a __value.
JKQTPGET_SET_MACRO(double, meanSymbolWidth) \details Description of the parameter meanSymbol is: <CENTER>\copybrief meanSymbol.</CENTER>
JKQTPGET_SET_MACRO(double, meanSymbolSize) \see meanSymbol for more information */
JKQTPGET_SET_MACRO(bool, drawMean) inline virtual void set_meanSymbol(const JKQTPgraphSymbols & __value)
JKQTPGET_SET_MACRO(bool, drawMedian) {
JKQTPGET_SET_MACRO(bool, drawMinMax) this->meanSymbol = __value;
}
/*! \brief returns the property meanSymbol.
\details Description of the parameter meanSymbol is: <CENTER>\copybrief meanSymbol.</CENTER>
\see meanSymbol for more information */
inline virtual JKQTPgraphSymbols get_meanSymbol() const
{
return this->meanSymbol;
}
/*! \brief sets the property meanSymbolWidth to the specified \a __value.
\details Description of the parameter meanSymbolWidth is: <CENTER>\copybrief meanSymbolWidth.</CENTER>
\see meanSymbolWidth for more information */
inline virtual void set_meanSymbolWidth(double __value)
{
this->meanSymbolWidth = __value;
}
/*! \brief returns the property meanSymbolWidth.
\details Description of the parameter meanSymbolWidth is: <CENTER>\copybrief meanSymbolWidth.</CENTER>
\see meanSymbolWidth for more information */
inline virtual double get_meanSymbolWidth() const
{
return this->meanSymbolWidth;
}
/*! \brief sets the property meanSymbolSize to the specified \a __value.
\details Description of the parameter meanSymbolSize is: <CENTER>\copybrief meanSymbolSize.</CENTER>
\see meanSymbolSize for more information */
inline virtual void set_meanSymbolSize(double __value)
{
this->meanSymbolSize = __value;
}
/*! \brief returns the property meanSymbolSize.
\details Description of the parameter meanSymbolSize is: <CENTER>\copybrief meanSymbolSize.</CENTER>
\see meanSymbolSize for more information */
inline virtual double get_meanSymbolSize() const
{
return this->meanSymbolSize;
}
/*! \brief sets the property drawMean to the specified \a __value.
\details Description of the parameter drawMean is: <CENTER>\copybrief drawMean.</CENTER>
\see drawMean for more information */
inline virtual void set_drawMean(bool __value)
{
this->drawMean = __value;
}
/*! \brief returns the property drawMean.
\details Description of the parameter drawMean is: <CENTER>\copybrief drawMean.</CENTER>
\see drawMean for more information */
inline virtual bool get_drawMean() const
{
return this->drawMean;
}
/*! \brief sets the property drawMedian to the specified \a __value.
\details Description of the parameter drawMedian is: <CENTER>\copybrief drawMedian.</CENTER>
\see drawMedian for more information */
inline virtual void set_drawMedian(bool __value)
{
this->drawMedian = __value;
}
/*! \brief returns the property drawMedian.
\details Description of the parameter drawMedian is: <CENTER>\copybrief drawMedian.</CENTER>
\see drawMedian for more information */
inline virtual bool get_drawMedian() const
{
return this->drawMedian;
}
/*! \brief sets the property drawMinMax to the specified \a __value.
\details Description of the parameter drawMinMax is: <CENTER>\copybrief drawMinMax.</CENTER>
\see drawMinMax for more information */
inline virtual void set_drawMinMax(bool __value)
{
this->drawMinMax = __value;
}
/*! \brief returns the property drawMinMax.
\details Description of the parameter drawMinMax is: <CENTER>\copybrief drawMinMax.</CENTER>
\see drawMinMax for more information */
inline virtual bool get_drawMinMax() const
{
return this->drawMinMax;
}
protected: protected:
/** \brief which plot style to use from the parent plotter (via JKQtPlotterBase::getPlotStyle() and JKQtPlotterBase::getNextStyle() ) */ /** \brief which plot style to use from the parent plotter (via JKQtPlotterBase::getPlotStyle() and JKQtPlotterBase::getNextStyle() ) */

10
lib/jkqtplotter/jkqtpgraphsevaluatedfunction.cpp
View File

@ -252,7 +252,7 @@ void JKQTPxFunctionLineGraph::createPlotData(bool collectParams) {
/*if (parent && parent->get_xAxis()->isLogAxis()) { /*if (parent && parent->get_xAxis()->isLogAxis()) {
for (double x=log(xmin)+logdelta0; x<log(xmax); x=x+logdelta0) { for (double x=log(xmin)+logdelta0; x<log(xmax); x=x+logdelta0) {
d->next = new doublePair; d->next = new doublePair;
d->next->x=exp(x+((double)rand()/(double)RAND_MAX-0.5)*delta0/2.0); d->next->x=exp(x+(static_cast<double>(rand())/static_cast<double>(RAND_MAX)-0.5)*delta0/2.0);
d->next->f=func(d->next->x,); d->next->f=func(d->next->x,);
d->next->next=nullptr; d->next->next=nullptr;
doublePair* dd=d; doublePair* dd=d;
@ -266,7 +266,7 @@ void JKQTPxFunctionLineGraph::createPlotData(bool collectParams) {
} else { } else {
for (double x=pxmin+delta0; x<pxmax; x=x+delta0) { for (double x=pxmin+delta0; x<pxmax; x=x+delta0) {
d->next = new doublePair; d->next = new doublePair;
d->next->x=parent->p2x(x+((double)rand()/(double)RAND_MAX-0.5)*delta0/2.0); d->next->x=parent->p2x(x+(static_cast<double>(rand())/static_cast<double>(RAND_MAX)-0.5)*delta0/2.0);
d->next->f=func(d->next->x); d->next->f=func(d->next->x);
d->next->next=nullptr; d->next->next=nullptr;
doublePair* dd=d; doublePair* dd=d;
@ -341,10 +341,10 @@ void JKQTPxFunctionLineGraph::refine(doublePair* a, doublePair* b, unsigned int
double xmid=ax+(delta)/2.0; double xmid=ax+(delta)/2.0;
/*if (parent && parent->get_xAxis()->isLogAxis()) { /*if (parent && parent->get_xAxis()->isLogAxis()) {
xmid=log(a->x)+(logdelta)/2.0; xmid=log(a->x)+(logdelta)/2.0;
xmid=xmid+((double)rand()/(double)RAND_MAX-0.5)*delta/5.0; xmid=xmid+(static_cast<double>(rand())/static_cast<double>(RAND_MAX)-0.5)*delta/5.0;
xmid=exp(xmid); xmid=exp(xmid);
} else {*/ } else {*/
xmid=xmid+((double)rand()/(double)RAND_MAX-0.5)*delta/5.0; // shake by 10% xmid=xmid+(static_cast<double>(rand())/static_cast<double>(RAND_MAX)-0.5)*delta/5.0; // shake by 10%
//} //}
double realxmid=parent->p2x(xmid); double realxmid=parent->p2x(xmid);
double realfmid; double realfmid;
@ -738,7 +738,7 @@ void JKQTPyFunctionLineGraph::createPlotData(bool collectParams) {
data=d; data=d;
for (double y=ymin+delta0; y<ymax; y=y+delta0) { for (double y=ymin+delta0; y<ymax; y=y+delta0) {
d->next = new doublePair; d->next = new doublePair;
d->next->x=y+((double)rand()/(double)RAND_MAX-0.5)*delta0/2.0; d->next->x=y+(static_cast<double>(rand())/static_cast<double>(RAND_MAX)-0.5)*delta0/2.0;
d->next->f=func(d->next->x); d->next->f=func(d->next->x);
d->next->next=nullptr; d->next->next=nullptr;
doublePair* dd=d; doublePair* dd=d;

1000
lib/jkqtplotter/jkqtpgraphsevaluatedfunction.h
View File

File diff suppressed because it is too large Load Diff

260
lib/jkqtplotter/jkqtpgraphsfilledcurve.h
View File

@ -48,16 +48,133 @@ class LIB_EXPORT JKQTPfilledCurveXGraph: public JKQTPxyGraph {
/** \brief returns the color to be used for the key label */ /** \brief returns the color to be used for the key label */
virtual QColor getKeyLabelColor() override; virtual QColor getKeyLabelColor() override;
JKQTPGET_SET_MACRO(QColor, color) /*! \brief sets the property color to the specified \a __value.
JKQTPGET_SET_MACRO(QColor, fillColor) \details Description of the parameter color is: <CENTER>\copybrief color.</CENTER>
JKQTPGET_SET_MACRO(Qt::PenStyle, style) \see color for more information */
JKQTPGET_SET_MACRO(double, lineWidth) inline virtual void set_color(const QColor & __value)
JKQTPGET_SET_MACRO(double, baseline) {
JKQTPGET_SET_MACRO(bool, drawLine) this->color = __value;
JKQTPGET_SET_MACRO(Qt::BrushStyle, fillStyle) }
/*! \brief returns the property color.
\details Description of the parameter color is: <CENTER>\copybrief color.</CENTER>
\see color for more information */
inline virtual QColor get_color() const
{
return this->color;
}
/*! \brief sets the property fillColor to the specified \a __value.
\details Description of the parameter fillColor is: <CENTER>\copybrief fillColor.</CENTER>
\see fillColor for more information */
inline virtual void set_fillColor(const QColor & __value)
{
this->fillColor = __value;
}
/*! \brief returns the property fillColor.
\details Description of the parameter fillColor is: <CENTER>\copybrief fillColor.</CENTER>
\see fillColor for more information */
inline virtual QColor get_fillColor() const
{
return this->fillColor;
}
/*! \brief sets the property style to the specified \a __value.
\details Description of the parameter style is: <CENTER>\copybrief style.</CENTER>
\see style for more information */
inline virtual void set_style(const Qt::PenStyle & __value)
{
this->style = __value;
}
/*! \brief returns the property style.
\details Description of the parameter style is: <CENTER>\copybrief style.</CENTER>
\see style for more information */
inline virtual Qt::PenStyle get_style() const
{
return this->style;
}
/*! \brief sets the property lineWidth to the specified \a __value.
\details Description of the parameter lineWidth is: <CENTER>\copybrief lineWidth.</CENTER>
\see lineWidth for more information */
inline virtual void set_lineWidth(double __value)
{
this->lineWidth = __value;
}
/*! \brief returns the property lineWidth.
\details Description of the parameter lineWidth is: <CENTER>\copybrief lineWidth.</CENTER>
\see lineWidth for more information */
inline virtual double get_lineWidth() const
{
return this->lineWidth;
}
/*! \brief sets the property baseline to the specified \a __value.
\details Description of the parameter baseline is: <CENTER>\copybrief baseline.</CENTER>
\see baseline for more information */
inline virtual void set_baseline(double __value)
{
this->baseline = __value;
}
/*! \brief returns the property baseline.
\details Description of the parameter baseline is: <CENTER>\copybrief baseline.</CENTER>
\see baseline for more information */
inline virtual double get_baseline() const
{
return this->baseline;
}
/*! \brief sets the property drawLine to the specified \a __value.
\details Description of the parameter drawLine is: <CENTER>\copybrief drawLine.</CENTER>
\see drawLine for more information */
inline virtual void set_drawLine(bool __value)
{
this->drawLine = __value;
}
/*! \brief returns the property drawLine.
\details Description of the parameter drawLine is: <CENTER>\copybrief drawLine.</CENTER>
\see drawLine for more information */
inline virtual bool get_drawLine() const
{
return this->drawLine;
}
/*! \brief sets the property fillStyle to the specified \a __value.
\details Description of the parameter fillStyle is: <CENTER>\copybrief fillStyle.</CENTER>
\see fillStyle for more information */
inline virtual void set_fillStyle(const Qt::BrushStyle & __value)
{
this->fillStyle = __value;
}
/*! \brief returns the property fillStyle.
\details Description of the parameter fillStyle is: <CENTER>\copybrief fillStyle.</CENTER>
\see fillStyle for more information */
inline virtual Qt::BrushStyle get_fillStyle() const
{
return this->fillStyle;
}
JKQTPGET_SET_MACRO(bool, drawSelectionLine) /*! \brief sets the property drawSelectionLine to the specified \a __value.
JKQTPGET_SET_MACRO(QColor, selectionLineColor) \details Description of the parameter drawSelectionLine is: <CENTER>\copybrief drawSelectionLine.</CENTER>
\see drawSelectionLine for more information */
inline virtual void set_drawSelectionLine(bool __value)
{
this->drawSelectionLine = __value;
}
/*! \brief returns the property drawSelectionLine.
\details Description of the parameter drawSelectionLine is: <CENTER>\copybrief drawSelectionLine.</CENTER>
\see drawSelectionLine for more information */
inline virtual bool get_drawSelectionLine() const
{
return this->drawSelectionLine;
}
/*! \brief sets the property selectionLineColor to the specified \a __value.
\details Description of the parameter selectionLineColor is: <CENTER>\copybrief selectionLineColor.</CENTER>
\see selectionLineColor for more information */
inline virtual void set_selectionLineColor(const QColor & __value)
{
this->selectionLineColor = __value;
}
/*! \brief returns the property selectionLineColor.
\details Description of the parameter selectionLineColor is: <CENTER>\copybrief selectionLineColor.</CENTER>
\see selectionLineColor for more information */
inline virtual QColor get_selectionLineColor() const
{
return this->selectionLineColor;
}
protected: protected:
@ -193,17 +310,124 @@ class LIB_EXPORT JKQTPfilledVerticalRangeGraph: public JKQTPxyGraph {
/** \brief returns the color to be used for the key label */ /** \brief returns the color to be used for the key label */
virtual QColor getKeyLabelColor() override; virtual QColor getKeyLabelColor() override;
JKQTPGET_SET_MACRO(int, yColumn2) /*! \brief sets the property yColumn2 to the specified \a __value.
JKQTPSET_CAST_MACRO(size_t, int, yColumn2) \details Description of the parameter yColumn2 is: <CENTER>\copybrief yColumn2.</CENTER>
\see yColumn2 for more information */
inline virtual void set_yColumn2(int __value)
{
this->yColumn2 = __value;
}
/*! \brief returns the property yColumn2.
\details Description of the parameter yColumn2 is: <CENTER>\copybrief yColumn2.</CENTER>
\see yColumn2 for more information */
inline virtual int get_yColumn2() const
{
return this->yColumn2;
}
/*! \brief sets the property yColumn2 to the specified \a __value, where __value is static_cast'ed from size_t to int.
\details Description of the parameter yColumn2 is: <CENTER>\copybrief yColumn2.</CENTER>
\see yColumn2 for more information */
inline virtual void set_yColumn2 (size_t __value) { this->yColumn2 = static_cast<int>(__value); }
JKQTPGET_SET_MACRO(QColor, color) /*! \brief sets the property color to the specified \a __value.
JKQTPGET_SET_MACRO(QColor, fillColor) \details Description of the parameter color is: <CENTER>\copybrief color.</CENTER>
JKQTPGET_SET_MACRO(Qt::PenStyle, style) \see color for more information */
JKQTPGET_SET_MACRO(bool, drawLine) inline virtual void set_color(const QColor & __value)
JKQTPGET_SET_MACRO(Qt::BrushStyle, fillStyle) {
this->color = __value;
}
/*! \brief returns the property color.
\details Description of the parameter color is: <CENTER>\copybrief color.</CENTER>
\see color for more information */
inline virtual QColor get_color() const
{
return this->color;
}
/*! \brief sets the property fillColor to the specified \a __value.
\details Description of the parameter fillColor is: <CENTER>\copybrief fillColor.</CENTER>
\see fillColor for more information */
inline virtual void set_fillColor(const QColor & __value)
{
this->fillColor = __value;
}
/*! \brief returns the property fillColor.
\details Description of the parameter fillColor is: <CENTER>\copybrief fillColor.</CENTER>
\see fillColor for more information */
inline virtual QColor get_fillColor() const
{
return this->fillColor;
}
/*! \brief sets the property style to the specified \a __value.
\details Description of the parameter style is: <CENTER>\copybrief style.</CENTER>
\see style for more information */
inline virtual void set_style(const Qt::PenStyle & __value)
{
this->style = __value;
}
/*! \brief returns the property style.
\details Description of the parameter style is: <CENTER>\copybrief style.</CENTER>
\see style for more information */
inline virtual Qt::PenStyle get_style() const
{
return this->style;
}
/*! \brief sets the property drawLine to the specified \a __value.
\details Description of the parameter drawLine is: <CENTER>\copybrief drawLine.</CENTER>
\see drawLine for more information */
inline virtual void set_drawLine(bool __value)
{
this->drawLine = __value;
}
/*! \brief returns the property drawLine.
\details Description of the parameter drawLine is: <CENTER>\copybrief drawLine.</CENTER>
\see drawLine for more information */
inline virtual bool get_drawLine() const
{
return this->drawLine;
}
/*! \brief sets the property fillStyle to the specified \a __value.
\details Description of the parameter fillStyle is: <CENTER>\copybrief fillStyle.</CENTER>
\see fillStyle for more information */
inline virtual void set_fillStyle(const Qt::BrushStyle & __value)
{
this->fillStyle = __value;
}
/*! \brief returns the property fillStyle.
\details Description of the parameter fillStyle is: <CENTER>\copybrief fillStyle.</CENTER>
\see fillStyle for more information */
inline virtual Qt::BrushStyle get_fillStyle() const
{
return this->fillStyle;
}
JKQTPGET_SET_MACRO(bool, drawSelectionLine) /*! \brief sets the property drawSelectionLine to the specified \a __value.
JKQTPGET_SET_MACRO(QColor, selectionLineColor) \details Description of the parameter drawSelectionLine is: <CENTER>\copybrief drawSelectionLine.</CENTER>
\see drawSelectionLine for more information */
inline virtual void set_drawSelectionLine(bool __value)
{
this->drawSelectionLine = __value;
}
/*! \brief returns the property drawSelectionLine.
\details Description of the parameter drawSelectionLine is: <CENTER>\copybrief drawSelectionLine.</CENTER>
\see drawSelectionLine for more information */
inline virtual bool get_drawSelectionLine() const
{
return this->drawSelectionLine;
}
/*! \brief sets the property selectionLineColor to the specified \a __value.
\details Description of the parameter selectionLineColor is: <CENTER>\copybrief selectionLineColor.</CENTER>
\see selectionLineColor for more information */
inline virtual void set_selectionLineColor(const QColor & __value)
{
this->selectionLineColor = __value;
}
/*! \brief returns the property selectionLineColor.
\details Description of the parameter selectionLineColor is: <CENTER>\copybrief selectionLineColor.</CENTER>
\see selectionLineColor for more information */
inline virtual QColor get_selectionLineColor() const
{
return this->selectionLineColor;
}
protected: protected:

660
lib/jkqtplotter/jkqtpgraphsgeometric.h
View File

@ -66,9 +66,48 @@ class LIB_EXPORT JKQTPgeoBaseLine: public JKQTPplotObject {
explicit JKQTPgeoBaseLine(QColor color, double lineWidth, Qt::PenStyle style, JKQtPlotter* parent); explicit JKQTPgeoBaseLine(QColor color, double lineWidth, Qt::PenStyle style, JKQtPlotter* parent);
JKQTPGET_SET_MACRO(QColor, color) /*! \brief sets the property color to the specified \a __value.
JKQTPGET_SET_MACRO(Qt::PenStyle, style) \details Description of the parameter color is: <CENTER>\copybrief color.</CENTER>
JKQTPGET_SET_MACRO(double, lineWidth) \see color for more information */
inline virtual void set_color(const QColor & __value)
{
this->color = __value;
}
/*! \brief returns the property color.
\details Description of the parameter color is: <CENTER>\copybrief color.</CENTER>
\see color for more information */
inline virtual QColor get_color() const
{
return this->color;
}
/*! \brief sets the property style to the specified \a __value.
\details Description of the parameter style is: <CENTER>\copybrief style.</CENTER>
\see style for more information */
inline virtual void set_style(const Qt::PenStyle & __value)
{
this->style = __value;
}
/*! \brief returns the property style.
\details Description of the parameter style is: <CENTER>\copybrief style.</CENTER>
\see style for more information */
inline virtual Qt::PenStyle get_style() const
{
return this->style;
}
/*! \brief sets the property lineWidth to the specified \a __value.
\details Description of the parameter lineWidth is: <CENTER>\copybrief lineWidth.</CENTER>
\see lineWidth for more information */
inline virtual void set_lineWidth(double __value)
{
this->lineWidth = __value;
}
/*! \brief returns the property lineWidth.
\details Description of the parameter lineWidth is: <CENTER>\copybrief lineWidth.</CENTER>
\see lineWidth for more information */
inline virtual double get_lineWidth() const
{
return this->lineWidth;
}
/** \brief sets the alpha-channel of the \a color (i.e. its transparency) */ /** \brief sets the alpha-channel of the \a color (i.e. its transparency) */
virtual void setAlpha(float alpha); virtual void setAlpha(float alpha);
@ -139,8 +178,34 @@ class LIB_EXPORT JKQTPgeoBaseFilled: public JKQTPgeoBaseLine {
*/ */
JKQTPgeoBaseFilled(QColor color, QColor fillColor, JKQtPlotter* parent); JKQTPgeoBaseFilled(QColor color, QColor fillColor, JKQtPlotter* parent);
JKQTPGET_SET_MACRO(QColor, fillColor) /*! \brief sets the property fillColor to the specified \a __value.
JKQTPGET_SET_MACRO(Qt::BrushStyle, fillStyle) \details Description of the parameter fillColor is: <CENTER>\copybrief fillColor.</CENTER>
\see fillColor for more information */
inline virtual void set_fillColor(const QColor & __value)
{
this->fillColor = __value;
}
/*! \brief returns the property fillColor.
\details Description of the parameter fillColor is: <CENTER>\copybrief fillColor.</CENTER>
\see fillColor for more information */
inline virtual QColor get_fillColor() const
{
return this->fillColor;
}
/*! \brief sets the property fillStyle to the specified \a __value.
\details Description of the parameter fillStyle is: <CENTER>\copybrief fillStyle.</CENTER>
\see fillStyle for more information */
inline virtual void set_fillStyle(const Qt::BrushStyle & __value)
{
this->fillStyle = __value;
}
/*! \brief returns the property fillStyle.
\details Description of the parameter fillStyle is: <CENTER>\copybrief fillStyle.</CENTER>
\see fillStyle for more information */
inline virtual Qt::BrushStyle get_fillStyle() const
{
return this->fillStyle;
}
/** \brief sets the alpha-channel of the \a color and \a fillColor (i.e. its transparency) to the same value */ /** \brief sets the alpha-channel of the \a color and \a fillColor (i.e. its transparency) to the same value */
virtual void setAlpha(float alpha) override; virtual void setAlpha(float alpha) override;
@ -192,13 +257,104 @@ class LIB_EXPORT JKQTPgeoSymbol: public JKQTPplotObject {
*/ */
JKQTPgeoSymbol(JKQtPlotter* parent, double x, double y, JKQTPgraphSymbols symbol=JKQTPcross, double symbolSize=10, QColor color=QColor("black"), QColor fillColor=QColor("grey")); JKQTPgeoSymbol(JKQtPlotter* parent, double x, double y, JKQTPgraphSymbols symbol=JKQTPcross, double symbolSize=10, QColor color=QColor("black"), QColor fillColor=QColor("grey"));
JKQTPGET_SET_MACRO(QColor, color) /*! \brief sets the property color to the specified \a __value.
JKQTPGET_SET_MACRO(QColor, fillColor) \details Description of the parameter color is: <CENTER>\copybrief color.</CENTER>
JKQTPGET_SET_MACRO(JKQTPgraphSymbols, symbol) \see color for more information */
JKQTPGET_SET_MACRO(double, symbolSize) inline virtual void set_color(const QColor & __value)
JKQTPGET_SET_MACRO(double, symbolWidth) {
JKQTPGET_SET_MACRO(double, x) this->color = __value;
JKQTPGET_SET_MACRO(double, y) }
/*! \brief returns the property color.
\details Description of the parameter color is: <CENTER>\copybrief color.</CENTER>
\see color for more information */
inline virtual QColor get_color() const
{
return this->color;
}
/*! \brief sets the property fillColor to the specified \a __value.
\details Description of the parameter fillColor is: <CENTER>\copybrief fillColor.</CENTER>
\see fillColor for more information */
inline virtual void set_fillColor(const QColor & __value)
{
this->fillColor = __value;
}
/*! \brief returns the property fillColor.
\details Description of the parameter fillColor is: <CENTER>\copybrief fillColor.</CENTER>
\see fillColor for more information */
inline virtual QColor get_fillColor() const
{
return this->fillColor;
}
/*! \brief sets the property symbol to the specified \a __value.
\details Description of the parameter symbol is: <CENTER>\copybrief symbol.</CENTER>
\see symbol for more information */
inline virtual void set_symbol(const JKQTPgraphSymbols & __value)
{
this->symbol = __value;
}
/*! \brief returns the property symbol.
\details Description of the parameter symbol is: <CENTER>\copybrief symbol.</CENTER>
\see symbol for more information */
inline virtual JKQTPgraphSymbols get_symbol() const
{
return this->symbol;
}
/*! \brief sets the property symbolSize to the specified \a __value.
\details Description of the parameter symbolSize is: <CENTER>\copybrief symbolSize.</CENTER>
\see symbolSize for more information */
inline virtual void set_symbolSize(double __value)
{
this->symbolSize = __value;
}
/*! \brief returns the property symbolSize.
\details Description of the parameter symbolSize is: <CENTER>\copybrief symbolSize.</CENTER>
\see symbolSize for more information */
inline virtual double get_symbolSize() const
{
return this->symbolSize;
}
/*! \brief sets the property symbolWidth to the specified \a __value.
\details Description of the parameter symbolWidth is: <CENTER>\copybrief symbolWidth.</CENTER>
\see symbolWidth for more information */
inline virtual void set_symbolWidth(double __value)
{
this->symbolWidth = __value;
}
/*! \brief returns the property symbolWidth.
\details Description of the parameter symbolWidth is: <CENTER>\copybrief symbolWidth.</CENTER>
\see symbolWidth for more information */
inline virtual double get_symbolWidth() const
{
return this->symbolWidth;
}
/*! \brief sets the property x to the specified \a __value.
\details Description of the parameter x is: <CENTER>\copybrief x.</CENTER>
\see x for more information */
inline virtual void set_x(double __value)
{
this->x = __value;
}
/*! \brief returns the property x.
\details Description of the parameter x is: <CENTER>\copybrief x.</CENTER>
\see x for more information */
inline virtual double get_x() const
{
return this->x;
}
/*! \brief sets the property y to the specified \a __value.
\details Description of the parameter y is: <CENTER>\copybrief y.</CENTER>
\see y for more information */
inline virtual void set_y(double __value)
{
this->y = __value;
}
/*! \brief returns the property y.
\details Description of the parameter y is: <CENTER>\copybrief y.</CENTER>
\see y for more information */
inline virtual double get_y() const
{
return this->y;
}
/** \copydoc JKQTPgraph::getXMinMax() */ /** \copydoc JKQTPgraph::getXMinMax() */
virtual bool getXMinMax(double& minx, double& maxx, double& smallestGreaterZero); virtual bool getXMinMax(double& minx, double& maxx, double& smallestGreaterZero);
@ -259,11 +415,76 @@ class LIB_EXPORT JKQTPgeoText: public JKQTPplotObject {
*/ */
JKQTPgeoText(JKQtPlotter* parent, double x, double y, QString text, double fontSize=10, QColor color=QColor("black")); JKQTPgeoText(JKQtPlotter* parent, double x, double y, QString text, double fontSize=10, QColor color=QColor("black"));
JKQTPGET_SET_MACRO(QColor, color) /*! \brief sets the property color to the specified \a __value.
JKQTPGET_SET_MACRO(QString, text) \details Description of the parameter color is: <CENTER>\copybrief color.</CENTER>
JKQTPGET_SET_MACRO(double, fontSize) \see color for more information */
JKQTPGET_SET_MACRO(double, x) inline virtual void set_color(const QColor & __value)
JKQTPGET_SET_MACRO(double, y) {
this->color = __value;
}
/*! \brief returns the property color.
\details Description of the parameter color is: <CENTER>\copybrief color.</CENTER>
\see color for more information */
inline virtual QColor get_color() const
{
return this->color;
}
/*! \brief sets the property text to the specified \a __value.
\details Description of the parameter text is: <CENTER>\copybrief text.</CENTER>
\see text for more information */
inline virtual void set_text(const QString & __value)
{
this->text = __value;
}
/*! \brief returns the property text.
\details Description of the parameter text is: <CENTER>\copybrief text.</CENTER>
\see text for more information */
inline virtual QString get_text() const
{
return this->text;
}
/*! \brief sets the property fontSize to the specified \a __value.
\details Description of the parameter fontSize is: <CENTER>\copybrief fontSize.</CENTER>
\see fontSize for more information */
inline virtual void set_fontSize(double __value)
{
this->fontSize = __value;
}
/*! \brief returns the property fontSize.
\details Description of the parameter fontSize is: <CENTER>\copybrief fontSize.</CENTER>
\see fontSize for more information */
inline virtual double get_fontSize() const
{
return this->fontSize;
}
/*! \brief sets the property x to the specified \a __value.
\details Description of the parameter x is: <CENTER>\copybrief x.</CENTER>
\see x for more information */
inline virtual void set_x(double __value)
{
this->x = __value;
}
/*! \brief returns the property x.
\details Description of the parameter x is: <CENTER>\copybrief x.</CENTER>
\see x for more information */
inline virtual double get_x() const
{
return this->x;
}
/*! \brief sets the property y to the specified \a __value.
\details Description of the parameter y is: <CENTER>\copybrief y.</CENTER>
\see y for more information */
inline virtual void set_y(double __value)
{
this->y = __value;
}
/*! \brief returns the property y.
\details Description of the parameter y is: <CENTER>\copybrief y.</CENTER>
\see y for more information */
inline virtual double get_y() const
{
return this->y;
}
/** \copydoc JKQTPplotObject::getXMinMax() */ /** \copydoc JKQTPplotObject::getXMinMax() */
virtual bool getXMinMax(double& minx, double& maxx, double& smallestGreaterZero) override; virtual bool getXMinMax(double& minx, double& maxx, double& smallestGreaterZero) override;
@ -335,10 +556,62 @@ class LIB_EXPORT JKQTPgeoLine: public JKQTPgeoBaseLine {
/** \brief plots the graph to the plotter object specified as parent */ /** \brief plots the graph to the plotter object specified as parent */
virtual void draw(JKQTPEnhancedPainter& painter) override; virtual void draw(JKQTPEnhancedPainter& painter) override;
JKQTPGET_SET_MACRO(double, x1) /*! \brief sets the property x1 to the specified \a __value.
JKQTPGET_SET_MACRO(double, y1) \details Description of the parameter x1 is: <CENTER>\copybrief x1.</CENTER>
JKQTPGET_SET_MACRO(double, x2) \see x1 for more information */
JKQTPGET_SET_MACRO(double, y2) inline virtual void set_x1(double __value)
{
this->x1 = __value;
}
/*! \brief returns the property x1.
\details Description of the parameter x1 is: <CENTER>\copybrief x1.</CENTER>
\see x1 for more information */
inline virtual double get_x1() const
{
return this->x1;
}
/*! \brief sets the property y1 to the specified \a __value.
\details Description of the parameter y1 is: <CENTER>\copybrief y1.</CENTER>
\see y1 for more information */
inline virtual void set_y1(double __value)
{
this->y1 = __value;
}
/*! \brief returns the property y1.
\details Description of the parameter y1 is: <CENTER>\copybrief y1.</CENTER>
\see y1 for more information */
inline virtual double get_y1() const
{
return this->y1;
}
/*! \brief sets the property x2 to the specified \a __value.
\details Description of the parameter x2 is: <CENTER>\copybrief x2.</CENTER>
\see x2 for more information */
inline virtual void set_x2(double __value)
{
this->x2 = __value;
}
/*! \brief returns the property x2.
\details Description of the parameter x2 is: <CENTER>\copybrief x2.</CENTER>
\see x2 for more information */
inline virtual double get_x2() const
{
return this->x2;
}
/*! \brief sets the property y2 to the specified \a __value.
\details Description of the parameter y2 is: <CENTER>\copybrief y2.</CENTER>
\see y2 for more information */
inline virtual void set_y2(double __value)
{
this->y2 = __value;
}
/*! \brief returns the property y2.
\details Description of the parameter y2 is: <CENTER>\copybrief y2.</CENTER>
\see y2 for more information */
inline virtual double get_y2() const
{
return this->y2;
}
protected: protected:
double x1, y1, x2, y2; double x1, y1, x2, y2;
}; };
@ -391,11 +664,76 @@ class LIB_EXPORT JKQTPgeoInfiniteLine: public JKQTPgeoBaseLine {
/** \brief plots the graph to the plotter object specified as parent */ /** \brief plots the graph to the plotter object specified as parent */
virtual void draw(JKQTPEnhancedPainter& painter) override; virtual void draw(JKQTPEnhancedPainter& painter) override;
JKQTPGET_SET_MACRO(double, x) /*! \brief sets the property x to the specified \a __value.
JKQTPGET_SET_MACRO(double, y) \details Description of the parameter x is: <CENTER>\copybrief x.</CENTER>
JKQTPGET_SET_MACRO(double, dx) \see x for more information */
JKQTPGET_SET_MACRO(double, dy) inline virtual void set_x(double __value)
JKQTPGET_SET_MACRO(bool, two_sided) {
this->x = __value;
}
/*! \brief returns the property x.
\details Description of the parameter x is: <CENTER>\copybrief x.</CENTER>
\see x for more information */
inline virtual double get_x() const
{
return this->x;
}
/*! \brief sets the property y to the specified \a __value.
\details Description of the parameter y is: <CENTER>\copybrief y.</CENTER>
\see y for more information */
inline virtual void set_y(double __value)
{
this->y = __value;
}
/*! \brief returns the property y.
\details Description of the parameter y is: <CENTER>\copybrief y.</CENTER>
\see y for more information */
inline virtual double get_y() const
{
return this->y;
}
/*! \brief sets the property dx to the specified \a __value.
\details Description of the parameter dx is: <CENTER>\copybrief dx.</CENTER>
\see dx for more information */
inline virtual void set_dx(double __value)
{
this->dx = __value;
}
/*! \brief returns the property dx.
\details Description of the parameter dx is: <CENTER>\copybrief dx.</CENTER>
\see dx for more information */
inline virtual double get_dx() const
{
return this->dx;
}
/*! \brief sets the property dy to the specified \a __value.
\details Description of the parameter dy is: <CENTER>\copybrief dy.</CENTER>
\see dy for more information */
inline virtual void set_dy(double __value)
{
this->dy = __value;
}
/*! \brief returns the property dy.
\details Description of the parameter dy is: <CENTER>\copybrief dy.</CENTER>
\see dy for more information */
inline virtual double get_dy() const
{
return this->dy;
}
/*! \brief sets the property two_sided to the specified \a __value.
\details Description of the parameter two_sided is: <CENTER>\copybrief two_sided.</CENTER>
\see two_sided for more information */
inline virtual void set_two_sided(bool __value)
{
this->two_sided = __value;
}
/*! \brief returns the property two_sided.
\details Description of the parameter two_sided is: <CENTER>\copybrief two_sided.</CENTER>
\see two_sided for more information */
inline virtual bool get_two_sided() const
{
return this->two_sided;
}
protected: protected:
double x, y, dx, dy; double x, y, dx, dy;
/** \brief indicates whether the line ends at the given point \f$ (x,y) \f$ (false, default), /** \brief indicates whether the line ends at the given point \f$ (x,y) \f$ (false, default),
@ -459,7 +797,20 @@ class LIB_EXPORT JKQTPgeoPolyLines: public JKQTPgeoBaseLine {
/** \brief plots the graph to the plotter object specified as parent */ /** \brief plots the graph to the plotter object specified as parent */
virtual void draw(JKQTPEnhancedPainter& painter) override; virtual void draw(JKQTPEnhancedPainter& painter) override;
JKQTPGET_SET_MACRO(QVector<QPointF>, points) /*! \brief sets the property points to the specified \a __value.
\details Description of the parameter points is: <CENTER>\copybrief points.</CENTER>
\see points for more information */
inline virtual void set_points(const QVector<QPointF> & __value)
{
this->points = __value;
}
/*! \brief returns the property points.
\details Description of the parameter points is: <CENTER>\copybrief points.</CENTER>
\see points for more information */
inline virtual QVector<QPointF> get_points() const
{
return this->points;
}
/** \brief append a point to the polygon */ /** \brief append a point to the polygon */
inline void appendPoint(const QPointF& p) { inline void appendPoint(const QPointF& p) {
@ -575,11 +926,76 @@ class LIB_EXPORT JKQTPgeoRectangle: public JKQTPgeoBaseFilled {
/** \brief plots the graph to the plotter object specified as parent */ /** \brief plots the graph to the plotter object specified as parent */
virtual void draw(JKQTPEnhancedPainter& painter) override; virtual void draw(JKQTPEnhancedPainter& painter) override;
JKQTPGET_SET_MACRO(double, x) /*! \brief sets the property x to the specified \a __value.
JKQTPGET_SET_MACRO(double, y) \details Description of the parameter x is: <CENTER>\copybrief x.</CENTER>
JKQTPGET_SET_MACRO(double, width) \see x for more information */
JKQTPGET_SET_MACRO(double, height) inline virtual void set_x(double __value)
JKQTPGET_SET_MACRO(double, angle) {
this->x = __value;
}
/*! \brief returns the property x.
\details Description of the parameter x is: <CENTER>\copybrief x.</CENTER>
\see x for more information */
inline virtual double get_x() const
{
return this->x;
}
/*! \brief sets the property y to the specified \a __value.
\details Description of the parameter y is: <CENTER>\copybrief y.</CENTER>
\see y for more information */
inline virtual void set_y(double __value)
{
this->y = __value;
}
/*! \brief returns the property y.
\details Description of the parameter y is: <CENTER>\copybrief y.</CENTER>
\see y for more information */
inline virtual double get_y() const
{
return this->y;
}
/*! \brief sets the property width to the specified \a __value.
\details Description of the parameter width is: <CENTER>\copybrief width.</CENTER>
\see width for more information */
inline virtual void set_width(double __value)
{
this->width = __value;
}
/*! \brief returns the property width.
\details Description of the parameter width is: <CENTER>\copybrief width.</CENTER>
\see width for more information */
inline virtual double get_width() const
{
return this->width;
}
/*! \brief sets the property height to the specified \a __value.
\details Description of the parameter height is: <CENTER>\copybrief height.</CENTER>
\see height for more information */
inline virtual void set_height(double __value)
{
this->height = __value;
}
/*! \brief returns the property height.
\details Description of the parameter height is: <CENTER>\copybrief height.</CENTER>
\see height for more information */
inline virtual double get_height() const
{
return this->height;
}
/*! \brief sets the property angle to the specified \a __value.
\details Description of the parameter angle is: <CENTER>\copybrief angle.</CENTER>
\see angle for more information */
inline virtual void set_angle(double __value)
{
this->angle = __value;
}
/*! \brief returns the property angle.
\details Description of the parameter angle is: <CENTER>\copybrief angle.</CENTER>
\see angle for more information */
inline virtual double get_angle() const
{
return this->angle;
}
void set_bottomleftrectangle(double x, double y, double width, double height); void set_bottomleftrectangle(double x, double y, double width, double height);
protected: protected:
@ -657,7 +1073,20 @@ class LIB_EXPORT JKQTPgeoPolygon: public JKQTPgeoBaseFilled {
/** \brief plots the graph to the plotter object specified as parent */ /** \brief plots the graph to the plotter object specified as parent */
virtual void draw(JKQTPEnhancedPainter& painter) override; virtual void draw(JKQTPEnhancedPainter& painter) override;
JKQTPGET_SET_MACRO(QVector<QPointF>, points) /*! \brief sets the property points to the specified \a __value.
\details Description of the parameter points is: <CENTER>\copybrief points.</CENTER>
\see points for more information */
inline virtual void set_points(const QVector<QPointF> & __value)
{
this->points = __value;
}
/*! \brief returns the property points.
\details Description of the parameter points is: <CENTER>\copybrief points.</CENTER>
\see points for more information */
inline virtual QVector<QPointF> get_points() const
{
return this->points;
}
/** \brief append a point to the polygon */ /** \brief append a point to the polygon */
inline void appendPoint(const QPointF& p) { inline void appendPoint(const QPointF& p) {
@ -772,7 +1201,20 @@ class LIB_EXPORT JKQTPgeoEllipse: public JKQTPgeoRectangle {
/** \brief plots the graph to the plotter object specified as parent */ /** \brief plots the graph to the plotter object specified as parent */
virtual void draw(JKQTPEnhancedPainter& painter) override; virtual void draw(JKQTPEnhancedPainter& painter) override;
JKQTPGET_SET_MACRO(unsigned int, controlPoints) /*! \brief sets the property controlPoints to the specified \a __value.
\details Description of the parameter controlPoints is: <CENTER>\copybrief controlPoints.</CENTER>
\see controlPoints for more information */
inline virtual void set_controlPoints(const unsigned int & __value)
{
this->controlPoints = __value;
}
/*! \brief returns the property controlPoints.
\details Description of the parameter controlPoints is: <CENTER>\copybrief controlPoints.</CENTER>
\see controlPoints for more information */
inline virtual unsigned int get_controlPoints() const
{
return this->controlPoints;
}
protected: protected:
/** \brief number of steps/control points to draw the ellipse */ /** \brief number of steps/control points to draw the ellipse */
unsigned int controlPoints; unsigned int controlPoints;
@ -823,14 +1265,118 @@ class LIB_EXPORT JKQTPgeoArc: public JKQTPgeoBaseLine {
/** \brief plots the graph to the plotter object specified as parent */ /** \brief plots the graph to the plotter object specified as parent */
virtual void draw(JKQTPEnhancedPainter& painter) override; virtual void draw(JKQTPEnhancedPainter& painter) override;
JKQTPGET_SET_MACRO(unsigned int, controlPoints) /*! \brief sets the property controlPoints to the specified \a __value.
JKQTPGET_SET_MACRO(double, angleStart) \details Description of the parameter controlPoints is: <CENTER>\copybrief controlPoints.</CENTER>
JKQTPGET_SET_MACRO(double, angleStop) \see controlPoints for more information */
JKQTPGET_SET_MACRO(double, x) inline virtual void set_controlPoints(const unsigned int & __value)
JKQTPGET_SET_MACRO(double, y) {
JKQTPGET_SET_MACRO(double, width) this->controlPoints = __value;
JKQTPGET_SET_MACRO(double, height) }
JKQTPGET_SET_MACRO(double, angle) /*! \brief returns the property controlPoints.
\details Description of the parameter controlPoints is: <CENTER>\copybrief controlPoints.</CENTER>
\see controlPoints for more information */
inline virtual unsigned int get_controlPoints() const
{
return this->controlPoints;
}
/*! \brief sets the property angleStart to the specified \a __value.
\details Description of the parameter angleStart is: <CENTER>\copybrief angleStart.</CENTER>
\see angleStart for more information */
inline virtual void set_angleStart(double __value)
{
this->angleStart = __value;
}
/*! \brief returns the property angleStart.
\details Description of the parameter angleStart is: <CENTER>\copybrief angleStart.</CENTER>
\see angleStart for more information */
inline virtual double get_angleStart() const
{
return this->angleStart;
}
/*! \brief sets the property angleStop to the specified \a __value.
\details Description of the parameter angleStop is: <CENTER>\copybrief angleStop.</CENTER>
\see angleStop for more information */
inline virtual void set_angleStop(double __value)
{
this->angleStop = __value;
}
/*! \brief returns the property angleStop.
\details Description of the parameter angleStop is: <CENTER>\copybrief angleStop.</CENTER>
\see angleStop for more information */
inline virtual double get_angleStop() const
{
return this->angleStop;
}
/*! \brief sets the property x to the specified \a __value.
\details Description of the parameter x is: <CENTER>\copybrief x.</CENTER>
\see x for more information */
inline virtual void set_x(double __value)
{
this->x = __value;
}
/*! \brief returns the property x.
\details Description of the parameter x is: <CENTER>\copybrief x.</CENTER>
\see x for more information */
inline virtual double get_x() const
{
return this->x;
}
/*! \brief sets the property y to the specified \a __value.
\details Description of the parameter y is: <CENTER>\copybrief y.</CENTER>
\see y for more information */
inline virtual void set_y(double __value)
{
this->y = __value;
}
/*! \brief returns the property y.
\details Description of the parameter y is: <CENTER>\copybrief y.</CENTER>
\see y for more information */
inline virtual double get_y() const
{
return this->y;
}
/*! \brief sets the property width to the specified \a __value.
\details Description of the parameter width is: <CENTER>\copybrief width.</CENTER>
\see width for more information */
inline virtual void set_width(double __value)
{
this->width = __value;
}
/*! \brief returns the property width.
\details Description of the parameter width is: <CENTER>\copybrief width.</CENTER>
\see width for more information */
inline virtual double get_width() const
{
return this->width;
}
/*! \brief sets the property height to the specified \a __value.
\details Description of the parameter height is: <CENTER>\copybrief height.</CENTER>
\see height for more information */
inline virtual void set_height(double __value)
{
this->height = __value;
}
/*! \brief returns the property height.
\details Description of the parameter height is: <CENTER>\copybrief height.</CENTER>
\see height for more information */
inline virtual double get_height() const
{
return this->height;
}
/*! \brief sets the property angle to the specified \a __value.
\details Description of the parameter angle is: <CENTER>\copybrief angle.</CENTER>
\see angle for more information */
inline virtual void set_angle(double __value)
{
this->angle = __value;
}
/*! \brief returns the property angle.
\details Description of the parameter angle is: <CENTER>\copybrief angle.</CENTER>
\see angle for more information */
inline virtual double get_angle() const
{
return this->angle;
}
protected: protected:
double x,y,width,height; double x,y,width,height;
/** \brief rotation angle of rectangle */ /** \brief rotation angle of rectangle */
@ -902,8 +1448,34 @@ class LIB_EXPORT JKQTPgeoPie: public JKQTPgeoEllipse {
/** \brief plots the graph to the plotter object specified as parent */ /** \brief plots the graph to the plotter object specified as parent */
virtual void draw(JKQTPEnhancedPainter& painter) override; virtual void draw(JKQTPEnhancedPainter& painter) override;
JKQTPGET_SET_MACRO(double, angleStart) /*! \brief sets the property angleStart to the specified \a __value.
JKQTPGET_SET_MACRO(double, angleStop) \details Description of the parameter angleStart is: <CENTER>\copybrief angleStart.</CENTER>
\see angleStart for more information */
inline virtual void set_angleStart(double __value)
{
this->angleStart = __value;
}
/*! \brief returns the property angleStart.
\details Description of the parameter angleStart is: <CENTER>\copybrief angleStart.</CENTER>
\see angleStart for more information */
inline virtual double get_angleStart() const
{
return this->angleStart;
}
/*! \brief sets the property angleStop to the specified \a __value.
\details Description of the parameter angleStop is: <CENTER>\copybrief angleStop.</CENTER>
\see angleStop for more information */
inline virtual void set_angleStop(double __value)
{
this->angleStop = __value;
}
/*! \brief returns the property angleStop.
\details Description of the parameter angleStop is: <CENTER>\copybrief angleStop.</CENTER>
\see angleStop for more information */
inline virtual double get_angleStop() const
{
return this->angleStop;
}
protected: protected:
/** \brief if we only draw an arc, this is the starting angle */ /** \brief if we only draw an arc, this is the starting angle */
double angleStart; double angleStart;

14
lib/jkqtplotter/jkqtpgraphsimage.cpp
View File

@ -258,7 +258,7 @@ void JKQTPImage::setParent(JKQtBasePlotter *parent)
actCopyImage->setEnabled(parent); actCopyImage->setEnabled(parent);
} }
void JKQTPImage::set_title(const typedef_set_title &title) void JKQTPImage::set_title(const QString &title)
{ {
JKQTPImageBase::set_title(title); JKQTPImageBase::set_title(title);
QString t=title; QString t=title;
@ -768,7 +768,7 @@ void JKQTPMathImage::setParent(JKQtBasePlotter* parent) {
actCopyPalette->setEnabled(parent); actCopyPalette->setEnabled(parent);
} }
void JKQTPMathImage::set_title(const JKQTPgraph::typedef_set_title &title) void JKQTPMathImage::set_title(const QString &title)
{ {
JKQTPMathImageBase::set_title(title); JKQTPMathImageBase::set_title(title);
QString t=title; QString t=title;
@ -2107,7 +2107,7 @@ void JKQTPRGBMathImage::drawKeyMarker(JKQTPEnhancedPainter &painter, QRectF &rec
painter.drawImage(rect, QPixmap(":/JKQTPlotter/jkqtp_plot_rgbimage.png").toImage()); painter.drawImage(rect, QPixmap(":/JKQTPlotter/jkqtp_plot_rgbimage.png").toImage());
} }
void JKQTPRGBMathImage::set_title(const JKQTPgraph::typedef_set_title &title) void JKQTPRGBMathImage::set_title(const QString &title)
{ {
JKQTPImageBase::set_title(title); JKQTPImageBase::set_title(title);
QString t=title; QString t=title;
@ -2590,7 +2590,7 @@ QVector<double> JKQTPOverlayImage::getDataAsDoubleVector() const
} }
void JKQTPOverlayImage::set_title(const JKQTPgraph::typedef_set_title &title) void JKQTPOverlayImage::set_title(const QString &title)
{ {
JKQTPImageBase::set_title(title); JKQTPImageBase::set_title(title);
QString t=title; QString t=title;
@ -2807,7 +2807,7 @@ double JKQTPContour::value(int xIdx, int yIdx)
} }
} }
bool JKQTPContour::intersect(QLineF &line, const QVector3D &vertex1,const QVector3D &vertex2,const QVector3D &vertex3,const double &level) bool JKQTPContour::intersect(QLineF &line, const QVector3D &vertex1,const QVector3D &vertex2,const QVector3D &vertex3,double level)
{ {
bool found = true; bool found = true;
@ -2969,7 +2969,7 @@ JKQTPContour::JKQTPContour(double x, double y, double width, double height, void
colorFromPalette=true; colorFromPalette=true;
relativeLevels=false; relativeLevels=false;
} }
int JKQTPContour::compare2level(const QVector3D &vertex, const double &level) int JKQTPContour::compare2level(const QVector3D &vertex, double level)
{ {
if (vertex.z() > level) if (vertex.z() > level)
return 1; return 1;
@ -3105,7 +3105,7 @@ void JKQTPContour::calcContourLines(QList<QVector<QLineF> > &ContourLines)
} }
} }
QPointF JKQTPContour::interpolatePoint(const QVector3D &point1, const QVector3D &point2,const double &level) QPointF JKQTPContour::interpolatePoint(const QVector3D &point1, const QVector3D &point2,double level)
{ {
const double h1 = point1.z() - level; // height above contour level const double h1 = point1.z() - level; // height above contour level
const double h2 = point2.z() - level; const double h2 = point2.z() - level;

1281
lib/jkqtplotter/jkqtpgraphsimage.h
View File

File diff suppressed because it is too large Load Diff

45
lib/jkqtplotter/jkqtpgraphsimpulses.h
View File

@ -46,9 +46,48 @@ class LIB_EXPORT JKQTPimpulsesHorizontalGraph: public JKQTPxyGraph {
/** \brief returns the color to be used for the key label */ /** \brief returns the color to be used for the key label */
virtual QColor getKeyLabelColor() override; virtual QColor getKeyLabelColor() override;
JKQTPGET_SET_MACRO(QColor, color) /*! \brief sets the property color to the specified \a __value.
JKQTPGET_SET_MACRO(double, lineWidth) \details Description of the parameter color is: <CENTER>\copybrief color.</CENTER>
JKQTPGET_SET_MACRO(double, baseline) \see color for more information */
inline virtual void set_color(const QColor & __value)
{
this->color = __value;
}
/*! \brief returns the property color.
\details Description of the parameter color is: <CENTER>\copybrief color.</CENTER>
\see color for more information */
inline virtual QColor get_color() const
{
return this->color;
}
/*! \brief sets the property lineWidth to the specified \a __value.
\details Description of the parameter lineWidth is: <CENTER>\copybrief lineWidth.</CENTER>
\see lineWidth for more information */
inline virtual void set_lineWidth(double __value)
{
this->lineWidth = __value;
}
/*! \brief returns the property lineWidth.
\details Description of the parameter lineWidth is: <CENTER>\copybrief lineWidth.</CENTER>
\see lineWidth for more information */
inline virtual double get_lineWidth() const
{
return this->lineWidth;
}
/*! \brief sets the property baseline to the specified \a __value.
\details Description of the parameter baseline is: <CENTER>\copybrief baseline.</CENTER>
\see baseline for more information */
inline virtual void set_baseline(double __value)
{
this->baseline = __value;
}
/*! \brief returns the property baseline.
\details Description of the parameter baseline is: <CENTER>\copybrief baseline.</CENTER>
\see baseline for more information */
inline virtual double get_baseline() const
{
return this->baseline;
}
/** \brief color of the graph */ /** \brief color of the graph */
QColor color; QColor color;

60
lib/jkqtplotter/jkqtpgraphsparsedfunction.h
View File

@ -57,9 +57,35 @@ class LIB_EXPORT JKQTPxParsedFunctionLineGraph: public JKQTPxFunctionLineGraph {
/** \brief class destructor */ /** \brief class destructor */
virtual ~JKQTPxParsedFunctionLineGraph() override; virtual ~JKQTPxParsedFunctionLineGraph() override;
JKQTPGET_SET_MACRO(QString, function) /*! \brief sets the property function to the specified \a __value.
\details Description of the parameter function is: <CENTER>\copybrief function.</CENTER>
\see function for more information */
inline virtual void set_function(const QString & __value)
{
this->function = __value;
}
/*! \brief returns the property function.
\details Description of the parameter function is: <CENTER>\copybrief function.</CENTER>
\see function for more information */
inline virtual QString get_function() const
{
return this->function;
}
JKQTPGET_SET_MACRO(QString, errorFunction) /*! \brief sets the property errorFunction to the specified \a __value.
\details Description of the parameter errorFunction is: <CENTER>\copybrief errorFunction.</CENTER>
\see errorFunction for more information */
inline virtual void set_errorFunction(const QString & __value)
{
this->errorFunction = __value;
}
/*! \brief returns the property errorFunction.
\details Description of the parameter errorFunction is: <CENTER>\copybrief errorFunction.</CENTER>
\see errorFunction for more information */
inline virtual QString get_errorFunction() const
{
return this->errorFunction;
}
/** \brief INTERNAL data structure /** \brief INTERNAL data structure
* \internal * \internal
@ -117,9 +143,35 @@ class LIB_EXPORT JKQTPyParsedFunctionLineGraph: public JKQTPyFunctionLineGraph {
/** \brief class destructor */ /** \brief class destructor */
virtual ~JKQTPyParsedFunctionLineGraph() override; virtual ~JKQTPyParsedFunctionLineGraph() override;
JKQTPGET_SET_MACRO(QString, function) /*! \brief sets the property function to the specified \a __value.
\details Description of the parameter function is: <CENTER>\copybrief function.</CENTER>
\see function for more information */
inline virtual void set_function(const QString & __value)
{
this->function = __value;
}
/*! \brief returns the property function.
\details Description of the parameter function is: <CENTER>\copybrief function.</CENTER>
\see function for more information */
inline virtual QString get_function() const
{
return this->function;
}
JKQTPGET_SET_MACRO(QString, errorFunction) /*! \brief sets the property errorFunction to the specified \a __value.
\details Description of the parameter errorFunction is: <CENTER>\copybrief errorFunction.</CENTER>
\see errorFunction for more information */
inline virtual void set_errorFunction(const QString & __value)
{
this->errorFunction = __value;
}
/*! \brief returns the property errorFunction.
\details Description of the parameter errorFunction is: <CENTER>\copybrief errorFunction.</CENTER>
\see errorFunction for more information */
inline virtual QString get_errorFunction() const
{
return this->errorFunction;
}
/** \brief INTERNAL data structure /** \brief INTERNAL data structure
* \internal * \internal

60
lib/jkqtplotter/jkqtpgraphspeakstream.h
View File

@ -81,10 +81,62 @@ class LIB_EXPORT JKQTPPeakStreamGraph: public JKQTPsingleColumnGraph {
/** \brief plots a key marker inside the specified rectangle \a rect */ /** \brief plots a key marker inside the specified rectangle \a rect */
virtual void drawKeyMarker(JKQTPEnhancedPainter& painter, QRectF& rect) override; virtual void drawKeyMarker(JKQTPEnhancedPainter& painter, QRectF& rect) override;
JKQTPGET_SET_MACRO(double, baseline) /*! \brief sets the property baseline to the specified \a __value.
JKQTPGET_SET_MACRO(double, peakHeight) \details Description of the parameter baseline is: <CENTER>\copybrief baseline.</CENTER>
JKQTPGET_SET_MACRO(bool, yPeaks) \see baseline for more information */
JKQTPGET_SET_MACRO(bool, drawBaseline) inline virtual void set_baseline(double __value)
{
this->baseline = __value;
}
/*! \brief returns the property baseline.
\details Description of the parameter baseline is: <CENTER>\copybrief baseline.</CENTER>
\see baseline for more information */
inline virtual double get_baseline() const
{
return this->baseline;
}
/*! \brief sets the property peakHeight to the specified \a __value.
\details Description of the parameter peakHeight is: <CENTER>\copybrief peakHeight.</CENTER>
\see peakHeight for more information */
inline virtual void set_peakHeight(double __value)
{
this->peakHeight = __value;
}
/*! \brief returns the property peakHeight.
\details Description of the parameter peakHeight is: <CENTER>\copybrief peakHeight.</CENTER>
\see peakHeight for more information */
inline virtual double get_peakHeight() const
{
return this->peakHeight;
}
/*! \brief sets the property yPeaks to the specified \a __value.
\details Description of the parameter yPeaks is: <CENTER>\copybrief yPeaks.</CENTER>
\see yPeaks for more information */
inline virtual void set_yPeaks(bool __value)
{
this->yPeaks = __value;
}
/*! \brief returns the property yPeaks.
\details Description of the parameter yPeaks is: <CENTER>\copybrief yPeaks.</CENTER>
\see yPeaks for more information */
inline virtual bool get_yPeaks() const
{
return this->yPeaks;
}
/*! \brief sets the property drawBaseline to the specified \a __value.
\details Description of the parameter drawBaseline is: <CENTER>\copybrief drawBaseline.</CENTER>
\see drawBaseline for more information */
inline virtual void set_drawBaseline(bool __value)
{
this->drawBaseline = __value;
}
/*! \brief returns the property drawBaseline.
\details Description of the parameter drawBaseline is: <CENTER>\copybrief drawBaseline.</CENTER>
\see drawBaseline for more information */
inline virtual bool get_drawBaseline() const
{
return this->drawBaseline;
}
protected: protected:

207
lib/jkqtplotter/jkqtplotter.h
View File

@ -130,13 +130,119 @@ class LIB_EXPORT JKQtPlotter: public QWidget {
/** \brief returns the class internally used for plotting */ /** \brief returns the class internally used for plotting */
const JKQtBasePlotter* get_constplotter() const { return const_cast<const JKQtBasePlotter*>(plotter); } const JKQtBasePlotter* get_constplotter() const { return const_cast<const JKQtBasePlotter*>(plotter); }
JKQTPGET_SET_MACRO_I(bool, displayToolbar, updateToolbar()) /*! \brief sets the property displayToolbar to the specified \a __value.
JKQTPGET_SET_MACRO_I(bool, toolbarAlwaysOn, updateToolbar()) \details Description of the parameter displayToolbar is: <CENTER>\copybrief displayToolbar.</CENTER>
JKQTPGET_SET_MACRO(bool, displayMousePosition) \see displayToolbar for more information */
JKQTPGET_SET_MACRO(bool, displayCustomMousePosition) inline virtual void set_displayToolbar(bool __value)
JKQTPGET_SET_MACRO_I(QColor, userActionColor, update()) {
JKQTPGET_SET_MACRO_I(QPainter::CompositionMode, userActionCompositionMode, update()) if (this->displayToolbar != __value) {
JKQTPGET_SET_MACRO_I(MouseActionModes, mouseActionMode, updateCursor()) this->displayToolbar = __value;
updateToolbar();
}
}
/*! \brief returns the property displayToolbar.
\details Description of the parameter displayToolbar is: <CENTER>\copybrief displayToolbar.</CENTER>
\see displayToolbar for more information */
inline virtual bool get_displayToolbar() const
{
return this->displayToolbar;
}
/*! \brief sets the property toolbarAlwaysOn to the specified \a __value.
\details Description of the parameter toolbarAlwaysOn is: <CENTER>\copybrief toolbarAlwaysOn.</CENTER>
\see toolbarAlwaysOn for more information */
inline virtual void set_toolbarAlwaysOn(bool __value)
{
if (this->toolbarAlwaysOn != __value) {
this->toolbarAlwaysOn = __value;
updateToolbar();
}
}
/*! \brief returns the property toolbarAlwaysOn.
\details Description of the parameter toolbarAlwaysOn is: <CENTER>\copybrief toolbarAlwaysOn.</CENTER>
\see toolbarAlwaysOn for more information */
inline virtual bool get_toolbarAlwaysOn() const
{
return this->toolbarAlwaysOn;
}
/*! \brief sets the property displayMousePosition to the specified \a __value.
\details Description of the parameter displayMousePosition is: <CENTER>\copybrief displayMousePosition.</CENTER>
\see displayMousePosition for more information */
inline virtual void set_displayMousePosition(bool __value)
{
this->displayMousePosition = __value;
}
/*! \brief returns the property displayMousePosition.
\details Description of the parameter displayMousePosition is: <CENTER>\copybrief displayMousePosition.</CENTER>
\see displayMousePosition for more information */
inline virtual bool get_displayMousePosition() const
{
return this->displayMousePosition;
}
/*! \brief sets the property displayCustomMousePosition to the specified \a __value.
\details Description of the parameter displayCustomMousePosition is: <CENTER>\copybrief displayCustomMousePosition.</CENTER>
\see displayCustomMousePosition for more information */
inline virtual void set_displayCustomMousePosition(bool __value)
{
this->displayCustomMousePosition = __value;
}
/*! \brief returns the property displayCustomMousePosition.
\details Description of the parameter displayCustomMousePosition is: <CENTER>\copybrief displayCustomMousePosition.</CENTER>
\see displayCustomMousePosition for more information */
inline virtual bool get_displayCustomMousePosition() const
{
return this->displayCustomMousePosition;
}
/*! \brief sets the property userActionColor to the specified \a __value.
\details Description of the parameter userActionColor is: <CENTER>\copybrief userActionColor.</CENTER>
\see userActionColor for more information */
inline virtual void set_userActionColor(const QColor & __value)
{
if (this->userActionColor != __value) {
this->userActionColor = __value;
update();
}
}
/*! \brief returns the property userActionColor.
\details Description of the parameter userActionColor is: <CENTER>\copybrief userActionColor.</CENTER>
\see userActionColor for more information */
inline virtual QColor get_userActionColor() const
{
return this->userActionColor;
}
/*! \brief sets the property userActionCompositionMode to the specified \a __value.
\details Description of the parameter userActionCompositionMode is: <CENTER>\copybrief userActionCompositionMode.</CENTER>
\see userActionCompositionMode for more information */
inline virtual void set_userActionCompositionMode(const QPainter::CompositionMode & __value)
{
if (this->userActionCompositionMode != __value) {
this->userActionCompositionMode = __value;
update();
}
}
/*! \brief returns the property userActionCompositionMode.
\details Description of the parameter userActionCompositionMode is: <CENTER>\copybrief userActionCompositionMode.</CENTER>
\see userActionCompositionMode for more information */
inline virtual QPainter::CompositionMode get_userActionCompositionMode() const
{
return this->userActionCompositionMode;
}
/*! \brief sets the property mouseActionMode to the specified \a __value.
\details Description of the parameter mouseActionMode is: <CENTER>\copybrief mouseActionMode.</CENTER>
\see mouseActionMode for more information */
inline virtual void set_mouseActionMode(const MouseActionModes & __value)
{
if (this->mouseActionMode != __value) {
this->mouseActionMode = __value;
updateCursor();
}
}
/*! \brief returns the property mouseActionMode.
\details Description of the parameter mouseActionMode is: <CENTER>\copybrief mouseActionMode.</CENTER>
\see mouseActionMode for more information */
inline virtual MouseActionModes get_mouseActionMode() const
{
return this->mouseActionMode;
}
/** \brief loads the plot properties from a QSettings object */ /** \brief loads the plot properties from a QSettings object */
virtual void loadSettings(QSettings& settings, QString group=QString("plots")); virtual void loadSettings(QSettings& settings, QString group=QString("plots"));
@ -199,28 +305,89 @@ class LIB_EXPORT JKQtPlotter: public QWidget {
* the lather case */ * the lather case */
inline void forceInternalDatastore() { plotter->forceInternalDatastore(); } inline void forceInternalDatastore() { plotter->forceInternalDatastore(); }
/** \brief switch emitting of signals, such as zoomChangedLocally() ..., on (sig=true) or off (sig=false) */
inline void set_emitSignals(bool sig) { plotter->set_emitSignals(sig); } inline void set_emitSignals(bool sig) { plotter->set_emitSignals(sig); }
/** \brief determine, whether emitting of signals, such as zoomChangedLocally() ..., is switched on or off */
inline bool get_emitSignals() { return plotter->get_emitSignals(); } inline bool get_emitSignals() { return plotter->get_emitSignals(); }
JKQTPGetMacro(bool, doDrawing) inline bool get_doDrawing() const { return doDrawing; }
void set_doDrawing(bool enable); void set_doDrawing(bool enable);
bool get_zoomByMouseRectangle() const; bool get_zoomByMouseRectangle() const;
void set_zoomByMouseRectangle(bool zomByrectangle); void set_zoomByMouseRectangle(bool zomByrectangle);
//GET_SET_MACRO(bool, zoomByDoubleAndRightMouseClick); //GET_SET_MACRO(bool, zoomByDoubleAndRightMouseClick);
JKQTPGET_SET_MACRO(RightMouseButtonAction, rightMouseButtonAction) /*! \brief sets the property rightMouseButtonAction to the specified \a __value.
JKQTPGET_SET_MACRO(LeftDoubleClickAction, leftDoubleClickAction) \details Description of the parameter rightMouseButtonAction is: <CENTER>\copybrief rightMouseButtonAction.</CENTER>
/** \brief returns the property menuSpecialContextMenu. \details Description of the parameter menuSpecialContextMenu is: <CENTER>\copybrief menuSpecialContextMenu.</CENTER>. \see menuSpecialContextMenu for more information */ \see rightMouseButtonAction for more information */
inline virtual void set_rightMouseButtonAction(const RightMouseButtonAction & __value)
{
this->rightMouseButtonAction = __value;
}
/*! \brief returns the property rightMouseButtonAction.
\details Description of the parameter rightMouseButtonAction is: <CENTER>\copybrief rightMouseButtonAction.</CENTER>
\see rightMouseButtonAction for more information */
inline virtual RightMouseButtonAction get_rightMouseButtonAction() const
{
return this->rightMouseButtonAction;
}
/*! \brief sets the property leftDoubleClickAction to the specified \a __value.
\details Description of the parameter leftDoubleClickAction is: <CENTER>\copybrief leftDoubleClickAction.</CENTER>
\see leftDoubleClickAction for more information */
inline virtual void set_leftDoubleClickAction(const LeftDoubleClickAction & __value)
{
this->leftDoubleClickAction = __value;
}
/*! \brief returns the property leftDoubleClickAction.
\details Description of the parameter leftDoubleClickAction is: <CENTER>\copybrief leftDoubleClickAction.</CENTER>
\see leftDoubleClickAction for more information */
inline virtual LeftDoubleClickAction get_leftDoubleClickAction() const
{
return this->leftDoubleClickAction;
}
/*! \brief returns the property menuSpecialContextMenu. \details Description of the parameter menuSpecialContextMenu is: <CENTER>\copybrief menuSpecialContextMenu.</CENTER>. \see menuSpecialContextMenu for more information */
inline QMenu* get_menuSpecialContextMenu() const { return this->menuSpecialContextMenu; } inline QMenu* get_menuSpecialContextMenu() const { return this->menuSpecialContextMenu; }
void set_menuSpecialContextMenu(QMenu* menu); void set_menuSpecialContextMenu(QMenu* menu);
JKQTPGET_SET_MACRO(bool, zoomByMouseWheel) /*! \brief sets the property zoomByMouseWheel to the specified \a __value.
\details Description of the parameter zoomByMouseWheel is: <CENTER>\copybrief zoomByMouseWheel.</CENTER>
\see zoomByMouseWheel for more information */
inline virtual void set_zoomByMouseWheel(bool __value)
{
this->zoomByMouseWheel = __value;
}
/*! \brief returns the property zoomByMouseWheel.
\details Description of the parameter zoomByMouseWheel is: <CENTER>\copybrief zoomByMouseWheel.</CENTER>
\see zoomByMouseWheel for more information */
inline virtual bool get_zoomByMouseWheel() const
{
return this->zoomByMouseWheel;
}
JKQTPGetMacro(double, mouseContextX) /** \brief returns the property mouseContextX.
JKQTPGetMacro(double, mouseContextY) \details Description of the parameter mouseContextX is: <CENTER>\copybrief mouseContextX.</CENTER>.
JKQTPGetMacro(int, mouseLastClickX) \see mouseContextX for more information */
JKQTPGetMacro(int, mouseLastClickY) inline double get_mouseContextX() const {
return this->mouseContextX;
}
/** \brief returns the property mouseContextY.
\details Description of the parameter mouseContextY is: <CENTER>\copybrief mouseContextY.</CENTER>.
\see mouseContextY for more information */
inline double get_mouseContextY() const {
return this->mouseContextY;
}
/** \brief returns the property mouseLastClickX.
\details Description of the parameter mouseLastClickX is: <CENTER>\copybrief mouseLastClickX.</CENTER>.
\see mouseLastClickX for more information */
inline int get_mouseLastClickX() const {
return this->mouseLastClickX;
}
/** \brief returns the property mouseLastClickY.
\details Description of the parameter mouseLastClickY is: <CENTER>\copybrief mouseLastClickY.</CENTER>.
\see mouseLastClickY for more information */
inline int get_mouseLastClickY() const {
return this->mouseLastClickY;
}
inline JKQTPhorizontalAxis* get_xAxis() { return plotter->get_xAxis(); } inline JKQTPhorizontalAxis* get_xAxis() { return plotter->get_xAxis(); }
inline JKQTPverticalAxis* get_yAxis() { return plotter->get_yAxis(); } inline JKQTPverticalAxis* get_yAxis() { return plotter->get_yAxis(); }
@ -476,17 +643,17 @@ class LIB_EXPORT JKQtPlotter: public QWidget {
/** \brief fill color of the zoom rectangle */ /** \brief fill color of the zoom rectangle */
QColor userActionColor; QColor userActionColor;
/** \brief default value for property property varname. \see userActionColor for more information */ /*! \brief default value for property property varname. \see userActionColor for more information */
QColor def_userActionColor; QColor def_userActionColor;
/** \brief fill color of the zoom rectangle */ /** \brief fill color of the zoom rectangle */
QPainter::CompositionMode userActionCompositionMode; QPainter::CompositionMode userActionCompositionMode;
/** \brief default value for property property varname. \see userActionCompositionMode for more information */ /*! \brief default value for property property varname. \see userActionCompositionMode for more information */
QPainter::CompositionMode def_userActionCompositionMode; QPainter::CompositionMode def_userActionCompositionMode;
/** \brief width/height of the icons in the plotter toolbar in pixels */ /** \brief width/height of the icons in the plotter toolbar in pixels */
int toolbarIconSize; int toolbarIconSize;
/** \brief default value for property property varname. \see toolbarIconSize for more information */ /*! \brief default value for property property varname. \see toolbarIconSize for more information */
int def_toolbarIconSize; int def_toolbarIconSize;
/** \brief this is set \c true if we are drawing a zoom rectangle */ /** \brief this is set \c true if we are drawing a zoom rectangle */
@ -609,7 +776,7 @@ class LIB_EXPORT JKQtPlotter: public QWidget {
bool displayMousePosition; bool displayMousePosition;
/** \brief this string is used to generate the position output above the graph */ /** \brief this string is used to generate the position output above the graph */
QString mousePositionTemplate; QString mousePositionTemplate;
/** \brief default value for property property varname. \see mousePositionTemplate for more information */ /*! \brief default value for property property varname. \see mousePositionTemplate for more information */
QString def_mousePositionTemplate; QString def_mousePositionTemplate;
/** \brief if set \c true and displayMousePosition is \c true, the mouse position is not automatically determined, but the text given to setMousePositionLabel() is used */ /** \brief if set \c true and displayMousePosition is \c true, the mouse position is not automatically determined, but the text given to setMousePositionLabel() is used */
bool displayCustomMousePosition; bool displayCustomMousePosition;

15
lib/jkqtplottergui/jkvanishqtoolbar.h
View File

@ -39,7 +39,20 @@ class LIB_EXPORT JKVanishQToolBar: public QToolBar {
JKVanishQToolBar(const QString& title, QWidget* parent=nullptr); JKVanishQToolBar(const QString& title, QWidget* parent=nullptr);
/** \brief class constructor */ /** \brief class constructor */
JKVanishQToolBar(QWidget* parent=nullptr); JKVanishQToolBar(QWidget* parent=nullptr);
JKQTPGET_SET_MACRO(bool, toolbarVanishes) /*! \brief sets the property toolbarVanishes to the specified \a __value.
\details Description of the parameter toolbarVanishes is: <CENTER>\copybrief toolbarVanishes.</CENTER>
\see toolbarVanishes for more information */
inline virtual void set_toolbarVanishes(bool __value)
{
this->toolbarVanishes = __value;
}
/*! \brief returns the property toolbarVanishes.
\details Description of the parameter toolbarVanishes is: <CENTER>\copybrief toolbarVanishes.</CENTER>
\see toolbarVanishes for more information */
inline virtual bool get_toolbarVanishes() const
{
return this->toolbarVanishes;
}
protected: protected:
bool toolbarVanishes; bool toolbarVanishes;
/** \brief this event triggers the vanishing of the toolbar */ /** \brief this event triggers the vanishing of the toolbar */

2
lib/jkqtplottertools/jkqtphighrestimer.h
View File

@ -175,7 +175,7 @@ for (unsigned long i=0; i<runs; i++) {
\endcode \endcode
* *
*/ */
void test(double* mean, double* stddev, unsigned long* histogram=NULL, double* histogram_x=NULL, unsigned long histogram_size=0); void test(double* mean, double* stddev, unsigned long* histogram=nullptr, double* histogram_x=nullptr, unsigned long histogram_size=0);
}; };

299
lib/jkqtplottertools/jkqtpimagetools.h
View File

@ -801,27 +801,284 @@ class LIB_EXPORT JKQTPColorPaletteTools {
public: public:
JKQTPGET_SET_MACRO(JKQTPMathImageColorPalette, palette) /*! \brief sets the property palette to the specified \a __value.
JKQTPGET_SET_MACRO(JKQTPMathImageColorRangeFailAction, rangeMinFailAction) \details Description of the parameter palette is: <CENTER>\copybrief palette.</CENTER>
JKQTPGET_SET_MACRO(JKQTPMathImageColorRangeFailAction, rangeMaxFailAction) \see palette for more information */
JKQTPGET_SET_MACRO(QColor, rangeMinFailColor) inline virtual void set_palette(const JKQTPMathImageColorPalette & __value)
JKQTPGET_SET_MACRO(QColor, rangeMaxFailColor) {
JKQTPGET_SET_MACRO(QColor, nanColor) this->palette = __value;
JKQTPGET_SET_MACRO(QColor, infColor) }
JKQTPGET_SET_MACRO(bool, showColorBar) /*! \brief returns the property palette.
JKQTPGET_SET_MACRO(int, colorBarWidth) \details Description of the parameter palette is: <CENTER>\copybrief palette.</CENTER>
JKQTPGET_SET_MACRO(int, colorBarOffset) \see palette for more information */
JKQTPGET_SET_MACRO(double, colorBarRelativeHeight) inline virtual JKQTPMathImageColorPalette get_palette() const
JKQTPGET_SET_MACRO(double, imageMin) {
JKQTPGET_SET_MACRO(double, imageMax) return this->palette;
JKQTPGET_SET_MACRO(bool, autoImageRange) }
JKQTPGET_SET_MACRO(QString, imageName) /*! \brief sets the property rangeMinFailAction to the specified \a __value.
JKQTPGET_SET_MACRO(QString, imageNameFontName) \details Description of the parameter rangeMinFailAction is: <CENTER>\copybrief rangeMinFailAction.</CENTER>
JKQTPGET_SET_MACRO(double, imageNameFontSize) \see rangeMinFailAction for more information */
JKQTPGET_MACRO(JKQTPverticalIndependentAxis*, colorBarRightAxis) inline virtual void set_rangeMinFailAction(const JKQTPMathImageColorRangeFailAction & __value)
JKQTPGET_MACRO(JKQTPhorizontalIndependentAxis*, colorBarTopAxis) {
JKQTPGET_SET_MACRO(bool, colorBarTopVisible) this->rangeMinFailAction = __value;
JKQTPGET_SET_MACRO(bool, colorBarRightVisible) }
/*! \brief returns the property rangeMinFailAction.
\details Description of the parameter rangeMinFailAction is: <CENTER>\copybrief rangeMinFailAction.</CENTER>
\see rangeMinFailAction for more information */
inline virtual JKQTPMathImageColorRangeFailAction get_rangeMinFailAction() const
{
return this->rangeMinFailAction;
}
/*! \brief sets the property rangeMaxFailAction to the specified \a __value.
\details Description of the parameter rangeMaxFailAction is: <CENTER>\copybrief rangeMaxFailAction.</CENTER>
\see rangeMaxFailAction for more information */
inline virtual void set_rangeMaxFailAction(const JKQTPMathImageColorRangeFailAction & __value)
{
this->rangeMaxFailAction = __value;
}
/*! \brief returns the property rangeMaxFailAction.
\details Description of the parameter rangeMaxFailAction is: <CENTER>\copybrief rangeMaxFailAction.</CENTER>
\see rangeMaxFailAction for more information */
inline virtual JKQTPMathImageColorRangeFailAction get_rangeMaxFailAction() const
{
return this->rangeMaxFailAction;
}
/*! \brief sets the property rangeMinFailColor to the specified \a __value.
\details Description of the parameter rangeMinFailColor is: <CENTER>\copybrief rangeMinFailColor.</CENTER>
\see rangeMinFailColor for more information */
inline virtual void set_rangeMinFailColor(const QColor & __value)
{
this->rangeMinFailColor = __value;
}
/*! \brief returns the property rangeMinFailColor.
\details Description of the parameter rangeMinFailColor is: <CENTER>\copybrief rangeMinFailColor.</CENTER>
\see rangeMinFailColor for more information */
inline virtual QColor get_rangeMinFailColor() const
{
return this->rangeMinFailColor;
}
/*! \brief sets the property rangeMaxFailColor to the specified \a __value.
\details Description of the parameter rangeMaxFailColor is: <CENTER>\copybrief rangeMaxFailColor.</CENTER>
\see rangeMaxFailColor for more information */
inline virtual void set_rangeMaxFailColor(const QColor & __value)
{
this->rangeMaxFailColor = __value;
}
/*! \brief returns the property rangeMaxFailColor.
\details Description of the parameter rangeMaxFailColor is: <CENTER>\copybrief rangeMaxFailColor.</CENTER>
\see rangeMaxFailColor for more information */
inline virtual QColor get_rangeMaxFailColor() const
{
return this->rangeMaxFailColor;
}
/*! \brief sets the property nanColor to the specified \a __value.
\details Description of the parameter nanColor is: <CENTER>\copybrief nanColor.</CENTER>
\see nanColor for more information */
inline virtual void set_nanColor(const QColor & __value)
{
this->nanColor = __value;
}
/*! \brief returns the property nanColor.
\details Description of the parameter nanColor is: <CENTER>\copybrief nanColor.</CENTER>
\see nanColor for more information */
inline virtual QColor get_nanColor() const
{
return this->nanColor;
}
/*! \brief sets the property infColor to the specified \a __value.
\details Description of the parameter infColor is: <CENTER>\copybrief infColor.</CENTER>
\see infColor for more information */
inline virtual void set_infColor(const QColor & __value)
{
this->infColor = __value;
}
/*! \brief returns the property infColor.
\details Description of the parameter infColor is: <CENTER>\copybrief infColor.</CENTER>
\see infColor for more information */
inline virtual QColor get_infColor() const
{
return this->infColor;
}
/*! \brief sets the property showColorBar to the specified \a __value.
\details Description of the parameter showColorBar is: <CENTER>\copybrief showColorBar.</CENTER>
\see showColorBar for more information */
inline virtual void set_showColorBar(bool __value)
{
this->showColorBar = __value;
}
/*! \brief returns the property showColorBar.
\details Description of the parameter showColorBar is: <CENTER>\copybrief showColorBar.</CENTER>
\see showColorBar for more information */
inline virtual bool get_showColorBar() const
{
return this->showColorBar;
}
/*! \brief sets the property colorBarWidth to the specified \a __value.
\details Description of the parameter colorBarWidth is: <CENTER>\copybrief colorBarWidth.</CENTER>
\see colorBarWidth for more information */
inline virtual void set_colorBarWidth(int __value)
{
this->colorBarWidth = __value;
}
/*! \brief returns the property colorBarWidth.
\details Description of the parameter colorBarWidth is: <CENTER>\copybrief colorBarWidth.</CENTER>
\see colorBarWidth for more information */
inline virtual int get_colorBarWidth() const
{
return this->colorBarWidth;
}
/*! \brief sets the property colorBarOffset to the specified \a __value.
\details Description of the parameter colorBarOffset is: <CENTER>\copybrief colorBarOffset.</CENTER>
\see colorBarOffset for more information */
inline virtual void set_colorBarOffset(int __value)
{
this->colorBarOffset = __value;
}
/*! \brief returns the property colorBarOffset.
\details Description of the parameter colorBarOffset is: <CENTER>\copybrief colorBarOffset.</CENTER>
\see colorBarOffset for more information */
inline virtual int get_colorBarOffset() const
{
return this->colorBarOffset;
}
/*! \brief sets the property colorBarRelativeHeight to the specified \a __value.
\details Description of the parameter colorBarRelativeHeight is: <CENTER>\copybrief colorBarRelativeHeight.</CENTER>
\see colorBarRelativeHeight for more information */
inline virtual void set_colorBarRelativeHeight(double __value)
{
this->colorBarRelativeHeight = __value;
}
/*! \brief returns the property colorBarRelativeHeight.
\details Description of the parameter colorBarRelativeHeight is: <CENTER>\copybrief colorBarRelativeHeight.</CENTER>
\see colorBarRelativeHeight for more information */
inline virtual double get_colorBarRelativeHeight() const
{
return this->colorBarRelativeHeight;
}
/*! \brief sets the property imageMin to the specified \a __value.
\details Description of the parameter imageMin is: <CENTER>\copybrief imageMin.</CENTER>
\see imageMin for more information */
inline virtual void set_imageMin(double __value)
{
this->imageMin = __value;
}
/*! \brief returns the property imageMin.
\details Description of the parameter imageMin is: <CENTER>\copybrief imageMin.</CENTER>
\see imageMin for more information */
inline virtual double get_imageMin() const
{
return this->imageMin;
}
/*! \brief sets the property imageMax to the specified \a __value.
\details Description of the parameter imageMax is: <CENTER>\copybrief imageMax.</CENTER>
\see imageMax for more information */
inline virtual void set_imageMax(double __value)
{
this->imageMax = __value;
}
/*! \brief returns the property imageMax.
\details Description of the parameter imageMax is: <CENTER>\copybrief imageMax.</CENTER>
\see imageMax for more information */
inline virtual double get_imageMax() const
{
return this->imageMax;
}
/*! \brief sets the property autoImageRange to the specified \a __value.
\details Description of the parameter autoImageRange is: <CENTER>\copybrief autoImageRange.</CENTER>
\see autoImageRange for more information */
inline virtual void set_autoImageRange(bool __value)
{
this->autoImageRange = __value;
}
/*! \brief returns the property autoImageRange.
\details Description of the parameter autoImageRange is: <CENTER>\copybrief autoImageRange.</CENTER>
\see autoImageRange for more information */
inline virtual bool get_autoImageRange() const
{
return this->autoImageRange;
}
/*! \brief sets the property imageName to the specified \a __value.
\details Description of the parameter imageName is: <CENTER>\copybrief imageName.</CENTER>
\see imageName for more information */
inline virtual void set_imageName(const QString & __value)
{
this->imageName = __value;
}
/*! \brief returns the property imageName.
\details Description of the parameter imageName is: <CENTER>\copybrief imageName.</CENTER>
\see imageName for more information */
inline virtual QString get_imageName() const
{
return this->imageName;
}
/*! \brief sets the property imageNameFontName to the specified \a __value.
\details Description of the parameter imageNameFontName is: <CENTER>\copybrief imageNameFontName.</CENTER>
\see imageNameFontName for more information */
inline virtual void set_imageNameFontName(const QString & __value)
{
this->imageNameFontName = __value;
}
/*! \brief returns the property imageNameFontName.
\details Description of the parameter imageNameFontName is: <CENTER>\copybrief imageNameFontName.</CENTER>
\see imageNameFontName for more information */
inline virtual QString get_imageNameFontName() const
{
return this->imageNameFontName;
}
/*! \brief sets the property imageNameFontSize to the specified \a __value.
\details Description of the parameter imageNameFontSize is: <CENTER>\copybrief imageNameFontSize.</CENTER>
\see imageNameFontSize for more information */
inline virtual void set_imageNameFontSize(double __value)
{
this->imageNameFontSize = __value;
}
/*! \brief returns the property imageNameFontSize.
\details Description of the parameter imageNameFontSize is: <CENTER>\copybrief imageNameFontSize.</CENTER>
\see imageNameFontSize for more information */
inline virtual double get_imageNameFontSize() const
{
return this->imageNameFontSize;
}
/*! \brief returns the property colorBarRightAxis.
\details Description of the parameter colorBarRightAxis is: <CENTER>\copybrief colorBarRightAxis.</CENTER>.
\see colorBarRightAxis for more information */
inline JKQTPverticalIndependentAxis* get_colorBarRightAxis() const {
return this->colorBarRightAxis;
}
/*! \brief returns the property colorBarTopAxis.
\details Description of the parameter colorBarTopAxis is: <CENTER>\copybrief colorBarTopAxis.</CENTER>.
\see colorBarTopAxis for more information */
inline JKQTPhorizontalIndependentAxis* get_colorBarTopAxis() const {
return this->colorBarTopAxis;
}
/*! \brief sets the property colorBarTopVisible to the specified \a __value.
\details Description of the parameter colorBarTopVisible is: <CENTER>\copybrief colorBarTopVisible.</CENTER>
\see colorBarTopVisible for more information */
inline virtual void set_colorBarTopVisible(bool __value)
{
this->colorBarTopVisible = __value;
}
/*! \brief returns the property colorBarTopVisible.
\details Description of the parameter colorBarTopVisible is: <CENTER>\copybrief colorBarTopVisible.</CENTER>
\see colorBarTopVisible for more information */
inline virtual bool get_colorBarTopVisible() const
{
return this->colorBarTopVisible;
}
/*! \brief sets the property colorBarRightVisible to the specified \a __value.
\details Description of the parameter colorBarRightVisible is: <CENTER>\copybrief colorBarRightVisible.</CENTER>
\see colorBarRightVisible for more information */
inline virtual void set_colorBarRightVisible(bool __value)
{
this->colorBarRightVisible = __value;
}
/*! \brief returns the property colorBarRightVisible.
\details Description of the parameter colorBarRightVisible is: <CENTER>\copybrief colorBarRightVisible.</CENTER>
\see colorBarRightVisible for more information */
inline virtual bool get_colorBarRightVisible() const
{
return this->colorBarRightVisible;
}
}; };
#endif #endif

17
lib/jkqtplottertools/jkqtpmathparser.h
View File

@ -578,7 +578,7 @@ class JKQTPMathParser
jkmpConstantNode(jkmpResult d, JKQTPMathParser* p, jkmpNode* par); jkmpConstantNode(jkmpResult d, JKQTPMathParser* p, jkmpNode* par);
/** \brief evaluate this node */ /** \brief evaluate this node */
virtual jkmpResult evaluate() override;; virtual jkmpResult evaluate() override;
}; };
/** /**
@ -814,7 +814,20 @@ class JKQTPMathParser
/**\brief class destructor */ /**\brief class destructor */
virtual ~JKQTPMathParser(); virtual ~JKQTPMathParser();
JKQTPGET_SET_MACRO(void*, data) /*! \brief sets the property data to the specified \a __value.
\details Description of the parameter data is: <CENTER>\copybrief data.</CENTER>
\see data for more information */
inline virtual void set_data(void* __value)
{
this->data = __value;
}
/*! \brief returns the property data.
\details Description of the parameter data is: <CENTER>\copybrief data.</CENTER>
\see data for more information */
inline virtual void* get_data() const
{
return this->data;
}
/**\brief register a new function /**\brief register a new function
* \param name name of the new function * \param name name of the new function

8
lib/jkqtplottertools/jkqtptools.cpp
View File

@ -96,13 +96,7 @@ std::string jkqtp_tolower(const std::string& s){
return ret; return ret;
}; };
long jkqtp_get_filesize(char *FileName) {
struct stat file;
if(!stat(FileName,&file)) {
return file.st_size;
}
return 0;
}
std::string jkqtp_bytestostr(double bytes){ std::string jkqtp_bytestostr(double bytes){
double data=bytes; double data=bytes;
std::string form="%.0lf"; std::string form="%.0lf";

402
lib/jkqtplottertools/jkqtptools.h
View File

@ -104,316 +104,6 @@
/**
* \defgroup tools_getset get_var and set_var macros
* \ingroup tools
*
* The macros in this group have the purpose to make writing \c get_<varname>() and \c set_<varname>(<varname>)
* methods for classes easier. They can be used by giving the type and the name of a private variable for which
* \c get_ and \c set_ methods should be created:
* \code
* class a {
* private:
* int var1;
* std::strign var2;
* public:
* GetSetMacro(int, var1);
* JKQTPGetMacro(std::string, var2);
* }
* \endcode
* This code will create a \c set_var1, a \c set_var2 and a \c get_var1 method with the apropriate types.
* All functions will be declared \c virtual and can thus be easily overloaded in inheriting classes. They are also
* declared \c inline so the compiler may optimize them by really inlining them.
*
* The GetSetMacro creates get and set methods while the GetMacro and the SetMacro only create one of the
* both.
*/
/*@{*/
/**
* \brief create get_varname() and set_varname(type __value) methods/functions
* inside a class, where \c type is the type of \c varname and \c varname is a
* previously declared private variable that should be accessed by these
* methodes
*/
#define JKQTPGET_SET_MACRO(type,varname) \
typedef type typedef_set_##varname ;\
/** \brief sets the property varname to the specified \a __value. \details Description of the parameter varname is: <CENTER>\copybrief varname.</CENTER> \see varname for more information */ \
inline virtual void set_##varname (const typedef_set_##varname & __value) \
{ \
this->varname = __value; \
} \
/** \brief returns the property varname. \see varname for more information */ \
inline virtual type get_##varname () const \
{\
return this->varname; \
}
#define JKQTPGET_SET_VMACRO(type,varname) \
typedef type typedef_set_##varname ;\
/** \brief sets the property varname to the specified \a __value. \details Description of the parameter varname is: <CENTER>\copybrief varname.</CENTER> \see varname for more information */ \
inline virtual void set_##varname (const typedef_set_##varname & __value) \
{ \
this->varname = __value; \
} \
/** \brief returns the property varname. \see varname for more information */ \
inline virtual type get_##varname () const \
{\
return this->varname; \
}
#define JKQTPGetSetMacro(type,varname) JKQTPGET_SET_MACRO(type,varname)
/**
* \brief create get_varname() and set_varname(type __value) methods/functions
* inside a class, where \c type is the type of \c varname and \c varname is a
* previously declared private variable that should be accessed by these
* methodes. In addition this will set the property paramsChanged to true, which
* you will have to declare in your class.
*/
#define JKQTPGET_SET_MACRO_P(type,varname) \
typedef type typedef_set_##varname ;\
inline virtual void set_##varname (const typedef_set_##varname & __value) /** \brief sets the property varname to the specified \a __value. \details Description of the parameter varname is: <CENTER>\copybrief varname.</CENTER> \see varname for more information */ \
{ \
this->varname = __value; \
this-> paramsChanged=true; \
} \
inline virtual type get_##varname () const /** \brief returns the property varname. \see varname for more information */ \
{\
return this->varname; \
}
#define JKQTPGetSetMacroP(type,varname) JKQTPGET_SET_MACRO_P(type,varname)
/**
* \brief like GetSetMacroP(), but adds the instruction \a inst to the set method. This may be used
* to update a component after a value has been set.
*/
#define JKQTPGET_SET_MACRO_IP(type,varname,inst) \
typedef type typedef_set_##varname ;\
/** \brief sets the property varname to the specified \a __value. \details Description of the parameter varname is: <CENTER>\copybrief varname.</CENTER> \see varname for more information */ \
inline virtual void set_##varname (const typedef_set_##varname & __value) \
{ \
if (this->varname != __value) { \
this->varname = __value; \
this-> paramsChanged=true; \
inst; \
} \
} \
/** \brief returns the property varname. \see varname for more information */ \
inline virtual type get_##varname () const \
{ \
return this->varname; \
}
#define JKQTPGetSetMacroIP(type,varname,inst) JKQTPGET_SET_MACRO_IP(type,varname,inst)
/**
* \brief like GetSetMacro(), but adds the instruction \a inst to the set method. This may be used
* to update a component after a value has been set.
*/
#define JKQTPGET_SET_MACRO_I(type,varname,inst) \
typedef type typedef_set_##varname ;\
/** \brief sets the property varname to the specified \a __value. \details Description of the parameter varname is: <CENTER>\copybrief varname.</CENTER> \see varname for more information */ \
inline virtual void set_##varname (const typedef_set_##varname & __value) \
{\
if (this->varname != __value) { \
this->varname = __value; \
inst; \
} \
} \
/** \brief returns the property varname. \see varname for more information */ \
inline virtual type get_##varname () const \
{\
return this->varname; \
}
#define JKQTPGetSetMacroI(type,varname,inst) JKQTPGET_SET_MACRO_I(type,varname,inst)
/**
* \brief sets two given properties at the same time, i.e. with one setter function with the name <code>set_<name>(type __value, type2 __value2)</code>. The getter methods are still separate. This may be used
* to update a component after a value has been set.
*/
#define JKQTPGET_SET_MACRO_TWO(name,type,varname,type2,varname2) \
/** \brief sets the properties varname and varname2 to the specified \a __value and \a __value2. \details Description of the parameter varname is: <CENTER>\copybrief varname.</CENTER> \details Description of the parameter varname2 is: <CENTER>\copybrief varname2.</CENTER> \see varname and varname2 for more information */ \
inline virtual void set_##name (type __value, type2 __value2) \
{\
bool set=false; \
if (this->varname != __value) { \
this->varname = __value; \
} \
if (this->varname2 != __value2) { \
this->varname2 = __value2; \
} \
} \
/** \brief returns the property varname. \see varname for more information */ \
inline virtual type get_##varname () const \
{\
return this->varname; \
} \
/** \brief returns the property varname2. \see varname2 for more information */\
inline virtual type2 get_##varname2 () const \
{\
return this->varname2; \
}
#define JKQTPGetSetMacroTwo(name,type,varname,type2,varname2) JKQTPGET_SET_MACRO_TWO(name,type,varname,type2,varname2)
/**
* \brief like GetSetMacroTwo(), but adds the instruction \a inst to the set method. This may be used
* to update a component after a value has been set.
*/
#define JKQTPGET_SET_MACRO_TWO_I(name,type,varname,type2,varname2,inst) \
/** \brief sets the properties varname and varname2 to the specified \a __value and \a __value2. \details Description of the parameter varname is: <CENTER>\copybrief varname.</CENTER> \details Description of the parameter varname2 is: <CENTER>\copybrief varname2.</CENTER> \see varname and varname2 for more information */ \
inline virtual void set_##name (type __value, type2 __value2) \
{\
bool set=false; \
if (this->varname != __value) { \
this->varname = __value; \
set=true; \
} \
if (this->varname2 != __value2) { \
this->varname2 = __value2; \
set=true; \
} \
if (set) { \
inst; \
} \
} \
/** \brief returns the property varname. \see varname for more information */ \
inline virtual type get_##varname () const \
{\
return this->varname; \
} \
/** \brief returns the property varname2. \see varname2 for more information */ \
inline virtual type2 get_##varname2 () const \
{\
return this->varname2; \
}
#define JKQTPGetSetMacroTwoI(name,type,varname,type2,varname2,inst) JKQTPGET_SET_MACRO_TWO_I(name,type,varname,type2,varname2,inst)
/**
* \brief like GetSetMacro(), but adds the instruction \a inst to the set method. This may be used
* to update a component after a value has been set. Alwys updates (no comparison of current
* and former value
*/
#define JKQTPGET_SET_MACRO_INC(type,varname,inst) \
typedef type typedef_set_##varname ;\
/** \brief sets the property varname to the specified \a __value. \details Description of the parameter varname is: <CENTER>\copybrief varname.</CENTER> \see varname for more information */ \
inline virtual void set_##varname (typedef_set_##varnam __value) \
{\
this->varname = __value; \
inst; \
} \
/** \brief returns the property varname. \see varname for more information */ \
inline virtual type get_##varname () const \
{\
return this->varname; \
}
#define JKQTPGetSetMacroINC(type,varname,inst) JKQTPGET_SET_MACRO_INC(type,varname,inst)
/** \brief create get_varname() and set_varname(type __value) methods/functions
* inside a class, where \c type is the type of \c varname and \c varname is a
* previously declared private variable that should be accessed by these
* methodes
*/
#define JKQTPGET_MACRO(type,varname) \
/** \brief returns the property varname. \details Description of the parameter varname is: <CENTER>\copybrief varname.</CENTER>. \see varname for more information */ \
inline virtual type get_##varname() const \
{ return this->varname; }
#define JKQTPGetMacro(type,varname) JKQTPGET_MACRO(type,varname)
/**
* \brief create set_varname(type __value) methods/functions
* inside a class, where \c type is the type of \c varname and \c varname is a
* previously declared private variable that should be accessed by these
* methodes
*/
#define JKQTPSET_MACRO(type,varname) \
/** \brief sets the property varname to the specified \a __value. \details Description of the parameter varname is: <CENTER>\copybrief varname.</CENTER> \see varname for more information */ \
inline virtual void set_##varname (const type & __value) \
{ \
this->varname = __value; \
}
#define JKQTPSetMacro(type,varname) JKQTPSET_MACRO(type,varname)
/**
* \brief create set_varname(type __value) methods/functions
* inside a class, where \c type is the type of \c varname and \c varname is a
* previously declared private variable that should be accessed by these
* methodes
*/
#define JKQTPSET_CAST_MACRO(typefunction,typeinternal,varname) \
/** \brief sets the property varname to the specified \a __value, where __value is static_cast'ed from typefunction to typeinternal. \details Description of the parameter varname is: <CENTER>\copybrief varname.</CENTER> \see varname for more information */ \
inline virtual void set_##varname (const typefunction & __value) \
{ \
this->varname = static_cast<typeinternal>(__value); \
}
/**
* \brief create set_varname(type __value) methods/functions
* inside a class, where \c type is the type of \c varname and \c varname is a
* previously declared private variable that should be accessed by these
* methodes. In addition this will set the property paramsChanged to true, which
* you will have to declare in your class.
*/
#define JKQTPSET_MACRO_P(type,varname) \
typedef type typedef_set_##varname ;\
/** \brief sets the property varname to the specified \a __value. \details Description of the parameter varname is: <CENTER>\copybrief varname.</CENTER> \see varname for more information */ \
inline virtual void set_##varname (const typedef_set_##varname & __value) \
{ \
if (this->varname != __value) { \
this->varname = __value; \
this->paramsChanged=true; \
} \
}
#define JKQTPSetMacroP(type,varname) JKQTPSET_MACRO_P(type,varname)
/**
* \brief like SetMacro(), but adds the instruction \a inst to the set method. This may be used
* to update a component after a value has been set
*/
#define JKQTPSET_MACRO_I(type,varname,inst) \
typedef type typedef_set_##varname ;\
/** \brief sets the property varname to the specified \a __value. \details Description of the parameter varname is: <CENTER>\copybrief varname.</CENTER> \see varname for more information */ \
inline virtual void set_##varname(const typedef_set_##varname & __value) \
{ \
if (this->varname != __value) { \
this->varname = __value; \
inst; \
} \
}
#define JKQTPSetMacroI(type,varname,inst) JKQTPSET_MACRO_I(type,varname,inst)
/**
* \brief like SetMacro(), but adds the instruction \a inst at the start of the set method. This may be used
* e.g. to lock a mutex in the set operation, e.g. using QMutexLocker locker(mutex); from Qt
*/
#define JKQTPSET_MACRO_I_BEFORE(type,varname,inst) \
typedef type typedef_set_##varname ;\
/** \brief sets the property varname to the specified \a __value. \details Description of the parameter varname is: <CENTER>\copybrief varname.</CENTER> \see varname for more information */ \
inline virtual void set_##varname(const typedef_set_##varname & __value) \
{ \
inst; \
if (this->varname != __value) { \
this->varname = __value; \
} \
}
#define JKQTPSetMacroIBefore(type,varname,inst) JKQTPSET_MACRO_I_BEFORE(type,varname,inst)
/**
* \brief like SetMacroP(), but adds the instruction \a inst to the set method. This may be used
* to update a component after a value has been set
*/
#define JKQTPSET_MACRO_IP(type,varname,inst) \
typedef type typedef_set_##varname ;\
/** \brief sets the property varname to the specified \a __value. \details Description of the parameter varname is: <CENTER>\copybrief varname.</CENTER> \see varname for more information */ \
inline virtual void set_##varname (const typedef_set_##varname & __value) \
{ \
if (this->varname != __value) { \
this->varname = __value; \
this->paramsChanged=true; \
inst; \
} \
}
#define JKQTPSetMacroIP(type,varname,inst) JKQTPSET_MACRO_IP(type,varname,inst)
/*@}*/
/** \defgroup tools_files filesystem and file I/O /** \defgroup tools_files filesystem and file I/O
* \ingroup tools * \ingroup tools
*/ */
@ -430,15 +120,12 @@ class JKQTPEnhancedPainter; // forward
/** \brief check whether the dlotaing point number is OK (i.e. non-inf, non-NAN) /** \brief check whether the dlotaing point number is OK (i.e. non-inf, non-NAN)
* \ingroup jkqtptools * \ingroup jkqtptools
*/ */
#define JKQTPIsOKFloat(v) (std::isfinite(v)&&(!std::isinf(v))&&(!std::isnan(v))) template <typename T>
inline T JKQTPIsOKFloat(T v) {
return std::isfinite(v)&&(!std::isinf(v))&&(!std::isnan(v));
}
/** \brief converts a QColor into a string using the jkqtp_rgbtostring() method.
* \ingroup jkqtptools
*
* This returns a QString which contains the name of named colors and the RGBA values in a QT readable form othertwise.
*/
#define JKQTP_QColor2String(color) QString(jkqtp_rgbtostring(static_cast<unsigned char>((color).red()), static_cast<unsigned char>((color).green()), static_cast<unsigned char>((color).blue()), static_cast<unsigned char>((color).alpha())).c_str())
/** \brief converts a QT::PenStyle into a string /** \brief converts a QT::PenStyle into a string
* \ingroup jkqtptools * \ingroup jkqtptools
@ -615,7 +302,7 @@ typedef struct {
*/ */
#define JKQTPPROPERTY(type,varname) \ #define JKQTPPROPERTY(type,varname) \
type varname; \ type varname; \
/** \brief default value for property property varname. \see varname for more information */ \ /*! \brief default value for property property varname. \see varname for more information */ \
type def_##varname; type def_##varname;
/** /**
@ -723,14 +410,18 @@ LIB_EXPORT QString JKQTPgraphSymbols2NameString(JKQTPgraphSymbols pos);
LIB_EXPORT JKQTPgraphSymbols String2JKQTPgraphSymbols(QString pos); LIB_EXPORT JKQTPgraphSymbols String2JKQTPgraphSymbols(QString pos);
/** \brief convert a double to a string, using the loacle "C"
* \ingroup jkqtptools
*/
inline QString JKQTPCDoubleToQString(double value) { inline QString JKQTPCDoubleToQString(double value) {
QLocale loc=QLocale::c(); QLocale loc=QLocale::c();
loc.setNumberOptions(QLocale::OmitGroupSeparator); loc.setNumberOptions(QLocale::OmitGroupSeparator);
return loc.toString(value, 'g', 18); return loc.toString(value, 'g', 18);
} }
/** \brief convert a double to a string
* \ingroup jkqtptools
*/
inline QString JKQTPDoubleToQString(double value, int prec = 10, char f = 'g', QChar decimalSeparator='.') { inline QString JKQTPDoubleToQString(double value, int prec = 10, char f = 'g', QChar decimalSeparator='.') {
QLocale loc=QLocale::c(); QLocale loc=QLocale::c();
loc.setNumberOptions(QLocale::OmitGroupSeparator); loc.setNumberOptions(QLocale::OmitGroupSeparator);
@ -743,7 +434,9 @@ inline QString JKQTPDoubleToQString(double value, int prec = 10, char f = 'g', Q
/** \brief rotate a rectangle by given angle (rotates all points around the center of the rectangle and returns it as a QPolygonF)
* \ingroup jkqtptools
*/
LIB_EXPORT QPolygonF jkqtpRotateRect(QRectF r, double angle); LIB_EXPORT QPolygonF jkqtpRotateRect(QRectF r, double angle);
@ -846,6 +539,9 @@ inline void jkqtpSort(T* input, T2* input2, int N, T* output=nullptr, T2* output
jkqtpQuicksort(data, data2, 0, N-1); jkqtpQuicksort(data, data2, 0, N-1);
} }
/** \brief RAII construct that times its lifetime, outputting properly indented qDebug()-message
* \ingroup jkqtptools
*/
class LIB_EXPORT JKQTPAutoOutputTimer : public QElapsedTimer class LIB_EXPORT JKQTPAutoOutputTimer : public QElapsedTimer
{ {
public: public:
@ -859,32 +555,94 @@ class LIB_EXPORT JKQTPAutoOutputTimer : public QElapsedTimer
}; };
/** \brief convert a string to lower-case characters
* \ingroup jkqtptools
*/
LIB_EXPORT std::string jkqtp_tolower(const std::string& s); LIB_EXPORT std::string jkqtp_tolower(const std::string& s);
/** \brief convert a string to a boolean
* \ingroup jkqtptools
*/
LIB_EXPORT bool jkqtp_strtobool(std::string data); LIB_EXPORT bool jkqtp_strtobool(std::string data);
/** \brief convert a string to upper-case
* \ingroup jkqtptools
*/
LIB_EXPORT std::string jkqtp_toupper(const std::string& s); LIB_EXPORT std::string jkqtp_toupper(const std::string& s);
/** \brief std::string wrapper around sprintf()
* \ingroup jkqtptools
*/
LIB_EXPORT std::string jkqtp_format(const std::string& templ, ...); LIB_EXPORT std::string jkqtp_format(const std::string& templ, ...);
LIB_EXPORT long jkqtp_get_filesize(char *FileName); /** \brief convert a number of bytes to a string, formatting e.g. 1024 as 1kB, ...
* \ingroup jkqtptools
*/
LIB_EXPORT std::string jkqtp_bytestostr(double bytes); LIB_EXPORT std::string jkqtp_bytestostr(double bytes);
/** \brief convert an integer to a string
* \ingroup jkqtptools
*/
LIB_EXPORT std::string jkqtp_inttostr(long data); LIB_EXPORT std::string jkqtp_inttostr(long data);
/** \brief convert an integer to a hex string
* \ingroup jkqtptools
*/
LIB_EXPORT std::string jkqtp_inttohex(long data); LIB_EXPORT std::string jkqtp_inttohex(long data);
/** \brief convert an unsigned int to a string
* \ingroup jkqtptools
*/
LIB_EXPORT std::string jkqtp_uinttostr(unsigned long data); LIB_EXPORT std::string jkqtp_uinttostr(unsigned long data);
/** \brief convert a double to a string
* \ingroup jkqtptools
*/
LIB_EXPORT std::string jkqtp_floattostr(double data, int past_comma=-1, bool remove_trail0=false, double belowIsZero=1e-16); LIB_EXPORT std::string jkqtp_floattostr(double data, int past_comma=-1, bool remove_trail0=false, double belowIsZero=1e-16);
/** \brief convert a double to a string, encoding powers of ten as characters, e.g. \c jkqtp_floattounitstr(1000,"g") will result in "1kg"
* \ingroup jkqtptools
*/
LIB_EXPORT std::string jkqtp_floattounitstr(double dataa, std::string unitname); LIB_EXPORT std::string jkqtp_floattounitstr(double dataa, std::string unitname);
/** \brief convert a boolean to a string
* \ingroup jkqtptools
*/
LIB_EXPORT std::string jkqtp_booltostr(bool data); LIB_EXPORT std::string jkqtp_booltostr(bool data);
/** \brief converts a RGBA color into a string
* \ingroup jkqtptools
*
* This returns a QString which contains the name of named colors and the RGBA values in a QT readable form othertwise.
*/
LIB_EXPORT std::string jkqtp_rgbtostring(unsigned char r, unsigned char g, unsigned char b, unsigned char a=255); LIB_EXPORT std::string jkqtp_rgbtostring(unsigned char r, unsigned char g, unsigned char b, unsigned char a=255);
/** \brief converts a QColor into a string using the jkqtp_rgbtostring() method.
* \ingroup jkqtptools
*
* This returns a QString which contains the name of named colors and the RGBA values in a QT readable form othertwise.
*/
inline QString JKQTP_QColor2String(QColor color) {
return QString(jkqtp_rgbtostring(static_cast<unsigned char>((color).red()), static_cast<unsigned char>((color).green()), static_cast<unsigned char>((color).blue()), static_cast<unsigned char>((color).alpha())).c_str());
}
/** \brief clean a string to be usable as a variable name, e.g. in an expression parser, or a C++-expression
* \ingroup jkqtptools
*/
LIB_EXPORT std::string jkqtp_to_valid_variable_name(std::string input); LIB_EXPORT std::string jkqtp_to_valid_variable_name(std::string input);
/** \brief convert a double to a string, encoding powers of ten as characters, e.g. \c jkqtp_floattounitstr(1000) will result in "1k"
* \ingroup jkqtptools
*/
LIB_EXPORT std::string jkqtp_floattounitstr(double data, int past_comma=5, bool remove_trail0=false); LIB_EXPORT std::string jkqtp_floattounitstr(double data, int past_comma=5, bool remove_trail0=false);
/** \brief convert a double to a string, encoding powers of ten as exponent in LaTeX notation (e.g. \c -1.23\cdot10^{-5})
* \ingroup jkqtptools
*/
LIB_EXPORT std::string jkqtp_floattolatexstr(double data, int past_comma=5, bool remove_trail0=false, double belowIsZero=1e-16, double minNoExponent=1e-3, double maxNoExponent=1e4); LIB_EXPORT std::string jkqtp_floattolatexstr(double data, int past_comma=5, bool remove_trail0=false, double belowIsZero=1e-16, double minNoExponent=1e-3, double maxNoExponent=1e4);
/** \brief convert a double to a string, encoding powers of ten as exponent with HTML tags
* \ingroup jkqtptools
*/
LIB_EXPORT std::string jkqtp_floattohtmlstr(double data, int past_comma=5, bool remove_trail0=false, double belowIsZero=1e-16, double minNoExponent=1e-3, double maxNoExponent=1e4); LIB_EXPORT std::string jkqtp_floattohtmlstr(double data, int past_comma=5, bool remove_trail0=false, double belowIsZero=1e-16, double minNoExponent=1e-3, double maxNoExponent=1e4);
/** \brief convert a character to a string
* \ingroup jkqtptools
*/
LIB_EXPORT std::string jkqtp_chartostr(char data); LIB_EXPORT std::string jkqtp_chartostr(char data);
/** \brief wandelt einen Datentyp in einen double um, wird von JKQTPDatastore zur Wandlung benutzt /** \brief wandelt einen Datentyp in einen double um, wird von JKQTPDatastore zur Wandlung benutzt