diff --git a/CMakeLists.txt b/CMakeLists.txt new file mode 100644 index 0000000000..cbfdc4363b --- /dev/null +++ b/CMakeLists.txt @@ -0,0 +1,93 @@ +cmake_minimum_required(VERSION 3.0) +list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake) + + + +project(JKQTPlotter LANGUAGES CXX) + + + +if(NOT DEFINED BUILD_SHARED_LIBS) + option(BUILD_SHARED_LIBS "Build as shared library" ON) +endif() +if(NOT DEFINED BUILD_STATIC_LIBS) + option(BUILD_STATIC_LIBS "Build as static library" ON) +endif() +if(NOT DEFINED BUILD_INCLUDE_XITS_FONTS) + option(BUILD_INCLUDE_XITS_FONTS "Include XITS fonts as resources in library" ON) +endif() +if(NOT DEFINED BUILD_EXAMPLES) + option(BUILD_EXAMPLES "Build examples" ON) +endif() +if(NOT DEFINED LIB_INSTALL) + option(LIB_INSTALL "Install library" ON) +endif() +if(NOT DEFINED CMAKE_INSTALL_PREFIX) + option(CMAKE_INSTALL_PREFIX "Install directory" .) +endif() + + + + + + +include(CheckCXXCompilerFlag) +if (NOT WIN32) + include(GNUInstallDirs) +endif(NOT WIN32) + +# Instruct CMake to run moc+rcc automatically when needed. +set(CMAKE_AUTOMOC ON) +set(CMAKE_AUTORCC ON) + +# Set a default build type if none was specified +if(NOT CMAKE_BUILD_TYPE AND NOT CMAKE_CONFIGURATION_TYPES) + message(STATUS "Setting build type to 'Debug' as none was specified") + set(CMAKE_BUILD_TYPE Debug CACHE STRING "Choose the type of build" FORCE) + # Set the possible values of build type for cmake-gui + set_property(CACHE CMAKE_BUILD_TYPE PROPERTY STRINGS "Debug" "Release" "MinSizeRel" "RelWithDebInfo") +endif() + +if (NOT CMAKE_INSTALL_LIBDIR) + set(CMAKE_INSTALL_LIBDIR "lib") +endif() + +if (NOT CMAKE_INSTALL_BINDIR) + set(CMAKE_INSTALL_BINDIR "bin") +endif() + +if (NOT CMAKE_INSTALL_INCLUDEDIR) + set(CMAKE_INSTALL_INCLUDEDIR "include") +endif() + + +find_package(Qt5 5.0 REQUIRED Core Gui Widgets PrintSupport) + + +set (CMAKE_CXX_STANDARD 11) + +if(MSVC) + if(BUILD_SHARED_LIBS) + set(CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS ON) + endif() + set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}) + set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}) + + add_compile_options(/EHsc) + add_definitions(/D_USE_MATH_DEFINES /D_CRT_NO_VA_START_VALIDATION /DNOMINMAX) +else() + add_compile_options(-fexceptions) +endif() +if(BUILD_INCLUDE_XITS_FONTS) + add_definitions(-DAUTOLOAD_XITS_FONTS -DUSE_XITS_FONTS ) +else() + add_definitions(-DNO_XITS_FONTS ) +endif() + + + +add_subdirectory(lib) +if(BUILD_EXAMPLES) + #add_subdirectory(examples) +endif() + diff --git a/examples/jkqtplot_test/TestWidgetBarcharts.h b/examples/jkqtplot_test/TestWidgetBarcharts.h index fac5b574ac..b37d9ba0ba 100644 --- a/examples/jkqtplot_test/TestWidgetBarcharts.h +++ b/examples/jkqtplot_test/TestWidgetBarcharts.h @@ -16,7 +16,7 @@ #include "jkqtplotter/jkqtpelementsoverlay.h" #include "jkqtplotter/jkqtpgraphsparsedfunction.h" #include "jkqtplotter/jkqtpbaseelements.h" -#include "jkqtplottergui/jkqtpgraphsmodel.h" +#include "jkqtplotter/gui/jkqtpgraphsmodel.h" #include "jkqtplotter/jkqtptools.h" #define N1 200 diff --git a/examples/jkqtplot_test/TestWidgetContourPlots.h b/examples/jkqtplot_test/TestWidgetContourPlots.h index 25fa78c021..f59605fd2c 100644 --- a/examples/jkqtplot_test/TestWidgetContourPlots.h +++ b/examples/jkqtplot_test/TestWidgetContourPlots.h @@ -17,7 +17,7 @@ #include "jkqtplotter/jkqtpelementsoverlay.h" #include "jkqtplotter/jkqtpgraphsparsedfunction.h" #include "jkqtplotter/jkqtpbaseelements.h" -#include "jkqtplottergui/jkqtpgraphsmodel.h" +#include "jkqtplotter/gui/jkqtpgraphsmodel.h" #include "jkqtplotter/jkqtptools.h" #define N1 200 diff --git a/examples/jkqtplot_test/TestWidgetEmptyPlot.h b/examples/jkqtplot_test/TestWidgetEmptyPlot.h index 568111c476..dccb88893b 100644 --- a/examples/jkqtplot_test/TestWidgetEmptyPlot.h +++ b/examples/jkqtplot_test/TestWidgetEmptyPlot.h @@ -16,7 +16,7 @@ #include "jkqtplotter/jkqtpelementsoverlay.h" #include "jkqtplotter/jkqtpgraphsparsedfunction.h" #include "jkqtplotter/jkqtpbaseelements.h" -#include "jkqtplottergui/jkqtpgraphsmodel.h" +#include "jkqtplotter/gui/jkqtpgraphsmodel.h" #include "jkqtplotter/jkqtptools.h" #define N1 200 diff --git a/examples/jkqtplot_test/TestWidgetFunctionPlots.h b/examples/jkqtplot_test/TestWidgetFunctionPlots.h index 8e2c30b7ce..52f68f254b 100644 --- a/examples/jkqtplot_test/TestWidgetFunctionPlots.h +++ b/examples/jkqtplot_test/TestWidgetFunctionPlots.h @@ -16,8 +16,8 @@ #include "jkqtplotter/jkqtpelementsoverlay.h" #include "jkqtplotter/jkqtpgraphsparsedfunction.h" #include "jkqtplotter/jkqtpbaseelements.h" -#include "jkqtplottergui/jkqtpgraphsmodel.h" -#include "jkqtplottergui/jkqtpcomboboxes.h" +#include "jkqtplotter/gui/jkqtpgraphsmodel.h" +#include "jkqtplotter/gui/jkqtpcomboboxes.h" #include "jkqtplotter/jkqtptools.h" #define N1 200 diff --git a/examples/jkqtplot_test/TestWidgetGeometry.h b/examples/jkqtplot_test/TestWidgetGeometry.h index 7ed199115d..54926613c6 100644 --- a/examples/jkqtplot_test/TestWidgetGeometry.h +++ b/examples/jkqtplot_test/TestWidgetGeometry.h @@ -16,7 +16,7 @@ #include "jkqtplotter/jkqtpelementsoverlay.h" #include "jkqtplotter/jkqtpgraphsparsedfunction.h" #include "jkqtplotter/jkqtpbaseelements.h" -#include "jkqtplottergui/jkqtpgraphsmodel.h" +#include "jkqtplotter/gui/jkqtpgraphsmodel.h" #include "jkqtplotter/jkqtptools.h" #define N1 200 diff --git a/examples/jkqtplot_test/TestWidgetGraphs.cpp b/examples/jkqtplot_test/TestWidgetGraphs.cpp index 72e3ae7fe6..dbe632900b 100644 --- a/examples/jkqtplot_test/TestWidgetGraphs.cpp +++ b/examples/jkqtplot_test/TestWidgetGraphs.cpp @@ -6,7 +6,7 @@ #include "jkqtplotter/jkqtpgraphsscatter.h" #include "jkqtplotter/jkqtpgraphsboxplot.h" #include "jkqtplotter/jkqtpgraphsfilledcurve.h" -#include "jkqtplottergui/jkqtpcomboboxes.h" +#include "jkqtplotter/gui/jkqtpcomboboxes.h" diff --git a/examples/jkqtplot_test/TestWidgetGraphs.h b/examples/jkqtplot_test/TestWidgetGraphs.h index 8b4927bd41..1e4e02b6e6 100644 --- a/examples/jkqtplot_test/TestWidgetGraphs.h +++ b/examples/jkqtplot_test/TestWidgetGraphs.h @@ -16,7 +16,7 @@ #include "jkqtplotter/jkqtpelementsoverlay.h" #include "jkqtplotter/jkqtpgraphsparsedfunction.h" #include "jkqtplotter/jkqtpbaseelements.h" -#include "jkqtplottergui/jkqtpgraphsmodel.h" +#include "jkqtplotter/gui/jkqtpgraphsmodel.h" #include "jkqtplotter/jkqtptools.h" #define N1 200 diff --git a/examples/jkqtplot_test/TestWidgetImages.cpp b/examples/jkqtplot_test/TestWidgetImages.cpp index 7f22bb78b4..42c8b67f9e 100644 --- a/examples/jkqtplot_test/TestWidgetImages.cpp +++ b/examples/jkqtplot_test/TestWidgetImages.cpp @@ -3,7 +3,7 @@ #include #include #include -#include "jkqtplottergui/jkqtpcomboboxes.h" +#include "jkqtplotter/gui/jkqtpcomboboxes.h" #include "jkqtplotter/jkqtpgraphsimageoverlays.h" #include "jkqtplotter/jkqtpgraphsimagergb.h" diff --git a/examples/jkqtplot_test/TestWidgetImages.h b/examples/jkqtplot_test/TestWidgetImages.h index 3fe86945d1..cd187f1fdd 100644 --- a/examples/jkqtplot_test/TestWidgetImages.h +++ b/examples/jkqtplot_test/TestWidgetImages.h @@ -16,7 +16,7 @@ #include "jkqtplotter/jkqtpelementsoverlay.h" #include "jkqtplotter/jkqtpgraphsparsedfunction.h" #include "jkqtplotter/jkqtpbaseelements.h" -#include "jkqtplottergui/jkqtpgraphsmodel.h" +#include "jkqtplotter/gui/jkqtpgraphsmodel.h" #include "jkqtplotter/jkqtptools.h" #define N1 200 diff --git a/examples/jkqtplot_test/TestWidgetLogGraphs.h b/examples/jkqtplot_test/TestWidgetLogGraphs.h index f8cdf55cf0..1c09942cc9 100644 --- a/examples/jkqtplot_test/TestWidgetLogGraphs.h +++ b/examples/jkqtplot_test/TestWidgetLogGraphs.h @@ -16,7 +16,7 @@ #include "jkqtplotter/jkqtpelementsoverlay.h" #include "jkqtplotter/jkqtpgraphsparsedfunction.h" #include "jkqtplotter/jkqtpbaseelements.h" -#include "jkqtplottergui/jkqtpgraphsmodel.h" +#include "jkqtplotter/gui/jkqtpgraphsmodel.h" #include "jkqtplotter/jkqtptools.h" diff --git a/examples/jkqtplot_test/TestWidgetParamScatterPlots.h b/examples/jkqtplot_test/TestWidgetParamScatterPlots.h index 41ac5f9712..038303cf90 100644 --- a/examples/jkqtplot_test/TestWidgetParamScatterPlots.h +++ b/examples/jkqtplot_test/TestWidgetParamScatterPlots.h @@ -16,7 +16,7 @@ #include "jkqtplotter/jkqtpelementsoverlay.h" #include "jkqtplotter/jkqtpgraphsparsedfunction.h" #include "jkqtplotter/jkqtpbaseelements.h" -#include "jkqtplottergui/jkqtpgraphsmodel.h" +#include "jkqtplotter/gui/jkqtpgraphsmodel.h" #include "jkqtplotter/jkqtptools.h" #define N1 200 diff --git a/examples/jkqtplot_test/TestWidgetRGBImages.h b/examples/jkqtplot_test/TestWidgetRGBImages.h index 6d75521901..0348c6da24 100644 --- a/examples/jkqtplot_test/TestWidgetRGBImages.h +++ b/examples/jkqtplot_test/TestWidgetRGBImages.h @@ -17,7 +17,7 @@ #include "jkqtplotter/jkqtpelementsoverlay.h" #include "jkqtplotter/jkqtpgraphsparsedfunction.h" #include "jkqtplotter/jkqtpbaseelements.h" -#include "jkqtplottergui/jkqtpgraphsmodel.h" +#include "jkqtplotter/gui/jkqtpgraphsmodel.h" #include "jkqtplotter/jkqtptools.h" #define N1 200 diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt new file mode 100644 index 0000000000..728b1821d8 --- /dev/null +++ b/lib/CMakeLists.txt @@ -0,0 +1,30 @@ +cmake_minimum_required(VERSION 3.0) + + + +message( STATUS ) +message( STATUS "=============================================================================" ) +message( STATUS "== JKQTPlotterLib Build Information ==" ) +message( STATUS "=============================================================================" ) +message( STATUS "Version: ${PROJECT_VERSION}") +if (CMAKE_BUILD_TYPE) + message( STATUS "Build type: ${CMAKE_BUILD_TYPE}") +endif(CMAKE_BUILD_TYPE) +message( STATUS "Using compiler: ${CMAKE_CXX_COMPILER_ID} ${CMAKE_CXX_COMPILER_VERSION}" ) +message( STATUS "Using Qt: ${Qt5_VERSION}" ) +message( STATUS " [at ${Qt5_DIR}]" ) +if(BUILD_INCLUDE_XITS_FONTS) + message( STATUS "Using XITS fonts" ) +endif(BUILD_INCLUDE_XITS_FONTS) +message( STATUS "Installing to: ${CMAKE_INSTALL_PREFIX}" ) +message( STATUS "=============================================================================" ) +message( STATUS ) + + + +include_directories(.) + +add_subdirectory(jkqtcommon) +add_subdirectory(jkqtmathtext) +add_subdirectory(jkqtfastplotter) +add_subdirectory(jkqtplotter) diff --git a/lib/jkqtcommon/CMakeLists.txt b/lib/jkqtcommon/CMakeLists.txt index eb96750fac..6d53ea1401 100644 --- a/lib/jkqtcommon/CMakeLists.txt +++ b/lib/jkqtcommon/CMakeLists.txt @@ -1,16 +1,110 @@ -cmake_minimum_required(VERSION 3.1) -# common definitions -include(../../common_include.cmake) +cmake_minimum_required(VERSION 3.0) -set(SOURCE - ${SOURCE} - ${CMAKE_CURRENT_SOURCE_DIR}/jkqtptools.cpp - PARENT_SCOPE +set(libBasename JKQTCommon) + +message( STATUS ) +message( STATUS "-----------------------------------------------------------------------------" ) +if(BUILD_SHARED_LIBS) + set(libsh_name ${libBasename}SharedLib) + set(${libsh_name}_LIBRARY ${libsh_name} PARENT_SCOPE) + message( STATUS "-- Building ${libsh_name}" ) +endif(BUILD_SHARED_LIBS) + +if(BUILD_STATIC_LIBS) + set(lib_name ${libBasename}Lib) + set(${lib_name}_LIBRARY ${lib_name} PARENT_SCOPE) + message( STATUS "-- Building ${lib_name}" ) +endif(BUILD_STATIC_LIBS) + + + +# Set up source files +set(SRCS + jkqtpdebuggingtools.cpp + jkqtpmathtools.cpp + jkqtpalgorithms.cpp + jkqtpstringtools.cpp + jkqtplinalgtools.cpp + jkqtpcodestructuring.cpp + jkqtpbasicimagetools.cpp + jkqtpdrawingtools.cpp + jkqtpenhancedpainter.cpp + jkqtphighrestimer.cpp + jkqtpmathparser.cpp + jkqttools.cpp + jkqtparraytools.cpp + jkqtpstatbasics.cpp + jkqtpstathistogram.cpp + jkqtpstatkde.cpp + jkqtpstatregression.cpp + jkqtpstatpoly.cpp + jkqtpstatgrouped.cpp ) set(HEADERS - ${HEADERS} - ${CMAKE_CURRENT_SOURCE_DIR}/jkqtptools.h - ${CMAKE_CURRENT_SOURCE_DIR}/jkqtp_imexport.h - PARENT_SCOPE -) \ No newline at end of file + jkqtp_imexport.h + jkqtpdebuggingtools.h + jkqtpmathtools.h + jkqtpalgorithms.h + jkqtpstringtools.h + jkqtplinalgtools.h + jkqtpcodestructuring.h + jkqtpbasicimagetools.h + jkqtpdrawingtools.h + jkqtpenhancedpainter.h + jkqtphighrestimer.h + jkqtpmathparser.h + jkqttools.h + jkqtparraytools.h + jkqtpstatisticstools.h + jkqtpstatbasics.h + jkqtpstathistogram.h + jkqtpstatkde.h + jkqtpstatregression.h + jkqtpstatpoly.h + jkqtpstatgrouped.h +) + + +if(BUILD_SHARED_LIBS) + add_library(${libsh_name} SHARED ${SRCS} ${HEADERS}) + set_property(TARGET ${libsh_name} PROPERTY VERSION "${PROJECT_VERSION}") + target_link_libraries(${libsh_name} Qt5::Core Qt5::Gui Qt5::Widgets Qt5::PrintSupport) + target_compile_definitions(${libsh_name} PRIVATE JKQTP_LIB_IN_DLL) + target_compile_definitions(${libsh_name} PRIVATE JKQTP_LIB_EXPORT_LIBRARY) +endif() + +if(BUILD_STATIC_LIBS) + add_library(${lib_name} STATIC ${SRCS} ${HEADERS}) + set_property(TARGET ${lib_name} PROPERTY VERSION "${PROJECT_VERSION}") + target_link_libraries(${lib_name} Qt5::Core Qt5::Gui Qt5::Widgets Qt5::PrintSupport) +endif() + + + +# Installation +if(LIB_INSTALL) + + if(BUILD_SHARED_LIBS) + install(TARGETS ${libsh_name} EXPORT ${libsh_name}_TARGETS + RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} + ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} + LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} + INCLUDES DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}jkqtcommon + ) + endif(BUILD_SHARED_LIBS) + + if(BUILD_STATIC_LIBS) + install(TARGETS ${lib_name} EXPORT ${lib_name}_TARGETS + RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} + ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} + LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} + INCLUDES DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}jkqtcommon + ) + endif(BUILD_STATIC_LIBS) + + install(FILES ${HEADERS} + DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}jkqtcommon + COMPONENT Headers) + +endif(LIB_INSTALL) diff --git a/lib/jkqtcommon/jkqtpbasicimagetools.h b/lib/jkqtcommon/jkqtpbasicimagetools.h index b038c9982a..bdcfc18dc5 100644 --- a/lib/jkqtcommon/jkqtpbasicimagetools.h +++ b/lib/jkqtcommon/jkqtpbasicimagetools.h @@ -133,13 +133,13 @@ enum JKQTPMathImageColorPalette { \ingroup jkqtplotter_imagelots_tools \see String2JKQTPMathImageColorPalette() */ -QString JKQTPMathImageColorPalette2String(JKQTPMathImageColorPalette p); +JKQTP_LIB_EXPORT QString JKQTPMathImageColorPalette2String(JKQTPMathImageColorPalette p); /*! \brief convert the palette name \a p to JKQTPMathImageColorPalette (compatible with String2JKQTPMathImageColorPalette() ) \ingroup jkqtplotter_imagelots_tools \see JKQTPMathImageColorPalette2String() */ -JKQTPMathImageColorPalette String2JKQTPMathImageColorPalette(const QString& p); +JKQTP_LIB_EXPORT JKQTPMathImageColorPalette String2JKQTPMathImageColorPalette(const QString& p); diff --git a/lib/jkqtcommon/jkqtpdrawingtools.h b/lib/jkqtcommon/jkqtpdrawingtools.h index 7fd8a17c5b..70e5967f9d 100644 --- a/lib/jkqtcommon/jkqtpdrawingtools.h +++ b/lib/jkqtcommon/jkqtpdrawingtools.h @@ -44,7 +44,7 @@ class JKQTPEnhancedPainter; // forward /*! \brief tool class with static values used by JKQTPlotter/JKQTBasePlotter \ingroup jkqtptools_drawing */ -JKQTP_LIB_EXPORT struct JKQTPlotterDrawingTools { +struct JKQTP_LIB_EXPORT JKQTPlotterDrawingTools { /** \brief smallest linewidth any line in JKQTPlotter/JKQTBasePlotter may have */ static const double ABS_MIN_LINEWIDTH; diff --git a/lib/jkqtcommon/jkqtphighrestimer.h b/lib/jkqtcommon/jkqtphighrestimer.h index 8cd914b6b2..75c2d63ec4 100644 --- a/lib/jkqtcommon/jkqtphighrestimer.h +++ b/lib/jkqtcommon/jkqtphighrestimer.h @@ -23,6 +23,8 @@ #include #include +#include "jkqtp_imexport.h" + #ifndef __WINDOWS__ # if defined(WIN32) || defined(WIN64) || defined(_MSC_VER) || defined(_WIN32) # define __WINDOWS__ @@ -125,7 +127,7 @@ * \test you can find an example application in the file \link test_hrestimer.cpp \endlink. * */ -class JKQTPHighResTimer { +class JKQTP_LIB_EXPORT JKQTPHighResTimer { protected: #ifdef __WINDOWS__ /** \brief internal: time stamp of the last call of start() */ diff --git a/lib/jkqtcommon/jkqtpmathparser.h b/lib/jkqtcommon/jkqtpmathparser.h index 04779f8d71..4609782c27 100644 --- a/lib/jkqtcommon/jkqtpmathparser.h +++ b/lib/jkqtcommon/jkqtpmathparser.h @@ -47,7 +47,7 @@ #include #include #include - +#include "jkqtp_imexport.h" #ifndef JKQTPMATHPARSER_H #define JKQTPMATHPARSER_H @@ -235,7 +235,7 @@ } \endcode */ -class JKQTPMathParser +class JKQTP_LIB_EXPORT JKQTPMathParser { protected: void* data; diff --git a/lib/jkqtcommon/jkqtpmathtools.h b/lib/jkqtcommon/jkqtpmathtools.h index 7b77d83797..855b5f0060 100644 --- a/lib/jkqtcommon/jkqtpmathtools.h +++ b/lib/jkqtcommon/jkqtpmathtools.h @@ -360,7 +360,7 @@ inline double jkqtp_polyEval(double x, PolyItP firstP, PolyItP lastP) { /*! \brief a C++-functor, which evaluates a polynomial \ingroup jkqtptools_math_basic */ -struct JKQTPPolynomialFunctor { +struct JKQTP_LIB_EXPORT JKQTPPolynomialFunctor { std::vector P; template inline JKQTPPolynomialFunctor(PolyItP firstP, PolyItP lastP) { diff --git a/lib/jkqtcommon/jkqtpstatgrouped.h b/lib/jkqtcommon/jkqtpstatgrouped.h index bc7d838b3f..9948fde067 100644 --- a/lib/jkqtcommon/jkqtpstatgrouped.h +++ b/lib/jkqtcommon/jkqtpstatgrouped.h @@ -60,13 +60,13 @@ typedef std::function JKQTPStatGroupDefinitionFunctor1D; \see JKQTPStatGroupDefinitionFunctor1D */ -double jkqtpstatGroupingIdentity1D(double v); +JKQTP_LIB_EXPORT double jkqtpstatGroupingIdentity1D(double v); /*! \brief use a rounded column value as group ID directly \f$ f(x)=\mbox{round}(x) \f$ \ingroup jkqtptools_math_statistics_grouped \see JKQTPStatGroupDefinitionFunctor1D */ -double jkqtpstatGroupingRound1D(double v); +JKQTP_LIB_EXPORT double jkqtpstatGroupingRound1D(double v); /*! \brief assign each value to groups \f$ \mbox{firstGroupCenter} \f$ , \f$ \mbox{firstGroupCenter}\pm\mbox{groupWidth}/2\f$ , \f$ \mbox{firstGroupCenter}\pm2\cdot\mbox{groupWidth}/2 \f$ , \f$ \mbox{firstGroupCenter}\pm3\cdot\mbox{groupWidth}/2 \f$ , ... \ingroup jkqtptools_math_statistics_grouped @@ -74,7 +74,7 @@ double jkqtpstatGroupingRound1D(double v); \see JKQTPStatGroupDefinitionFunctor1D, jkqtpstatMakeGroupingCustomRound1D() for a factory-function that returns a functor of this function bound to specific arguments. */ -double jkqtpstatGroupingCustomRound1D(double v, double firstGroupCenter, double groupWidth); +JKQTP_LIB_EXPORT double jkqtpstatGroupingCustomRound1D(double v, double firstGroupCenter, double groupWidth); /*! \brief generates a functor of jkqtpstatGroupingCustomRound1D() with the two paramaters \a firstGroupCenter and \a groupWidth fixed to the given values \ingroup jkqtptools_math_statistics_grouped @@ -82,7 +82,7 @@ double jkqtpstatGroupingCustomRound1D(double v, double firstGroupCenter, double \see JKQTPStatGroupDefinitionFunctor1D, jkqtpstatGroupingCustomRound1D() */ -JKQTPStatGroupDefinitionFunctor1D jkqtpstatMakeGroupingCustomRound1D(double firstGroupCenter, double groupWidth); +JKQTP_LIB_EXPORT JKQTPStatGroupDefinitionFunctor1D jkqtpstatMakeGroupingCustomRound1D(double firstGroupCenter, double groupWidth); diff --git a/lib/jkqtfastplotter/CMakeLists.txt b/lib/jkqtfastplotter/CMakeLists.txt new file mode 100644 index 0000000000..08dddb3f87 --- /dev/null +++ b/lib/jkqtfastplotter/CMakeLists.txt @@ -0,0 +1,74 @@ +cmake_minimum_required(VERSION 3.0) + +set(libBasename JKQTFastPlotter) + +message( STATUS ) +message( STATUS "-----------------------------------------------------------------------------" ) +if(BUILD_SHARED_LIBS) + set(libsh_name ${libBasename}SharedLib) + set(${libsh_name}_LIBRARY ${libsh_name} PARENT_SCOPE) + message( STATUS "-- Building ${libsh_name}" ) +endif(BUILD_SHARED_LIBS) + +if(BUILD_STATIC_LIBS) + set(lib_name ${libBasename}Lib) + set(${lib_name}_LIBRARY ${lib_name} PARENT_SCOPE) + message( STATUS "-- Building ${lib_name}" ) +endif(BUILD_STATIC_LIBS) + + +find_package(Qt5 COMPONENTS Core Gui OpenGL Script Widgets PrintSupport) + +# Set up source files +set(SRCS + jkqtfastplotter.cpp +) + +set(HEADERS + jkqtfastplotter.h +) + + + +if(BUILD_SHARED_LIBS) + add_library(${libsh_name} SHARED ${SRCS} ${HEADERS} ${RESOURCES}) + set_property(TARGET ${libsh_name} PROPERTY VERSION "${PROJECT_VERSION}") + target_link_libraries(${libsh_name} Qt5::Core Qt5::Gui Qt5::Widgets Qt5::PrintSupport Qt5::OpenGL JKQTCommonSharedLib) + target_compile_definitions(${libsh_name} PRIVATE JKQTP_LIB_IN_DLL) + target_compile_definitions(${libsh_name} PRIVATE JKQTP_LIB_EXPORT_LIBRARY) +endif() + +if(BUILD_STATIC_LIBS) + add_library(${lib_name} STATIC ${SRCS} ${HEADERS} ${RESOURCES}) + set_property(TARGET ${lib_name} PROPERTY VERSION "${PROJECT_VERSION}") + target_link_libraries(${lib_name} Qt5::Core Qt5::Gui Qt5::Widgets Qt5::PrintSupport Qt5::OpenGL JKQTCommonLib) +endif() + + + +# Installation +if(LIB_INSTALL) + + if(BUILD_SHARED_LIBS) + install(TARGETS ${libsh_name} EXPORT ${libsh_name}_TARGETS + RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} + ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} + LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} + INCLUDES DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}jkqtfastplotter + ) + endif(BUILD_SHARED_LIBS) + + if(BUILD_STATIC_LIBS) + install(TARGETS ${lib_name} EXPORT ${lib_name}_TARGETS + RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} + ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} + LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} + INCLUDES DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}jkqtfastplotter + ) + endif(BUILD_STATIC_LIBS) + + install(FILES ${HEADERS} + DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}jkqtfastplotter + COMPONENT Headers) + +endif(LIB_INSTALL) diff --git a/lib/jkqtmathtext.pri b/lib/jkqtmathtext.pri index e1abe4ecfc..6bcf75b601 100644 --- a/lib/jkqtmathtext.pri +++ b/lib/jkqtmathtext.pri @@ -9,7 +9,7 @@ isEmpty(JKQTP_MATHTEXT_PRI_INCLUDED) { SOURCES += $$PWD/jkqtmathtext/jkqtmathtext.cpp - include($$PWD/jkqtplotterressources/math_fonts/xits.pri) + include($$PWD/jkqtmathtext/resources/xits.pri) DEFINES += AUTOLOAD_XITS_FONTS DEFINES += USE_XITS_FONTS diff --git a/lib/jkqtmathtext/CMakeLists.txt b/lib/jkqtmathtext/CMakeLists.txt index 322eba28f0..3656ffff76 100644 --- a/lib/jkqtmathtext/CMakeLists.txt +++ b/lib/jkqtmathtext/CMakeLists.txt @@ -1,15 +1,78 @@ -cmake_minimum_required(VERSION 3.1) -# common definitions -include(../../common_include.cmake) +cmake_minimum_required(VERSION 3.0) -set(SOURCE - ${SOURCE} - ${CMAKE_CURRENT_SOURCE_DIR}/jkqtmathtext.cpp - PARENT_SCOPE +set(libBasename JKQTMathText) + +message( STATUS ) +message( STATUS "-----------------------------------------------------------------------------" ) +if(BUILD_SHARED_LIBS) + set(libsh_name ${libBasename}SharedLib) + set(${libsh_name}_LIBRARY ${libsh_name} PARENT_SCOPE) + message( STATUS "-- Building ${libsh_name}" ) +endif(BUILD_SHARED_LIBS) + +if(BUILD_STATIC_LIBS) + set(lib_name ${libBasename}Lib) + set(${lib_name}_LIBRARY ${lib_name} PARENT_SCOPE) + message( STATUS "-- Building ${lib_name}" ) +endif(BUILD_STATIC_LIBS) + + + +# Set up source files +set(SRCS + jkqtmathtext.cpp ) set(HEADERS - ${HEADERS} - ${CMAKE_CURRENT_SOURCE_DIR}/jkqtmathtext.h - PARENT_SCOPE -) \ No newline at end of file + jkqtmathtext.h +) + +if(BUILD_INCLUDE_XITS_FONTS) + set(RESOURCES + resources/xits.qrc + ) +endif(BUILD_INCLUDE_XITS_FONTS) + + +if(BUILD_SHARED_LIBS) + add_library(${libsh_name} SHARED ${SRCS} ${HEADERS} ${RESOURCES}) + set_property(TARGET ${libsh_name} PROPERTY VERSION "${PROJECT_VERSION}") + target_link_libraries(${libsh_name} Qt5::Core Qt5::Gui Qt5::Widgets Qt5::PrintSupport JKQTCommonSharedLib) + target_compile_definitions(${libsh_name} PRIVATE JKQTP_LIB_IN_DLL) + target_compile_definitions(${libsh_name} PRIVATE JKQTP_LIB_EXPORT_LIBRARY) +endif() + +if(BUILD_STATIC_LIBS) + add_library(${lib_name} STATIC ${SRCS} ${HEADERS} ${RESOURCES}) + set_property(TARGET ${lib_name} PROPERTY VERSION "${PROJECT_VERSION}") + target_link_libraries(${lib_name} Qt5::Core Qt5::Gui Qt5::Widgets Qt5::PrintSupport JKQTCommonLib) +endif() + + + +# Installation +if(LIB_INSTALL) + + if(BUILD_SHARED_LIBS) + install(TARGETS ${libsh_name} EXPORT ${libsh_name}_TARGETS + RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} + ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} + LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} + INCLUDES DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}jkqtmathtext + ) + endif(BUILD_SHARED_LIBS) + + if(BUILD_STATIC_LIBS) + install(TARGETS ${lib_name} EXPORT ${lib_name}_TARGETS + RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} + ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} + LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} + INCLUDES DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}jkqtmathtext + ) + endif(BUILD_STATIC_LIBS) + + install(FILES ${HEADERS} + DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}jkqtmathtext + COMPONENT Headers) + +endif(LIB_INSTALL) diff --git a/lib/jkqtplotterressources/math_fonts/xits.pri b/lib/jkqtmathtext/resources/xits.pri similarity index 100% rename from lib/jkqtplotterressources/math_fonts/xits.pri rename to lib/jkqtmathtext/resources/xits.pri diff --git a/lib/jkqtplotterressources/math_fonts/xits.qrc b/lib/jkqtmathtext/resources/xits.qrc similarity index 100% rename from lib/jkqtplotterressources/math_fonts/xits.qrc rename to lib/jkqtmathtext/resources/xits.qrc diff --git a/lib/jkqtplotterressources/math_fonts/xits/FONTLOG.txt.in b/lib/jkqtmathtext/resources/xits/FONTLOG.txt.in similarity index 100% rename from lib/jkqtplotterressources/math_fonts/xits/FONTLOG.txt.in rename to lib/jkqtmathtext/resources/xits/FONTLOG.txt.in diff --git a/lib/jkqtplotterressources/math_fonts/xits/Makefile b/lib/jkqtmathtext/resources/xits/Makefile similarity index 100% rename from lib/jkqtplotterressources/math_fonts/xits/Makefile rename to lib/jkqtmathtext/resources/xits/Makefile diff --git a/lib/jkqtplotterressources/math_fonts/xits/OFL-FAQ.txt b/lib/jkqtmathtext/resources/xits/OFL-FAQ.txt similarity index 100% rename from lib/jkqtplotterressources/math_fonts/xits/OFL-FAQ.txt rename to lib/jkqtmathtext/resources/xits/OFL-FAQ.txt diff --git a/lib/jkqtplotterressources/math_fonts/xits/OFL.txt b/lib/jkqtmathtext/resources/xits/OFL.txt similarity index 100% rename from lib/jkqtplotterressources/math_fonts/xits/OFL.txt rename to lib/jkqtmathtext/resources/xits/OFL.txt diff --git a/lib/jkqtplotterressources/math_fonts/xits/README.md b/lib/jkqtmathtext/resources/xits/README.md similarity index 100% rename from lib/jkqtplotterressources/math_fonts/xits/README.md rename to lib/jkqtmathtext/resources/xits/README.md diff --git a/lib/jkqtplotterressources/math_fonts/xits/XITS-Bold.otf b/lib/jkqtmathtext/resources/xits/XITS-Bold.otf similarity index 100% rename from lib/jkqtplotterressources/math_fonts/xits/XITS-Bold.otf rename to lib/jkqtmathtext/resources/xits/XITS-Bold.otf diff --git a/lib/jkqtplotterressources/math_fonts/xits/XITS-BoldItalic.otf b/lib/jkqtmathtext/resources/xits/XITS-BoldItalic.otf similarity index 100% rename from lib/jkqtplotterressources/math_fonts/xits/XITS-BoldItalic.otf rename to lib/jkqtmathtext/resources/xits/XITS-BoldItalic.otf diff --git a/lib/jkqtplotterressources/math_fonts/xits/XITS-Italic.otf b/lib/jkqtmathtext/resources/xits/XITS-Italic.otf similarity index 100% rename from lib/jkqtplotterressources/math_fonts/xits/XITS-Italic.otf rename to lib/jkqtmathtext/resources/xits/XITS-Italic.otf diff --git a/lib/jkqtplotterressources/math_fonts/xits/XITS-Regular.otf b/lib/jkqtmathtext/resources/xits/XITS-Regular.otf similarity index 100% rename from lib/jkqtplotterressources/math_fonts/xits/XITS-Regular.otf rename to lib/jkqtmathtext/resources/xits/XITS-Regular.otf diff --git a/lib/jkqtplotterressources/math_fonts/xits/XITSMath-Bold.otf b/lib/jkqtmathtext/resources/xits/XITSMath-Bold.otf similarity index 100% rename from lib/jkqtplotterressources/math_fonts/xits/XITSMath-Bold.otf rename to lib/jkqtmathtext/resources/xits/XITSMath-Bold.otf diff --git a/lib/jkqtplotterressources/math_fonts/xits/XITSMath-Regular.otf b/lib/jkqtmathtext/resources/xits/XITSMath-Regular.otf similarity index 100% rename from lib/jkqtplotterressources/math_fonts/xits/XITSMath-Regular.otf rename to lib/jkqtmathtext/resources/xits/XITSMath-Regular.otf diff --git a/lib/jkqtplotterressources/math_fonts/xits/documentation/documentation-sources/user-guide.tex b/lib/jkqtmathtext/resources/xits/documentation/documentation-sources/user-guide.tex similarity index 100% rename from lib/jkqtplotterressources/math_fonts/xits/documentation/documentation-sources/user-guide.tex rename to lib/jkqtmathtext/resources/xits/documentation/documentation-sources/user-guide.tex diff --git a/lib/jkqtplotterressources/math_fonts/xits/documentation/documentation-sources/xits-specimen.tex b/lib/jkqtmathtext/resources/xits/documentation/documentation-sources/xits-specimen.tex similarity index 100% rename from lib/jkqtplotterressources/math_fonts/xits/documentation/documentation-sources/xits-specimen.tex rename to lib/jkqtmathtext/resources/xits/documentation/documentation-sources/xits-specimen.tex diff --git a/lib/jkqtplotterressources/math_fonts/xits/documentation/user-guide.pdf b/lib/jkqtmathtext/resources/xits/documentation/user-guide.pdf similarity index 100% rename from lib/jkqtplotterressources/math_fonts/xits/documentation/user-guide.pdf rename to lib/jkqtmathtext/resources/xits/documentation/user-guide.pdf diff --git a/lib/jkqtplotterressources/math_fonts/xits/documentation/xits-specimen.pdf b/lib/jkqtmathtext/resources/xits/documentation/xits-specimen.pdf similarity index 100% rename from lib/jkqtplotterressources/math_fonts/xits/documentation/xits-specimen.pdf rename to lib/jkqtmathtext/resources/xits/documentation/xits-specimen.pdf diff --git a/lib/jkqtplotterressources/math_fonts/xits/sources/XITS-Bold.fea b/lib/jkqtmathtext/resources/xits/sources/XITS-Bold.fea similarity index 100% rename from lib/jkqtplotterressources/math_fonts/xits/sources/XITS-Bold.fea rename to lib/jkqtmathtext/resources/xits/sources/XITS-Bold.fea diff --git a/lib/jkqtplotterressources/math_fonts/xits/sources/XITS-Bold.sfd b/lib/jkqtmathtext/resources/xits/sources/XITS-Bold.sfd similarity index 100% rename from lib/jkqtplotterressources/math_fonts/xits/sources/XITS-Bold.sfd rename to lib/jkqtmathtext/resources/xits/sources/XITS-Bold.sfd diff --git a/lib/jkqtplotterressources/math_fonts/xits/sources/XITS-BoldItalic.fea b/lib/jkqtmathtext/resources/xits/sources/XITS-BoldItalic.fea similarity index 100% rename from lib/jkqtplotterressources/math_fonts/xits/sources/XITS-BoldItalic.fea rename to lib/jkqtmathtext/resources/xits/sources/XITS-BoldItalic.fea diff --git a/lib/jkqtplotterressources/math_fonts/xits/sources/XITS-BoldItalic.sfd b/lib/jkqtmathtext/resources/xits/sources/XITS-BoldItalic.sfd similarity index 100% rename from lib/jkqtplotterressources/math_fonts/xits/sources/XITS-BoldItalic.sfd rename to lib/jkqtmathtext/resources/xits/sources/XITS-BoldItalic.sfd diff --git a/lib/jkqtplotterressources/math_fonts/xits/sources/XITS-Italic.fea b/lib/jkqtmathtext/resources/xits/sources/XITS-Italic.fea similarity index 100% rename from lib/jkqtplotterressources/math_fonts/xits/sources/XITS-Italic.fea rename to lib/jkqtmathtext/resources/xits/sources/XITS-Italic.fea diff --git a/lib/jkqtplotterressources/math_fonts/xits/sources/XITS-Italic.sfd b/lib/jkqtmathtext/resources/xits/sources/XITS-Italic.sfd similarity index 100% rename from lib/jkqtplotterressources/math_fonts/xits/sources/XITS-Italic.sfd rename to lib/jkqtmathtext/resources/xits/sources/XITS-Italic.sfd diff --git a/lib/jkqtplotterressources/math_fonts/xits/sources/XITS-Regular.fea b/lib/jkqtmathtext/resources/xits/sources/XITS-Regular.fea similarity index 100% rename from lib/jkqtplotterressources/math_fonts/xits/sources/XITS-Regular.fea rename to lib/jkqtmathtext/resources/xits/sources/XITS-Regular.fea diff --git a/lib/jkqtplotterressources/math_fonts/xits/sources/XITS-Regular.sfd b/lib/jkqtmathtext/resources/xits/sources/XITS-Regular.sfd similarity index 100% rename from lib/jkqtplotterressources/math_fonts/xits/sources/XITS-Regular.sfd rename to lib/jkqtmathtext/resources/xits/sources/XITS-Regular.sfd diff --git a/lib/jkqtplotterressources/math_fonts/xits/sources/XITSMath-Bold.fea b/lib/jkqtmathtext/resources/xits/sources/XITSMath-Bold.fea similarity index 100% rename from lib/jkqtplotterressources/math_fonts/xits/sources/XITSMath-Bold.fea rename to lib/jkqtmathtext/resources/xits/sources/XITSMath-Bold.fea diff --git a/lib/jkqtplotterressources/math_fonts/xits/sources/XITSMath-Bold.sfd b/lib/jkqtmathtext/resources/xits/sources/XITSMath-Bold.sfd similarity index 100% rename from lib/jkqtplotterressources/math_fonts/xits/sources/XITSMath-Bold.sfd rename to lib/jkqtmathtext/resources/xits/sources/XITSMath-Bold.sfd diff --git a/lib/jkqtplotterressources/math_fonts/xits/sources/XITSMath-Regular.fea b/lib/jkqtmathtext/resources/xits/sources/XITSMath-Regular.fea similarity index 100% rename from lib/jkqtplotterressources/math_fonts/xits/sources/XITSMath-Regular.fea rename to lib/jkqtmathtext/resources/xits/sources/XITSMath-Regular.fea diff --git a/lib/jkqtplotterressources/math_fonts/xits/sources/XITSMath-Regular.sfd b/lib/jkqtmathtext/resources/xits/sources/XITSMath-Regular.sfd similarity index 100% rename from lib/jkqtplotterressources/math_fonts/xits/sources/XITSMath-Regular.sfd rename to lib/jkqtmathtext/resources/xits/sources/XITSMath-Regular.sfd diff --git a/lib/jkqtplotterressources/math_fonts/xits/sources/frac.fea b/lib/jkqtmathtext/resources/xits/sources/frac.fea similarity index 100% rename from lib/jkqtplotterressources/math_fonts/xits/sources/frac.fea rename to lib/jkqtmathtext/resources/xits/sources/frac.fea diff --git a/lib/jkqtplotterressources/math_fonts/xits/sources/numrdnom.fea b/lib/jkqtmathtext/resources/xits/sources/numrdnom.fea similarity index 100% rename from lib/jkqtplotterressources/math_fonts/xits/sources/numrdnom.fea rename to lib/jkqtmathtext/resources/xits/sources/numrdnom.fea diff --git a/lib/jkqtplotterressources/math_fonts/xits/sources/xits.fea b/lib/jkqtmathtext/resources/xits/sources/xits.fea similarity index 100% rename from lib/jkqtplotterressources/math_fonts/xits/sources/xits.fea rename to lib/jkqtmathtext/resources/xits/sources/xits.fea diff --git a/lib/jkqtplotterressources/math_fonts/xits/test-suite/.gitignore b/lib/jkqtmathtext/resources/xits/test-suite/.gitignore similarity index 100% rename from lib/jkqtplotterressources/math_fonts/xits/test-suite/.gitignore rename to lib/jkqtmathtext/resources/xits/test-suite/.gitignore diff --git a/lib/jkqtplotterressources/math_fonts/xits/test-suite/README b/lib/jkqtmathtext/resources/xits/test-suite/README similarity index 100% rename from lib/jkqtplotterressources/math_fonts/xits/test-suite/README rename to lib/jkqtmathtext/resources/xits/test-suite/README diff --git a/lib/jkqtplotterressources/math_fonts/xits/test-suite/accents.cld b/lib/jkqtmathtext/resources/xits/test-suite/accents.cld similarity index 100% rename from lib/jkqtplotterressources/math_fonts/xits/test-suite/accents.cld rename to lib/jkqtmathtext/resources/xits/test-suite/accents.cld diff --git a/lib/jkqtplotterressources/math_fonts/xits/test-suite/amsmath.ltx b/lib/jkqtmathtext/resources/xits/test-suite/amsmath.ltx similarity index 100% rename from lib/jkqtplotterressources/math_fonts/xits/test-suite/amsmath.ltx rename to lib/jkqtmathtext/resources/xits/test-suite/amsmath.ltx diff --git a/lib/jkqtplotterressources/math_fonts/xits/test-suite/arabic.tex b/lib/jkqtmathtext/resources/xits/test-suite/arabic.tex similarity index 100% rename from lib/jkqtplotterressources/math_fonts/xits/test-suite/arabic.tex rename to lib/jkqtmathtext/resources/xits/test-suite/arabic.tex diff --git a/lib/jkqtplotterressources/math_fonts/xits/test-suite/hat.tex b/lib/jkqtmathtext/resources/xits/test-suite/hat.tex similarity index 100% rename from lib/jkqtplotterressources/math_fonts/xits/test-suite/hat.tex rename to lib/jkqtmathtext/resources/xits/test-suite/hat.tex diff --git a/lib/jkqtplotterressources/math_fonts/xits/test-suite/integrals.cld b/lib/jkqtmathtext/resources/xits/test-suite/integrals.cld similarity index 100% rename from lib/jkqtplotterressources/math_fonts/xits/test-suite/integrals.cld rename to lib/jkqtmathtext/resources/xits/test-suite/integrals.cld diff --git a/lib/jkqtplotterressources/math_fonts/xits/test-suite/mathcal.tex b/lib/jkqtmathtext/resources/xits/test-suite/mathcal.tex similarity index 100% rename from lib/jkqtplotterressources/math_fonts/xits/test-suite/mathcal.tex rename to lib/jkqtmathtext/resources/xits/test-suite/mathcal.tex diff --git a/lib/jkqtplotterressources/math_fonts/xits/test-suite/mathkern.tex b/lib/jkqtmathtext/resources/xits/test-suite/mathkern.tex similarity index 100% rename from lib/jkqtplotterressources/math_fonts/xits/test-suite/mathkern.tex rename to lib/jkqtmathtext/resources/xits/test-suite/mathkern.tex diff --git a/lib/jkqtplotterressources/math_fonts/xits/test-suite/overunder.cld b/lib/jkqtmathtext/resources/xits/test-suite/overunder.cld similarity index 100% rename from lib/jkqtplotterressources/math_fonts/xits/test-suite/overunder.cld rename to lib/jkqtmathtext/resources/xits/test-suite/overunder.cld diff --git a/lib/jkqtplotterressources/math_fonts/xits/test-suite/sscript.cld b/lib/jkqtmathtext/resources/xits/test-suite/sscript.cld similarity index 100% rename from lib/jkqtplotterressources/math_fonts/xits/test-suite/sscript.cld rename to lib/jkqtmathtext/resources/xits/test-suite/sscript.cld diff --git a/lib/jkqtplotterressources/math_fonts/xits/test-suite/upintegrals.tex b/lib/jkqtmathtext/resources/xits/test-suite/upintegrals.tex similarity index 100% rename from lib/jkqtplotterressources/math_fonts/xits/test-suite/upintegrals.tex rename to lib/jkqtmathtext/resources/xits/test-suite/upintegrals.tex diff --git a/lib/jkqtplotterressources/math_fonts/xits/test-suite/varselector.cld b/lib/jkqtmathtext/resources/xits/test-suite/varselector.cld similarity index 100% rename from lib/jkqtplotterressources/math_fonts/xits/test-suite/varselector.cld rename to lib/jkqtmathtext/resources/xits/test-suite/varselector.cld diff --git a/lib/jkqtplotterressources/math_fonts/xits/test-suite/varselector.tex b/lib/jkqtmathtext/resources/xits/test-suite/varselector.tex similarity index 100% rename from lib/jkqtplotterressources/math_fonts/xits/test-suite/varselector.tex rename to lib/jkqtmathtext/resources/xits/test-suite/varselector.tex diff --git a/lib/jkqtplotterressources/math_fonts/xits/test-suite/vert.tex b/lib/jkqtmathtext/resources/xits/test-suite/vert.tex similarity index 100% rename from lib/jkqtplotterressources/math_fonts/xits/test-suite/vert.tex rename to lib/jkqtmathtext/resources/xits/test-suite/vert.tex diff --git a/lib/jkqtplotterressources/math_fonts/xits/test-suite/xits-env.tex b/lib/jkqtmathtext/resources/xits/test-suite/xits-env.tex similarity index 100% rename from lib/jkqtplotterressources/math_fonts/xits/test-suite/xits-env.tex rename to lib/jkqtmathtext/resources/xits/test-suite/xits-env.tex diff --git a/lib/jkqtplotterressources/math_fonts/xits/tex/xits-math.lfg b/lib/jkqtmathtext/resources/xits/tex/xits-math.lfg similarity index 100% rename from lib/jkqtplotterressources/math_fonts/xits/tex/xits-math.lfg rename to lib/jkqtmathtext/resources/xits/tex/xits-math.lfg diff --git a/lib/jkqtplotterressources/math_fonts/xits/tools/changelog.py b/lib/jkqtmathtext/resources/xits/tools/changelog.py similarity index 100% rename from lib/jkqtplotterressources/math_fonts/xits/tools/changelog.py rename to lib/jkqtmathtext/resources/xits/tools/changelog.py diff --git a/lib/jkqtplotterressources/math_fonts/xits/tools/copy-math-from-amiri.py b/lib/jkqtmathtext/resources/xits/tools/copy-math-from-amiri.py similarity index 100% rename from lib/jkqtplotterressources/math_fonts/xits/tools/copy-math-from-amiri.py rename to lib/jkqtmathtext/resources/xits/tools/copy-math-from-amiri.py diff --git a/lib/jkqtplotterressources/math_fonts/xits/tools/fontcoverage.py b/lib/jkqtmathtext/resources/xits/tools/fontcoverage.py similarity index 100% rename from lib/jkqtplotterressources/math_fonts/xits/tools/fontcoverage.py rename to lib/jkqtmathtext/resources/xits/tools/fontcoverage.py diff --git a/lib/jkqtplotterressources/math_fonts/xits/tools/makefnt.py b/lib/jkqtmathtext/resources/xits/tools/makefnt.py similarity index 100% rename from lib/jkqtplotterressources/math_fonts/xits/tools/makefnt.py rename to lib/jkqtmathtext/resources/xits/tools/makefnt.py diff --git a/lib/jkqtplotterressources/math_fonts/xits/tools/makeweb.py b/lib/jkqtmathtext/resources/xits/tools/makeweb.py similarity index 100% rename from lib/jkqtplotterressources/math_fonts/xits/tools/makeweb.py rename to lib/jkqtmathtext/resources/xits/tools/makeweb.py diff --git a/lib/jkqtplotter.pri b/lib/jkqtplotter.pri index b1a570af09..cf324c02ea 100644 --- a/lib/jkqtplotter.pri +++ b/lib/jkqtplotter.pri @@ -44,11 +44,11 @@ isEmpty(JKQTP_PLOTTER_PRI_INCLUDED) { $$PWD/jkqtplotter/jkqtpbaseplotterstyle.h \ $$PWD/jkqtplotter/jkqtpcoordinateaxes.h \ $$PWD/jkqtplotter/jkqtpcoordinateaxesstyle.h \ - $$PWD/jkqtplottergui/jkqtpcomboboxes.h \ - $$PWD/jkqtplottergui/jkqtpenhancedspinboxes.h \ - $$PWD/jkqtplottergui/jkqtpenhancedtableview.h \ - $$PWD/jkqtplottergui/jkqtpgraphsmodel.h \ - $$PWD/jkqtplottergui/jkvanishqtoolbar.h \ + $$PWD/jkqtplotter/gui/jkqtpcomboboxes.h \ + $$PWD/jkqtplotter/gui/jkqtpenhancedspinboxes.h \ + $$PWD/jkqtplotter/gui/jkqtpenhancedtableview.h \ + $$PWD/jkqtplotter/gui/jkqtpgraphsmodel.h \ + $$PWD/jkqtplotter/gui/jkvanishqtoolbar.h \ $$PWD/jkqtplotter/jkqtpimagetools.h @@ -88,16 +88,16 @@ isEmpty(JKQTP_PLOTTER_PRI_INCLUDED) { $$PWD/jkqtplotter/jkqtpbaseplotterstyle.cpp \ $$PWD/jkqtplotter/jkqtpcoordinateaxes.cpp \ $$PWD/jkqtplotter/jkqtpcoordinateaxesstyle.cpp \ - $$PWD/jkqtplottergui/jkqtpcomboboxes.cpp \ - $$PWD/jkqtplottergui/jkqtpenhancedspinboxes.cpp \ - $$PWD/jkqtplottergui/jkqtpenhancedtableview.cpp \ - $$PWD/jkqtplottergui/jkqtpgraphsmodel.cpp \ - $$PWD/jkqtplottergui/jkvanishqtoolbar.cpp \ + $$PWD/jkqtplotter/gui/jkqtpcomboboxes.cpp \ + $$PWD/jkqtplotter/gui/jkqtpenhancedspinboxes.cpp \ + $$PWD/jkqtplotter/gui/jkqtpenhancedtableview.cpp \ + $$PWD/jkqtplotter/gui/jkqtpgraphsmodel.cpp \ + $$PWD/jkqtplotter/gui/jkvanishqtoolbar.cpp \ $$PWD/jkqtplotter/jkqtpimagetools.cpp - RESOURCES += $$PWD/jkqtplotterressources/jkqtpbaseplotter.qrc \ - $$PWD/jkqtplotterressources/jkqtpstyles.qrc + RESOURCES += $$PWD/jkqtplotter/resources/jkqtpbaseplotter.qrc \ + $$PWD/jkqtplotter/resources/jkqtpstyles.qrc QT += xml svg opengl diff --git a/lib/jkqtplotter/CMakeLists.txt b/lib/jkqtplotter/CMakeLists.txt new file mode 100644 index 0000000000..174dd80fcc --- /dev/null +++ b/lib/jkqtplotter/CMakeLists.txt @@ -0,0 +1,155 @@ +cmake_minimum_required(VERSION 3.0) + +set(libBasename JKQTPlotter) + +message( STATUS ) +message( STATUS "-----------------------------------------------------------------------------" ) +if(BUILD_SHARED_LIBS) + set(libsh_name ${libBasename}SharedLib) + set(${libsh_name}_LIBRARY ${libsh_name} PARENT_SCOPE) + message( STATUS "-- Building ${libsh_name}" ) +endif(BUILD_SHARED_LIBS) + +if(BUILD_STATIC_LIBS) + set(lib_name ${libBasename}Lib) + set(${lib_name}_LIBRARY ${lib_name} PARENT_SCOPE) + message( STATUS "-- Building ${lib_name}" ) +endif(BUILD_STATIC_LIBS) + +find_package(Qt5 5.0 REQUIRED Core Gui Widgets PrintSupport Svg Xml) + +# Set up source files +set(SRCS + jkqtptools.cpp + jkqtpbaseelements.cpp + jkqtpbaseplotter.cpp + jkqtpdatastorage.cpp + jkqtpelementsoverlay.cpp + jkqtpgraphsscatter.cpp + jkqtpgraphsrange.cpp + jkqtpgraphsspecialline.cpp + jkqtpgraphsbarchart.cpp + jkqtpgraphsbase.cpp + jkqtpgraphsbaseerrors.cpp + jkqtpgraphsbasestylingmixins.cpp + jkqtpgraphsboxplot.cpp + jkqtpgraphsboxplotstylingmixins.cpp + jkqtpgraphsevaluatedfunction.cpp + jkqtpgraphsfilledcurve.cpp + jkqtpgraphsgeometric.cpp + jkqtpgraphsimage.cpp + jkqtpgraphsimpulses.cpp + jkqtpgraphsparsedfunction.cpp + jkqtpgraphspeakstream.cpp + jkqtpgraphssinglecolumnsymbols.cpp + jkqtpgraphsimageoverlays.cpp + jkqtpgraphscontour.cpp + jkqtpgraphsimagergb.cpp + jkqtpgraphsviolinplot.cpp + jkqtpgraphsviolinplotstylingmixins.cpp + jkqtpgraphsstatisticsadaptors.cpp + jkqtplotter.cpp + jkqtplotterstyle.cpp + jkqtpkeystyle.cpp + jkqtpbaseplotterstyle.cpp + jkqtpcoordinateaxes.cpp + jkqtpcoordinateaxesstyle.cpp + gui/jkqtpcomboboxes.cpp + gui/jkqtpenhancedspinboxes.cpp + gui/jkqtpenhancedtableview.cpp + gui/jkqtpgraphsmodel.cpp + gui/jkvanishqtoolbar.cpp + jkqtpimagetools.cpp +) + +set(HEADERS + jkqtptools.h + jkqtpbaseelements.h + jkqtpbaseplotter.h + jkqtpdatastorage.h + jkqtpelementsoverlay.h + jkqtpgraphsscatter.h + jkqtpgraphsrange.h + jkqtpgraphsspecialline.h + jkqtpgraphsbarchart.h + jkqtpgraphsbase.h + jkqtpgraphsbaseerrors.h + jkqtpgraphsbasestylingmixins.h + jkqtpgraphsboxplot.h + jkqtpgraphsboxplotstylingmixins.h + jkqtpgraphsevaluatedfunction.h + jkqtpgraphsfilledcurve.h + jkqtpgraphsgeometric.h + jkqtpgraphsimage.h + jkqtpgraphsimpulses.h + jkqtpgraphsparsedfunction.h + jkqtpgraphspeakstream.h + jkqtpgraphssinglecolumnsymbols.h + jkqtpgraphsimageoverlays.h + jkqtpgraphscontour.h + jkqtpgraphsimagergb.h + jkqtpgraphsviolinplot.h + jkqtpgraphsviolinplotstylingmixins.h + jkqtpgraphsstatisticsadaptors.h + jkqtplotter.h + jkqtplotterstyle.h + jkqtpkeystyle.h + jkqtpbaseplotterstyle.h + jkqtpcoordinateaxes.h + jkqtpcoordinateaxesstyle.h + gui/jkqtpcomboboxes.h + gui/jkqtpenhancedspinboxes.h + gui/jkqtpenhancedtableview.h + gui/jkqtpgraphsmodel.h + gui/jkvanishqtoolbar.h + jkqtpimagetools.h +) + +set(RESOURCES + resources/jkqtpbaseplotter.qrc + resources/jkqtpstyles.qrc +) + + +if(BUILD_SHARED_LIBS) + add_library(${libsh_name} SHARED ${SRCS} ${HEADERS} ${RESOURCES}) + set_property(TARGET ${libsh_name} PROPERTY VERSION "${PROJECT_VERSION}") + target_link_libraries(${libsh_name} Qt5::Core Qt5::Gui Qt5::Widgets Qt5::PrintSupport Qt5::Svg Qt5::Xml JKQTCommonSharedLib JKQTMathTextSharedLib) + target_compile_definitions(${libsh_name} PRIVATE JKQTP_LIB_IN_DLL) + target_compile_definitions(${libsh_name} PRIVATE JKQTP_LIB_EXPORT_LIBRARY) +endif() + +if(BUILD_STATIC_LIBS) + add_library(${lib_name} STATIC ${SRCS} ${HEADERS} ${RESOURCES}) + set_property(TARGET ${lib_name} PROPERTY VERSION "${PROJECT_VERSION}") + target_link_libraries(${lib_name} Qt5::Core Qt5::Gui Qt5::Widgets Qt5::PrintSupport Qt5::Svg Qt5::Xml JKQTCommonLib JKQTMathTextLib) +endif() + + + +# Installation +if(LIB_INSTALL) + + if(BUILD_SHARED_LIBS) + install(TARGETS ${libsh_name} EXPORT ${libsh_name}_TARGETS + RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} + ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} + LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} + INCLUDES DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/jkqtplotter + ) + endif(BUILD_SHARED_LIBS) + + if(BUILD_STATIC_LIBS) + install(TARGETS ${lib_name} EXPORT ${lib_name}_TARGETS + RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} + ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} + LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} + INCLUDES DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/jkqtplotter + ) + endif(BUILD_STATIC_LIBS) + + install(FILES ${HEADERS} + DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/jkqtplotter + COMPONENT Headers) + +endif(LIB_INSTALL) diff --git a/lib/jkqtplottergui/jkqtpcomboboxes.cpp b/lib/jkqtplotter/gui/jkqtpcomboboxes.cpp similarity index 97% rename from lib/jkqtplottergui/jkqtpcomboboxes.cpp rename to lib/jkqtplotter/gui/jkqtpcomboboxes.cpp index e0c77cb387..5c7f6b82b7 100644 --- a/lib/jkqtplottergui/jkqtpcomboboxes.cpp +++ b/lib/jkqtplotter/gui/jkqtpcomboboxes.cpp @@ -19,7 +19,7 @@ -#include "jkqtplottergui/jkqtpcomboboxes.h" +#include "jkqtplotter/gui/jkqtpcomboboxes.h" #include "jkqtplotter/jkqtpbaseplotter.h" #include "jkqtplotter/jkqtptools.h" #include diff --git a/lib/jkqtplottergui/jkqtpcomboboxes.h b/lib/jkqtplotter/gui/jkqtpcomboboxes.h similarity index 100% rename from lib/jkqtplottergui/jkqtpcomboboxes.h rename to lib/jkqtplotter/gui/jkqtpcomboboxes.h diff --git a/lib/jkqtplottergui/jkqtpenhancedspinboxes.cpp b/lib/jkqtplotter/gui/jkqtpenhancedspinboxes.cpp similarity index 93% rename from lib/jkqtplottergui/jkqtpenhancedspinboxes.cpp rename to lib/jkqtplotter/gui/jkqtpenhancedspinboxes.cpp index c4ff9f30d4..06162e7876 100644 --- a/lib/jkqtplottergui/jkqtpenhancedspinboxes.cpp +++ b/lib/jkqtplotter/gui/jkqtpenhancedspinboxes.cpp @@ -21,7 +21,7 @@ Copyright (c) 2008-2019 Jan W. Krieger () -#include "jkqtplottergui/jkqtpenhancedspinboxes.h" +#include "jkqtplotter/gui/jkqtpenhancedspinboxes.h" diff --git a/lib/jkqtplottergui/jkqtpenhancedspinboxes.h b/lib/jkqtplotter/gui/jkqtpenhancedspinboxes.h similarity index 100% rename from lib/jkqtplottergui/jkqtpenhancedspinboxes.h rename to lib/jkqtplotter/gui/jkqtpenhancedspinboxes.h diff --git a/lib/jkqtplottergui/jkqtpenhancedtableview.cpp b/lib/jkqtplotter/gui/jkqtpenhancedtableview.cpp similarity index 97% rename from lib/jkqtplottergui/jkqtpenhancedtableview.cpp rename to lib/jkqtplotter/gui/jkqtpenhancedtableview.cpp index f701f45535..ec1d28cceb 100644 --- a/lib/jkqtplottergui/jkqtpenhancedtableview.cpp +++ b/lib/jkqtplotter/gui/jkqtpenhancedtableview.cpp @@ -22,7 +22,7 @@ Copyright (c) 2008-2019 Jan W. Krieger () -#include "jkqtplottergui/jkqtpenhancedtableview.h" +#include "jkqtplotter/gui/jkqtpenhancedtableview.h" #include #include #include diff --git a/lib/jkqtplottergui/jkqtpenhancedtableview.h b/lib/jkqtplotter/gui/jkqtpenhancedtableview.h similarity index 100% rename from lib/jkqtplottergui/jkqtpenhancedtableview.h rename to lib/jkqtplotter/gui/jkqtpenhancedtableview.h diff --git a/lib/jkqtplottergui/jkqtpgraphsmodel.cpp b/lib/jkqtplotter/gui/jkqtpgraphsmodel.cpp similarity index 95% rename from lib/jkqtplottergui/jkqtpgraphsmodel.cpp rename to lib/jkqtplotter/gui/jkqtpgraphsmodel.cpp index db13ce9712..62ab791652 100644 --- a/lib/jkqtplottergui/jkqtpgraphsmodel.cpp +++ b/lib/jkqtplotter/gui/jkqtpgraphsmodel.cpp @@ -19,7 +19,7 @@ -#include "jkqtplottergui/jkqtpgraphsmodel.h" +#include "jkqtplotter/gui/jkqtpgraphsmodel.h" #include "jkqtplotter/jkqtpbaseplotter.h" #include "jkqtplotter/jkqtptools.h" #include "jkqtplotter/jkqtpgraphsscatter.h" diff --git a/lib/jkqtplottergui/jkqtpgraphsmodel.h b/lib/jkqtplotter/gui/jkqtpgraphsmodel.h similarity index 100% rename from lib/jkqtplottergui/jkqtpgraphsmodel.h rename to lib/jkqtplotter/gui/jkqtpgraphsmodel.h diff --git a/lib/jkqtplottergui/jkvanishqtoolbar.cpp b/lib/jkqtplotter/gui/jkvanishqtoolbar.cpp similarity index 93% rename from lib/jkqtplottergui/jkvanishqtoolbar.cpp rename to lib/jkqtplotter/gui/jkvanishqtoolbar.cpp index a5cb88dac7..8584afc9b3 100644 --- a/lib/jkqtplottergui/jkvanishqtoolbar.cpp +++ b/lib/jkqtplotter/gui/jkvanishqtoolbar.cpp @@ -19,7 +19,7 @@ -#include "jkqtplottergui/jkvanishqtoolbar.h" +#include "jkqtplotter/gui/jkvanishqtoolbar.h" JKVanishQToolBar::JKVanishQToolBar(const QString &title, QWidget *parent): QToolBar(title, parent) { toolbarVanishes=true; diff --git a/lib/jkqtplottergui/jkvanishqtoolbar.h b/lib/jkqtplotter/gui/jkvanishqtoolbar.h similarity index 100% rename from lib/jkqtplottergui/jkvanishqtoolbar.h rename to lib/jkqtplotter/gui/jkvanishqtoolbar.h diff --git a/lib/jkqtplotter/jkqtpbaseplotter.cpp b/lib/jkqtplotter/jkqtpbaseplotter.cpp index 2270badd33..7ff7341866 100644 --- a/lib/jkqtplotter/jkqtpbaseplotter.cpp +++ b/lib/jkqtplotter/jkqtpbaseplotter.cpp @@ -31,8 +31,8 @@ #include #include #include "jkqtplotter/jkqtpbaseplotter.h" -#include "jkqtplottergui/jkqtpgraphsmodel.h" -#include "jkqtplottergui/jkqtpenhancedtableview.h" +#include "jkqtplotter/gui/jkqtpgraphsmodel.h" +#include "jkqtplotter/gui/jkqtpenhancedtableview.h" #include #include #include diff --git a/lib/jkqtplotter/jkqtpbaseplotter.h b/lib/jkqtplotter/jkqtpbaseplotter.h index 49b13d7fef..913d626510 100644 --- a/lib/jkqtplotter/jkqtpbaseplotter.h +++ b/lib/jkqtplotter/jkqtpbaseplotter.h @@ -24,7 +24,7 @@ #include "jkqtplotter/jkqtpbaseelements.h" #include "jkqtplotter/jkqtpelementsoverlay.h" #include "jkqtcommon/jkqtpenhancedpainter.h" -#include "jkqtplottergui/jkqtpenhancedspinboxes.h" +#include "jkqtplotter/gui/jkqtpenhancedspinboxes.h" #include #include diff --git a/lib/jkqtplotter/jkqtplotter.h b/lib/jkqtplotter/jkqtplotter.h index 2f3f9086b6..39a2e4a831 100644 --- a/lib/jkqtplotter/jkqtplotter.h +++ b/lib/jkqtplotter/jkqtplotter.h @@ -43,7 +43,7 @@ #include "jkqtplotter/jkqtpbaseplotterstyle.h" #include "jkqtplotter/jkqtptools.h" #include "jkqtcommon/jkqtp_imexport.h" -#include "jkqtplottergui/jkvanishqtoolbar.h" +#include "jkqtplotter/gui/jkvanishqtoolbar.h" #include #ifndef JKQTPLOTTER_H diff --git a/lib/jkqtplotterressources/images/copy16.png b/lib/jkqtplotter/resources/images/copy16.png similarity index 100% rename from lib/jkqtplotterressources/images/copy16.png rename to lib/jkqtplotter/resources/images/copy16.png diff --git a/lib/jkqtplotterressources/images/copy16.svgz b/lib/jkqtplotter/resources/images/copy16.svgz similarity index 100% rename from lib/jkqtplotterressources/images/copy16.svgz rename to lib/jkqtplotter/resources/images/copy16.svgz diff --git a/lib/jkqtplotterressources/images/copy16_nohead.png b/lib/jkqtplotter/resources/images/copy16_nohead.png similarity index 100% rename from lib/jkqtplotterressources/images/copy16_nohead.png rename to lib/jkqtplotter/resources/images/copy16_nohead.png diff --git a/lib/jkqtplotterressources/images/copy16_nohead.svg b/lib/jkqtplotter/resources/images/copy16_nohead.svg similarity index 100% rename from lib/jkqtplotterressources/images/copy16_nohead.svg rename to lib/jkqtplotter/resources/images/copy16_nohead.svg diff --git a/lib/jkqtplotterressources/images/cursor_circle.png b/lib/jkqtplotter/resources/images/cursor_circle.png similarity index 100% rename from lib/jkqtplotterressources/images/cursor_circle.png rename to lib/jkqtplotter/resources/images/cursor_circle.png diff --git a/lib/jkqtplotterressources/images/cursor_circle_mask.png b/lib/jkqtplotter/resources/images/cursor_circle_mask.png similarity index 100% rename from lib/jkqtplotterressources/images/cursor_circle_mask.png rename to lib/jkqtplotter/resources/images/cursor_circle_mask.png diff --git a/lib/jkqtplotterressources/images/cursor_ellipse.png b/lib/jkqtplotter/resources/images/cursor_ellipse.png similarity index 100% rename from lib/jkqtplotterressources/images/cursor_ellipse.png rename to lib/jkqtplotter/resources/images/cursor_ellipse.png diff --git a/lib/jkqtplotterressources/images/cursor_ellipse_mask.png b/lib/jkqtplotter/resources/images/cursor_ellipse_mask.png similarity index 100% rename from lib/jkqtplotterressources/images/cursor_ellipse_mask.png rename to lib/jkqtplotter/resources/images/cursor_ellipse_mask.png diff --git a/lib/jkqtplotterressources/images/cursor_line.png b/lib/jkqtplotter/resources/images/cursor_line.png similarity index 100% rename from lib/jkqtplotterressources/images/cursor_line.png rename to lib/jkqtplotter/resources/images/cursor_line.png diff --git a/lib/jkqtplotterressources/images/cursor_line_mask.png b/lib/jkqtplotter/resources/images/cursor_line_mask.png similarity index 100% rename from lib/jkqtplotterressources/images/cursor_line_mask.png rename to lib/jkqtplotter/resources/images/cursor_line_mask.png diff --git a/lib/jkqtplotterressources/images/cursor_rectangle.png b/lib/jkqtplotter/resources/images/cursor_rectangle.png similarity index 100% rename from lib/jkqtplotterressources/images/cursor_rectangle.png rename to lib/jkqtplotter/resources/images/cursor_rectangle.png diff --git a/lib/jkqtplotterressources/images/cursor_rectangle_mask.png b/lib/jkqtplotter/resources/images/cursor_rectangle_mask.png similarity index 100% rename from lib/jkqtplotterressources/images/cursor_rectangle_mask.png rename to lib/jkqtplotter/resources/images/cursor_rectangle_mask.png diff --git a/lib/jkqtplotterressources/images/cursor_scribble.png b/lib/jkqtplotter/resources/images/cursor_scribble.png similarity index 100% rename from lib/jkqtplotterressources/images/cursor_scribble.png rename to lib/jkqtplotter/resources/images/cursor_scribble.png diff --git a/lib/jkqtplotterressources/images/cursor_scribble_mask.png b/lib/jkqtplotter/resources/images/cursor_scribble_mask.png similarity index 100% rename from lib/jkqtplotterressources/images/cursor_scribble_mask.png rename to lib/jkqtplotter/resources/images/cursor_scribble_mask.png diff --git a/lib/jkqtplotterressources/images/cursor_zoom.png b/lib/jkqtplotter/resources/images/cursor_zoom.png similarity index 100% rename from lib/jkqtplotterressources/images/cursor_zoom.png rename to lib/jkqtplotter/resources/images/cursor_zoom.png diff --git a/lib/jkqtplotterressources/images/cursor_zoom_mask.png b/lib/jkqtplotter/resources/images/cursor_zoom_mask.png similarity index 100% rename from lib/jkqtplotterressources/images/cursor_zoom_mask.png rename to lib/jkqtplotter/resources/images/cursor_zoom_mask.png diff --git a/lib/jkqtplotterressources/images/exit.png b/lib/jkqtplotter/resources/images/exit.png similarity index 100% rename from lib/jkqtplotterressources/images/exit.png rename to lib/jkqtplotter/resources/images/exit.png diff --git a/lib/jkqtplotterressources/images/jkqtp_16_copydata.png b/lib/jkqtplotter/resources/images/jkqtp_16_copydata.png similarity index 100% rename from lib/jkqtplotterressources/images/jkqtp_16_copydata.png rename to lib/jkqtplotter/resources/images/jkqtp_16_copydata.png diff --git a/lib/jkqtplotterressources/images/jkqtp_16_copyimg.png b/lib/jkqtplotter/resources/images/jkqtp_16_copyimg.png similarity index 100% rename from lib/jkqtplotterressources/images/jkqtp_16_copyimg.png rename to lib/jkqtplotter/resources/images/jkqtp_16_copyimg.png diff --git a/lib/jkqtplotterressources/images/jkqtp_16_copymatlab.png b/lib/jkqtplotter/resources/images/jkqtp_16_copymatlab.png similarity index 100% rename from lib/jkqtplotterressources/images/jkqtp_16_copymatlab.png rename to lib/jkqtplotter/resources/images/jkqtp_16_copymatlab.png diff --git a/lib/jkqtplotterressources/images/jkqtp_16_filesave.png b/lib/jkqtplotter/resources/images/jkqtp_16_filesave.png similarity index 100% rename from lib/jkqtplotterressources/images/jkqtp_16_filesave.png rename to lib/jkqtplotter/resources/images/jkqtp_16_filesave.png diff --git a/lib/jkqtplotterressources/images/jkqtp_16_savepdf.png b/lib/jkqtplotter/resources/images/jkqtp_16_savepdf.png similarity index 100% rename from lib/jkqtplotterressources/images/jkqtp_16_savepdf.png rename to lib/jkqtplotter/resources/images/jkqtp_16_savepdf.png diff --git a/lib/jkqtplotterressources/images/jkqtp_16_savepix.png b/lib/jkqtplotter/resources/images/jkqtp_16_savepix.png similarity index 100% rename from lib/jkqtplotterressources/images/jkqtp_16_savepix.png rename to lib/jkqtplotter/resources/images/jkqtp_16_savepix.png diff --git a/lib/jkqtplotterressources/images/jkqtp_16_saveps.png b/lib/jkqtplotter/resources/images/jkqtp_16_saveps.png similarity index 100% rename from lib/jkqtplotterressources/images/jkqtp_16_saveps.png rename to lib/jkqtplotter/resources/images/jkqtp_16_saveps.png diff --git a/lib/jkqtplotterressources/images/jkqtp_16_savesvg.png b/lib/jkqtplotter/resources/images/jkqtp_16_savesvg.png similarity index 100% rename from lib/jkqtplotterressources/images/jkqtp_16_savesvg.png rename to lib/jkqtplotter/resources/images/jkqtp_16_savesvg.png diff --git a/lib/jkqtplotterressources/images/jkqtp_24_print.png b/lib/jkqtplotter/resources/images/jkqtp_24_print.png similarity index 100% rename from lib/jkqtplotterressources/images/jkqtp_24_print.png rename to lib/jkqtplotter/resources/images/jkqtp_24_print.png diff --git a/lib/jkqtplotterressources/images/jkqtp_24_zoomall.png b/lib/jkqtplotter/resources/images/jkqtp_24_zoomall.png similarity index 100% rename from lib/jkqtplotterressources/images/jkqtp_24_zoomall.png rename to lib/jkqtplotter/resources/images/jkqtp_24_zoomall.png diff --git a/lib/jkqtplotterressources/images/jkqtp_24_zoomin.png b/lib/jkqtplotter/resources/images/jkqtp_24_zoomin.png similarity index 100% rename from lib/jkqtplotterressources/images/jkqtp_24_zoomin.png rename to lib/jkqtplotter/resources/images/jkqtp_24_zoomin.png diff --git a/lib/jkqtplotterressources/images/jkqtp_24_zoomout.png b/lib/jkqtplotter/resources/images/jkqtp_24_zoomout.png similarity index 100% rename from lib/jkqtplotterressources/images/jkqtp_24_zoomout.png rename to lib/jkqtplotter/resources/images/jkqtp_24_zoomout.png diff --git a/lib/jkqtplotterressources/images/jkqtp_axis_complete.png b/lib/jkqtplotter/resources/images/jkqtp_axis_complete.png similarity index 100% rename from lib/jkqtplotterressources/images/jkqtp_axis_complete.png rename to lib/jkqtplotter/resources/images/jkqtp_axis_complete.png diff --git a/lib/jkqtplotterressources/images/jkqtp_axis_complete.svg b/lib/jkqtplotter/resources/images/jkqtp_axis_complete.svg similarity index 100% rename from lib/jkqtplotterressources/images/jkqtp_axis_complete.svg rename to lib/jkqtplotter/resources/images/jkqtp_axis_complete.svg diff --git a/lib/jkqtplotterressources/images/jkqtp_axis_line.png b/lib/jkqtplotter/resources/images/jkqtp_axis_line.png similarity index 100% rename from lib/jkqtplotterressources/images/jkqtp_axis_line.png rename to lib/jkqtplotter/resources/images/jkqtp_axis_line.png diff --git a/lib/jkqtplotterressources/images/jkqtp_axis_line.svg b/lib/jkqtplotter/resources/images/jkqtp_axis_line.svg similarity index 100% rename from lib/jkqtplotterressources/images/jkqtp_axis_line.svg rename to lib/jkqtplotter/resources/images/jkqtp_axis_line.svg diff --git a/lib/jkqtplotterressources/images/jkqtp_axis_none.png b/lib/jkqtplotter/resources/images/jkqtp_axis_none.png similarity index 100% rename from lib/jkqtplotterressources/images/jkqtp_axis_none.png rename to lib/jkqtplotter/resources/images/jkqtp_axis_none.png diff --git a/lib/jkqtplotterressources/images/jkqtp_axis_none.svg b/lib/jkqtplotter/resources/images/jkqtp_axis_none.svg similarity index 100% rename from lib/jkqtplotterressources/images/jkqtp_axis_none.svg rename to lib/jkqtplotter/resources/images/jkqtp_axis_none.svg diff --git a/lib/jkqtplotterressources/images/jkqtp_axis_ticks.png b/lib/jkqtplotter/resources/images/jkqtp_axis_ticks.png similarity index 100% rename from lib/jkqtplotterressources/images/jkqtp_axis_ticks.png rename to lib/jkqtplotter/resources/images/jkqtp_axis_ticks.png diff --git a/lib/jkqtplotterressources/images/jkqtp_axis_ticks.svg b/lib/jkqtplotter/resources/images/jkqtp_axis_ticks.svg similarity index 100% rename from lib/jkqtplotterressources/images/jkqtp_axis_ticks.svg rename to lib/jkqtplotter/resources/images/jkqtp_axis_ticks.svg diff --git a/lib/jkqtplotterressources/images/jkqtp_axis_ticksandlabels.png b/lib/jkqtplotter/resources/images/jkqtp_axis_ticksandlabels.png similarity index 100% rename from lib/jkqtplotterressources/images/jkqtp_axis_ticksandlabels.png rename to lib/jkqtplotter/resources/images/jkqtp_axis_ticksandlabels.png diff --git a/lib/jkqtplotterressources/images/jkqtp_axis_ticksandlabels.svg b/lib/jkqtplotter/resources/images/jkqtp_axis_ticksandlabels.svg similarity index 100% rename from lib/jkqtplotterressources/images/jkqtp_axis_ticksandlabels.svg rename to lib/jkqtplotter/resources/images/jkqtp_axis_ticksandlabels.svg diff --git a/lib/jkqtplotterressources/images/jkqtp_copydata.png b/lib/jkqtplotter/resources/images/jkqtp_copydata.png similarity index 100% rename from lib/jkqtplotterressources/images/jkqtp_copydata.png rename to lib/jkqtplotter/resources/images/jkqtp_copydata.png diff --git a/lib/jkqtplotterressources/images/jkqtp_copyimg.png b/lib/jkqtplotter/resources/images/jkqtp_copyimg.png similarity index 100% rename from lib/jkqtplotterressources/images/jkqtp_copyimg.png rename to lib/jkqtplotter/resources/images/jkqtp_copyimg.png diff --git a/lib/jkqtplotterressources/images/jkqtp_copyimg.svg b/lib/jkqtplotter/resources/images/jkqtp_copyimg.svg similarity index 100% rename from lib/jkqtplotterressources/images/jkqtp_copyimg.svg rename to lib/jkqtplotter/resources/images/jkqtp_copyimg.svg diff --git a/lib/jkqtplotterressources/images/jkqtp_copymatlab.png b/lib/jkqtplotter/resources/images/jkqtp_copymatlab.png similarity index 100% rename from lib/jkqtplotterressources/images/jkqtp_copymatlab.png rename to lib/jkqtplotter/resources/images/jkqtp_copymatlab.png diff --git a/lib/jkqtplotterressources/images/jkqtp_copymatlab.svgz b/lib/jkqtplotter/resources/images/jkqtp_copymatlab.svgz similarity index 100% rename from lib/jkqtplotterressources/images/jkqtp_copymatlab.svgz rename to lib/jkqtplotter/resources/images/jkqtp_copymatlab.svgz diff --git a/lib/jkqtplotterressources/images/jkqtp_datacopy.svgz b/lib/jkqtplotter/resources/images/jkqtp_datacopy.svgz similarity index 100% rename from lib/jkqtplotterressources/images/jkqtp_datacopy.svgz rename to lib/jkqtplotter/resources/images/jkqtp_datacopy.svgz diff --git a/lib/jkqtplotterressources/images/jkqtp_ebars.png b/lib/jkqtplotter/resources/images/jkqtp_ebars.png similarity index 100% rename from lib/jkqtplotterressources/images/jkqtp_ebars.png rename to lib/jkqtplotter/resources/images/jkqtp_ebars.png diff --git a/lib/jkqtplotterressources/images/jkqtp_ebars.svg b/lib/jkqtplotter/resources/images/jkqtp_ebars.svg similarity index 100% rename from lib/jkqtplotterressources/images/jkqtp_ebars.svg rename to lib/jkqtplotter/resources/images/jkqtp_ebars.svg diff --git a/lib/jkqtplotterressources/images/jkqtp_eboxes.png b/lib/jkqtplotter/resources/images/jkqtp_eboxes.png similarity index 100% rename from lib/jkqtplotterressources/images/jkqtp_eboxes.png rename to lib/jkqtplotter/resources/images/jkqtp_eboxes.png diff --git a/lib/jkqtplotterressources/images/jkqtp_eboxes.svg b/lib/jkqtplotter/resources/images/jkqtp_eboxes.svg similarity index 100% rename from lib/jkqtplotterressources/images/jkqtp_eboxes.svg rename to lib/jkqtplotter/resources/images/jkqtp_eboxes.svg diff --git a/lib/jkqtplotterressources/images/jkqtp_eellipses.png b/lib/jkqtplotter/resources/images/jkqtp_eellipses.png similarity index 100% rename from lib/jkqtplotterressources/images/jkqtp_eellipses.png rename to lib/jkqtplotter/resources/images/jkqtp_eellipses.png diff --git a/lib/jkqtplotterressources/images/jkqtp_eellipses.svg b/lib/jkqtplotter/resources/images/jkqtp_eellipses.svg similarity index 100% rename from lib/jkqtplotterressources/images/jkqtp_eellipses.svg rename to lib/jkqtplotter/resources/images/jkqtp_eellipses.svg diff --git a/lib/jkqtplotterressources/images/jkqtp_elines.png b/lib/jkqtplotter/resources/images/jkqtp_elines.png similarity index 100% rename from lib/jkqtplotterressources/images/jkqtp_elines.png rename to lib/jkqtplotter/resources/images/jkqtp_elines.png diff --git a/lib/jkqtplotterressources/images/jkqtp_elines.svg b/lib/jkqtplotter/resources/images/jkqtp_elines.svg similarity index 100% rename from lib/jkqtplotterressources/images/jkqtp_elines.svg rename to lib/jkqtplotter/resources/images/jkqtp_elines.svg diff --git a/lib/jkqtplotterressources/images/jkqtp_elinesbars.png b/lib/jkqtplotter/resources/images/jkqtp_elinesbars.png similarity index 100% rename from lib/jkqtplotterressources/images/jkqtp_elinesbars.png rename to lib/jkqtplotter/resources/images/jkqtp_elinesbars.png diff --git a/lib/jkqtplotterressources/images/jkqtp_elinesbars.svg b/lib/jkqtplotter/resources/images/jkqtp_elinesbars.svg similarity index 100% rename from lib/jkqtplotterressources/images/jkqtp_elinesbars.svg rename to lib/jkqtplotter/resources/images/jkqtp_elinesbars.svg diff --git a/lib/jkqtplotterressources/images/jkqtp_elinessbars.png b/lib/jkqtplotter/resources/images/jkqtp_elinessbars.png similarity index 100% rename from lib/jkqtplotterressources/images/jkqtp_elinessbars.png rename to lib/jkqtplotter/resources/images/jkqtp_elinessbars.png diff --git a/lib/jkqtplotterressources/images/jkqtp_elinessbars.svg b/lib/jkqtplotter/resources/images/jkqtp_elinessbars.svg similarity index 100% rename from lib/jkqtplotterressources/images/jkqtp_elinessbars.svg rename to lib/jkqtplotter/resources/images/jkqtp_elinessbars.svg diff --git a/lib/jkqtplotterressources/images/jkqtp_enone.png b/lib/jkqtplotter/resources/images/jkqtp_enone.png similarity index 100% rename from lib/jkqtplotterressources/images/jkqtp_enone.png rename to lib/jkqtplotter/resources/images/jkqtp_enone.png diff --git a/lib/jkqtplotterressources/images/jkqtp_enone.svg b/lib/jkqtplotter/resources/images/jkqtp_enone.svg similarity index 100% rename from lib/jkqtplotterressources/images/jkqtp_enone.svg rename to lib/jkqtplotter/resources/images/jkqtp_enone.svg diff --git a/lib/jkqtplotterressources/images/jkqtp_epoly.png b/lib/jkqtplotter/resources/images/jkqtp_epoly.png similarity index 100% rename from lib/jkqtplotterressources/images/jkqtp_epoly.png rename to lib/jkqtplotter/resources/images/jkqtp_epoly.png diff --git a/lib/jkqtplotterressources/images/jkqtp_epoly.svg b/lib/jkqtplotter/resources/images/jkqtp_epoly.svg similarity index 100% rename from lib/jkqtplotterressources/images/jkqtp_epoly.svg rename to lib/jkqtplotter/resources/images/jkqtp_epoly.svg diff --git a/lib/jkqtplotterressources/images/jkqtp_epolybars.png b/lib/jkqtplotter/resources/images/jkqtp_epolybars.png similarity index 100% rename from lib/jkqtplotterressources/images/jkqtp_epolybars.png rename to lib/jkqtplotter/resources/images/jkqtp_epolybars.png diff --git a/lib/jkqtplotterressources/images/jkqtp_epolybars.svg b/lib/jkqtplotter/resources/images/jkqtp_epolybars.svg similarity index 100% rename from lib/jkqtplotterressources/images/jkqtp_epolybars.svg rename to lib/jkqtplotter/resources/images/jkqtp_epolybars.svg diff --git a/lib/jkqtplotterressources/images/jkqtp_epolysbars.png b/lib/jkqtplotter/resources/images/jkqtp_epolysbars.png similarity index 100% rename from lib/jkqtplotterressources/images/jkqtp_epolysbars.png rename to lib/jkqtplotter/resources/images/jkqtp_epolysbars.png diff --git a/lib/jkqtplotterressources/images/jkqtp_epolysbars.svg b/lib/jkqtplotter/resources/images/jkqtp_epolysbars.svg similarity index 100% rename from lib/jkqtplotterressources/images/jkqtp_epolysbars.svg rename to lib/jkqtplotter/resources/images/jkqtp_epolysbars.svg diff --git a/lib/jkqtplotterressources/images/jkqtp_esbars.png b/lib/jkqtplotter/resources/images/jkqtp_esbars.png similarity index 100% rename from lib/jkqtplotterressources/images/jkqtp_esbars.png rename to lib/jkqtplotter/resources/images/jkqtp_esbars.png diff --git a/lib/jkqtplotterressources/images/jkqtp_esbars.svg b/lib/jkqtplotter/resources/images/jkqtp_esbars.svg similarity index 100% rename from lib/jkqtplotterressources/images/jkqtp_esbars.svg rename to lib/jkqtplotter/resources/images/jkqtp_esbars.svg diff --git a/lib/jkqtplotterressources/images/jkqtp_key_ibl.png b/lib/jkqtplotter/resources/images/jkqtp_key_ibl.png similarity index 100% rename from lib/jkqtplotterressources/images/jkqtp_key_ibl.png rename to lib/jkqtplotter/resources/images/jkqtp_key_ibl.png diff --git a/lib/jkqtplotterressources/images/jkqtp_key_ibl.svg b/lib/jkqtplotter/resources/images/jkqtp_key_ibl.svg similarity index 100% rename from lib/jkqtplotterressources/images/jkqtp_key_ibl.svg rename to lib/jkqtplotter/resources/images/jkqtp_key_ibl.svg diff --git a/lib/jkqtplotterressources/images/jkqtp_key_ibr.png b/lib/jkqtplotter/resources/images/jkqtp_key_ibr.png similarity index 100% rename from lib/jkqtplotterressources/images/jkqtp_key_ibr.png rename to lib/jkqtplotter/resources/images/jkqtp_key_ibr.png diff --git a/lib/jkqtplotterressources/images/jkqtp_key_ibr.svg b/lib/jkqtplotter/resources/images/jkqtp_key_ibr.svg similarity index 100% rename from lib/jkqtplotterressources/images/jkqtp_key_ibr.svg rename to lib/jkqtplotter/resources/images/jkqtp_key_ibr.svg diff --git a/lib/jkqtplotterressources/images/jkqtp_key_itl.png b/lib/jkqtplotter/resources/images/jkqtp_key_itl.png similarity index 100% rename from lib/jkqtplotterressources/images/jkqtp_key_itl.png rename to lib/jkqtplotter/resources/images/jkqtp_key_itl.png diff --git a/lib/jkqtplotterressources/images/jkqtp_key_itl.svg b/lib/jkqtplotter/resources/images/jkqtp_key_itl.svg similarity index 100% rename from lib/jkqtplotterressources/images/jkqtp_key_itl.svg rename to lib/jkqtplotter/resources/images/jkqtp_key_itl.svg diff --git a/lib/jkqtplotterressources/images/jkqtp_key_itr.png b/lib/jkqtplotter/resources/images/jkqtp_key_itr.png similarity index 100% rename from lib/jkqtplotterressources/images/jkqtp_key_itr.png rename to lib/jkqtplotter/resources/images/jkqtp_key_itr.png diff --git a/lib/jkqtplotterressources/images/jkqtp_key_itr.svg b/lib/jkqtplotter/resources/images/jkqtp_key_itr.svg similarity index 100% rename from lib/jkqtplotterressources/images/jkqtp_key_itr.svg rename to lib/jkqtplotter/resources/images/jkqtp_key_itr.svg diff --git a/lib/jkqtplotterressources/images/jkqtp_key_obl.png b/lib/jkqtplotter/resources/images/jkqtp_key_obl.png similarity index 100% rename from lib/jkqtplotterressources/images/jkqtp_key_obl.png rename to lib/jkqtplotter/resources/images/jkqtp_key_obl.png diff --git a/lib/jkqtplotterressources/images/jkqtp_key_obl.svg b/lib/jkqtplotter/resources/images/jkqtp_key_obl.svg similarity index 100% rename from lib/jkqtplotterressources/images/jkqtp_key_obl.svg rename to lib/jkqtplotter/resources/images/jkqtp_key_obl.svg diff --git a/lib/jkqtplotterressources/images/jkqtp_key_obr.png b/lib/jkqtplotter/resources/images/jkqtp_key_obr.png similarity index 100% rename from lib/jkqtplotterressources/images/jkqtp_key_obr.png rename to lib/jkqtplotter/resources/images/jkqtp_key_obr.png diff --git a/lib/jkqtplotterressources/images/jkqtp_key_obr.svg b/lib/jkqtplotter/resources/images/jkqtp_key_obr.svg similarity index 100% rename from lib/jkqtplotterressources/images/jkqtp_key_obr.svg rename to lib/jkqtplotter/resources/images/jkqtp_key_obr.svg diff --git a/lib/jkqtplotterressources/images/jkqtp_key_olb.png b/lib/jkqtplotter/resources/images/jkqtp_key_olb.png similarity index 100% rename from lib/jkqtplotterressources/images/jkqtp_key_olb.png rename to lib/jkqtplotter/resources/images/jkqtp_key_olb.png diff --git a/lib/jkqtplotterressources/images/jkqtp_key_olb.svg b/lib/jkqtplotter/resources/images/jkqtp_key_olb.svg similarity index 100% rename from lib/jkqtplotterressources/images/jkqtp_key_olb.svg rename to lib/jkqtplotter/resources/images/jkqtp_key_olb.svg diff --git a/lib/jkqtplotterressources/images/jkqtp_key_olt.png b/lib/jkqtplotter/resources/images/jkqtp_key_olt.png similarity index 100% rename from lib/jkqtplotterressources/images/jkqtp_key_olt.png rename to lib/jkqtplotter/resources/images/jkqtp_key_olt.png diff --git a/lib/jkqtplotterressources/images/jkqtp_key_olt.svg b/lib/jkqtplotter/resources/images/jkqtp_key_olt.svg similarity index 100% rename from lib/jkqtplotterressources/images/jkqtp_key_olt.svg rename to lib/jkqtplotter/resources/images/jkqtp_key_olt.svg diff --git a/lib/jkqtplotterressources/images/jkqtp_key_orb.png b/lib/jkqtplotter/resources/images/jkqtp_key_orb.png similarity index 100% rename from lib/jkqtplotterressources/images/jkqtp_key_orb.png rename to lib/jkqtplotter/resources/images/jkqtp_key_orb.png diff --git a/lib/jkqtplotterressources/images/jkqtp_key_orb.svg b/lib/jkqtplotter/resources/images/jkqtp_key_orb.svg similarity index 100% rename from lib/jkqtplotterressources/images/jkqtp_key_orb.svg rename to lib/jkqtplotter/resources/images/jkqtp_key_orb.svg diff --git a/lib/jkqtplotterressources/images/jkqtp_key_ort.png b/lib/jkqtplotter/resources/images/jkqtp_key_ort.png similarity index 100% rename from lib/jkqtplotterressources/images/jkqtp_key_ort.png rename to lib/jkqtplotter/resources/images/jkqtp_key_ort.png diff --git a/lib/jkqtplotterressources/images/jkqtp_key_ort.svg b/lib/jkqtplotter/resources/images/jkqtp_key_ort.svg similarity index 100% rename from lib/jkqtplotterressources/images/jkqtp_key_ort.svg rename to lib/jkqtplotter/resources/images/jkqtp_key_ort.svg diff --git a/lib/jkqtplotterressources/images/jkqtp_key_otl.png b/lib/jkqtplotter/resources/images/jkqtp_key_otl.png similarity index 100% rename from lib/jkqtplotterressources/images/jkqtp_key_otl.png rename to lib/jkqtplotter/resources/images/jkqtp_key_otl.png diff --git a/lib/jkqtplotterressources/images/jkqtp_key_otl.svg b/lib/jkqtplotter/resources/images/jkqtp_key_otl.svg similarity index 100% rename from lib/jkqtplotterressources/images/jkqtp_key_otl.svg rename to lib/jkqtplotter/resources/images/jkqtp_key_otl.svg diff --git a/lib/jkqtplotterressources/images/jkqtp_key_otr.png b/lib/jkqtplotter/resources/images/jkqtp_key_otr.png similarity index 100% rename from lib/jkqtplotterressources/images/jkqtp_key_otr.png rename to lib/jkqtplotter/resources/images/jkqtp_key_otr.png diff --git a/lib/jkqtplotterressources/images/jkqtp_key_otr.svg b/lib/jkqtplotter/resources/images/jkqtp_key_otr.svg similarity index 100% rename from lib/jkqtplotterressources/images/jkqtp_key_otr.svg rename to lib/jkqtplotter/resources/images/jkqtp_key_otr.svg diff --git a/lib/jkqtplotterressources/images/jkqtp_mouseact_default.png b/lib/jkqtplotter/resources/images/jkqtp_mouseact_default.png similarity index 100% rename from lib/jkqtplotterressources/images/jkqtp_mouseact_default.png rename to lib/jkqtplotter/resources/images/jkqtp_mouseact_default.png diff --git a/lib/jkqtplotterressources/images/jkqtp_mouseact_default.svg b/lib/jkqtplotter/resources/images/jkqtp_mouseact_default.svg similarity index 100% rename from lib/jkqtplotterressources/images/jkqtp_mouseact_default.svg rename to lib/jkqtplotter/resources/images/jkqtp_mouseact_default.svg diff --git a/lib/jkqtplotterressources/images/jkqtp_mouseact_drag.png b/lib/jkqtplotter/resources/images/jkqtp_mouseact_drag.png similarity index 100% rename from lib/jkqtplotterressources/images/jkqtp_mouseact_drag.png rename to lib/jkqtplotter/resources/images/jkqtp_mouseact_drag.png diff --git a/lib/jkqtplotterressources/images/jkqtp_mouseact_drag.svg b/lib/jkqtplotter/resources/images/jkqtp_mouseact_drag.svg similarity index 100% rename from lib/jkqtplotterressources/images/jkqtp_mouseact_drag.svg rename to lib/jkqtplotter/resources/images/jkqtp_mouseact_drag.svg diff --git a/lib/jkqtplotterressources/images/jkqtp_mouseact_ruler.png b/lib/jkqtplotter/resources/images/jkqtp_mouseact_ruler.png similarity index 100% rename from lib/jkqtplotterressources/images/jkqtp_mouseact_ruler.png rename to lib/jkqtplotter/resources/images/jkqtp_mouseact_ruler.png diff --git a/lib/jkqtplotterressources/images/jkqtp_mouseact_ruler.svg b/lib/jkqtplotter/resources/images/jkqtp_mouseact_ruler.svg similarity index 100% rename from lib/jkqtplotterressources/images/jkqtp_mouseact_ruler.svg rename to lib/jkqtplotter/resources/images/jkqtp_mouseact_ruler.svg diff --git a/lib/jkqtplotterressources/images/jkqtp_mouseact_tooltip.png b/lib/jkqtplotter/resources/images/jkqtp_mouseact_tooltip.png similarity index 100% rename from lib/jkqtplotterressources/images/jkqtp_mouseact_tooltip.png rename to lib/jkqtplotter/resources/images/jkqtp_mouseact_tooltip.png diff --git a/lib/jkqtplotterressources/images/jkqtp_mouseact_tooltip.svg b/lib/jkqtplotter/resources/images/jkqtp_mouseact_tooltip.svg similarity index 100% rename from lib/jkqtplotterressources/images/jkqtp_mouseact_tooltip.svg rename to lib/jkqtplotter/resources/images/jkqtp_mouseact_tooltip.svg diff --git a/lib/jkqtplotterressources/images/jkqtp_mouseact_zoomrect.png b/lib/jkqtplotter/resources/images/jkqtp_mouseact_zoomrect.png similarity index 100% rename from lib/jkqtplotterressources/images/jkqtp_mouseact_zoomrect.png rename to lib/jkqtplotter/resources/images/jkqtp_mouseact_zoomrect.png diff --git a/lib/jkqtplotterressources/images/jkqtp_mouseact_zoomrect.svg b/lib/jkqtplotter/resources/images/jkqtp_mouseact_zoomrect.svg similarity index 100% rename from lib/jkqtplotterressources/images/jkqtp_mouseact_zoomrect.svg rename to lib/jkqtplotter/resources/images/jkqtp_mouseact_zoomrect.svg diff --git a/lib/jkqtplotterressources/images/jkqtp_print.png b/lib/jkqtplotter/resources/images/jkqtp_print.png similarity index 100% rename from lib/jkqtplotterressources/images/jkqtp_print.png rename to lib/jkqtplotter/resources/images/jkqtp_print.png diff --git a/lib/jkqtplotterressources/images/jkqtp_savecsv.png b/lib/jkqtplotter/resources/images/jkqtp_savecsv.png similarity index 100% rename from lib/jkqtplotterressources/images/jkqtp_savecsv.png rename to lib/jkqtplotter/resources/images/jkqtp_savecsv.png diff --git a/lib/jkqtplotterressources/images/jkqtp_savedata.png b/lib/jkqtplotter/resources/images/jkqtp_savedata.png similarity index 100% rename from lib/jkqtplotterressources/images/jkqtp_savedata.png rename to lib/jkqtplotter/resources/images/jkqtp_savedata.png diff --git a/lib/jkqtplotterressources/images/jkqtp_savedata.svg b/lib/jkqtplotter/resources/images/jkqtp_savedata.svg similarity index 100% rename from lib/jkqtplotterressources/images/jkqtp_savedata.svg rename to lib/jkqtplotter/resources/images/jkqtp_savedata.svg diff --git a/lib/jkqtplotterressources/images/jkqtp_savepdf.png b/lib/jkqtplotter/resources/images/jkqtp_savepdf.png similarity index 100% rename from lib/jkqtplotterressources/images/jkqtp_savepdf.png rename to lib/jkqtplotter/resources/images/jkqtp_savepdf.png diff --git a/lib/jkqtplotterressources/images/jkqtp_savepix.png b/lib/jkqtplotter/resources/images/jkqtp_savepix.png similarity index 100% rename from lib/jkqtplotterressources/images/jkqtp_savepix.png rename to lib/jkqtplotter/resources/images/jkqtp_savepix.png diff --git a/lib/jkqtplotterressources/images/jkqtp_saveplot.png b/lib/jkqtplotter/resources/images/jkqtp_saveplot.png similarity index 100% rename from lib/jkqtplotterressources/images/jkqtp_saveplot.png rename to lib/jkqtplotter/resources/images/jkqtp_saveplot.png diff --git a/lib/jkqtplotterressources/images/jkqtp_saveplot.svg b/lib/jkqtplotter/resources/images/jkqtp_saveplot.svg similarity index 100% rename from lib/jkqtplotterressources/images/jkqtp_saveplot.svg rename to lib/jkqtplotter/resources/images/jkqtp_saveplot.svg diff --git a/lib/jkqtplotterressources/images/jkqtp_saveps.png b/lib/jkqtplotter/resources/images/jkqtp_saveps.png similarity index 100% rename from lib/jkqtplotterressources/images/jkqtp_saveps.png rename to lib/jkqtplotter/resources/images/jkqtp_saveps.png diff --git a/lib/jkqtplotterressources/images/jkqtp_savesvg.png b/lib/jkqtplotter/resources/images/jkqtp_savesvg.png similarity index 100% rename from lib/jkqtplotterressources/images/jkqtp_savesvg.png rename to lib/jkqtplotter/resources/images/jkqtp_savesvg.png diff --git a/lib/jkqtplotterressources/images/jkqtp_showplotdata.png b/lib/jkqtplotter/resources/images/jkqtp_showplotdata.png similarity index 100% rename from lib/jkqtplotterressources/images/jkqtp_showplotdata.png rename to lib/jkqtplotter/resources/images/jkqtp_showplotdata.png diff --git a/lib/jkqtplotterressources/images/jkqtp_showplotdata.svg b/lib/jkqtplotter/resources/images/jkqtp_showplotdata.svg similarity index 100% rename from lib/jkqtplotterressources/images/jkqtp_showplotdata.svg rename to lib/jkqtplotter/resources/images/jkqtp_showplotdata.svg diff --git a/lib/jkqtplotterressources/images/jkqtp_ticks_date.png b/lib/jkqtplotter/resources/images/jkqtp_ticks_date.png similarity index 100% rename from lib/jkqtplotterressources/images/jkqtp_ticks_date.png rename to lib/jkqtplotter/resources/images/jkqtp_ticks_date.png diff --git a/lib/jkqtplotterressources/images/jkqtp_ticks_date.svg b/lib/jkqtplotter/resources/images/jkqtp_ticks_date.svg similarity index 100% rename from lib/jkqtplotterressources/images/jkqtp_ticks_date.svg rename to lib/jkqtplotter/resources/images/jkqtp_ticks_date.svg diff --git a/lib/jkqtplotterressources/images/jkqtp_ticks_datetime.png b/lib/jkqtplotter/resources/images/jkqtp_ticks_datetime.png similarity index 100% rename from lib/jkqtplotterressources/images/jkqtp_ticks_datetime.png rename to lib/jkqtplotter/resources/images/jkqtp_ticks_datetime.png diff --git a/lib/jkqtplotterressources/images/jkqtp_ticks_datetime.svg b/lib/jkqtplotter/resources/images/jkqtp_ticks_datetime.svg similarity index 100% rename from lib/jkqtplotterressources/images/jkqtp_ticks_datetime.svg rename to lib/jkqtplotter/resources/images/jkqtp_ticks_datetime.svg diff --git a/lib/jkqtplotterressources/images/jkqtp_ticks_default.png b/lib/jkqtplotter/resources/images/jkqtp_ticks_default.png similarity index 100% rename from lib/jkqtplotterressources/images/jkqtp_ticks_default.png rename to lib/jkqtplotter/resources/images/jkqtp_ticks_default.png diff --git a/lib/jkqtplotterressources/images/jkqtp_ticks_default.svg b/lib/jkqtplotter/resources/images/jkqtp_ticks_default.svg similarity index 100% rename from lib/jkqtplotterressources/images/jkqtp_ticks_default.svg rename to lib/jkqtplotter/resources/images/jkqtp_ticks_default.svg diff --git a/lib/jkqtplotterressources/images/jkqtp_ticks_exp.png b/lib/jkqtplotter/resources/images/jkqtp_ticks_exp.png similarity index 100% rename from lib/jkqtplotterressources/images/jkqtp_ticks_exp.png rename to lib/jkqtplotter/resources/images/jkqtp_ticks_exp.png diff --git a/lib/jkqtplotterressources/images/jkqtp_ticks_exp.svg b/lib/jkqtplotter/resources/images/jkqtp_ticks_exp.svg similarity index 100% rename from lib/jkqtplotterressources/images/jkqtp_ticks_exp.svg rename to lib/jkqtplotter/resources/images/jkqtp_ticks_exp.svg diff --git a/lib/jkqtplotterressources/images/jkqtp_ticks_expchar.png b/lib/jkqtplotter/resources/images/jkqtp_ticks_expchar.png similarity index 100% rename from lib/jkqtplotterressources/images/jkqtp_ticks_expchar.png rename to lib/jkqtplotter/resources/images/jkqtp_ticks_expchar.png diff --git a/lib/jkqtplotterressources/images/jkqtp_ticks_expchar.svg b/lib/jkqtplotter/resources/images/jkqtp_ticks_expchar.svg similarity index 100% rename from lib/jkqtplotterressources/images/jkqtp_ticks_expchar.svg rename to lib/jkqtplotter/resources/images/jkqtp_ticks_expchar.svg diff --git a/lib/jkqtplotterressources/images/jkqtp_ticks_time.png b/lib/jkqtplotter/resources/images/jkqtp_ticks_time.png similarity index 100% rename from lib/jkqtplotterressources/images/jkqtp_ticks_time.png rename to lib/jkqtplotter/resources/images/jkqtp_ticks_time.png diff --git a/lib/jkqtplotterressources/images/jkqtp_ticks_time.svg b/lib/jkqtplotter/resources/images/jkqtp_ticks_time.svg similarity index 100% rename from lib/jkqtplotterressources/images/jkqtp_ticks_time.svg rename to lib/jkqtplotter/resources/images/jkqtp_ticks_time.svg diff --git a/lib/jkqtplotterressources/images/jkqtp_zoom.png b/lib/jkqtplotter/resources/images/jkqtp_zoom.png similarity index 100% rename from lib/jkqtplotterressources/images/jkqtp_zoom.png rename to lib/jkqtplotter/resources/images/jkqtp_zoom.png diff --git a/lib/jkqtplotterressources/images/jkqtp_zoomall.png b/lib/jkqtplotter/resources/images/jkqtp_zoomall.png similarity index 100% rename from lib/jkqtplotterressources/images/jkqtp_zoomall.png rename to lib/jkqtplotter/resources/images/jkqtp_zoomall.png diff --git a/lib/jkqtplotterressources/images/jkqtp_zoomin.png b/lib/jkqtplotter/resources/images/jkqtp_zoomin.png similarity index 100% rename from lib/jkqtplotterressources/images/jkqtp_zoomin.png rename to lib/jkqtplotter/resources/images/jkqtp_zoomin.png diff --git a/lib/jkqtplotterressources/images/jkqtp_zoomout.png b/lib/jkqtplotter/resources/images/jkqtp_zoomout.png similarity index 100% rename from lib/jkqtplotterressources/images/jkqtp_zoomout.png rename to lib/jkqtplotter/resources/images/jkqtp_zoomout.png diff --git a/lib/jkqtplotterressources/images/kruler.png b/lib/jkqtplotter/resources/images/kruler.png similarity index 100% rename from lib/jkqtplotterressources/images/kruler.png rename to lib/jkqtplotter/resources/images/kruler.png diff --git a/lib/jkqtplotterressources/images/plot_contour.png b/lib/jkqtplotter/resources/images/plot_contour.png similarity index 100% rename from lib/jkqtplotterressources/images/plot_contour.png rename to lib/jkqtplotter/resources/images/plot_contour.png diff --git a/lib/jkqtplotterressources/images/plot_contour.svg b/lib/jkqtplotter/resources/images/plot_contour.svg similarity index 100% rename from lib/jkqtplotterressources/images/plot_contour.svg rename to lib/jkqtplotter/resources/images/plot_contour.svg diff --git a/lib/jkqtplotterressources/images/plot_image.png b/lib/jkqtplotter/resources/images/plot_image.png similarity index 100% rename from lib/jkqtplotterressources/images/plot_image.png rename to lib/jkqtplotter/resources/images/plot_image.png diff --git a/lib/jkqtplotterressources/images/plot_image.svg b/lib/jkqtplotter/resources/images/plot_image.svg similarity index 100% rename from lib/jkqtplotterressources/images/plot_image.svg rename to lib/jkqtplotter/resources/images/plot_image.svg diff --git a/lib/jkqtplotterressources/images/plot_mimage.png b/lib/jkqtplotter/resources/images/plot_mimage.png similarity index 100% rename from lib/jkqtplotterressources/images/plot_mimage.png rename to lib/jkqtplotter/resources/images/plot_mimage.png diff --git a/lib/jkqtplotterressources/images/plot_mimage.svg b/lib/jkqtplotter/resources/images/plot_mimage.svg similarity index 100% rename from lib/jkqtplotterressources/images/plot_mimage.svg rename to lib/jkqtplotter/resources/images/plot_mimage.svg diff --git a/lib/jkqtplotterressources/images/plot_rgbimage.png b/lib/jkqtplotter/resources/images/plot_rgbimage.png similarity index 100% rename from lib/jkqtplotterressources/images/plot_rgbimage.png rename to lib/jkqtplotter/resources/images/plot_rgbimage.png diff --git a/lib/jkqtplotterressources/jkqtpbaseplotter.qrc b/lib/jkqtplotter/resources/jkqtpbaseplotter.qrc similarity index 100% rename from lib/jkqtplotterressources/jkqtpbaseplotter.qrc rename to lib/jkqtplotter/resources/jkqtpbaseplotter.qrc diff --git a/lib/jkqtplotterressources/jkqtpstyles.qrc b/lib/jkqtplotter/resources/jkqtpstyles.qrc similarity index 100% rename from lib/jkqtplotterressources/jkqtpstyles.qrc rename to lib/jkqtplotter/resources/jkqtpstyles.qrc diff --git a/lib/jkqtplotterressources/styles/blackandwhite.ini b/lib/jkqtplotter/resources/styles/blackandwhite.ini similarity index 100% rename from lib/jkqtplotterressources/styles/blackandwhite.ini rename to lib/jkqtplotter/resources/styles/blackandwhite.ini diff --git a/lib/jkqtplotterressources/styles/blueprint.ini b/lib/jkqtplotter/resources/styles/blueprint.ini similarity index 100% rename from lib/jkqtplotterressources/styles/blueprint.ini rename to lib/jkqtplotter/resources/styles/blueprint.ini diff --git a/lib/jkqtplotterressources/styles/dark.ini b/lib/jkqtplotter/resources/styles/dark.ini similarity index 100% rename from lib/jkqtplotterressources/styles/dark.ini rename to lib/jkqtplotter/resources/styles/dark.ini diff --git a/lib/jkqtplotterressources/styles/default.ini b/lib/jkqtplotter/resources/styles/default.ini similarity index 100% rename from lib/jkqtplotterressources/styles/default.ini rename to lib/jkqtplotter/resources/styles/default.ini diff --git a/lib/jkqtplotterressources/styles/simple_axesoffset.ini b/lib/jkqtplotter/resources/styles/simple_axesoffset.ini similarity index 100% rename from lib/jkqtplotterressources/styles/simple_axesoffset.ini rename to lib/jkqtplotter/resources/styles/simple_axesoffset.ini diff --git a/lib/jkqtplotterressources/styles/simple_axesoffset_plotbox.ini b/lib/jkqtplotter/resources/styles/simple_axesoffset_plotbox.ini similarity index 100% rename from lib/jkqtplotterressources/styles/simple_axesoffset_plotbox.ini rename to lib/jkqtplotter/resources/styles/simple_axesoffset_plotbox.ini diff --git a/lib/jkqtplotterressources/styles/simple_gridandticks.ini b/lib/jkqtplotter/resources/styles/simple_gridandticks.ini similarity index 100% rename from lib/jkqtplotterressources/styles/simple_gridandticks.ini rename to lib/jkqtplotter/resources/styles/simple_gridandticks.ini