From 60a4656dd8a7e35de3f6ff72d3804a8ecf799235 Mon Sep 17 00:00:00 2001 From: jkriege2 Date: Thu, 22 Sep 2022 00:44:54 +0200 Subject: [PATCH] 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 element JKQTPCALTscientific, so axis label ticks can be displayed as numbers in scientific notation like 1.2E-34 auto-generate JKQTPCALabelType documentation --- doc/CMakeLists.txt | 8 + doc/dox/whatsnew.dox | 2 + doc/images/JKQTPCALTdate.png | Bin 9457 -> 3005 bytes doc/images/JKQTPCALTdatetime.png | Bin 0 -> 3238 bytes doc/images/JKQTPCALTdefault.png | Bin 3025 -> 2085 bytes doc/images/JKQTPCALTexponent.png | Bin 3225 -> 2267 bytes doc/images/JKQTPCALTexponentCharacter.png | Bin 0 -> 3538 bytes doc/images/JKQTPCALTfrac.png | Bin 0 -> 2040 bytes doc/images/JKQTPCALTintfrac.png | Bin 0 -> 2131 bytes doc/images/JKQTPCALTintsfrac.png | Bin 0 -> 2471 bytes doc/images/JKQTPCALTintslashfrac.png | Bin 0 -> 2328 bytes doc/images/JKQTPCALTscientific.png | Bin 0 -> 1936 bytes doc/images/JKQTPCALTsfrac.png | Bin 0 -> 2458 bytes doc/images/JKQTPCALTslashfrac.png | Bin 0 -> 2278 bytes doc/images/JKQTPCALTtime.png | Bin 9070 -> 1893 bytes lib/jkqtcommon/jkqtpmathtools.cpp | 39 ++ lib/jkqtcommon/jkqtpmathtools.h | 11 + lib/jkqtcommon/jkqtpstringtools.cpp | 60 ++- lib/jkqtcommon/jkqtpstringtools.h | 9 +- lib/jkqtplotter/gui/jkqtpcomboboxes.cpp | 4 + lib/jkqtplotter/jkqtpcoordinateaxes.cpp | 131 ++++--- lib/jkqtplotter/jkqtpcoordinateaxes.h | 4 + lib/jkqtplotter/jkqtptools.cpp | 16 +- lib/jkqtplotter/jkqtptools.h | 14 +- .../jkqtplotter_doc_imagegenerator.cpp | 343 +++++++++++------- 25 files changed, 446 insertions(+), 195 deletions(-) create mode 100644 doc/images/JKQTPCALTdatetime.png create mode 100644 doc/images/JKQTPCALTexponentCharacter.png create mode 100644 doc/images/JKQTPCALTfrac.png create mode 100644 doc/images/JKQTPCALTintfrac.png create mode 100644 doc/images/JKQTPCALTintsfrac.png create mode 100644 doc/images/JKQTPCALTintslashfrac.png create mode 100644 doc/images/JKQTPCALTscientific.png create mode 100644 doc/images/JKQTPCALTsfrac.png create mode 100644 doc/images/JKQTPCALTslashfrac.png diff --git a/doc/CMakeLists.txt b/doc/CMakeLists.txt index e46ceef9aa..94cf7e8eb3 100644 --- a/doc/CMakeLists.txt +++ b/doc/CMakeLists.txt @@ -114,6 +114,14 @@ if(JKQtPlotter_BUILD_TOOLS) ) add_dependencies(JKQTPlotter_GenerateDocImages JKQTPlotter_GenerateDocImages_listerrorindicators) + add_custom_target(JKQTPlotter_GenerateDocImages_listaxislabeltype + COMMENT "Building JKQTPlotter Documentation Images: listaxislabeltype" + COMMAND ${JKQTPlotter_GenerateDocImages_COMMAND} --listaxislabeltype --background=lightgrey --iconsize=50 --outputdir="${JKQTPlotter_GenerateDocImages_OutputDir}/" + WORKING_DIRECTORY ${JKQtPlotter_QT_BINDIR} + DEPENDS jkqtplotter_doc_imagegenerator + ) + add_dependencies(JKQTPlotter_GenerateDocImages JKQTPlotter_GenerateDocImages_listaxislabeltype) + endif(JKQtPlotter_BUILD_TOOLS) diff --git a/doc/dox/whatsnew.dox b/doc/dox/whatsnew.dox index 4cda84510c..b92c99044b 100644 --- a/doc/dox/whatsnew.dox +++ b/doc/dox/whatsnew.dox @@ -52,6 +52,8 @@ 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 element JKQTPCALTscientific, so axis label ticks can be displayed as numbers in scientific notation like \c 1.2E-34
  • JKQTMathText: