From 8855891eea2695049de1aeccd8c33398e780823e Mon Sep 17 00:00:00 2001 From: jkriege2 Date: Sun, 25 Sep 2022 15:34:05 +0200 Subject: [PATCH] NEW: added option to draw a zero axis to JKQTPCoordinateAxis, which draws an axis at the origin of the coordinate system --- doc/CMakeLists.txt | 2 + doc/dox/examples_and_tutorials.dox | 9 +- doc/dox/whatsnew.dox | 1 + doc/images/JKQTPColumnContourPlot.png | Bin 91254 -> 91349 bytes doc/images/JKQTPColumnContourPlot_small.png | Bin 22785 -> 22865 bytes .../JKQTPCoordinateAxisStyleDrawMode0.png | Bin 0 -> 19084 bytes doc/images/JKQTPHorizontalAxisPositioning.cdr | Bin 0 -> 2607644 bytes doc/images/JKQTPHorizontalAxisPositioning.png | Bin 0 -> 46522 bytes ...TPHorizontalIndependentAxisPositioning.cdr | Bin 0 -> 3248668 bytes ...TPHorizontalIndependentAxisPositioning.png | Bin 0 -> 108471 bytes doc/images/JKQTPVerticalAxisPositioning.cdr | Bin 0 -> 2603997 bytes doc/images/JKQTPVerticalAxisPositioning.png | Bin 0 -> 42074 bytes ...KQTPVerticalIndependentAxisPositioning.cdr | Bin 0 -> 3254599 bytes ...KQTPVerticalIndependentAxisPositioning.png | Bin 0 -> 50161 bytes doc/images/jkqtpcoordinateaxis1.cdr | Bin 28847 -> 2613529 bytes doc/images/jkqtpcoordinateaxis1.png | Bin 65017 -> 47668 bytes examples/CMakeLists.txt | 1 + examples/geo_coordinateaxis0/CMakeLists.txt | 36 ++ examples/geo_coordinateaxis0/README.md | 26 ++ .../geo_coordinateaxis0.cpp | 75 ++++ lib/jkqtplotter/graphs/jkqtpgeoshapes.cpp | 2 +- lib/jkqtplotter/jkqtpbaseplotter.cpp | 2 +- lib/jkqtplotter/jkqtpcoordinateaxes.cpp | 409 +++++++++++++----- lib/jkqtplotter/jkqtpcoordinateaxes.h | 151 +++++-- lib/jkqtplotter/jkqtpcoordinateaxesstyle.cpp | 30 +- lib/jkqtplotter/jkqtpcoordinateaxesstyle.h | 11 +- screenshots/contourplot.png | Bin 134543 -> 134706 bytes screenshots/contourplot_small.png | Bin 22785 -> 22865 bytes screenshots/geo_coordinateaxis0.png | Bin 0 -> 29345 bytes screenshots/geo_coordinateaxis0_small.png | Bin 0 -> 12388 bytes screenshots/geometric.png | Bin 176893 -> 191490 bytes screenshots/geometric_small.png | Bin 16955 -> 17766 bytes screenshots/imageplot.png | Bin 23114 -> 23274 bytes screenshots/imageplot_modifier.png | Bin 76401 -> 76995 bytes screenshots/imageplot_modifier_small.png | Bin 13811 -> 14094 bytes screenshots/imageplot_nodatastore.png | Bin 26661 -> 26829 bytes screenshots/imageplot_nodatastore_small.png | Bin 15006 -> 15108 bytes screenshots/imageplot_small.png | Bin 11624 -> 11696 bytes screenshots/imageplot_userpal_program.png | Bin 18842 -> 18980 bytes .../imageplot_userpal_program_small.png | Bin 9729 -> 9804 bytes screenshots/mandelbrot.png | Bin 91563 -> 91804 bytes screenshots/mandelbrot_small.png | Bin 10327 -> 10346 bytes screenshots/multiplot_controlwindow.png | Bin 37707 -> 37738 bytes screenshots/multiplot_controlwindow_small.png | Bin 6027 -> 6053 bytes screenshots/parametriccurve2.png | Bin 28042 -> 28259 bytes screenshots/parametriccurve2_small.png | Bin 7978 -> 8051 bytes screenshots/paramscatterplot.png | Bin 94494 -> 95014 bytes screenshots/paramscatterplot_small.png | Bin 13409 -> 13523 bytes screenshots/parsedfunctionplot.png | Bin 29333 -> 29344 bytes screenshots/parsedfunctionplot_small.png | Bin 8348 -> 8371 bytes screenshots/rgbimageplot.png | Bin 34519 -> 34765 bytes screenshots/rgbimageplot_small.png | Bin 14481 -> 14635 bytes 52 files changed, 581 insertions(+), 174 deletions(-) create mode 100644 doc/images/JKQTPCoordinateAxisStyleDrawMode0.png create mode 100644 doc/images/JKQTPHorizontalAxisPositioning.cdr create mode 100644 doc/images/JKQTPHorizontalAxisPositioning.png create mode 100644 doc/images/JKQTPHorizontalIndependentAxisPositioning.cdr create mode 100644 doc/images/JKQTPHorizontalIndependentAxisPositioning.png create mode 100644 doc/images/JKQTPVerticalAxisPositioning.cdr create mode 100644 doc/images/JKQTPVerticalAxisPositioning.png create mode 100644 doc/images/JKQTPVerticalIndependentAxisPositioning.cdr create mode 100644 doc/images/JKQTPVerticalIndependentAxisPositioning.png create mode 100644 examples/geo_coordinateaxis0/CMakeLists.txt create mode 100644 examples/geo_coordinateaxis0/README.md create mode 100644 examples/geo_coordinateaxis0/geo_coordinateaxis0.cpp create mode 100644 screenshots/geo_coordinateaxis0.png create mode 100644 screenshots/geo_coordinateaxis0_small.png diff --git a/doc/CMakeLists.txt b/doc/CMakeLists.txt index 70dc30b1e6..8837a43fb6 100644 --- a/doc/CMakeLists.txt +++ b/doc/CMakeLists.txt @@ -177,6 +177,7 @@ if(JKQtPlotter_BUILD_EXAMPLES) rgbimageplot rgbimageplot_qt mandelbrot + geo_coordinateaxis0 #speed ) @@ -198,6 +199,7 @@ if(JKQtPlotter_BUILD_EXAMPLES) filledgraphs/JKQTPFilledCurveXGraph,JKQTPFilledCurveYGraph/--smallscreenshotplot filledgraphs_errors/JKQTPFilledCurveXErrorGraph,JKQTPFilledCurveYErrorGraph/--smallscreenshotplot evalcurve/JKQTPXYFunctionLineGraph/--smallscreenshotplot + geo_coordinateaxis0/JKQTPCoordinateAxisStyleDrawMode0 ) diff --git a/doc/dox/examples_and_tutorials.dox b/doc/dox/examples_and_tutorials.dox index 6507b5dff6..f54c05fd8e 100644 --- a/doc/dox/examples_and_tutorials.dox +++ b/doc/dox/examples_and_tutorials.dox @@ -98,12 +98,15 @@ All test-projects are Qt-projects that use qmake to build. You can load them int \image html geometric_small.png \subpage JKQTPlotterGeometricGraphs `JKQTPGeometricPlotElement`, `JKQTPGeoArc`, `JKQTPGeoLine`, `JKQTPGeoRectangle`, ... - \image html geo_arrows_small.png - \subpage JKQTPlotterGeometricArrows - `JKQTPGeoArrow`, ... \image html geo_simple_small.png \subpage JKQTPlotterGeometricGraphsSimple `JKQTPGeoEllipse`, `JKQTPGeoArc`, `JKQTPGeoChord`, `JKQTPGeoPie` + \image html geo_arrows_small.png + \subpage JKQTPlotterGeometricArrows + `JKQTPGeoArrow`, ... + \image html geo_coordinateaxis0_small.png + \subpage JKQTPlotterGeometricCoordinateAxis0 + `JKQTPCoordinateAxisStyle::drawMode0`, `JKQTPGeoPolygon`, `JKQTPGeoEllipse` \subsection jkqtp_extut_keyaxesstyles Examples for Styling the Plot, Keys, Axes, ... diff --git a/doc/dox/whatsnew.dox b/doc/dox/whatsnew.dox index 87f08831b2..dd4d4ff0d4 100644 --- a/doc/dox/whatsnew.dox +++ b/doc/dox/whatsnew.dox @@ -59,6 +59,7 @@ Changes, compared to \ref page_whatsnew_V4_0_0 "v4.0.0" include: 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 ...
    • +
  • NEW: added option to draw a zero axis to JKQTPCoordinateAxis, which draws an axis at the origin of the coordinate system
  • JKQTMathText: