diff --git a/README.md b/README.md index 2126cea203..9560464b36 100644 --- a/README.md +++ b/README.md @@ -29,7 +29,7 @@ All test-projects are Qt-projects that use qmake to build. You can load them int | Screenshot | Description | Notes | |:-------------:| ------------- | ------------- | -| [![](https://raw.githubusercontent.com/jkriege2/JKQtPlotter/master/screenshots/jkqtplotter_simpletest_logaxes_small.png)](https://github.com/jkriege2/JKQtPlotter/tree/master/test/jkqtplotter_simpletest_logaxes) | [logarithmic axes](https://github.com/jkriege2/JKQtPlotter/tree/master/test/jkqtplotter_simpletest_logaxes) | `JKQTPxyLineGraph` and `JKQTPgeoText`
C++ vector of data
logarithmic axes
plot line styles
internal LaTeX parser
add commenting text to a graph | +| [![](https://raw.githubusercontent.com/jkriege2/JKQtPlotter/master/screenshots/jkqtplotter_simpletest_logaxes_small.png)](https://github.com/jkriege2/JKQtPlotter/tree/master/test/jkqtplotter_simpletest_logaxes) | [logarithmic axes](https://github.com/jkriege2/JKQtPlotter/tree/master/test/jkqtplotter_simpletest_logaxes) | `JKQTPxyLineGraph` and `JKQTPgeoText`
C++ vector of data
logarithmic axes and styling
plot line styles
internal LaTeX parser
add commenting text to a graph | | [![](https://raw.githubusercontent.com/jkriege2/JKQtPlotter/master/screenshots/jkqtplotter_simpletest_dateaxes_small.png)
![](https://raw.githubusercontent.com/jkriege2/JKQtPlotter/master/screenshots/jkqtplotter_simpletest_dateaxes_dates_small.png)
![](https://raw.githubusercontent.com/jkriege2/JKQtPlotter/master/screenshots/jkqtplotter_simpletest_dateaxes_timeaxis_small.png)](https://github.com/jkriege2/JKQtPlotter/tree/master/test/jkqtplotter_simpletest_dateaxes) | [date/time axes](https://github.com/jkriege2/JKQtPlotter/tree/master/test/jkqtplotter_simpletest_dateaxes) | `JKQTPxyLineGraph` and `JKQTPfilledVerticalRangeGraph`
C++ vector of data
date/time axes
plot min/max range graph
internal LaTeX parser
data from CSV files | diff --git a/lib/jkqtmathtext/jkqtmathtext.cpp b/lib/jkqtmathtext/jkqtmathtext.cpp index 88b637c88b..4e51cf6483 100644 --- a/lib/jkqtmathtext/jkqtmathtext.cpp +++ b/lib/jkqtmathtext/jkqtmathtext.cpp @@ -3263,7 +3263,7 @@ void JKQTmathText::useXITS() #ifdef AUTOLOAD_XITS_FONTS //qDebug()<<"has XITS: "<get_mathText()->useXITS(); +#endif parent->get_mathText()->set_fontSize(fontSize*parent->get_fontSizeMultiplier()); parent->get_mathText()->set_fontColor(color); parent->get_mathText()->parse(text); diff --git a/screenshots/jkqtplotter_simpletest_logaxes.png b/screenshots/jkqtplotter_simpletest_logaxes.png index 3b14801aa2..e40d2ea194 100644 Binary files a/screenshots/jkqtplotter_simpletest_logaxes.png and b/screenshots/jkqtplotter_simpletest_logaxes.png differ diff --git a/screenshots/jkqtplotter_simpletest_logaxes_highqmathrendering.png b/screenshots/jkqtplotter_simpletest_logaxes_highqmathrendering.png new file mode 100644 index 0000000000..3e8fa0d6a7 Binary files /dev/null and b/screenshots/jkqtplotter_simpletest_logaxes_highqmathrendering.png differ diff --git a/screenshots/jkqtplotter_simpletest_logaxes_lowqmathrendering.png b/screenshots/jkqtplotter_simpletest_logaxes_lowqmathrendering.png new file mode 100644 index 0000000000..3aba3b2647 Binary files /dev/null and b/screenshots/jkqtplotter_simpletest_logaxes_lowqmathrendering.png differ diff --git a/screenshots/jkqtplotter_simpletest_logaxes_nominorgrid.png b/screenshots/jkqtplotter_simpletest_logaxes_nominorgrid.png new file mode 100644 index 0000000000..5009bebb29 Binary files /dev/null and b/screenshots/jkqtplotter_simpletest_logaxes_nominorgrid.png differ diff --git a/screenshots/logaxis_set_labelType.png b/screenshots/logaxis_set_labelType.png new file mode 100644 index 0000000000..33d2cf3bef Binary files /dev/null and b/screenshots/logaxis_set_labelType.png differ diff --git a/screenshots/logaxis_set_minorticks.png b/screenshots/logaxis_set_minorticks.png new file mode 100644 index 0000000000..b0a2023aec Binary files /dev/null and b/screenshots/logaxis_set_minorticks.png differ diff --git a/test/jkqtplotter_simpletest_logaxes/README.md b/test/jkqtplotter_simpletest_logaxes/README.md index 7cbc7636ed..2c7faf12ae 100644 --- a/test/jkqtplotter_simpletest_logaxes/README.md +++ b/test/jkqtplotter_simpletest_logaxes/README.md @@ -41,29 +41,70 @@ Then a `JKQTPgeoText` is added to the graph, which shows the function plotted in ```c++ // 4. Also we add a text-element in the plot to show the plotted function // This element (JKQTPgeoText) is taken from the set of geometric elements - // and is simply parametrized by a position (1.8/10) and the text to display. + // and is simply parametrized by a position (1.25/10) and the text to display. // In addition you can also set the font size (here to 15) - plot.addGraph(new JKQTPgeoText(&plot, 1.8, 10, "\\frac{A}{A_{stat}}=\\frac{1}{\\sqrt{\\left(1-\\eta^2\\right)^2+\\left(2{\\eta}D\\right)^2}}", 15)); - // for nicer rendering we set the fonts used by the internal LaTeX parser instance to XITS - plot.get_plotter()->get_mathText()->useXITS(); + // Use '$...$' around the actual math string to ensure rendering with a math font + // (the internal renderer uses XITS fonts by default, which are free and auto-distributed + // and loaded in the library). If you don't use the math-mode modifiers, the default + // font of the other rendering text is used, which might not be suitable for + // high-quality math rendering. + plot.addGraph(new JKQTPgeoText(&plot, 1.25, 10, "$\\frac{A}{A_{stat}}=\\frac{1}{\\sqrt{\\left(1-\\eta^2\\right)^2+\\left(2{\\eta}D\\right)^2}}$", 15)); ``` +The difference between not using and using `$...$` for the equation can be seen below (left: no $-math-mode, right: using $-math-mode): +![](https://raw.githubusercontent.com/jkriege2/JKQtPlotter/master/screenshots/jkqtplotter_simpletest_logaxes_lowqmathrendering.png) ![](https://raw.githubusercontent.com/jkriege2/JKQtPlotter/master/screenshots/jkqtplotter_simpletest_logaxes_highqmathrendering.png) Finally the y-axis is switched to logarithmic scaling and the axis labels are set: ```c++ - // 4. set y-axis to logarithmic (x-axis would be analogous) - // and set axis labels (using LaTeX notation) +// 5. set y-axis to logarithmic (x-axis would be analogous, but using `plot.get_xAxis()`) plot.get_yAxis()->set_logAxis(true); - plot.get_yAxis()->set_axisLabel("Amplitude A/A_{stat}"); - plot.get_xAxis()->set_axisLabel("relative driving frequency \\eta=\\omega/\\omega_0"); + // now we set the number of label ticks to 9 (you give the count if minor between two majors, + // so if you want ticks for 1,2,3,...,10,20,30,...,100... you need to use 9: + plot.get_yAxis()->set_minorTicks(9); + // the minor grid is not shown by default. You can switch it on: + plot.get_yAxis()->set_drawMinorGrid(true); + // usually axis ticks are shown as numbers 0.01, 0.1, 1, 10, ... You can also force the scientific + // power-of-10 notation, using: + plot.get_yAxis()->set_labelType(JKQTPCALTexponent); + // the number of digits in JKQTPCALTexponent determines which labels are drawn in standard-notation, + // as compared to power-notation (e.g. if set to 1, the labels 0.1=10^{-1}, 1, 10 are shown in + // standard notation, the rest in power-notation. This tweak improves readability) + plot.get_yAxis()->set_labelDigits(0); + // minor tick labels are usually not displayed, but you can switch them on, using + //plot.get_yAxis()->set_minorTickLabelsEnabled(true); + // the axis font sizes can be set with: + plot.get_yAxis()->set_tickLabelFontSize(10); // axis tick labels + plot.get_yAxis()->set_minorTickLabelFontSize(7); // minor axis tick labels + plot.get_yAxis()->set_labelFontSize(14); // axis label size + plot.get_xAxis()->set_tickLabelFontSize(10); // axis tick labels + plot.get_xAxis()->set_minorTickLabelFontSize(7); // minor axis tick labels + plot.get_xAxis()->set_labelFontSize(14); // axis label size + // ... and finally set axis labels (using LaTeX notation and $...$ to improve rendering) + plot.get_yAxis()->set_axisLabel("Amplitude $A/A_{stat}$"); + plot.get_xAxis()->set_axisLabel("relative driving frequency $\\eta=\\omega/\\omega_0$"); ``` +As an alternative `JKQTPCALTexponentCharacter` does not use the power-of-10 notation, but uses the usual unit-characters, e.g. 0.001=1m, 0.000001=1ยต, 10000=10k, ... + The result looks like this: -![jkqtplotter_simpletest_symbols_and_styles](https://raw.githubusercontent.com/jkriege2/JKQtPlotter/master/screenshots/jkqtplotter_simpletest_logaxes.png) +![jkqtplotter_simpletest_logaxes](https://raw.githubusercontent.com/jkriege2/JKQtPlotter/master/screenshots/jkqtplotter_simpletest_logaxes.png) Without the logarithmic scaling we would have: -![jkqtplotter_simpletest_symbols_and_styles](https://raw.githubusercontent.com/jkriege2/JKQtPlotter/master/screenshots/jkqtplotter_simpletest_logaxes_nolog.png) +![jkqtplotter_simpletest_logaxes_nolog](https://raw.githubusercontent.com/jkriege2/JKQtPlotter/master/screenshots/jkqtplotter_simpletest_logaxes_nolog.png) + +Switching the minor grid off results in a plot like this: + +![jkqtplotter_simpletest_logaxes_nominorgrid](https://raw.githubusercontent.com/jkriege2/JKQtPlotter/master/screenshots/jkqtplotter_simpletest_logaxes_nominorgrid.png) + +These examples show the results for different typical values for `set_minorTicks()`: +![logaxis_set_minorticks](https://raw.githubusercontent.com/jkriege2/JKQtPlotter/master/screenshots/logaxis_set_minorticks.png) + +These examples show the results for different typical values for `set_labelType()`: +![logaxis_set_labelType](https://raw.githubusercontent.com/jkriege2/JKQtPlotter/master/screenshots/logaxis_set_labelType.png) + +These examples show the results for different typical values for `set_labelType()`: +![logaxis_set_labelType](https://raw.githubusercontent.com/jkriege2/JKQtPlotter/master/screenshots/logaxis_set_labelType.png) [Back to JKQTPlotter main page](https://github.com/jkriege2/JKQtPlotter/) \ No newline at end of file diff --git a/test/jkqtplotter_simpletest_logaxes/jkqtplotter_simpletest_logaxes.cpp b/test/jkqtplotter_simpletest_logaxes/jkqtplotter_simpletest_logaxes.cpp index e88c6b41a5..f05c17b925 100644 --- a/test/jkqtplotter_simpletest_logaxes/jkqtplotter_simpletest_logaxes.cpp +++ b/test/jkqtplotter_simpletest_logaxes/jkqtplotter_simpletest_logaxes.cpp @@ -49,7 +49,7 @@ int main(int argc, char* argv[]) graph->set_lineWidth(1.5); // graph title is made from symbol+penstyle - graph->set_title(QString("D=\\delta/\\omega_0=%1").arg(D[id])); + graph->set_title(QString("$D=\\delta/\\omega_0=%1$").arg(D[id])); // add the graph to the plot, so it is actually displayed plot.addGraph(graph); @@ -59,23 +59,47 @@ int main(int argc, char* argv[]) // This element (JKQTPgeoText) is taken from the set of geometric elements // and is simply parametrized by a position (1.25/10) and the text to display. // In addition you can also set the font size (here to 15) - plot.addGraph(new JKQTPgeoText(&plot, 1.25, 10, "\\frac{A}{A_{stat}}=\\frac{1}{\\sqrt{\\left(1-\\eta^2\\right)^2+\\left(2{\\eta}D\\right)^2}}", 15)); - // for nicer rendering we set the fonts used by the internal LaTeX parser instance to XITS - //plot.get_plotter()->get_mathText()->useXITS(); + // Use '$...$' around the actual math string to ensure rendering with a math font + // (the internal renderer uses XITS fonts by default, which are free and auto-distributed + // and loaded in the library). If you don't use the math-mode modifiers, the default + // font of the other rendering text is used, which might not be suitable for + // high-quality math rendering. + plot.addGraph(new JKQTPgeoText(&plot, 1.25, 10, "$\\frac{A}{A_{stat}}=\\frac{1}{\\sqrt{\\left(1-\\eta^2\\right)^2+\\left(2{\\eta}D\\right)^2}}$", 15)); - // 4. set y-axis to logarithmic (x-axis would be analogous) - // and set axis labels (using LaTeX notation) + // 5. set y-axis to logarithmic (x-axis would be analogous, but using `plot.get_xAxis()`) plot.get_yAxis()->set_logAxis(true); - plot.get_yAxis()->set_axisLabel("Amplitude A/A_{stat}"); - plot.get_xAxis()->set_axisLabel("relative driving frequency \\eta=\\omega/\\omega_0"); + // now we set the number of label ticks to 9 (you give the count if minor between two majors, + // so if you want ticks for 1,2,3,...,10,20,30,...,100... you need to use 9: + plot.get_yAxis()->set_minorTicks(9); + // the minor grid is not shown by default. You can switch it on: + plot.get_yAxis()->set_drawMinorGrid(true); + // usually axis ticks are shown as numbers 0.01, 0.1, 1, 10, ... You can also force the scientific + // power-of-10 notation, using: + plot.get_yAxis()->set_labelType(JKQTPCALTexponent); + // the number of digits in JKQTPCALTexponent determines which labels are drawn in standard-notation, + // as compared to power-notation (e.g. if set to 1, the labels 0.1=10^{-1}, 1, 10 are shown in + // standard notation, the rest in power-notation. This tweak improves readability) + plot.get_yAxis()->set_labelDigits(0); + // minor tick labels are usually not displayed, but you can switch them on, using + //plot.get_yAxis()->set_minorTickLabelsEnabled(true); + // the axis font sizes can be set with: + plot.get_yAxis()->set_tickLabelFontSize(10); // axis tick labels + plot.get_yAxis()->set_minorTickLabelFontSize(7); // minor axis tick labels + plot.get_yAxis()->set_labelFontSize(14); // axis label size + plot.get_xAxis()->set_tickLabelFontSize(10); // axis tick labels + plot.get_xAxis()->set_minorTickLabelFontSize(7); // minor axis tick labels + plot.get_xAxis()->set_labelFontSize(14); // axis label size + // ... and finally set axis labels (using LaTeX notation and $...$ to improve rendering) + plot.get_yAxis()->set_axisLabel("Amplitude $A/A_{stat}$"); + plot.get_xAxis()->set_axisLabel("relative driving frequency $\\eta=\\omega/\\omega_0$"); - // 5. autoscale the plot so the graph is contained + // 6. autoscale the plot so the graph is contained plot.zoomToFit(); - // 6. show plotter and make it a decent size + // 7. show plotter and make it a decent size plot.show(); - plot.resize(600,400); + plot.resize(700,500); return app.exec(); }