- 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!)
2024-11-15 10:05:47 +08:00 · 2019-11-10 15:35:07 +01:00 · 2019-11-10 15:35:07 +01:00 · 528f6fe537
commit 528f6fe537
parent 92c1851c8c
53 changed files with 181 additions and 50 deletions
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@ -25,9 +25,6 @@ endif()
 if(NOT DEFINED BUILD_EXAMPLES)
    option(BUILD_EXAMPLES "Build examples" ON)
 endif()
-if(NOT DEFINED BUILD_HAS_OPENCV)
-    option(BUILD_HAS_OPENCV "OpenCV available? If yes, OpenCV examples are built when BUILD_EXAMPLES=ON" OFF)
-endif()
 if(NOT DEFINED LIB_INSTALL)
    option(LIB_INSTALL "Install library" ON)
 endif()
@ -37,10 +34,10 @@ if(NOT DEFINED CMAKE_INSTALL_PREFIX)
 endif()


+list(APPEND CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake)

-
-
-
+include(jkqtplotter_deployqt)
+include(jkqtplotter_deployopencv)
 include(CheckCXXCompilerFlag)
 if (NOT WIN32)
    include(GNUInstallDirs)
--- a/cmake/jkqtplotter_deployopencv.cmake
+++ b/cmake/jkqtplotter_deployopencv.cmake
@ -0,0 +1,12 @@
+function(jkqtplotter_deployopencv TARGET_NAME)
+    #use windeploy
+    if(OpenCV_FOUND)
+		if(WIN32)
+			add_custom_command(TARGET ${EXENAME} POST_BUILD        # Adds a post-build event the TARGET
+				COMMAND ${CMAKE_COMMAND} -E copy_directory
+				"${_OpenCV_LIB_PATH}"
+				$<TARGET_FILE_DIR:${EXENAME}>
+				)
+		endif(WIN32)
+	endif(OpenCV_Found)
+endfunction(jkqtplotter_deployopencv)
--- a/cmake/jkqtplotter_deployqt.cmake
+++ b/cmake/jkqtplotter_deployqt.cmake
@ -0,0 +1,30 @@
+function(jkqtplotter_deployqt TARGET_NAME)
+    #use windeploy
+    if (WIN32)
+        get_target_property(_qmake_executable Qt5::qmake IMPORTED_LOCATION)
+        get_filename_component(_qt_bin_dir "${_qmake_executable}" DIRECTORY)
+        find_program(WINDEPLOYQT_EXECUTABLE windeployqt HINTS "${_qt_bin_dir}")
+        find_program(MACDEPLOYQT_EXECUTABLE macdeployqt HINTS "${_qt_bin_dir}")
+
+        set(WINDEPLOYQTOPTION "--release")
+        if (CMAKE_BUILD_TYPE STREQUAL "Debug")
+            set(WINDEPLOYQTOPTION "--debug")
+        endif()
+
+        # install system runtime lib
+        include( InstallRequiredSystemLibraries )
+        if( CMAKE_INSTALL_SYSTEM_RUNTIME_LIBS )
+            install( PROGRAMS ${CMAKE_INSTALL_SYSTEM_RUNTIME_LIBS} DESTINATION ${CMAKE_INSTALL_PREFIX} COMPONENT System )
+        endif( CMAKE_INSTALL_SYSTEM_RUNTIME_LIBS )
+
+        get_filename_component(CMAKE_CXX_COMPILER_BINPATH ${CMAKE_CXX_COMPILER} DIRECTORY )
+        add_custom_command(TARGET ${TARGET_NAME} POST_BUILD
+            COMMAND "${CMAKE_COMMAND}" -E
+                env PATH="${CMAKE_CXX_COMPILER_BINPATH}\;${_qt_bin_dir}" "${WINDEPLOYQT_EXECUTABLE}"
+                    --compiler-runtime
+                    ${WINDEPLOYQTOPTION}
+                    \"$<TARGET_FILE:${TARGET_NAME}>\"
+            COMMENT "Running windeployqt ... "
+        )
+    endif(WIN32)
+endfunction(jkqtplotter_deployqt)
--- a/examples/advplotstyling/CMakeLists.txt
+++ b/examples/advplotstyling/CMakeLists.txt
@ -24,3 +24,5 @@ endif()
 if(LIB_INSTALL)
    install(TARGETS ${EXENAME} RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
 endif(LIB_INSTALL)
+#Installation of Qt DLLs on Windows
+jkqtplotter_deployqt(${EXENAME})
--- a/examples/barchart/CMakeLists.txt
+++ b/examples/barchart/CMakeLists.txt
@ -26,3 +26,5 @@ endif()
 if(LIB_INSTALL)
    install(TARGETS ${EXENAME} RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
 endif(LIB_INSTALL)
+#Installation of Qt DLLs on Windows
+jkqtplotter_deployqt(${EXENAME})
--- a/examples/boxplot/CMakeLists.txt
+++ b/examples/boxplot/CMakeLists.txt
@ -26,3 +26,5 @@ endif()
 if(LIB_INSTALL)
    install(TARGETS ${EXENAME} RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
 endif(LIB_INSTALL)
+#Installation of Qt DLLs on Windows
+jkqtplotter_deployqt(${EXENAME})
--- a/examples/contourplot/CMakeLists.txt
+++ b/examples/contourplot/CMakeLists.txt
@ -26,3 +26,5 @@ endif()
 if(LIB_INSTALL)
    install(TARGETS ${EXENAME} RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
 endif(LIB_INSTALL)
+#Installation of Qt DLLs on Windows
+jkqtplotter_deployqt(${EXENAME})
--- a/examples/datastore/CMakeLists.txt
+++ b/examples/datastore/CMakeLists.txt
@ -26,3 +26,5 @@ endif()
 if(LIB_INSTALL)
    install(TARGETS ${EXENAME} RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
 endif(LIB_INSTALL)
+#Installation of Qt DLLs on Windows
+jkqtplotter_deployqt(${EXENAME})
--- a/examples/datastore_groupedstat/CMakeLists.txt
+++ b/examples/datastore_groupedstat/CMakeLists.txt
@ -26,3 +26,5 @@ endif()
 if(LIB_INSTALL)
    install(TARGETS ${EXENAME} RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
 endif(LIB_INSTALL)
+#Installation of Qt DLLs on Windows
+jkqtplotter_deployqt(${EXENAME})
--- a/examples/datastore_iterators/CMakeLists.txt
+++ b/examples/datastore_iterators/CMakeLists.txt
@ -26,3 +26,5 @@ endif()
 if(LIB_INSTALL)
    install(TARGETS ${EXENAME} RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
 endif(LIB_INSTALL)
+#Installation of Qt DLLs on Windows
+jkqtplotter_deployqt(${EXENAME})
--- a/examples/datastore_regression/CMakeLists.txt
+++ b/examples/datastore_regression/CMakeLists.txt
@ -26,3 +26,5 @@ endif()
 if(LIB_INSTALL)
    install(TARGETS ${EXENAME} RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
 endif(LIB_INSTALL)
+#Installation of Qt DLLs on Windows
+jkqtplotter_deployqt(${EXENAME})
--- a/examples/datastore_statistics/CMakeLists.txt
+++ b/examples/datastore_statistics/CMakeLists.txt
@ -26,3 +26,5 @@ endif()
 if(LIB_INSTALL)
    install(TARGETS ${EXENAME} RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
 endif(LIB_INSTALL)
+#Installation of Qt DLLs on Windows
+jkqtplotter_deployqt(${EXENAME})
--- a/examples/datastore_statistics_2d/CMakeLists.txt
+++ b/examples/datastore_statistics_2d/CMakeLists.txt
@ -26,3 +26,5 @@ endif()
 if(LIB_INSTALL)
    install(TARGETS ${EXENAME} RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
 endif(LIB_INSTALL)
+#Installation of Qt DLLs on Windows
+jkqtplotter_deployqt(${EXENAME})
--- a/examples/dateaxes/CMakeLists.txt
+++ b/examples/dateaxes/CMakeLists.txt
@ -26,3 +26,5 @@ endif()
 if(LIB_INSTALL)
    install(TARGETS ${EXENAME} RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
 endif(LIB_INSTALL)
+#Installation of Qt DLLs on Windows
+jkqtplotter_deployqt(${EXENAME})
--- a/examples/distributionplot/CMakeLists.txt
+++ b/examples/distributionplot/CMakeLists.txt
@ -26,3 +26,5 @@ endif()
 if(LIB_INSTALL)
    install(TARGETS ${EXENAME} RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
 endif(LIB_INSTALL)
+#Installation of Qt DLLs on Windows
+jkqtplotter_deployqt(${EXENAME})
--- a/examples/errorbarstyles/CMakeLists.txt
+++ b/examples/errorbarstyles/CMakeLists.txt
@ -26,3 +26,5 @@ endif()
 if(LIB_INSTALL)
    install(TARGETS ${EXENAME} RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
 endif(LIB_INSTALL)
+#Installation of Qt DLLs on Windows
+jkqtplotter_deployqt(${EXENAME})
--- a/examples/filledgraphs/CMakeLists.txt
+++ b/examples/filledgraphs/CMakeLists.txt
@ -26,3 +26,5 @@ endif()
 if(LIB_INSTALL)
    install(TARGETS ${EXENAME} RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
 endif(LIB_INSTALL)
+#Installation of Qt DLLs on Windows
+jkqtplotter_deployqt(${EXENAME})
--- a/examples/functionplot/CMakeLists.txt
+++ b/examples/functionplot/CMakeLists.txt
@ -26,3 +26,5 @@ endif()
 if(LIB_INSTALL)
    install(TARGETS ${EXENAME} RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
 endif(LIB_INSTALL)
+#Installation of Qt DLLs on Windows
+jkqtplotter_deployqt(${EXENAME})
--- a/examples/geometric/CMakeLists.txt
+++ b/examples/geometric/CMakeLists.txt
@ -26,3 +26,5 @@ endif()
 if(LIB_INSTALL)
    install(TARGETS ${EXENAME} RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
 endif(LIB_INSTALL)
+#Installation of Qt DLLs on Windows
+jkqtplotter_deployqt(${EXENAME})
--- a/examples/imageplot/CMakeLists.txt
+++ b/examples/imageplot/CMakeLists.txt
@ -26,3 +26,5 @@ endif()
 if(LIB_INSTALL)
    install(TARGETS ${EXENAME} RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
 endif(LIB_INSTALL)
+#Installation of Qt DLLs on Windows
+jkqtplotter_deployqt(${EXENAME})
--- a/examples/imageplot_modifier/CMakeLists.txt
+++ b/examples/imageplot_modifier/CMakeLists.txt
@ -26,3 +26,5 @@ endif()
 if(LIB_INSTALL)
    install(TARGETS ${EXENAME} RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
 endif(LIB_INSTALL)
+#Installation of Qt DLLs on Windows
+jkqtplotter_deployqt(${EXENAME})
--- a/examples/imageplot_nodatastore/CMakeLists.txt
+++ b/examples/imageplot_nodatastore/CMakeLists.txt
@ -26,3 +26,5 @@ endif()
 if(LIB_INSTALL)
    install(TARGETS ${EXENAME} RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
 endif(LIB_INSTALL)
+#Installation of Qt DLLs on Windows
+jkqtplotter_deployqt(${EXENAME})
--- a/examples/imageplot_opencv/CMakeLists.txt
+++ b/examples/imageplot_opencv/CMakeLists.txt
@ -1,34 +1,37 @@
 cmake_minimum_required(VERSION 3.0)
-if (BUILD_HAS_OPENCV)
-    find_package( OpenCV  )
-    if(OpenCV_FOUND)
+find_package( OpenCV  )
+if(OpenCV_FOUND)

-        set(EXAMPLE_NAME imageplot_opencv)
-        set(EXENAME jkqtptest_${EXAMPLE_NAME})
+    set(EXAMPLE_NAME imageplot_opencv)
+    set(EXENAME jkqtptest_${EXAMPLE_NAME})

-        message( STATUS "..   Building Example ${EXAMPLE_NAME}" )
+    message( STATUS "..   Building Example ${EXAMPLE_NAME}" )

-        # Set up source files
-        set(SOURCES ${EXAMPLE_NAME}.cpp)
-        set(HEADERS )
-        set(RESOURCES  )
-        set(UIS  )
+    # Set up source files
+    set(SOURCES ${EXAMPLE_NAME}.cpp)
+    set(HEADERS )
+    set(RESOURCES  )
+    set(UIS  )

-        add_executable(${EXENAME} WIN32 ${SOURCES} ${HEADERS} ${RESOURCES} ${UIS})
-        target_include_directories(${EXENAME} PRIVATE ../../lib)
-        if(BUILD_STATIC_LIBS)
-            target_link_libraries(${EXENAME} JKQTPlotterLib)
-        elseif(BUILD_SHARED_LIBS)
-            target_link_libraries(${EXENAME} JKQTPlotterSharedLib)
-        endif()
-        include_directories( ${OpenCV_INCLUDE_DIRS} )
-        target_link_libraries(${EXENAME} ${OpenCV_LIBS} )
+    add_executable(${EXENAME} WIN32 ${SOURCES} ${HEADERS} ${RESOURCES} ${UIS})
+    target_include_directories(${EXENAME} PRIVATE ../../lib)
+    if(BUILD_STATIC_LIBS)
+        target_link_libraries(${EXENAME} JKQTPlotterLib)
+    elseif(BUILD_SHARED_LIBS)
+        target_link_libraries(${EXENAME} JKQTPlotterSharedLib)
+    endif()
+    include_directories(${EXENAME}  ${OpenCV_INCLUDE_DIRS} )
+    target_link_libraries(${EXENAME} ${OpenCV_LIBS} )
+
+    # Installation
+    if(LIB_INSTALL)
+        install(TARGETS ${EXENAME} RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
+    endif(LIB_INSTALL)
+
+    #Installation of Qt DLLs on Windows
+    jkqtplotter_deployqt(${EXENAME})
+    #Installation of OpenCV DLLs on Windows
+    jkqtplotter_deployopencv(${EXENAME})


-
-        # Installation
-        if(LIB_INSTALL)
-            install(TARGETS ${EXENAME} RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
-        endif(LIB_INSTALL)
-    endif(OpenCV_FOUND)
-endif()
+endif(OpenCV_FOUND)
--- a/examples/imageplot_userpal/CMakeLists.txt
+++ b/examples/imageplot_userpal/CMakeLists.txt
@ -26,3 +26,5 @@ endif()
 if(LIB_INSTALL)
    install(TARGETS ${EXENAME} RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
 endif(LIB_INSTALL)
+#Installation of Qt DLLs on Windows
+jkqtplotter_deployqt(${EXENAME})
--- a/examples/impulsesplot/CMakeLists.txt
+++ b/examples/impulsesplot/CMakeLists.txt
@ -26,3 +26,5 @@ endif()
 if(LIB_INSTALL)
    install(TARGETS ${EXENAME} RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
 endif(LIB_INSTALL)
+#Installation of Qt DLLs on Windows
+jkqtplotter_deployqt(${EXENAME})
--- a/examples/jkqtfastplotter_test/CMakeLists.txt
+++ b/examples/jkqtfastplotter_test/CMakeLists.txt
@ -29,3 +29,5 @@ endif()
 if(LIB_INSTALL)
    install(TARGETS ${EXENAME} RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
 endif(LIB_INSTALL)
+#Installation of Qt DLLs on Windows
+jkqtplotter_deployqt(${EXENAME})
--- a/examples/jkqtmathtext_simpletest/CMakeLists.txt
+++ b/examples/jkqtmathtext_simpletest/CMakeLists.txt
@ -28,3 +28,5 @@ endif()
 if(LIB_INSTALL)
    install(TARGETS ${EXENAME} RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
 endif(LIB_INSTALL)
+#Installation of Qt DLLs on Windows
+jkqtplotter_deployqt(${EXENAME})
--- a/examples/jkqtmathtext_test/CMakeLists.txt
+++ b/examples/jkqtmathtext_test/CMakeLists.txt
@ -29,3 +29,5 @@ endif()
 if(LIB_INSTALL)
    install(TARGETS ${EXENAME} RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
 endif(LIB_INSTALL)
+#Installation of Qt DLLs on Windows
+jkqtplotter_deployqt(${EXENAME})
--- a/examples/jkqtplot_test/CMakeLists.txt
+++ b/examples/jkqtplot_test/CMakeLists.txt
@ -36,3 +36,5 @@ endif()
 if(LIB_INSTALL)
    install(TARGETS ${EXENAME} RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
 endif(LIB_INSTALL)
+#Installation of Qt DLLs on Windows
+jkqtplotter_deployqt(${EXENAME})
--- a/examples/logaxes/CMakeLists.txt
+++ b/examples/logaxes/CMakeLists.txt
@ -26,3 +26,5 @@ endif()
 if(LIB_INSTALL)
    install(TARGETS ${EXENAME} RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
 endif(LIB_INSTALL)
+#Installation of Qt DLLs on Windows
+jkqtplotter_deployqt(${EXENAME})
--- a/examples/multiplot/CMakeLists.txt
+++ b/examples/multiplot/CMakeLists.txt
@ -26,3 +26,5 @@ endif()
 if(LIB_INSTALL)
    install(TARGETS ${EXENAME} RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
 endif(LIB_INSTALL)
+#Installation of Qt DLLs on Windows
+jkqtplotter_deployqt(${EXENAME})
--- a/examples/parametriccurve/CMakeLists.txt
+++ b/examples/parametriccurve/CMakeLists.txt
@ -26,3 +26,5 @@ endif()
 if(LIB_INSTALL)
    install(TARGETS ${EXENAME} RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
 endif(LIB_INSTALL)
+#Installation of Qt DLLs on Windows
+jkqtplotter_deployqt(${EXENAME})
--- a/examples/paramscatterplot/CMakeLists.txt
+++ b/examples/paramscatterplot/CMakeLists.txt
@ -26,3 +26,5 @@ endif()
 if(LIB_INSTALL)
    install(TARGETS ${EXENAME} RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
 endif(LIB_INSTALL)
+#Installation of Qt DLLs on Windows
+jkqtplotter_deployqt(${EXENAME})
--- a/examples/paramscatterplot_image/CMakeLists.txt
+++ b/examples/paramscatterplot_image/CMakeLists.txt
@ -26,3 +26,5 @@ endif()
 if(LIB_INSTALL)
    install(TARGETS ${EXENAME} RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
 endif(LIB_INSTALL)
+#Installation of Qt DLLs on Windows
+jkqtplotter_deployqt(${EXENAME})
--- a/examples/parsedfunctionplot/CMakeLists.txt
+++ b/examples/parsedfunctionplot/CMakeLists.txt
@ -26,3 +26,5 @@ endif()
 if(LIB_INSTALL)
    install(TARGETS ${EXENAME} RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
 endif(LIB_INSTALL)
+#Installation of Qt DLLs on Windows
+jkqtplotter_deployqt(${EXENAME})
--- a/examples/rgbimageplot/CMakeLists.txt
+++ b/examples/rgbimageplot/CMakeLists.txt
@ -26,3 +26,5 @@ endif()
 if(LIB_INSTALL)
    install(TARGETS ${EXENAME} RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
 endif(LIB_INSTALL)
+#Installation of Qt DLLs on Windows
+jkqtplotter_deployqt(${EXENAME})
--- a/examples/rgbimageplot_opencv/CMakeLists.txt
+++ b/examples/rgbimageplot_opencv/CMakeLists.txt
@ -1,7 +1,6 @@
 cmake_minimum_required(VERSION 3.0)
-if (BUILD_HAS_OPENCV)
-    find_package( OpenCV  )
-    if(OpenCV_FOUND)
+find_package( OpenCV  )
+if (OpenCV_FOUND)

        set(EXAMPLE_NAME rgbimageplot_opencv)
        set(EXENAME jkqtptest_${EXAMPLE_NAME})
@ -21,7 +20,7 @@ if (BUILD_HAS_OPENCV)
        elseif(BUILD_SHARED_LIBS)
            target_link_libraries(${EXENAME} JKQTPlotterSharedLib)
        endif()
-        include_directories( ${OpenCV_INCLUDE_DIRS} )
+        include_directories(${EXENAME} ${OpenCV_INCLUDE_DIRS} )
        target_link_libraries(${EXENAME} ${OpenCV_LIBS} )


@ -29,5 +28,12 @@ if (BUILD_HAS_OPENCV)
        if(LIB_INSTALL)
            install(TARGETS ${EXENAME} RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
        endif(LIB_INSTALL)
-    endif(OpenCV_FOUND)
-endif(BUILD_HAS_OPENCV)
+        #Installation of Qt DLLs on Windows
+        jkqtplotter_deployqt(${EXENAME})
+        #Installation of OpenCV DLLs on Windows
+        jkqtplotter_deployopencv(${EXENAME})
+        add_custom_command(TARGET ${EXENAME} POST_BUILD
+            COMMAND ${CMAKE_COMMAND} -E copy "${CMAKE_CURRENT_SOURCE_DIR}/rgbimageplot_opencv_example.bmp" $<TARGET_FILE_DIR:${EXENAME}>
+        )
+
+endif(OpenCV_FOUND)
--- a/examples/rgbimageplot_opencv/README.md
+++ b/examples/rgbimageplot_opencv/README.md
@ -46,9 +46,6 @@ int main(int argc, char* argv[])
    // 4. create a graph (JKQTPColumnRGBMathImage) with the columns created above as data
    JKQTPColumnRGBMathImage* graph=new JKQTPColumnRGBMathImage(&plot);
    graph->setTitle("");
-    // set size of the data (the datastore does not contain this info, as it only manages 1D columns of data and this is used to assume a row-major ordering
-    graph->setNx(picture.cols);
-    graph->setNy(picture.rows);
    // where does the image start in the plot, given in plot-axis-coordinates (bottom-left corner)
    graph->setX(0);
    graph->setY(0);
@ -56,6 +53,7 @@ int main(int argc, char* argv[])
    graph->setWidth(picture.cols);
    graph->setHeight(picture.rows);
    // image column with the data
+	// Note: this also sets the matrix sized Nx and Ny!!!
    graph->setImageRColumn(cPictureR);
    graph->setImageGColumn(cPictureG);
    graph->setImageBColumn(cPictureB);
--- a/examples/rgbimageplot_opencv/rgbimageplot_opencv.cpp
+++ b/examples/rgbimageplot_opencv/rgbimageplot_opencv.cpp
@ -30,7 +30,7 @@ int main(int argc, char* argv[])


    // 2. now we open a BMP-file and load it into an OpenCV cv::Mat
-    cv::Mat picture = cv::imread("example.bmp");
+    cv::Mat picture = cv::imread("rgbimageplot_opencv_example.bmp");
    qDebug()<<picture.rows<<"x"<<picture.cols<<"x"<<picture.channels();


@ -46,9 +46,6 @@ int main(int argc, char* argv[])
    // 4. create a graph (JKQTPColumnRGBMathImage) with the columns created above as data
    JKQTPColumnRGBMathImage* graph=new JKQTPColumnRGBMathImage(&plot);
    graph->setTitle("");
-    // set size of the data (the datastore does not contain this info, as it only manages 1D columns of data and this is used to assume a row-major ordering
-    graph->setNx(picture.cols);
-    graph->setNy(picture.rows);
    // where does the image start in the plot, given in plot-axis-coordinates (bottom-left corner)
    graph->setX(0);
    graph->setY(0);
@ -56,9 +53,9 @@ int main(int argc, char* argv[])
    graph->setWidth(picture.cols);
    graph->setHeight(picture.rows);
    // image column with the data
-    graph->setImageRColumn(cPictureR);
-    graph->setImageGColumn(cPictureG);
-    graph->setImageBColumn(cPictureB);
+    graph->setImageRColumn(static_cast<int>(cPictureR));
+    graph->setImageGColumn(static_cast<int>(cPictureG));
+    graph->setImageBColumn(static_cast<int>(cPictureB));
    // determine min/max of each channel manually
    graph->setImageMinR(0);
    graph->setImageMaxR(255);
--- a/examples/rgbimageplot_opencv/rgbimageplot_opencv_example.bmp
+++ b/examples/rgbimageplot_opencv/rgbimageplot_opencv_example.bmp
--- a/examples/rgbimageplot_qt/CMakeLists.txt
+++ b/examples/rgbimageplot_qt/CMakeLists.txt
@ -26,3 +26,5 @@ endif()
 if(LIB_INSTALL)
    install(TARGETS ${EXENAME} RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
 endif(LIB_INSTALL)
+#Installation of Qt DLLs on Windows
+jkqtplotter_deployqt(${EXENAME})
--- a/examples/simpletest/CMakeLists.txt
+++ b/examples/simpletest/CMakeLists.txt
@ -26,3 +26,5 @@ endif()
 if(LIB_INSTALL)
    install(TARGETS ${EXENAME} RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
 endif(LIB_INSTALL)
+#Installation of Qt DLLs on Windows
+jkqtplotter_deployqt(${EXENAME})
--- a/examples/speed/CMakeLists.txt
+++ b/examples/speed/CMakeLists.txt
@ -26,3 +26,5 @@ endif()
 if(LIB_INSTALL)
    install(TARGETS ${EXENAME} RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
 endif(LIB_INSTALL)
+#Installation of Qt DLLs on Windows
+jkqtplotter_deployqt(${EXENAME})
--- a/examples/stackedbars/CMakeLists.txt
+++ b/examples/stackedbars/CMakeLists.txt
@ -26,3 +26,5 @@ endif()
 if(LIB_INSTALL)
    install(TARGETS ${EXENAME} RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
 endif(LIB_INSTALL)
+#Installation of Qt DLLs on Windows
+jkqtplotter_deployqt(${EXENAME})
--- a/examples/stepplots/CMakeLists.txt
+++ b/examples/stepplots/CMakeLists.txt
@ -26,3 +26,5 @@ endif()
 if(LIB_INSTALL)
    install(TARGETS ${EXENAME} RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
 endif(LIB_INSTALL)
+#Installation of Qt DLLs on Windows
+jkqtplotter_deployqt(${EXENAME})
--- a/examples/styledboxplot/CMakeLists.txt
+++ b/examples/styledboxplot/CMakeLists.txt
@ -26,3 +26,5 @@ endif()
 if(LIB_INSTALL)
    install(TARGETS ${EXENAME} RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
 endif(LIB_INSTALL)
+#Installation of Qt DLLs on Windows
+jkqtplotter_deployqt(${EXENAME})
--- a/examples/styling/CMakeLists.txt
+++ b/examples/styling/CMakeLists.txt
@ -26,3 +26,5 @@ endif()
 if(LIB_INSTALL)
    install(TARGETS ${EXENAME} RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
 endif(LIB_INSTALL)
+#Installation of Qt DLLs on Windows
+jkqtplotter_deployqt(${EXENAME})
--- a/examples/symbols_and_errors/CMakeLists.txt
+++ b/examples/symbols_and_errors/CMakeLists.txt
@ -26,3 +26,5 @@ endif()
 if(LIB_INSTALL)
    install(TARGETS ${EXENAME} RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
 endif(LIB_INSTALL)
+#Installation of Qt DLLs on Windows
+jkqtplotter_deployqt(${EXENAME})
--- a/examples/symbols_and_styles/CMakeLists.txt
+++ b/examples/symbols_and_styles/CMakeLists.txt
@ -26,3 +26,5 @@ endif()
 if(LIB_INSTALL)
    install(TARGETS ${EXENAME} RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
 endif(LIB_INSTALL)
+#Installation of Qt DLLs on Windows
+jkqtplotter_deployqt(${EXENAME})
--- a/examples/ui/CMakeLists.txt
+++ b/examples/ui/CMakeLists.txt
@ -26,3 +26,5 @@ endif()
 if(LIB_INSTALL)
    install(TARGETS ${EXENAME} RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
 endif(LIB_INSTALL)
+#Installation of Qt DLLs on Windows
+jkqtplotter_deployqt(${EXENAME})
--- a/examples/user_interaction/CMakeLists.txt
+++ b/examples/user_interaction/CMakeLists.txt
@ -26,3 +26,5 @@ endif()
 if(LIB_INSTALL)
    install(TARGETS ${EXENAME} RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
 endif(LIB_INSTALL)
+#Installation of Qt DLLs on Windows
+jkqtplotter_deployqt(${EXENAME})
--- a/examples/violinplot/CMakeLists.txt
+++ b/examples/violinplot/CMakeLists.txt
@ -26,3 +26,5 @@ endif()
 if(LIB_INSTALL)
    install(TARGETS ${EXENAME} RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
 endif(LIB_INSTALL)
+#Installation of Qt DLLs on Windows
+jkqtplotter_deployqt(${EXENAME})
--- a/lib/jkqtplotter/jkqtpopencvinterface.h
+++ b/lib/jkqtplotter/jkqtpopencvinterface.h
@ -77,7 +77,7 @@ inline size_t JKQTPCopyCvMatToColumn(JKQTPDatastore* datastore, const cv::Mat& m
    else if (CV_MAT_DEPTH(mat.type())==CV_8U) JKQTPDatastore_Helper::copyDataFromMat<uint8_t>(d, mat, channel);
    else throw std::runtime_error("datatype of cv::Mat not supported by JKQTPDatastore::copyImageToColumn()");

-    return datastore->addInternalColumn(d, N, name);
+    return datastore->addInternalImageColumn(d, mat.cols, mat.rows, name);
 }