diff --git a/doc/dox/whatsnew.dox b/doc/dox/whatsnew.dox
index f3704ca519..644e8f7d83 100644
--- a/doc/dox/whatsnew.dox
+++ b/doc/dox/whatsnew.dox
@@ -54,10 +54,11 @@ Changes, compared to \ref page_whatsnew_V4_0_0 "v4.0.0" include:
NEW: barcharts (derived from JKQTPBarGraphBase) can be configured to use different fill styles above and below the baseline, see JKQTPBarGraphBase::FillMode
NEW: added new error indicator styles JKQTPErrorHalfBarsOutwards, JKQTPErrorHalfBarsInwards, JKQTPErrorHalfBarsAbove, JKQTPErrorHalfBarsBelow which are especially useful for barcharts
NEW: Added signals JKQTBasePlotter::beforeExporting()/JKQTBasePlotter::afterExporting() and JKQTBasePlotterJKQTBasePlotter:beforePrinting()/JKQTBasePlotter::afterPrinting() which allow to modify the plot just before and just after an export/print
- NEW: Added new JKQTPCALabelType elements (JKQTPCALTfrac...), so axis label ticks can be displayed as fractions 1/2 instead of 0.5
- NEW: Added new JKQTPCALabelType elements JKQTPCALTscientific, so axis label ticks can be displayed as numbers in scientific notation like \c 1.2E-34
+ NEW: Added new JKQTPCALabelType elements (JKQTPCALTfrac...), so axis label ticks can be displayed as fractions 1/2 instead of 0.5
+ JKQTPCALTscientific, so axis label ticks can be displayed as numbers in scientific notation like \c 1.2E-34
JKQTPCALTprintf for general formatting with a printf-format string
NEW: all elements of a coordinate axis may have their own color now
+ NEW: added possibility to scale the axis ticks by a factor (e.g. pi) to generate axes with ticks 0pi, 1pi, 2pi ...
JKQTMathText:
diff --git a/doc/images/axisstyle/JKQTPCALTintslashfrac.png b/doc/images/axisstyle/JKQTPCALTintslashfrac.png
index fe82e7c10d..329c70049a 100644
Binary files a/doc/images/axisstyle/JKQTPCALTintslashfrac.png and b/doc/images/axisstyle/JKQTPCALTintslashfrac.png differ
diff --git a/doc/images/axisstyle/JKQTPCALTslashfrac.png b/doc/images/axisstyle/JKQTPCALTslashfrac.png
index 51d0d5bb03..6290a14178 100644
Binary files a/doc/images/axisstyle/JKQTPCALTslashfrac.png and b/doc/images/axisstyle/JKQTPCALTslashfrac.png differ
diff --git a/doc/images/axisstyle/JKQTPLTMLin.png b/doc/images/axisstyle/JKQTPLTMLin.png
new file mode 100644
index 0000000000..effd9f8ec7
Binary files /dev/null and b/doc/images/axisstyle/JKQTPLTMLin.png differ
diff --git a/doc/images/axisstyle/JKQTPLTMLinOrPower.png b/doc/images/axisstyle/JKQTPLTMLinOrPower.png
new file mode 100644
index 0000000000..c512c14cc2
Binary files /dev/null and b/doc/images/axisstyle/JKQTPLTMLinOrPower.png differ
diff --git a/doc/images/axisstyle/JKQTPLTMPower.png b/doc/images/axisstyle/JKQTPLTMPower.png
new file mode 100644
index 0000000000..1238567143
Binary files /dev/null and b/doc/images/axisstyle/JKQTPLTMPower.png differ
diff --git a/doc/images/axisstyle/axis_unit_scaling_none.png b/doc/images/axisstyle/axis_unit_scaling_none.png
new file mode 100644
index 0000000000..3f362858b6
Binary files /dev/null and b/doc/images/axisstyle/axis_unit_scaling_none.png differ
diff --git a/doc/images/axisstyle/axis_unit_scaling_pi.png b/doc/images/axisstyle/axis_unit_scaling_pi.png
new file mode 100644
index 0000000000..f1fba75f59
Binary files /dev/null and b/doc/images/axisstyle/axis_unit_scaling_pi.png differ
diff --git a/doc/images/jkqtmathtext/jkqtmathtext_utf8.png b/doc/images/jkqtmathtext/jkqtmathtext_utf8.png
index 5cf7dfacb0..86a2e74075 100644
Binary files a/doc/images/jkqtmathtext/jkqtmathtext_utf8.png and b/doc/images/jkqtmathtext/jkqtmathtext_utf8.png differ
diff --git a/lib/jkqtfastplotter/jkqtfastplotter.h b/lib/jkqtfastplotter/jkqtfastplotter.h
index 0e8e185380..4f7085d300 100644
--- a/lib/jkqtfastplotter/jkqtfastplotter.h
+++ b/lib/jkqtfastplotter/jkqtfastplotter.h
@@ -424,7 +424,7 @@ class JKQTFASTPLOTTER_LIB_EXPORT JKQTFastPlotter :
}
}
- /** \brief return x coordinate coordinate from x-pixel */
+ /** \brief return x coordinate from x-pixel */
inline double p2x(long x) {
if (xAxisLog) {
return exp(JKQTPSTATISTICS_LN10*(static_cast(x)-xOffset)/(xScale));
@@ -443,7 +443,7 @@ class JKQTFASTPLOTTER_LIB_EXPORT JKQTFastPlotter :
}
}
- /** \brief return y coordinate coordinate from y-pixel */
+ /** \brief return y coordinate from y-pixel */
inline double p2y(long y) {
if (yAxisLog) {
return exp(JKQTPSTATISTICS_LN10*(static_cast(y)-yOffset)/(-1.0*yScale));
diff --git a/lib/jkqtplotter/jkqtpbaseplotter.h b/lib/jkqtplotter/jkqtpbaseplotter.h
index 38409e5dc8..e6331a21c5 100644
--- a/lib/jkqtplotter/jkqtpbaseplotter.h
+++ b/lib/jkqtplotter/jkqtpbaseplotter.h
@@ -585,7 +585,7 @@ class JKQTPLOTTER_LIB_EXPORT JKQTBasePlotter: public QObject {
/** \brief clear all additional plotters for grid printing mode */
void clearGridPrintingPlotters();
- /** \brief return x-pixel coordinate from time coordinate */
+ /** \brief return x-pixel coordinate from x coordinate */
inline double x2p(double x) const {
return xAxis->x2p(x);
}
@@ -595,12 +595,12 @@ class JKQTPLOTTER_LIB_EXPORT JKQTBasePlotter: public QObject {
return yAxis->x2p(y);
}
- /** \brief return time coordinate coordinate from x-pixel */
+ /** \brief return x coordinate from x-pixel */
inline double p2x(double x) const {
return xAxis->p2x(x);
}
- /** \brief return y coordinate coordinate from y-pixel */
+ /** \brief return y coordinate from y-pixel */
inline double p2y(double y) const {
return yAxis->p2x(y);
}
diff --git a/lib/jkqtplotter/jkqtpcoordinateaxes.cpp b/lib/jkqtplotter/jkqtpcoordinateaxes.cpp
index cb2b4127b3..ff03bca0d9 100644
--- a/lib/jkqtplotter/jkqtpcoordinateaxes.cpp
+++ b/lib/jkqtplotter/jkqtpcoordinateaxes.cpp
@@ -56,6 +56,8 @@ JKQTPCoordinateAxis::JKQTPCoordinateAxis(JKQTBasePlotter* _parent):
tickSpacing(0),
tickSpacingLog(10),
axisLabel(),
+ tickUnitFactor(1),
+ tickUnitName(""),
axisPrefix(),
scaleSign(1)
{
@@ -403,17 +405,28 @@ QString JKQTPCoordinateAxis::floattolabel(double data, int past_comma) const {
belowIsZero=fabs(getMax()-getMin())*1e-6;
}
+ data=data/tickUnitFactor;
+
+ auto addTickUnit=[&](const QString& s) {
+ if (tickUnitName.isEmpty()) return s;
+ bool ok=false;
+ const double d=s.toDouble(&ok);
+ if (s=="0" || (ok && fabs(d)<1e-300)) return s;
+ if (s=="1" || (ok && d==1.0)) return tickUnitName;
+ return s+tickUnitName;
+ };
+
switch(axisStyle.tickLabelType) {
case JKQTPCALTcount:
return "";
case JKQTPCALTdefault:
- return floattostringWithFormat(loc, data, 'f', past_comma, remove_trail0);
+ return addTickUnit(floattostringWithFormat(loc, data, 'f', past_comma, remove_trail0));
case JKQTPCALTscientific:
- return floattostringWithFormat(loc, data, 'e', past_comma, remove_trail0);
+ return addTickUnit(floattostringWithFormat(loc, data, 'e', past_comma, remove_trail0));
case JKQTPCALTexponent:
- return QString(jkqtp_floattolatexstr(data, past_comma, remove_trail0, belowIsZero, pow(10, -past_comma), pow(10, past_comma+1)).c_str());
+ return addTickUnit(QString(jkqtp_floattolatexstr(data, past_comma, remove_trail0, belowIsZero, pow(10, -past_comma), pow(10, past_comma+1)).c_str()));
case JKQTPCALTexponentCharacter:
- return QString(jkqtp_floattolatexunitstr(data, past_comma, remove_trail0).c_str());
+ return addTickUnit(QString(jkqtp_floattolatexunitstr(data, past_comma, remove_trail0).c_str()));
case JKQTPCALTintfrac:
case JKQTPCALTintsfrac:
case JKQTPCALTintslashfrac:
@@ -443,16 +456,21 @@ QString JKQTPCoordinateAxis::floattolabel(double data, int past_comma) const {
if (num!=0) {
if (denom==1) res+=QString::number(num);
else {
- if (axisStyle.tickLabelType==JKQTPCALTfrac || axisStyle.tickLabelType==JKQTPCALTintfrac) res+=QString("\\frac{%1}{%2}").arg(num).arg(denom);
- else if (axisStyle.tickLabelType==JKQTPCALTsfrac || axisStyle.tickLabelType==JKQTPCALTintsfrac) res+=QString("\\sfrac{%1}{%2}").arg(num).arg(denom);
+ if (axisStyle.tickLabelType==JKQTPCALTfrac || (axisStyle.tickLabelType==JKQTPCALTintfrac && intpart==0)) res+=QString("\\frac{%1}{%2}").arg(addTickUnit(QString::number(num))).arg(denom);
+ else if (axisStyle.tickLabelType==JKQTPCALTintfrac) res=addTickUnit(res+QString("\\frac{%1}{%2}").arg(num).arg(denom));
+ else if (axisStyle.tickLabelType==JKQTPCALTsfrac || (axisStyle.tickLabelType==JKQTPCALTintsfrac && intpart==0)) res+=QString("\\sfrac{%1}{%2}").arg(addTickUnit(QString::number(num))).arg(denom);
+ else if (axisStyle.tickLabelType==JKQTPCALTintsfrac) res=addTickUnit(res+QString("\\sfrac{%1}{%2}").arg(num).arg(denom));
else {
if (res.size()>0 && res[res.size()-1].isDigit()) {
if (sign<0) res+="-";
else res+="+";
}
- res+=QString("%1/%2").arg(num).arg(denom);
+ if (axisStyle.tickLabelType==JKQTPCALTintslashfrac)
+ res=addTickUnit("("+res+QString("%1/%2").arg(num).arg(denom)+")");
}
}
+ } else {
+ res=addTickUnit(res);
}
}
//std::cout< "<tickUnitName = __value;
+ this->paramsChanged=true;
+ redrawPlot();
+}
+
+void JKQTPCoordinateAxis::setTickUnitFactor(double __value)
+{
+ this->tickUnitFactor = __value;
+ this->paramsChanged=true;
+ redrawPlot();
+}
+
+void JKQTPCoordinateAxis::setTickUnit(double factor, const QString &name)
+{
+ this->tickUnitFactor = factor;
+ this->tickUnitName = name;
+ this->paramsChanged=true;
+ redrawPlot();
+}
+
+void JKQTPCoordinateAxis::setTickUnitPi()
+{
+ setTickUnit(JKQTPSTATISTICS_PI, "\\;\\pi");
+}
+
+void JKQTPCoordinateAxis::resetTickUnit()
+{
+ setTickUnit(1, "");
+}
+
void JKQTPCoordinateAxis::setLabelPosition(JKQTPLabelPosition __value) {
this->axisStyle.labelPosition = __value;
this->paramsChanged=true;
diff --git a/lib/jkqtplotter/jkqtpcoordinateaxes.h b/lib/jkqtplotter/jkqtpcoordinateaxes.h
index d8a1abf0c2..f3151f3890 100644
--- a/lib/jkqtplotter/jkqtpcoordinateaxes.h
+++ b/lib/jkqtplotter/jkqtpcoordinateaxes.h
@@ -41,7 +41,7 @@ class JKQTBasePlotter;
This class implements all the functionality needed for a coordinate axis:
- transform world to screen coordinates and vice versa
- - draw the axis (implemented by child classes!) with these elements: axis lines, JKQTPCoordinateAxisStyle::ticks, tick labels, axis label, x/y=0 axis
+ - draw the axis (implemented by child classes!) with these elements: axis lines, ticks, tick labels, axis label, x/y=0 axis
- measure the axes in screen coordinates
- load and save the settings to an ini file
.
@@ -115,12 +115,11 @@ class JKQTBasePlotter;
\see You can find example here: \ref JKQTPlotterImagePlotQImageRGB and \ref JKQTPlotterImagePlotRGBOpenCV
- \section jkqtplotter_base_grids_baseelemenets Axis JKQTPCoordinateAxisStyle::Ticks and Grids
-
- This section explains how this component draws the JKQTPCoordinateAxisStyle::ticks on coordinate axes and the grids that may be drawn below
+ \section jkqtplotter_base_grids_baseelemenets Axis Ticks and Grids
+ This section explains how this component draws the ticks on coordinate axes and the grids that may be drawn below
the plots. In principle both - grids and axes - are drawn the same way, i.e. with the same step widths. There are
- two types of JKQTPCoordinateAxisStyle::ticks and grids: The major and the minor JKQTPCoordinateAxisStyle::ticks/grids. The major JKQTPCoordinateAxisStyle::ticks also show a label that denotes the
- value they represent. Between two major JKQTPCoordinateAxisStyle::ticks the axis shows \a JKQTPCoordinateAxisStyle::minorTicks small JKQTPCoordinateAxisStyle::ticks that are not
+ two types of ticks and grids: The major and the minor ticks/grids. The major ticks also show a label that denotes the
+ value they represent. Between two major ticks the axis shows \a JKQTPCoordinateAxisStyle::minorTicks small ticks that are not
accompanied by a label. The next image shows an example of an axis:
\image html plot_axis_ticksandlabels.png
@@ -135,21 +134,36 @@ class JKQTBasePlotter;
For grids applies the same. There are two grids that are drawn in different styles (often the major grid is drawn
thicker and darker than the minor grid).
- The minor JKQTPCoordinateAxisStyle::ticks and grid lines are generated automatically, depending in the setting of \a JKQTPCoordinateAxisStyle::minorTicks.
- These properties give the number of minor JKQTPCoordinateAxisStyle::ticks between two major JKQTPCoordinateAxisStyle::ticks, so if the major JKQTPCoordinateAxisStyle::ticks are at 1,2,3,... and you
- want minor JKQTPCoordinateAxisStyle::ticks at 1.1, 1.2, 1.3,... then you will have to set \c JKQTPCoordinateAxisStyle::minorTicks=9 as there are nine JKQTPCoordinateAxisStyle::ticks between two major
- JKQTPCoordinateAxisStyle::ticks. So the minor tick spacing is calculated as: \f[ \Delta\mbox{MinorTicks}=\frac{\Delta\mbox{ticks}}{\mbox{minorTicks}+1} \f]
+ The minor ticks and grid lines are generated automatically, depending in the setting of \a JKQTPCoordinateAxisStyle::minorTicks.
+ These properties give the number of minor ticks between two major ticks, so if the major ticks are at 1,2,3,... and you
+ want minor ticks at 1.1, 1.2, 1.3,... then you will have to set \c JKQTPCoordinateAxisStyle::minorTicks=9 as there are nine ticks between two major
+ ticks. So the minor tick spacing is calculated as: \f[ \Delta\mbox{MinorTicks}=\frac{\Delta\mbox{ticks}}{\mbox{minorTicks}+1} \f]
- The same applies for logarithmic axes. If the major JKQTPCoordinateAxisStyle::ticks are at 1,10,100,... and you set \c JKQTPCoordinateAxisStyle::minorTicks=9 the program will
- generate 9 equally spaced minor JKQTPCoordinateAxisStyle::ticks in between, so you have minor JKQTPCoordinateAxisStyle::ticks at 2,3,4,...,11,12,13,... This results in a standard
- logarithmic axis. If you set \c JKQTPCoordinateAxisStyle::minorTicks=1 then you will get minor JKQTPCoordinateAxisStyle::ticks at 5,15,150,...
+ The same applies for logarithmic axes. If the major ticks are at 1,10,100,... and you set \c JKQTPCoordinateAxisStyle::minorTicks=9 the program will
+ generate 9 equally spaced minor ticks in between, so you have minor ticks at 2,3,4,...,11,12,13,... This results in a standard
+ logarithmic axis. If you set \c JKQTPCoordinateAxisStyle::minorTicks=1 then you will get minor ticks at 5,15,150,...
\image html plot_logaxis_ticksandlabels.png
The major tick-tick distances of linear axes may be calculated automatically in a way that the axis shows at least a given
- number of JKQTPCoordinateAxisStyle::ticks \c JKQTPCoordinateAxisStyle::minTicks. The algorithm takes that tick spacing that will give a number of JKQTPCoordinateAxisStyle::ticks per axis
+ number of ticks \c JKQTPCoordinateAxisStyle::minTicks. The algorithm takes that tick spacing that will give a number of ticks per axis
nearest but \c ">=" to the given \c JKQTPCoordinateAxisStyle::minTicks. The Algorithm is described in detail with the function
calcLinearTickSpacing(). To activate this automatic tick spacing you have to set autoAxisSpacing=true.
+
+ \section jkqtplotter_coordinateaxes_tickscaling Axis Tick Units/Scaling
+ In some cases it is desired to put the axis ticks not at 1,2,3,... but rather at \f$ 1\pi \f$ , \f$ 2\pi \f$ , \f$ 3\pi \f$ or any other
+ unit than \f$ pi \f$ ,i.e.:
+
+ \image html axisstyle/axis_unit_scaling_none.png "no axis scaling (default case)"
+ \image html axisstyle/axis_unit_scaling_pi.png "pi-axis scaling (default case)"
+
+ You can use these methods to set such a factor:
+ - setTickUnitFactor() for the actual factor and setTickUnitName() for a name, added to the tick label
+ - setTickUnit() sets factor and name in one call
+ - setTickUnitPi() shortcut to set pi-scaling
+ - resetTickUnit() resets to no-scaling (default case)
+ .
+
*/
class JKQTPLOTTER_LIB_EXPORT JKQTPCoordinateAxis: public QObject {
Q_OBJECT
@@ -171,7 +185,7 @@ class JKQTPLOTTER_LIB_EXPORT JKQTPCoordinateAxis: public QObject {
virtual void saveSettings(QSettings& settings, const QString& group=QString("plots/axes/")) const;
- /** \brief return x-pixel coordinate from time coordinate */
+ /** \brief return x-pixel coordinate from x coordinate */
inline double x2p(double x) const {
double r=0;
if (logAxis) {
@@ -187,7 +201,7 @@ class JKQTPLOTTER_LIB_EXPORT JKQTPCoordinateAxis: public QObject {
}
}
- /** \brief return time coordinate coordinate from x-pixel */
+ /** \brief return x coordinate from x-pixel */
inline double p2x(double x) const {
double xx=x;
if (inverted) {
@@ -253,6 +267,10 @@ class JKQTPLOTTER_LIB_EXPORT JKQTPCoordinateAxis: public QObject {
inline JKQTPCALabelType getTickLabelType() const { return this->axisStyle.tickLabelType; }
/** \copydoc axisLabel */
inline QString getAxisLabel() const { return this->axisLabel; }
+ /** \copydoc tickUnitFactor */
+ inline double getTickUnitFactor() const { return this->tickUnitFactor; }
+ /** \copydoc tickUnitName */
+ inline QString getTickUnitName() const { return this->tickUnitName; }
/** \copydoc JKQTPCoordinateAxisStyle::labelPosition */
inline JKQTPLabelPosition getLabelPosition() const { return this->axisStyle.labelPosition; }
/** \copydoc JKQTPCoordinateAxisStyle::labelFontSize */
@@ -465,6 +483,28 @@ class JKQTPLOTTER_LIB_EXPORT JKQTPCoordinateAxis: public QObject {
/** \copydoc axisLabel */
void setAxisLabel (const QString& __value);
+ /** \copydoc tickUnitName */
+ void setTickUnitName(const QString& __value);
+
+ /** \copydoc tickUnitFactor */
+ void setTickUnitFactor(double __value);
+ /** \brief sets tickUnitFactor and tickUnitName in one call
+ *
+ * \see calls setTickUnitName() and setTickUnitFactor()
+ */
+ void setTickUnit(double factor, const QString& name);
+ /** \brief sets pi-scaling for tickUnitFactor and tickUnitName in one call
+ *
+ * \image html axisstyle/axis_unit_scaling_pi.png
+ * \see calls setTickUnitName() and setTickUnitFactor()
+ */
+ void setTickUnitPi();
+ /** \brief resets tickUnitFactor and tickUnitName in one call
+ *
+ * \see calls setTickUnit(), setTickUnitName() and setTickUnitFactor()
+ */
+ void resetTickUnit();
+
/** \copydoc JKQTPCoordinateAxisStyle::labelPosition */
void setLabelPosition (JKQTPLabelPosition __value);
@@ -627,9 +667,9 @@ class JKQTPLOTTER_LIB_EXPORT JKQTPCoordinateAxis: public QObject {
QString floattolabel(double data, int past_comma) const;
/** \brief parent plotter class */
JKQTBasePlotter* parent;
- /** \brief current view: minimum of time axis */
+ /** \brief current view: minimum of axis */
double axismin;
- /** \brief current view: maximum of time axis */
+ /** \brief current view: maximum of axis */
double axismax;
/** \brief absoulte minimum of axis (axismin/axismax xan not be set below this) */
@@ -647,18 +687,18 @@ class JKQTPLOTTER_LIB_EXPORT JKQTPCoordinateAxis: public QObject {
/** \brief absolute minimum range width, feature switched off when <0 */
double axisMinWidth;
- /** \brief calculated property: width of plot on time axis (calculated by calcPlotScaling() )
+ /** \brief calculated property: width of plot on axis (calculated by calcPlotScaling() )
*
* \see calcPlotScaling(), calcTickSpacing()
*/
double width;
- /** \brief calculated property: time axis scaling factor (calculated by calcPlotScaling() )
+ /** \brief calculated property: axis scaling factor (calculated by calcPlotScaling() )
*
* \see calcPlotScaling(), calcTickSpacing()
*/
double scale;
- /** \brief calculated property: time axis offset (calculated by calcPlotScaling() )
+ /** \brief calculated property: axis offset (calculated by calcPlotScaling() )
*
* \see calcPlotScaling(), calcTickSpacing()
*/
@@ -709,6 +749,12 @@ class JKQTPLOTTER_LIB_EXPORT JKQTPCoordinateAxis: public QObject {
/** \brief axis label of the axis */
QString axisLabel;
+ /** \brief tick values are the actual x/y-coordiniate, divided by this value (e.g. pu \f$ \pi \f$ to have an axis with values 0, pi, 2pi, 3pi ...) */
+ double tickUnitFactor;
+
+ /** \brief name of the factor tickUnitFactor. This string is used in tick-labels to write e.g. \c "2pi" instead of 6.28... */
+ QString tickUnitName;
+
/** \brief calculates the tick spacing for a linear axis that spans \a awidth and that should
* show at least \a JKQTPCoordinateAxisStyle::minTicks JKQTPCoordinateAxisStyle::ticks.
diff --git a/lib/jkqtplotter/jkqtptools.h b/lib/jkqtplotter/jkqtptools.h
index 066fa70334..8ae288abb3 100644
--- a/lib/jkqtplotter/jkqtptools.h
+++ b/lib/jkqtplotter/jkqtptools.h
@@ -445,7 +445,7 @@ enum JKQTPCALabelType {
JKQTPCALTscientific, /*!< \brief print the numbers in scientific notation, e.g. \c "1.23e-4" \image html axisstyle/JKQTPCALTscientific.png */
JKQTPCALTexponentCharacter, /*!< \brief print the numbers and show a unit character, i.e. 5μ for \f$ 5\cdot 10^{-6} \f$ , \c 3k for \f$ 3\cdot 10^3 \f$ ... \image html axisstyle/JKQTPCALTexponentCharacter.png */
JKQTPCALTexponent, /*!< \brief show numbers in exponential for, e.g. \f$ 3\cdot 10^5 \f$ ... \image html axisstyle/JKQTPCALTexponent.png */
- JKQTPCALTprintf, /*!< \brief generate axis label from an arbitrary "printf" formatting string (see e.g. https://en.wikipedia.org/wiki/Printf_format_string ). The only data parameter is the tick value as \c double The following image shows an example for \c "y=%+.2f": \image html axisstyle/JKQTPCALTprintf.png */
+ JKQTPCALTprintf, /*!< \brief generate axis label from an arbitrary "printf" formatting string (see e.g. https://en.wikipedia.org/wiki/Printf_format_string ). The first data parameter is the tick value as \c double an the second is tickUnitName as string. The following image shows an example for \c "y=%+.2f": \image html axisstyle/JKQTPCALTprintf.png */
JKQTPCALTdate, /*!< \brief show numbers as dates \image html axisstyle/JKQTPCALTdate.png */
JKQTPCALTtime, /*!< \brief show numbers as times \image html axisstyle/JKQTPCALTtime.png*/
JKQTPCALTdatetime, /*!< \brief show numbers as times \image html axisstyle/JKQTPCALTdatetime.png */
@@ -465,9 +465,9 @@ enum JKQTPCALabelType {
/** \brief mode of the axis ticks
* \ingroup jkqtpplottersupprt */
enum JKQTPLabelTickMode {
- JKQTPLTMLinOrPower=0, /*!< \brief linear, or log, depending on whether the axis is log */
- JKQTPLTMLin, /*!< \brief always linear (even for log-axes) */
- JKQTPLTMPower, /*!< \brief powers (of the log-base) */
+ JKQTPLTMLinOrPower=0, /*!< \brief linear, or log, depending on whether the axis is log \image html axisstyle/JKQTPLTMLinOrPower.png */
+ JKQTPLTMLin, /*!< \brief always linear (even for log-axes) \image html axisstyle/JKQTPLTMLin.png */
+ JKQTPLTMPower, /*!< \brief powers (of the log-base) \image html axisstyle/JKQTPLTMPower.png */
JKQTPLTMmax=JKQTPLTMPower
};
diff --git a/screenshots/imageplot_userpal_program.png b/screenshots/imageplot_userpal_program.png
index ac5ca34050..4977c1984f 100644
Binary files a/screenshots/imageplot_userpal_program.png and b/screenshots/imageplot_userpal_program.png differ
diff --git a/screenshots/imageplot_userpal_program_small.png b/screenshots/imageplot_userpal_program_small.png
index 6d61f7f685..b96d8f4804 100644
Binary files a/screenshots/imageplot_userpal_program_small.png and b/screenshots/imageplot_userpal_program_small.png differ
diff --git a/screenshots/multiplot_controlwindow.png b/screenshots/multiplot_controlwindow.png
index 5fe791c503..bf548904a3 100644
Binary files a/screenshots/multiplot_controlwindow.png and b/screenshots/multiplot_controlwindow.png differ
diff --git a/screenshots/multiplot_controlwindow_small.png b/screenshots/multiplot_controlwindow_small.png
index 8e87106b18..b755e78628 100644
Binary files a/screenshots/multiplot_controlwindow_small.png and b/screenshots/multiplot_controlwindow_small.png differ
diff --git a/screenshots/parsedfunctionplot.png b/screenshots/parsedfunctionplot.png
index acf6e9ed10..95b809f321 100644
Binary files a/screenshots/parsedfunctionplot.png and b/screenshots/parsedfunctionplot.png differ
diff --git a/screenshots/parsedfunctionplot_small.png b/screenshots/parsedfunctionplot_small.png
index 6d282f9ad1..54e5e34dfa 100644
Binary files a/screenshots/parsedfunctionplot_small.png and b/screenshots/parsedfunctionplot_small.png differ
diff --git a/tools/jkqtplotter_doc_imagegenerator/jkqtplotter_doc_imagegenerator.cpp b/tools/jkqtplotter_doc_imagegenerator/jkqtplotter_doc_imagegenerator.cpp
index 19d4bebf39..442b82ad6f 100644
--- a/tools/jkqtplotter_doc_imagegenerator/jkqtplotter_doc_imagegenerator.cpp
+++ b/tools/jkqtplotter_doc_imagegenerator/jkqtplotter_doc_imagegenerator.cpp
@@ -312,6 +312,62 @@ void doListAxisStyling(const QDir& outputDir, int iconsize, QColor backgroundCol
plot.getXAxis()->setDrawMode1(JKQTPCADMLine|JKQTPCADMcompleteMinMaxArrow);
imgheight=iconsize; plot.grabPixelImage(QSize(plot.getWidth(),plot.getHeight()), false).copy(0,plot.getHeight()-imgheight,plot.getWidth(),imgheight).save(outputDir.absoluteFilePath("JKQTPCADMcompleteMinMaxArrow.png"), "png");
+
+ plot.setXY(0.1,100,0.1,10);
+ plot.setWidgetSize(iconsize*4,4*iconsize);
+ plot.setShowKey(false);
+ plot.setGrid(true);
+ plot.getXAxis()->setLogAxis(true);
+ plot.getYAxis()->setLogAxis(false);
+ plot.getXAxis()->setShowZeroAxis(false);
+ plot.getYAxis()->setShowZeroAxis(false);
+ plot.getXAxis()->setDrawMode1(JKQTPCADMcomplete);
+ plot.getXAxis()->setDrawMode2(JKQTPCADMLine);
+ plot.getYAxis()->setDrawMode1(JKQTPCADMcomplete);
+ plot.getYAxis()->setDrawMode2(JKQTPCADMLine);
+ plot.getXAxis()->setAxisLabel("log. axis");
+ plot.getYAxis()->setAxisLabel("lin. axis");
+
+ plot.getXAxis()->setTickMode(JKQTPLTMLinOrPower);
+ plot.getYAxis()->setTickMode(JKQTPLTMLinOrPower);
+ plot.grabPixelImage(QSize(plot.getWidth(),plot.getHeight()), false).copy(0,0,plot.getWidth(),plot.getHeight()).save(outputDir.absoluteFilePath("JKQTPLTMLinOrPower.png"), "png");
+
+ plot.getXAxis()->setTickMode(JKQTPLTMLin);
+ plot.getYAxis()->setTickMode(JKQTPLTMLin);
+ plot.grabPixelImage(QSize(plot.getWidth(),plot.getHeight()), false).copy(0,0,plot.getWidth(),plot.getHeight()).save(outputDir.absoluteFilePath("JKQTPLTMLin.png"), "png");
+
+ plot.getXAxis()->setTickMode(JKQTPLTMPower);
+ plot.getYAxis()->setTickMode(JKQTPLTMPower);
+ plot.grabPixelImage(QSize(plot.getWidth(),plot.getHeight()), false).copy(0,0,plot.getWidth(),plot.getHeight()).save(outputDir.absoluteFilePath("JKQTPLTMPower.png"), "png");
+
+
+
+ plot.setXY(0.1,10.0*JKQTPSTATISTICS_PI,0,2.1*JKQTPSTATISTICS_PI);
+ plot.setWidgetSize(iconsize*4,4*iconsize);
+ plot.setShowKey(false);
+ plot.setGrid(true);
+ plot.getXAxis()->setLogAxis(true);
+ plot.getYAxis()->setLogAxis(false);
+ plot.getXAxis()->setShowZeroAxis(false);
+ plot.getYAxis()->setShowZeroAxis(false);
+ plot.getXAxis()->setDrawMode1(JKQTPCADMcomplete);
+ plot.getXAxis()->setDrawMode2(JKQTPCADMLine);
+ plot.getYAxis()->setDrawMode1(JKQTPCADMcomplete);
+ plot.getYAxis()->setDrawMode2(JKQTPCADMLine);
+ plot.getXAxis()->setAxisLabel("log. axis");
+ plot.getYAxis()->setAxisLabel("lin. axis");
+ plot.getXAxis()->setMinTicks(5);
+ plot.getYAxis()->setMinTicks(3);
+ plot.getYAxis()->setTickLabelType(JKQTPCALTfrac);
+
+ plot.getXAxis()->setTickMode(JKQTPLTMLinOrPower);
+ plot.getYAxis()->setTickMode(JKQTPLTMLinOrPower);
+ plot.grabPixelImage(QSize(plot.getWidth(),plot.getHeight()), false).copy(0,0,plot.getWidth(),plot.getHeight()).save(outputDir.absoluteFilePath("axis_unit_scaling_none.png"), "png");
+ plot.getXAxis()->setTickUnitFactor(JKQTPSTATISTICS_PI);
+ plot.getXAxis()->setTickUnitName("\\;\\pi");
+ plot.getYAxis()->setTickUnitFactor(JKQTPSTATISTICS_PI);
+ plot.getYAxis()->setTickUnitName("\\;\\pi");
+ plot.grabPixelImage(QSize(plot.getWidth(),plot.getHeight()), false).copy(0,0,plot.getWidth(),plot.getHeight()).save(outputDir.absoluteFilePath("axis_unit_scaling_pi.png"), "png");
}
int main(int argc, char* argv[])