From 8ccaaaebe6917406ec1f5afc9844a5ae063380b3 Mon Sep 17 00:00:00 2001 From: jkriege2 Date: Mon, 22 Jan 2024 21:31:09 +0100 Subject: [PATCH] NEW: added "currentcolor" as color-placeholder in style.ini files and using it in conjunction with linear-gradient() in cyberpunk and dark styles NEW: added style simple_noaxes.ini --- doc/dox/jkqtplotter_styling.dox | 4 ++ doc/dox/whatsnew.dox | 3 +- doc/images/jkqtmathtext/jkqtmathtext_utf8.png | Bin 3039 -> 3248 bytes doc/images/styles/cyberpunk.ini.png | Bin 153956 -> 177387 bytes doc/images/styles/cyberpunk.ini.symbols.png | Bin 30803 -> 49410 bytes doc/images/styles/dark.ini.png | Bin 144686 -> 164326 bytes doc/images/styles/dark.ini.symbols.png | Bin 32195 -> 45689 bytes doc/images/styles/default.ini.png | Bin 146958 -> 149872 bytes doc/images/styles/simple_noaxes.ini.png | Bin 0 -> 99066 bytes .../styles/simple_noaxes.ini.symbols.png | Bin 0 -> 30633 bytes lib/jkqtcommon/jkqtpdrawingtools.cpp | 25 ++++++++++ lib/jkqtcommon/jkqtpdrawingtools.h | 43 ++++++++++++++++ lib/jkqtcommon/jkqtpstringtools.cpp | 7 +++ lib/jkqtplotter/jkqtpbaseplotter.cpp | 10 +++- lib/jkqtplotter/jkqtpgraphsbasestyle.cpp | 12 +++-- lib/jkqtplotter/jkqtpgraphsbasestyle.h | 46 ++++++++++-------- lib/jkqtplotter/resources/jkqtpstyles.qrc | 1 + .../resources/styles/blackandwhite.ini | 1 + .../resources/styles/cyberpunk.ini | 1 + lib/jkqtplotter/resources/styles/dark.ini | 1 + lib/jkqtplotter/resources/styles/default.ini | 13 ++--- .../resources/styles/simple_noaxes.ini | 15 ++++++ 22 files changed, 149 insertions(+), 33 deletions(-) create mode 100644 doc/images/styles/simple_noaxes.ini.png create mode 100644 doc/images/styles/simple_noaxes.ini.symbols.png create mode 100644 lib/jkqtplotter/resources/styles/simple_noaxes.ini diff --git a/doc/dox/jkqtplotter_styling.dox b/doc/dox/jkqtplotter_styling.dox index 8406ecb5aee..90e95cb58eb 100644 --- a/doc/dox/jkqtplotter_styling.dox +++ b/doc/dox/jkqtplotter_styling.dox @@ -91,6 +91,10 @@ Here is a table with all available ready-made styles: :/JKQTPlotter/styles/simple_gridandticks.ini \image html simple_gridandticks.ini.png \image html simple_gridandticks.ini.symbols.png + + :/JKQTPlotter/styles/simple_noaxes.ini + \image html simple_noaxes.ini.png + \image html simple_noaxes.ini.symbols.png diff --git a/doc/dox/whatsnew.dox b/doc/dox/whatsnew.dox index 764d890b971..4649ceb11b3 100644 --- a/doc/dox/whatsnew.dox +++ b/doc/dox/whatsnew.dox @@ -118,7 +118,8 @@ Changes, compared to \ref page_whatsnew_V4_0_0 "v4.0.0" include:
  • NEW: Due to addition of JKQTMathText::setFontOptions() and the matchign extension of JKQTMathText::setFontSpecial() (see below) you can now add modifiers like +BOLD+ITALIC to any font-name provided to JKQTPlotter and in style INI-files
  • NEW: added JKQTPLabelMinBesides and JKQTPLabelMaxBesides to JKQTPLabelPosition, so labels can be set besides the axes
  • NEW/REWORKED all functions in JKQTBasePlotter are re-entrant, i.e. different instances can be used from different threads in parallel (although there is some overhead due to shared caches between the threads!). This is demonstrated and discussed in \ref JKQTPlotterMultiThreaded .
  • -
  • NEW: NEW allow linear-gradient()... in brush definitions of style.ini-file
  • +
  • NEW: allow linear-gradient(), currentcolor, ... in brush definitions of style.ini-file ... and using it is cyberpunk and dark styles
  • +
  • NEW: style simple_noaxes.ini
  • JKQTMathText: