Commit Graph

709 Commits

Author SHA1 Message Date
jkriege2
54f7dba0bf bugfix: removed some unneeded functions in mathparser 2019-11-24 10:52:24 +01:00
jkriege2
f70d93ba11 Merge branch 'master' of https://github.com/jkriege2/JKQtPlotter 2019-11-24 10:43:00 +01:00
jkriege2
56660e2f4b fixed several compiler warnings (mostly Visual Studio): clean-up of use of math constants M_PI ... and j0()/j1()/...-functions etc. 2019-11-24 10:42:44 +01:00
jkriege2
29b1c5aa37 solved link error with Visual Studio (upper/lower case mismatch in DEFINE was 'JKQtPlotter_LIB_...' but should be 'JKQTPLOTTER_LIB_...') 2019-11-24 10:42:23 +01:00
Jan W. Krieger
89b39de672
Merge pull request #26 from certik/travis
Improve Travis: test on Linux and macOS
2019-11-23 19:29:55 +01:00
Jan W. Krieger
5133d4ab51
Merge pull request #30 from jkriege2/add-code-of-conduct-1
Create CODE_OF_CONDUCT.md
2019-11-21 21:47:01 +01:00
Jan W. Krieger
a6f4d34ab6
Create CODE_OF_CONDUCT.md 2019-11-21 21:46:40 +01:00
Jan W. Krieger
863b80385f
Merge pull request #29 from certik/rpath
Set the proper RPATH for installed libraries
2019-11-21 21:42:49 +01:00
jkriege2
4c9db88a2e some more fixes do MSVC build 2019-11-21 21:42:10 +01:00
Jan W. Krieger
265a36bf89
set(CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS on) to hopefully fix MSVC build problems with examples 2019-11-21 18:34:09 +01:00
Ondřej Čertík
910d8641b5 Move the setting to a dedicated CMake file 2019-11-21 09:07:25 -07:00
jkriege2
6d8139e996 add missing compiler flag 2019-11-21 08:01:17 +01:00
Ondřej Čertík
78d55e7079 Set the proper RPATH for installed libraries 2019-11-20 11:55:23 -07:00
Ondřej Čertík
bbc6238029 Do not use "set -e" for the activate script 2019-11-18 12:23:24 -07:00
Ondřej Čertík
18f454f1b2 Only use clang on macOS
The gcc version was using clang underneath also. If we wanted to use
gcc, we would need to ensure cmake picks it up properly. We do not
really need to test gcc on macOS, as long as things build correctly
there with the default compiler (clang).
2019-11-18 12:17:24 -07:00
Ondřej Čertík
97e90919f6 Upgrade macOS to 10.12 (Qt requires that) 2019-11-18 12:09:39 -07:00
Ondřej Čertík
7768667dc0 Install GL/gl.h 2019-11-18 12:03:09 -07:00
Ondřej Čertík
2c6d6f4301 Move install and tests into scripts 2019-11-18 11:58:38 -07:00
Ondřej Čertík
700ec93abc Fix the test matrix 2019-11-18 11:48:50 -07:00
Ondřej Čertík
fd2a8f5c70 Improve Travis: test on Linux and macOS
Keep the Doxygen run as before, but also test building and installing
using cmake on Linux and macOS with both gcc and clang.
2019-11-18 11:43:37 -07:00
Jan W. Krieger
cbd9882a30
Merge pull request #24 from certik/cmake2
Fix the name of jkqtplotter_lib_properties
2019-11-18 18:49:58 +01:00
Ondřej Čertík
457a53d666 Fix the name of jkqtplotter_lib_properties
Previously it could not find the cmake file and giving an error:
```
CMake Error at CMakeLists.txt:15 (include):
  include could not find load file:

    JKQtPlotter_LIB_properties
```
2019-11-18 10:46:08 -07:00
jkriege2
39c43ef8ab improved speedtest example (context-menu now allows to select the different options) and updated performance table for a newer processor 2019-11-18 16:46:15 +01:00
jkriege2
307f477626 fix issue #19: got rid of jkqtpArrayMalloc(), jkqtpArrayCalloc(), jkqtpArrayFree() (which were a remenant of QuickFit 3 and not really portable or useful) 2019-11-18 16:15:49 +01:00
jkriege2
bc1afa7815 DOC-fix: two example-descriptions were not a subpage of the examples page 2019-11-18 16:09:22 +01:00
jkriege2
b3550c1302 using newer doxygen version in Travis-Doc-Build 2019-11-18 16:05:37 +01:00
jkriege2
f3fa587541 reworked CMake build system ... now JKQT...Config.cmake-files are written into the correct directory 2019-11-18 15:59:06 +01:00
jkriege2
d494407e76 fixed some compiler warnings (qSort is deprecated ... using std::sort instead) 2019-11-18 13:08:42 +01:00
jkriege2
61d3108fb8 removed some unneeded debug-messages 2019-11-18 08:15:07 +01:00
Jan W. Krieger
92daa4d1a8
Merge pull request #16 from certik/typo
Fix a typo
2019-11-17 19:37:18 +01:00
Ondřej Čertík
69674d5f81 Fix a typo 2019-11-17 10:42:44 -07:00
jkriege2
23620c2b9a added greek letter sample for JKQtMathTest_test 2019-11-16 15:03:16 +01:00
jkriege2
5575d1fa4e some bugfixes in math rendering (e.g. problems with greek letters)
fixed some compiler warnings
2019-11-16 15:02:48 +01:00
jkriege2
4e890b9cb3 updated XITS to current master 2019-11-16 14:16:45 +01:00
jkriege2
428e54f52a simplified option to deactivate XITS fonts (no longer creates preprocessor symbols, as they were not used anywhere) 2019-11-16 14:07:09 +01:00
jkriege2
ef482042db fixed documentation 2019-11-16 13:58:24 +01:00
jkriege2
57e8fb3362 added CImg interface (header-only) + examples
some corrections for OpenCV examples
2019-11-16 13:50:43 +01:00
jkriege2
e087f40870 documentation improvement for OpenCV + minor fixes 2019-11-16 11:35:59 +01:00
jkriege2
528f6fe537 - added post-build deploy for OpenCV and Qt-DLLs (on windows)
- checked OpenCV-examples and improved OpenCV-copy-tool (now copies as an image column, as appropriate!)
2019-11-10 15:35:07 +01:00
jkriege2
92c1851c8c bugfix: OpenCV-interface used hidden function 2019-10-17 23:49:50 +02:00
Jan W. Krieger
0c34710fc7
Merge pull request #15 from midjji/qt5.9-fix
qt5.9 support
2019-10-17 15:15:37 +02:00
Mikael
abc32875f6 qt5.9 support 2019-10-17 11:32:23 +02:00
Jan W. Krieger
3aafc48d9b
Merge pull request #12 from dtimson/master
Corrections in palette drawing
2019-09-21 11:12:49 +01:00
Dan Timson
24af63688b corrections to allow palettes to be drawn correctly 2019-09-16 18:09:17 +01:00
Dan Timson
3a1b536c58 Minor documentation clarifications 2019-09-16 18:05:40 +01:00
Jan W. Krieger
89e0885308
Merge pull request #11 from cvilas/master
compiles for Qt5 in KDE Neon 5.16.4
2019-08-23 15:20:20 +02:00
Vilas Chitrakaran
95ffeadcf7 compiles for Qt5 in Kde Neon 5.16.4 2019-08-23 13:21:38 +01:00
jkriege2
686fb1eeb1 using mix-in class JKQTPColorPaletteWithModifierStyleAndToolsMixin now also in JKQTPMathImage ... 2019-07-31 22:10:26 +02:00
jkriege2
4347d27c04 * reworked color-palette-system:
1. added several new (JKQTPMathImageBone, JKQTPMathImageCool, JKQTPMathImageCopper, JKQTPMathImageAutumn, JKQTPMathImageSeismic, JKQTPMathImageTerrain, JKQTPMathImageViridis, JKQTPMathImageMagma, JKQTPMathImageInferno, JKQTPMathImagePlasma)
  2. reworked LUT-types (now a QVector, instead of a C-array, suing malloc)
  3. reworked available functions to build LUTs (cleanup, more options, clearer names)
  4. added functions to load palettes from files
  5. Improved documentation
* added example for user-controlled color palettes
2019-07-28 16:30:50 +02:00
jkriege2
4ae591c42f only use CMake builds on AppVeyor 2019-06-30 21:11:53 +02:00