mirrors/JKQtPlotter
1
0
Fork 0
mirror of https://github.com/jkriege2/JKQtPlotter.git synced 2024-11-15 10:05:47 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

- added post-build deploy for OpenCV and Qt-DLLs (on windows)

Browse Source 
- checked OpenCV-examples and improved OpenCV-copy-tool (now copies as an image column, as appropriate!)
This commit is contained in:
jkriege2 2019-11-10 15:35:07 +01:00
parent 92c1851c8c
commit 528f6fe537
53 changed files with 181 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
CMakeLists.txt
View File

@ -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)

12
cmake/jkqtplotter_deployopencv.cmake Normal file
View File

@ -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)

30
cmake/jkqtplotter_deployqt.cmake Normal file
View File

@ -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)

2
examples/advplotstyling/CMakeLists.txt
View File

@ -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})

2
examples/barchart/CMakeLists.txt
View File

@ -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})

2
examples/boxplot/CMakeLists.txt
View File

@ -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})

2
examples/contourplot/CMakeLists.txt
View File

@ -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})

2
examples/datastore/CMakeLists.txt
View File

@ -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})

2
examples/datastore_groupedstat/CMakeLists.txt
View File

@ -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})

2
examples/datastore_iterators/CMakeLists.txt
View File

@ -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})

2
examples/datastore_regression/CMakeLists.txt
View File

@ -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})

2
examples/datastore_statistics/CMakeLists.txt
View File

@ -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})

2
examples/datastore_statistics_2d/CMakeLists.txt
View File

@ -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})

2
examples/dateaxes/CMakeLists.txt
View File

@ -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})

2
examples/distributionplot/CMakeLists.txt
View File

@ -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})

2
examples/errorbarstyles/CMakeLists.txt
View File

@ -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})

2
examples/filledgraphs/CMakeLists.txt
View File

@ -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})

2
examples/functionplot/CMakeLists.txt
View File

@ -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})

2
examples/geometric/CMakeLists.txt
View File

@ -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})

2
examples/imageplot/CMakeLists.txt
View File

@ -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})

2
examples/imageplot_modifier/CMakeLists.txt
View File

@ -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})

2
examples/imageplot_nodatastore/CMakeLists.txt
View File

@ -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})

13
examples/imageplot_opencv/CMakeLists.txt
View File

@ -1,5 +1,4 @@
cmake_minimum_required(VERSION 3.0)
if (BUILD_HAS_OPENCV)
find_package( OpenCV )
if(OpenCV_FOUND)
@ -21,14 +20,18 @@ 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} )
# 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})
endif(OpenCV_FOUND)
endif()

2
examples/imageplot_userpal/CMakeLists.txt
View File

@ -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})

2
examples/impulsesplot/CMakeLists.txt
View File

@ -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})

2
examples/jkqtfastplotter_test/CMakeLists.txt
View File

@ -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})

2
examples/jkqtmathtext_simpletest/CMakeLists.txt
View File

@ -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})

2
examples/jkqtmathtext_test/CMakeLists.txt
View File

@ -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})

2
examples/jkqtplot_test/CMakeLists.txt
View File

@ -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})

2
examples/logaxes/CMakeLists.txt
View File

@ -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})

2
examples/multiplot/CMakeLists.txt
View File

@ -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})

2
examples/parametriccurve/CMakeLists.txt
View File

@ -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})

2
examples/paramscatterplot/CMakeLists.txt
View File

@ -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})

2
examples/paramscatterplot_image/CMakeLists.txt
View File

@ -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})

2
examples/parsedfunctionplot/CMakeLists.txt
View File

@ -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})

2
examples/rgbimageplot/CMakeLists.txt
View File

@ -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})

12
examples/rgbimageplot_opencv/CMakeLists.txt
View File

@ -1,5 +1,4 @@
cmake_minimum_required(VERSION 3.0)
if (BUILD_HAS_OPENCV)
find_package( OpenCV )
if (OpenCV_FOUND)
@ -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)
#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)
endif(BUILD_HAS_OPENCV)

4
examples/rgbimageplot_opencv/README.md
View File

@ -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);

11
examples/rgbimageplot_opencv/rgbimageplot_opencv.cpp
View File

@ -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);

0
examples/rgbimageplot_opencv/example.bmp → examples/rgbimageplot_opencv/rgbimageplot_opencv_example.bmp
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 412 KiB

After

Width:  |  Height:  |  Size: 412 KiB

2
examples/rgbimageplot_qt/CMakeLists.txt
View File

@ -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})

2
examples/simpletest/CMakeLists.txt
View File

@ -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})

2
examples/speed/CMakeLists.txt
View File

@ -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})

2
examples/stackedbars/CMakeLists.txt
View File

@ -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})

2
examples/stepplots/CMakeLists.txt
View File

@ -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})

2
examples/styledboxplot/CMakeLists.txt
View File

@ -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})

2
examples/styling/CMakeLists.txt
View File

@ -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})

2
examples/symbols_and_errors/CMakeLists.txt
View File

@ -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})

2
examples/symbols_and_styles/CMakeLists.txt
View File

@ -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})

2
examples/ui/CMakeLists.txt
View File

@ -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})

2
examples/user_interaction/CMakeLists.txt
View File

@ -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})

2
examples/violinplot/CMakeLists.txt
View File

@ -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})

2
lib/jkqtplotter/jkqtpopencvinterface.h
View File

@ -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);
}