From 86aa40afce56bd2a79868b06237f3ca1f45f388e Mon Sep 17 00:00:00 2001 From: "Jan W. Krieger" Date: Sat, 16 Jul 2022 13:06:59 +0200 Subject: [PATCH 1/4] Added links --- README.md | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index c05a419e5e..0871615e7d 100644 --- a/README.md +++ b/README.md @@ -29,11 +29,11 @@ This software is licensed under the term of the [GNU Lesser General Public Licen ![EXAMPLES-Page](./screenshots/examplesbanner.png) ## Main Features -- 2D Plotter widget class (JKQTPlotter) +- 2D Plotter widget class ([JKQTPlotter](http://jkriege2.github.io/JKQtPlotter/group__jkqtplotter.html) - high-quality plotting - no other dependencies than Qt >= 5.0 ([CImg](https://cimg.eu/) and [OpenCV](https://opencv.org/) are optional dependencies) - highly customizable axes/grids (linear/log, date/time, custom ticks ...) - - integrated LaTeX parser (pure C++, no dependencies) to render mathematical equations in axis labels, ticks, ... + - [JKQTMathText:](http://jkriege2.github.io/JKQtPlotter/group__jkqtmathtext.html) integrated LaTeX parser (pure C++, no dependencies) to render mathematical equations in axis labels, ticks, ... - extensive user-interactions pre-programmed (several zooming modes, selecting regions, custom context menus, switch graph visibility, ...) - full print and export (PDF,PNG,...) support with preview and parametrization out-the-box - highly customizable look and feel @@ -69,6 +69,10 @@ This software is licensed under the term of the [GNU Lesser General Public Licen A Documentation (auto-)generated with [doxygen](http://www.doxygen.nl/) from the trunk source code can be found here: **[http://jkriege2.github.io/JKQTPlotter/index.html](http://jkriege2.github.io/JKQtPlotter/index.html)** +There are also some subpage of general intetest: +- [TODO List](http://jkriege2.github.io/JKQtPlotter/page_todo.html) +- [Release Notes & Version Overview](http://jkriege2.github.io/JKQtPlotter/page_whatsnew.html) + ## [Examples](./examples/) There is a [large set of usage examples (with explanations for each) and tutorials](./examples/) in the folder [`./examples/`](./examples). All test-projects are Qt-projects that use qmake to build. You can load them into QtCreator easily. From ca35ef0322a094557103c76ef845a20a888eb65d Mon Sep 17 00:00:00 2001 From: "Jan W. Krieger" Date: Mon, 18 Jul 2022 18:14:00 +0200 Subject: [PATCH 2/4] add Appveyor-build for MacOS --- appveyor.yml | 26 ++++++++++++++++++++++++-- 1 file changed, 24 insertions(+), 2 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index 68cf1f7e19..8a275d13e1 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -58,11 +58,17 @@ environment: COMPILER: GCC QTVER: 6.2 CMAKE_GENERATOR: "Unix Makefiles" + + - QTABI: macos + COMPILER: CLANG + QTVER: 6.2 + CMAKE_GENERATOR: "Unix Makefiles" image: # AppVeyor builds are ordered by the image list: - Visual Studio 2019 - Ubuntu2004 + - macos-monterey matrix: exclude: @@ -73,6 +79,8 @@ matrix: QTABI: mingw53_32 - image: Visual Studio 2019 QTABI: msvc2015 + - image: Visual Studio 2019 + QTABI: macos - image: Ubuntu2004 QTABI: mingw81_64 - image: Ubuntu2004 @@ -83,6 +91,20 @@ matrix: QTABI: msvc2015 - image: Ubuntu2004 QTABI: mingw53_32 + - image: Ubuntu2004 + QTABI: macos + - image: macos-monterey + QTABI: msvc2015_64 + - image: macos-monterey + QTABI: msvc2015 + - image: macos-monterey + QTABI: mingw53_32 + - image: macos-monterey + QTABI: gcc_64 + - image: macos-monterey + QTABI: mingw81_64 + - image: macos-monterey + QTABI: msvc2019_64 for: @@ -145,12 +167,12 @@ for: - - # Linux (Ubuntu2004) + # Linux (Ubuntu2004) and MacOS (Monterey) - matrix: only: - image: Ubuntu2004 + - image: macos-monterey init: - sh: echo == INIT SYSTEM ENVIRONMENT ====================================================================== From 580635144f1bf463d5e705b11e2b071164755921 Mon Sep 17 00:00:00 2001 From: "Jan W. Krieger" Date: Mon, 18 Jul 2022 23:01:18 +0200 Subject: [PATCH 3/4] bugfixed appVeyor-builds for MacOs --- appveyor.yml | 56 +++++++++++++++++++++++++++++++++++++++++++--------- 1 file changed, 47 insertions(+), 9 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index 8a275d13e1..cf2ad3b7b5 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -66,9 +66,9 @@ environment: image: # AppVeyor builds are ordered by the image list: - - Visual Studio 2019 - - Ubuntu2004 - macos-monterey + - Ubuntu2004 + - Visual Studio 2019 matrix: exclude: @@ -167,13 +167,12 @@ for: - # Linux (Ubuntu2004) and MacOS (Monterey) + # Linux (Ubuntu2004) - matrix: only: - image: Ubuntu2004 - - image: macos-monterey - + init: - sh: echo == INIT SYSTEM ENVIRONMENT ====================================================================== - sh: echo _NPROCESSORS_ONLN=$(getconf _NPROCESSORS_ONLN) @@ -192,10 +191,6 @@ for: - sh: echo QTDIR=$QTDIR - sh: echo QT_DIR=$QT_DIR - sh: echo Qt5_DIR=$Qt5_DIR - - sh: ls /home/appveyor - - sh: ls /home/appveyor/Qt - - sh: ls /home/appveyor/Qt/5.15 - - sh: ls /home/appveyor/Qt/5.15/gcc_64 - sh: echo PATH=$PATH - sh: sudo apt-get update -y # Install OpenCV @@ -215,3 +210,46 @@ for: - sh: cmake -G "$CMAKE_GENERATOR" "-DCMAKE_PREFIX_PATH=$QTDIR" .. - sh: echo --- Build using CMake ------------------------------------------------------------------------------- - sh: cmake --build . --config "$CONFIGURATION" -- $CMAKE_BUILDFLAGS + + + + + + + + + # MacOS (Monterey) + - + matrix: + only: + - image: macos-monterey + + init: + - sh: echo == INIT SYSTEM ENVIRONMENT ====================================================================== + - sh: echo _NPROCESSORS_ONLN=$(getconf _NPROCESSORS_ONLN) + - sh: echo APPVEYOR_BUILD_WORKER_IMAGE=$APPVEYOR_BUILD_WORKER_IMAGE + - sh: echo QTABI=$QTABI + - sh: echo CMAKE_GENERATOR=$CMAKE_GENERATOR + + install: + # Init compiler environment + - sh: echo == INIT COMPILER ENVIRONMENT ==================================================================== + - sh: export QTDIR=$HOME/Qt/$QTVER/$QTABI/ + - sh: export QT_DIR=$HOME/Qt/$QTVER/$QTABI/ + - sh: export Qt5_DIR=$QTDIR/lib/cmake + - sh: echo QTDIR=$QTDIR + - sh: echo QT_DIR=$QT_DIR + - sh: echo Qt5_DIR=$Qt5_DIR + - sh: echo PATH=$PATH + # Install OpenCV + + build_script: + - sh: echo == BUILD JKQtPlotter ============================================================================ + - sh: mkdir build + - sh: cd build + - sh: echo --- Run CMake Configure ----------------------------------------------------------------------------- + - sh: doxygen --version + - sh: cmake --version + - sh: cmake -G "$CMAKE_GENERATOR" "-DCMAKE_PREFIX_PATH=$QTDIR" .. + - sh: echo --- Build using CMake ------------------------------------------------------------------------------- + - sh: cmake --build . --config "$CONFIGURATION" -- $CMAKE_BUILDFLAGS From fbdcac9bd449490dc0010bd06642648ec66a2683 Mon Sep 17 00:00:00 2001 From: "Jan W. Krieger" Date: Mon, 18 Jul 2022 23:06:24 +0200 Subject: [PATCH 4/4] Update appveyor.yml --- appveyor.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/appveyor.yml b/appveyor.yml index cf2ad3b7b5..244071209e 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -248,7 +248,6 @@ for: - sh: mkdir build - sh: cd build - sh: echo --- Run CMake Configure ----------------------------------------------------------------------------- - - sh: doxygen --version - sh: cmake --version - sh: cmake -G "$CMAKE_GENERATOR" "-DCMAKE_PREFIX_PATH=$QTDIR" .. - sh: echo --- Build using CMake -------------------------------------------------------------------------------