diff --git a/README.md b/README.md index 6ea1b29113..a0d09215d3 100644 --- a/README.md +++ b/README.md @@ -26,7 +26,9 @@ All test-projects are Qt-projects that use qmake to build. You can load them int | Screenshot | Description | Notes | |:-------------:| ------------- | ------------- | -| [![](https://raw.githubusercontent.com/jkriege2/JKQtPlotter/master/screenshots/jkqtplotter_simpletest_imageplot_small.png)](https://github.com/jkriege2/JKQtPlotter/tree/master/test/jkqtplotter_simpletest_imageplot) | [1-channel Raw C Image Plot](https://github.com/jkriege2/JKQtPlotter/tree/master/test/jkqtplotter_simpletest_imageplot) | `JKQTPColumnMathImage`
image data copied from C-style row-major array into a single column of the internal datastore | +| [![](https://raw.githubusercontent.com/jkriege2/JKQtPlotter/master/screenshots/jkqtplotter_simpletest_imageplot_small.png)](https://github.com/jkriege2/JKQtPlotter/tree/master/test/jkqtplotter_simpletest_imageplot) | [Basic 1-channel Raw C Image Plot](https://github.com/jkriege2/JKQtPlotter/tree/master/test/jkqtplotter_simpletest_imageplot) | `JKQTPColumnMathImage`
image data copied from C-style row-major array into a single column of the internal datastore
Describes several options of the image plotting classes (different ways of color coding, what to do with data above/below the limits etc.) | +| [![](https://raw.githubusercontent.com/jkriege2/JKQtPlotter/master/screenshots/jkqtplotter_simpletest_imageplot_modifier_small.png)](https://github.com/jkriege2/JKQtPlotter/tree/master/test/jkqtplotter_simpletest_imageplot_modifier) | [Modifier-Feature of Image Plots](https://github.com/jkriege2/JKQtPlotter/tree/master/test/jkqtplotter_simpletest_imageplot_modifier) | `JKQTPColumnMathImage`
image data copied from C-style row-major array into a single column of the internal datastore
Image is modified by a second image to display two data dimensions at the same time | +| [![](https://raw.githubusercontent.com/jkriege2/JKQtPlotter/master/screenshots/jkqtplotter_simpletest_imageplot_nodatastore_small.png)](https://github.com/jkriege2/JKQtPlotter/tree/master/test/jkqtplotter_simpletest_imageplot_nodatastore) | [Basic 1-channel Raw C Image Plot
without the internal datastore](https://github.com/jkriege2/JKQtPlotter/tree/master/test/jkqtplotter_simpletest_imageplot_nodatastore) | `JKQTPMathImage`
image data in a C-style row-major array, not using internal datastore | | [![](https://raw.githubusercontent.com/jkriege2/JKQtPlotter/master/screenshots/jkqtplotter_simpletest_imageplot_opencv_small.png)](https://github.com/jkriege2/JKQtPlotter/tree/master/test/jkqtplotter_simpletest_imageplot_opencv) | [1-channel OpenCV cv::Mat Image Plot](https://github.com/jkriege2/JKQtPlotter/tree/master/test/jkqtplotter_simpletest_imageplot_opencv) | `JKQTPColumnMathImage`
image data copied from OpenCV cv::Mat-structure into a single column of the internal datastore | | [![](https://raw.githubusercontent.com/jkriege2/JKQtPlotter/master/screenshots/jkqtplotter_simpletest_rgbimageplot_opencv_small.png)](https://github.com/jkriege2/JKQtPlotter/tree/master/test/jkqtplotter_simpletest_rgbimageplot_opencv) | [RGB OpenCV cv::Mat Image Plot](https://github.com/jkriege2/JKQtPlotter/tree/master/test/jkqtplotter_simpletest_rgbimageplot_opencv) | `JKQTPColumnRGBMathImage`
image data copied from OpenCV cv::Mat-structure into three columns of the internal datastore | diff --git a/lib/jkqtplotter/jkqtpimageelements.h b/lib/jkqtplotter/jkqtpimageelements.h index 9a4faa4f35..c938ec45ab 100644 --- a/lib/jkqtplotter/jkqtpimageelements.h +++ b/lib/jkqtplotter/jkqtpimageelements.h @@ -302,18 +302,18 @@ class LIB_EXPORT JKQTPMathImage: public JKQTPMathImageBase { static QIcon getPaletteIcon(int i) ; /*! \brief get QIcon representing the given palette */ static QIcon getPaletteIcon(JKQTPMathImageColorPalette palette) ; - /*! \brief get QIcon representing the given palette */ + /*! \brief get QImage representing the given palette */ static QImage getPaletteImage(int i, int width, int height=1) ; - /*! \brief get QIcon representing the given palette */ + /*! \brief get QImage representing the given palette */ static QImage getPaletteImage(JKQTPMathImageColorPalette palette, int width, int height=1) ; /*! \brief get QIcon representing the given palette */ static QIcon getPaletteKeyIcon(int i) ; /*! \brief get QIcon representing the given palette */ static QIcon getPaletteKeyIcon(JKQTPMathImageColorPalette palette) ; - /*! \brief get QIcon representing the given palette */ + /*! \brief get QImage representing the given palette */ static QImage getPaletteKeyImage(int i, int width, int height) ; - /*! \brief get QIcon representing the given palette */ + /*! \brief get QImage representing the given palette */ static QImage getPaletteKeyImage(JKQTPMathImageColorPalette palette, int width, int height) ; diff --git a/screenshots/jkqtplotter_simpletest_imageplot__scale02.png b/screenshots/jkqtplotter_simpletest_imageplot__scale02.png new file mode 100644 index 0000000000..ebf2123189 Binary files /dev/null and b/screenshots/jkqtplotter_simpletest_imageplot__scale02.png differ diff --git a/screenshots/jkqtplotter_simpletest_imageplot__smallscalecolor.png b/screenshots/jkqtplotter_simpletest_imageplot__smallscalecolor.png new file mode 100644 index 0000000000..342d5340cd Binary files /dev/null and b/screenshots/jkqtplotter_simpletest_imageplot__smallscalecolor.png differ diff --git a/screenshots/jkqtplotter_simpletest_imageplot__smallscalelimitcolor.png b/screenshots/jkqtplotter_simpletest_imageplot__smallscalelimitcolor.png new file mode 100644 index 0000000000..698fe7ae0a Binary files /dev/null and b/screenshots/jkqtplotter_simpletest_imageplot__smallscalelimitcolor.png differ diff --git a/screenshots/jkqtplotter_simpletest_imageplot__smallscaletransparent.png b/screenshots/jkqtplotter_simpletest_imageplot__smallscaletransparent.png new file mode 100644 index 0000000000..a8e4610e6d Binary files /dev/null and b/screenshots/jkqtplotter_simpletest_imageplot__smallscaletransparent.png differ diff --git a/screenshots/jkqtplotter_simpletest_imageplot_modifier.png b/screenshots/jkqtplotter_simpletest_imageplot_modifier.png new file mode 100644 index 0000000000..1885b1ed5a Binary files /dev/null and b/screenshots/jkqtplotter_simpletest_imageplot_modifier.png differ diff --git a/screenshots/jkqtplotter_simpletest_imageplot_modifier_imageonly.png b/screenshots/jkqtplotter_simpletest_imageplot_modifier_imageonly.png new file mode 100644 index 0000000000..8a3e010db5 Binary files /dev/null and b/screenshots/jkqtplotter_simpletest_imageplot_modifier_imageonly.png differ diff --git a/screenshots/jkqtplotter_simpletest_imageplot_modifier_modifieronly.png b/screenshots/jkqtplotter_simpletest_imageplot_modifier_modifieronly.png new file mode 100644 index 0000000000..905dea1151 Binary files /dev/null and b/screenshots/jkqtplotter_simpletest_imageplot_modifier_modifieronly.png differ diff --git a/screenshots/jkqtplotter_simpletest_imageplot_nodatastore.png b/screenshots/jkqtplotter_simpletest_imageplot_nodatastore.png new file mode 100644 index 0000000000..76a6d756fa Binary files /dev/null and b/screenshots/jkqtplotter_simpletest_imageplot_nodatastore.png differ diff --git a/screenshots/jkqtplotter_simpletest_imageplot_nodatastore_small.png b/screenshots/jkqtplotter_simpletest_imageplot_nodatastore_small.png new file mode 100644 index 0000000000..0985f460c6 Binary files /dev/null and b/screenshots/jkqtplotter_simpletest_imageplot_nodatastore_small.png differ diff --git a/test/jkqtplot_test/TestWidgetBarcharts.cpp b/test/jkqtplot_test/TestWidgetBarcharts.cpp index cb8ca3a491..60f1f893b3 100644 --- a/test/jkqtplot_test/TestWidgetBarcharts.cpp +++ b/test/jkqtplot_test/TestWidgetBarcharts.cpp @@ -3,7 +3,7 @@ #include #include #include -#include "jkqtpbarchartelements.h" +#include "jkqtplotter/jkqtpbarchartelements.h" diff --git a/test/jkqtplot_test/TestWidgetBarcharts.h b/test/jkqtplot_test/TestWidgetBarcharts.h index 7f599959e0..3d4f2b2465 100644 --- a/test/jkqtplot_test/TestWidgetBarcharts.h +++ b/test/jkqtplot_test/TestWidgetBarcharts.h @@ -10,14 +10,14 @@ #include #include #include -#include "../../jkqtplotter.h" -#include "../../jkqtpgeoelements.h" -#include "../../jkqtpimageelements.h" -#include "../../jkqtpoverlayelements.h" -#include "../../jkqtpparsedfunctionelements.h" -#include "../../jkqtpbaseelements.h" -#include "../../jkqtpplotsmodel.h" -#include "../../jkqtptools.h" +#include "jkqtplotter/jkqtplotter.h" +#include "jkqtplotter/jkqtpgeoelements.h" +#include "jkqtplotter/jkqtpimageelements.h" +#include "jkqtplotter/jkqtpoverlayelements.h" +#include "jkqtplotter/jkqtpparsedfunctionelements.h" +#include "jkqtplotter/jkqtpbaseelements.h" +#include "jkqtplotter/jkqtpplotsmodel.h" +#include "jkqtplottertools/jkqtptools.h" #define N1 200 #define N2 50 diff --git a/test/jkqtplot_test/TestWidgetContourPlots.h b/test/jkqtplot_test/TestWidgetContourPlots.h index 68cf9cabef..98cd00aad8 100644 --- a/test/jkqtplot_test/TestWidgetContourPlots.h +++ b/test/jkqtplot_test/TestWidgetContourPlots.h @@ -10,14 +10,14 @@ #include #include #include -#include "../../jkqtplotter.h" -#include "../../jkqtpgeoelements.h" -#include "../../jkqtpimageelements.h" -#include "../../jkqtpoverlayelements.h" -#include "../../jkqtpparsedfunctionelements.h" -#include "../../jkqtpbaseelements.h" -#include "../../jkqtpplotsmodel.h" -#include "../../jkqtptools.h" +#include "jkqtplotter/jkqtplotter.h" +#include "jkqtplotter/jkqtpgeoelements.h" +#include "jkqtplotter/jkqtpimageelements.h" +#include "jkqtplotter/jkqtpoverlayelements.h" +#include "jkqtplotter/jkqtpparsedfunctionelements.h" +#include "jkqtplotter/jkqtpbaseelements.h" +#include "jkqtplotter/jkqtpplotsmodel.h" +#include "jkqtplottertools/jkqtptools.h" #define N1 200 #define N2 50 diff --git a/test/jkqtplot_test/TestWidgetEmptyPlot.h b/test/jkqtplot_test/TestWidgetEmptyPlot.h index 828c0490ee..6aee1d836b 100644 --- a/test/jkqtplot_test/TestWidgetEmptyPlot.h +++ b/test/jkqtplot_test/TestWidgetEmptyPlot.h @@ -10,14 +10,14 @@ #include #include #include -#include "../../jkqtplotter.h" -#include "../../jkqtpgeoelements.h" -#include "../../jkqtpimageelements.h" -#include "../../jkqtpoverlayelements.h" -#include "../../jkqtpparsedfunctionelements.h" -#include "../../jkqtpbaseelements.h" -#include "../../jkqtpplotsmodel.h" -#include "../../jkqtptools.h" +#include "jkqtplotter/jkqtplotter.h" +#include "jkqtplotter/jkqtpgeoelements.h" +#include "jkqtplotter/jkqtpimageelements.h" +#include "jkqtplotter/jkqtpoverlayelements.h" +#include "jkqtplotter/jkqtpparsedfunctionelements.h" +#include "jkqtplotter/jkqtpbaseelements.h" +#include "jkqtplotter/jkqtpplotsmodel.h" +#include "jkqtplottertools/jkqtptools.h" #define N1 200 #define N2 50 diff --git a/test/jkqtplot_test/TestWidgetFunctionPlots.h b/test/jkqtplot_test/TestWidgetFunctionPlots.h index fe419d67dd..9b7009e1c5 100644 --- a/test/jkqtplot_test/TestWidgetFunctionPlots.h +++ b/test/jkqtplot_test/TestWidgetFunctionPlots.h @@ -10,14 +10,14 @@ #include #include #include -#include "../../jkqtplotter.h" -#include "../../jkqtpgeoelements.h" -#include "../../jkqtpimageelements.h" -#include "../../jkqtpoverlayelements.h" -#include "../../jkqtpparsedfunctionelements.h" -#include "../../jkqtpbaseelements.h" -#include "../../jkqtpplotsmodel.h" -#include "../../jkqtptools.h" +#include "jkqtplotter/jkqtplotter.h" +#include "jkqtplotter/jkqtpgeoelements.h" +#include "jkqtplotter/jkqtpimageelements.h" +#include "jkqtplotter/jkqtpoverlayelements.h" +#include "jkqtplotter/jkqtpparsedfunctionelements.h" +#include "jkqtplotter/jkqtpbaseelements.h" +#include "jkqtplotter/jkqtpplotsmodel.h" +#include "jkqtplottertools/jkqtptools.h" #define N1 200 #define N2 50 diff --git a/test/jkqtplot_test/TestWidgetGeometry.h b/test/jkqtplot_test/TestWidgetGeometry.h index e60eba5490..3a5c21bda7 100644 --- a/test/jkqtplot_test/TestWidgetGeometry.h +++ b/test/jkqtplot_test/TestWidgetGeometry.h @@ -10,14 +10,14 @@ #include #include #include -#include "../../jkqtplotter.h" -#include "../../jkqtpgeoelements.h" -#include "../../jkqtpimageelements.h" -#include "../../jkqtpoverlayelements.h" -#include "../../jkqtpparsedfunctionelements.h" -#include "../../jkqtpbaseelements.h" -#include "../../jkqtpplotsmodel.h" -#include "../../jkqtptools.h" +#include "jkqtplotter/jkqtplotter.h" +#include "jkqtplotter/jkqtpgeoelements.h" +#include "jkqtplotter/jkqtpimageelements.h" +#include "jkqtplotter/jkqtpoverlayelements.h" +#include "jkqtplotter/jkqtpparsedfunctionelements.h" +#include "jkqtplotter/jkqtpbaseelements.h" +#include "jkqtplotter/jkqtpplotsmodel.h" +#include "jkqtplottertools/jkqtptools.h" #define N1 200 #define N2 50 diff --git a/test/jkqtplot_test/TestWidgetGraphs.cpp b/test/jkqtplot_test/TestWidgetGraphs.cpp index 9f1b46b041..cf87e543fb 100644 --- a/test/jkqtplot_test/TestWidgetGraphs.cpp +++ b/test/jkqtplot_test/TestWidgetGraphs.cpp @@ -3,7 +3,7 @@ #include #include #include -#include "jkqtpboxplotelements.h" +#include "jkqtplotter/jkqtpboxplotelements.h" diff --git a/test/jkqtplot_test/TestWidgetGraphs.h b/test/jkqtplot_test/TestWidgetGraphs.h index cd6fb65bee..640f42355a 100644 --- a/test/jkqtplot_test/TestWidgetGraphs.h +++ b/test/jkqtplot_test/TestWidgetGraphs.h @@ -10,14 +10,14 @@ #include #include #include -#include "../../jkqtplotter.h" -#include "../../jkqtpgeoelements.h" -#include "../../jkqtpimageelements.h" -#include "../../jkqtpoverlayelements.h" -#include "../../jkqtpparsedfunctionelements.h" -#include "../../jkqtpbaseelements.h" -#include "../../jkqtpplotsmodel.h" -#include "../../jkqtptools.h" +#include "jkqtplotter/jkqtplotter.h" +#include "jkqtplotter/jkqtpgeoelements.h" +#include "jkqtplotter/jkqtpimageelements.h" +#include "jkqtplotter/jkqtpoverlayelements.h" +#include "jkqtplotter/jkqtpparsedfunctionelements.h" +#include "jkqtplotter/jkqtpbaseelements.h" +#include "jkqtplotter/jkqtpplotsmodel.h" +#include "jkqtplottertools/jkqtptools.h" #define N1 200 #define N2 50 diff --git a/test/jkqtplot_test/TestWidgetImages.h b/test/jkqtplot_test/TestWidgetImages.h index 8198fa2054..7ea8b67020 100644 --- a/test/jkqtplot_test/TestWidgetImages.h +++ b/test/jkqtplot_test/TestWidgetImages.h @@ -10,14 +10,14 @@ #include #include #include -#include "../../jkqtplotter.h" -#include "../../jkqtpgeoelements.h" -#include "../../jkqtpimageelements.h" -#include "../../jkqtpoverlayelements.h" -#include "../../jkqtpparsedfunctionelements.h" -#include "../../jkqtpbaseelements.h" -#include "../../jkqtpplotsmodel.h" -#include "../../jkqtptools.h" +#include "jkqtplotter/jkqtplotter.h" +#include "jkqtplotter/jkqtpgeoelements.h" +#include "jkqtplotter/jkqtpimageelements.h" +#include "jkqtplotter/jkqtpoverlayelements.h" +#include "jkqtplotter/jkqtpparsedfunctionelements.h" +#include "jkqtplotter/jkqtpbaseelements.h" +#include "jkqtplotter/jkqtpplotsmodel.h" +#include "jkqtplottertools/jkqtptools.h" #define N1 200 #define N2 50 diff --git a/test/jkqtplot_test/TestWidgetLogGraphs.h b/test/jkqtplot_test/TestWidgetLogGraphs.h index 5bd2b267ea..9b45a163bf 100644 --- a/test/jkqtplot_test/TestWidgetLogGraphs.h +++ b/test/jkqtplot_test/TestWidgetLogGraphs.h @@ -10,14 +10,14 @@ #include #include #include -#include "../../jkqtplotter.h" -#include "../../jkqtpgeoelements.h" -#include "../../jkqtpimageelements.h" -#include "../../jkqtpoverlayelements.h" -#include "../../jkqtpparsedfunctionelements.h" -#include "../../jkqtpbaseelements.h" -#include "../../jkqtpplotsmodel.h" -#include "../../jkqtptools.h" +#include "jkqtplotter/jkqtplotter.h" +#include "jkqtplotter/jkqtpgeoelements.h" +#include "jkqtplotter/jkqtpimageelements.h" +#include "jkqtplotter/jkqtpoverlayelements.h" +#include "jkqtplotter/jkqtpparsedfunctionelements.h" +#include "jkqtplotter/jkqtpbaseelements.h" +#include "jkqtplotter/jkqtpplotsmodel.h" +#include "jkqtplottertools/jkqtptools.h" diff --git a/test/jkqtplot_test/TestWidgetParamScatterPlots.h b/test/jkqtplot_test/TestWidgetParamScatterPlots.h index caff8b55ee..b9bad502bf 100644 --- a/test/jkqtplot_test/TestWidgetParamScatterPlots.h +++ b/test/jkqtplot_test/TestWidgetParamScatterPlots.h @@ -10,14 +10,14 @@ #include #include #include -#include "../../jkqtplotter.h" -#include "../../jkqtpgeoelements.h" -#include "../../jkqtpimageelements.h" -#include "../../jkqtpoverlayelements.h" -#include "../../jkqtpparsedfunctionelements.h" -#include "../../jkqtpbaseelements.h" -#include "../../jkqtpplotsmodel.h" -#include "../../jkqtptools.h" +#include "jkqtplotter/jkqtplotter.h" +#include "jkqtplotter/jkqtpgeoelements.h" +#include "jkqtplotter/jkqtpimageelements.h" +#include "jkqtplotter/jkqtpoverlayelements.h" +#include "jkqtplotter/jkqtpparsedfunctionelements.h" +#include "jkqtplotter/jkqtpbaseelements.h" +#include "jkqtplotter/jkqtpplotsmodel.h" +#include "jkqtplottertools/jkqtptools.h" #define N1 200 #define N2 50 diff --git a/test/jkqtplot_test/TestWidgetPeaksPlots.h b/test/jkqtplot_test/TestWidgetPeaksPlots.h index 09d1d94db8..ba04e9b309 100644 --- a/test/jkqtplot_test/TestWidgetPeaksPlots.h +++ b/test/jkqtplot_test/TestWidgetPeaksPlots.h @@ -10,14 +10,14 @@ #include #include #include -#include "../../jkqtplotter.h" -#include "../../jkqtpgeoelements.h" -#include "../../jkqtpimageelements.h" -#include "../../jkqtpoverlayelements.h" -#include "../../jkqtpparsedfunctionelements.h" -#include "../../jkqtpbaseelements.h" -#include "../../jkqtpplotsmodel.h" -#include "../../jkqtptools.h" +#include "jkqtplotter/jkqtplotter.h" +#include "jkqtplotter/jkqtpgeoelements.h" +#include "jkqtplotter/jkqtpimageelements.h" +#include "jkqtplotter/jkqtpoverlayelements.h" +#include "jkqtplotter/jkqtpparsedfunctionelements.h" +#include "jkqtplotter/jkqtpbaseelements.h" +#include "jkqtplotter/jkqtpplotsmodel.h" +#include "jkqtplottertools/jkqtptools.h" #define N1 200 #define N2 50 diff --git a/test/jkqtplot_test/TestWidgetRGBImages.h b/test/jkqtplot_test/TestWidgetRGBImages.h index b0a014db83..ece1b8d9ee 100644 --- a/test/jkqtplot_test/TestWidgetRGBImages.h +++ b/test/jkqtplot_test/TestWidgetRGBImages.h @@ -10,14 +10,14 @@ #include #include #include -#include "../../jkqtplotter.h" -#include "../../jkqtpgeoelements.h" -#include "../../jkqtpimageelements.h" -#include "../../jkqtpoverlayelements.h" -#include "../../jkqtpparsedfunctionelements.h" -#include "../../jkqtpbaseelements.h" -#include "../../jkqtpplotsmodel.h" -#include "../../jkqtptools.h" +#include "jkqtplotter/jkqtplotter.h" +#include "jkqtplotter/jkqtpgeoelements.h" +#include "jkqtplotter/jkqtpimageelements.h" +#include "jkqtplotter/jkqtpoverlayelements.h" +#include "jkqtplotter/jkqtpparsedfunctionelements.h" +#include "jkqtplotter/jkqtpbaseelements.h" +#include "jkqtplotter/jkqtpplotsmodel.h" +#include "jkqtplottertools/jkqtptools.h" #define N1 200 #define N2 50 diff --git a/test/jkqtplotter_simpletest_imageplot/README.md b/test/jkqtplotter_simpletest_imageplot/README.md index 31d51040dd..0ebaee1f97 100644 --- a/test/jkqtplotter_simpletest_imageplot/README.md +++ b/test/jkqtplotter_simpletest_imageplot/README.md @@ -84,10 +84,7 @@ int main(int argc, char* argv[]) graph->get_colorBarRightAxis()->set_axisLabel("light intensity [A.U.]"); // determine min/max of data automatically and use it to set the range of the color-scale graph->set_autoImageRange(true); - // you can set the color-scale range manually by using: - // graph->set_autoImageRange(false); - // graph->set_imageMin(0); - // graph->set_imageMax(10); + // 5. add the graphs to the plot, so it is actually displayed @@ -120,4 +117,36 @@ The result looks like this: ![jkqtplotter_simpletest_imageplot](https://raw.githubusercontent.com/jkriege2/JKQtPlotter/master/screenshots/jkqtplotter_simpletest_imageplot.png) +There are several ways to modify the plot: + # You can set the color scale manually (here 0..2), by using + ``` + graph->set_autoImageRange(false); + graph->set_imageMin(0); + graph->set_imageMax(2); + ``` + instead of + ``` + graph->set_autoImageRange(true); + ``` + from above. The result will look like this:
+ ![jkqtplotter_simpletest_imageplot__scale02](https://raw.githubusercontent.com/jkriege2/JKQtPlotter/master/screenshots/jkqtplotter_simpletest_imageplot__scale02.png)
+ Note how the color scale is not used completely, because data really only scales between 0 and 1. + # If you set the color-range to 0.1 .. 0.8 with + ``` + graph->set_autoImageRange(false); + graph->set_imageMin(0.1); + graph->set_imageMax(0.8); + ``` + Then there will be datapoints above or below the range of the colorscale. The default behaviour of the graph is to use the first color of the palette for every pixel with a value below the minimum (here 0.1) and the last color in the palette for every pixel with a value above the maximum.
+ ![jkqtplotter_simpletest_imageplot__smallscalelimitcolor](https://raw.githubusercontent.com/jkriege2/JKQtPlotter/master/screenshots/jkqtplotter_simpletest_imageplot__smallscalelimitcolor.png)
+ You can change this behaviour by `set_rangeMinFailAction(),set_rangeMaxFailAction()` with one of these parameters: + - `JKQTPMathImageLastPaletteColor`: the default behaviour explained above + - `JKQTPMathImageGivenColor`: use a color set by `set_rangeMinFailColor(),set_rangeMaxFailColor()` (here e.g. black for min and grey for max)
+ ![jkqtplotter_simpletest_imageplot__smallscalecolor](https://raw.githubusercontent.com/jkriege2/JKQtPlotter/master/screenshots/jkqtplotter_simpletest_imageplot__smallscalecolor.png) + - `JKQTPMathImageTransparent`: draw pixels transparent
+ ![jkqtplotter_simpletest_imageplot__smallscaletransparent](https://raw.githubusercontent.com/jkriege2/JKQtPlotter/master/screenshots/jkqtplotter_simpletest_imageplot__smallscaletransparent.png) + . +. + + [Back to JKQTPlotter main page](https://github.com/jkriege2/JKQtPlotter/) \ No newline at end of file diff --git a/test/jkqtplotter_simpletest_imageplot_modifier/README.md b/test/jkqtplotter_simpletest_imageplot_modifier/README.md new file mode 100644 index 0000000000..778f2fae7f --- /dev/null +++ b/test/jkqtplotter_simpletest_imageplot_modifier/README.md @@ -0,0 +1,125 @@ +[Back to JKQTPlotter main page](https://github.com/jkriege2/JKQtPlotter/) + +# JKQtPlotter + +## Simple math image plot +This project (see `./test/jkqtplotter_simpletest_imageplot_modifier/`) creates a JKQtPlotter widget (as a new window) and adds a color-coded image plot of a mathematical function (here `sin(r)`). Then a second image (linearly scaling from 1 in the center to 0 at the borders) is used to modify the first image. The modification can + +The soruce code of the main application is (see `./test/jkqtplotter_simpletest_imageplot_modifier/jkqtplotter_simpletest_imageplot_modifier.cpp`): +```c++ +#include +#include +#include "jkqtplotter/jkqtplotter.h" +#include "jkqtplotter/jkqtpimageelements.h" + +#ifndef M_PI +#define M_PI 3.14159265358979323846 +#endif + + +int main(int argc, char* argv[]) +{ + QApplication app(argc, argv); + + JKQtPlotter plot; + // 1. create a plotter window and get a pointer to the internal datastore (for convenience) + plot.get_plotter()->set_useAntiAliasingForGraphs(true); // nicer (but slower) plotting + plot.get_plotter()->set_useAntiAliasingForSystem(true); // nicer (but slower) plotting + plot.get_plotter()->set_useAntiAliasingForText(true); // nicer (but slower) text rendering + JKQTPdatastore* ds=plot.getDatastore(); + + // 2. now we create data for the charts (taken from https://commons.wikimedia.org/wiki/File:Energiemix_Deutschland.svg) + const int NX=150; // image dimension in x-direction [pixels] + const int NY=150; // image dimension in x-direction [pixels] + double image[NX*NY]; // row-major image + double modifier[NX*NY]; // row-major modfier image + + // 2 calculate image of airy disk in a row-major array + double x, y=-static_cast(NY)/2.0; + for (int iy=0; iy(NX)/2.0; + for (int ix=0; ixaddCopiedImageAsColumn(image, NX, NY, "imagedata"); + size_t cModifier=ds->addCopiedImageAsColumn(modifier, NX, NY, "modifier"); + + + // 4. create a graph (JKQTPColumnMathImage) with the column created above as data + // The data is color-coded with the color-palette JKQTPMathImageMATLAB + // the converted range of data is determined automatically because set_autoImageRange(true) + JKQTPColumnMathImage* graph=new JKQTPColumnMathImage(&plot); + graph->set_title(""); + // image column with the data + graph->set_imageColumn(cImage); + // now set the modifier image: + graph->set_modifierColumn(cModifier); + graph->set_autoModifierRange(true); + // ... and specify which image property is modified (here the saturation, but ModifyAlpha for the transparency and ModifyValue from the HSV color-model are also possible): + graph->set_modifierMode(JKQTPMathImageBase::ModifySaturation); + // 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->set_Nx(NX); + graph->set_Ny(NY); + // where does the image start in the plot, given in plot-axis-coordinates (bottom-left corner) + graph->set_x(-NX/2.0); + graph->set_y(-NX/2.0); + // width and height of the image in plot-axis-coordinates + graph->set_width(NX); + graph->set_height(NY); + // color-map is "MATLAB" + graph->set_palette(JKQTPMathImageMATLAB); + // determine min/max of data automatically and use it to set the range of the color-scale + graph->set_autoImageRange(true); + + + + + // 5. add the graphs to the plot, so it is actually displayed + plot.addGraph(graph); + + + // 6. set axis labels + plot.get_xAxis()->set_axisLabel("x [{\\mu}m]"); + plot.get_yAxis()->set_axisLabel("y [{\\mu}m]"); + + + // 7. fix axis and plot aspect ratio to 1 + plot.get_plotter()->set_maintainAspectRatio(true); + plot.get_plotter()->set_maintainAxisAspectRatio(true); + + // 8 autoscale the plot so the graph is contained + plot.zoomToFit(); + + // show plotter and make it a decent size + plot.show(); + plot.resize(500,500); + plot.setWindowTitle("JKQTPColumnMathImage"); + + + return app.exec(); +} +``` +The data image (`sin(r/30)`) on its own looks like this:
+![jkqtplotter_simpletest_imageplot_modifier_imageonly](https://raw.githubusercontent.com/jkriege2/JKQtPlotter/master/screenshots/jkqtplotter_simpletest_imageplot_modifier_imageonly.png)
+and the modifier image on its own would look like this:
+![jkqtplotter_simpletest_imageplot_modifier_modifieronly](https://raw.githubusercontent.com/jkriege2/JKQtPlotter/master/screenshots/jkqtplotter_simpletest_imageplot_modifier_modifieronly.png) + +Combined the two form this plot:
+![jkqtplotter_simpletest_imageplot_modifier](https://raw.githubusercontent.com/jkriege2/JKQtPlotter/master/screenshots/jkqtplotter_simpletest_imageplot_modifier.png) + + +See [`test/jkqtplotter_simpletest_imageplot`](https://github.com/jkriege2/JKQtPlotter/tree/master/test/jkqtplotter_simpletest_imageplot) for a detailed description of the other possibilities that the class JKQTPColumnMathImage (and also JKQTPMathImage) offer with respect to determining how an image is plotted. You can combine all options there with the modifier feature described here. + + +[Back to JKQTPlotter main page](https://github.com/jkriege2/JKQtPlotter/) \ No newline at end of file diff --git a/test/jkqtplotter_simpletest_imageplot_modifier/jkqtplotter_simpletest_imageplot_modifier.cpp b/test/jkqtplotter_simpletest_imageplot_modifier/jkqtplotter_simpletest_imageplot_modifier.cpp new file mode 100644 index 0000000000..81ab12633e --- /dev/null +++ b/test/jkqtplotter_simpletest_imageplot_modifier/jkqtplotter_simpletest_imageplot_modifier.cpp @@ -0,0 +1,102 @@ +#include +#include +#include "jkqtplotter/jkqtplotter.h" +#include "jkqtplotter/jkqtpimageelements.h" + +#ifndef M_PI +#define M_PI 3.14159265358979323846 +#endif + + +int main(int argc, char* argv[]) +{ + QApplication app(argc, argv); + + JKQtPlotter plot; + // 1. create a plotter window and get a pointer to the internal datastore (for convenience) + plot.get_plotter()->set_useAntiAliasingForGraphs(true); // nicer (but slower) plotting + plot.get_plotter()->set_useAntiAliasingForSystem(true); // nicer (but slower) plotting + plot.get_plotter()->set_useAntiAliasingForText(true); // nicer (but slower) text rendering + JKQTPdatastore* ds=plot.getDatastore(); + + // 2. now we create data for the charts (taken from https://commons.wikimedia.org/wiki/File:Energiemix_Deutschland.svg) + const int NX=150; // image dimension in x-direction [pixels] + const int NY=150; // image dimension in x-direction [pixels] + double image[NX*NY]; // row-major image + double modifier[NX*NY]; // row-major modfier image + + // 2 calculate image of airy disk in a row-major array + double x, y=-static_cast(NY)/2.0; + for (int iy=0; iy(NX)/2.0; + for (int ix=0; ixaddCopiedImageAsColumn(image, NX, NY, "imagedata"); + size_t cModifier=ds->addCopiedImageAsColumn(modifier, NX, NY, "modifier"); + + + // 4. create a graph (JKQTPColumnMathImage) with the column created above as data + // The data is color-coded with the color-palette JKQTPMathImageMATLAB + // the converted range of data is determined automatically because set_autoImageRange(true) + JKQTPColumnMathImage* graph=new JKQTPColumnMathImage(&plot); + graph->set_title(""); + // image column with the data + graph->set_imageColumn(cImage); + // now set the modifier image: + graph->set_modifierColumn(cModifier); + graph->set_autoModifierRange(true); + // ... and specify which image property is modified (here the saturation, but ModifyAlpha for the transparency and ModifyValue from the HSV color-model are also possible): + graph->set_modifierMode(JKQTPMathImageBase::ModifySaturation); + // 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->set_Nx(NX); + graph->set_Ny(NY); + // where does the image start in the plot, given in plot-axis-coordinates (bottom-left corner) + graph->set_x(-NX/2.0); + graph->set_y(-NX/2.0); + // width and height of the image in plot-axis-coordinates + graph->set_width(NX); + graph->set_height(NY); + // color-map is "MATLAB" + graph->set_palette(JKQTPMathImageMATLAB); + // determine min/max of data automatically and use it to set the range of the color-scale + graph->set_autoImageRange(true); + + + + + // 5. add the graphs to the plot, so it is actually displayed + plot.addGraph(graph); + + + // 6. set axis labels + plot.get_xAxis()->set_axisLabel("x [{\\mu}m]"); + plot.get_yAxis()->set_axisLabel("y [{\\mu}m]"); + + + // 7. fix axis and plot aspect ratio to 1 + plot.get_plotter()->set_maintainAspectRatio(true); + plot.get_plotter()->set_maintainAxisAspectRatio(true); + + // 8 autoscale the plot so the graph is contained + plot.zoomToFit(); + + // show plotter and make it a decent size + plot.show(); + plot.resize(500,500); + plot.setWindowTitle("JKQTPColumnMathImage"); + + + return app.exec(); +} diff --git a/test/jkqtplotter_simpletest_imageplot_modifier/jkqtplotter_simpletest_imageplot_modifier.pro b/test/jkqtplotter_simpletest_imageplot_modifier/jkqtplotter_simpletest_imageplot_modifier.pro new file mode 100644 index 0000000000..b8034f92d0 --- /dev/null +++ b/test/jkqtplotter_simpletest_imageplot_modifier/jkqtplotter_simpletest_imageplot_modifier.pro @@ -0,0 +1,16 @@ +# source code for this simple demo +SOURCES = jkqtplotter_simpletest_imageplot_modifier.cpp + +# configure Qt +CONFIG += qt +QT += core gui svg +greaterThan(QT_MAJOR_VERSION, 4): QT += widgets printsupport + +# output executable name +TARGET = jkqtplotter_simpletest_imageplot_modifier + +# include JKQtPlotter source code +include(../../lib/jkqtplotter.pri) +# here you can activate some debug options +#DEFINES += SHOW_JKQTPLOTTER_DEBUG +#DEFINES += JKQTBP_AUTOTIMER diff --git a/test/jkqtplotter_simpletest_imageplot_nodatastore/README.md b/test/jkqtplotter_simpletest_imageplot_nodatastore/README.md new file mode 100644 index 0000000000..02ee24f6ad --- /dev/null +++ b/test/jkqtplotter_simpletest_imageplot_nodatastore/README.md @@ -0,0 +1,115 @@ +[Back to JKQTPlotter main page](https://github.com/jkriege2/JKQtPlotter/) + +# JKQtPlotter + +## Simple math image plot without use of central JKQTdatastore +This project (see `./test/jkqtplotter_simpletest_imageplot_nodatastore/`) simply creates a JKQtPlotter widget (as a new window) and adds a color-coded image plot of a mathematical function (here the Airy disk). The image is stored as a simple C-array in row-major ordering and then given to a JKQTPMathImage to visualize it. The data is stored as a pointer directly in the JKQTPMathImage object. There is also a variant JKQTPColumnMathImage of JKQTPMathImage, which references a column in the internal JKQTdatastore and uses the data there for plotting. In both cases data has to be organized as a row-major matrix of values. JKQTPMathImage supports different dataytpes ([u]nit8/16/32/64,float,double see `JKQTPMathImageBase::DataType`) that can be configured e.g. by `set_data()`. + +The soruce code of the main application is (see `./test/jkqtplotter_simpletest_imageplot_nodatastore/jkqtplotter_simpletest_imageplot_nodatastore.cpp`): +```c++ +#include +#include +#include "jkqtplotter/jkqtplotter.h" +#include "jkqtplotter/jkqtpimageelements.h" + +#ifndef M_PI +#define M_PI 3.14159265358979323846 +#endif + + +int main(int argc, char* argv[]) +{ + QApplication app(argc, argv); + + JKQtPlotter plot; + // 1. create a plotter window and get a pointer to the internal datastore (for convenience) + plot.get_plotter()->set_useAntiAliasingForGraphs(true); // nicer (but slower) plotting + plot.get_plotter()->set_useAntiAliasingForSystem(true); // nicer (but slower) plotting + plot.get_plotter()->set_useAntiAliasingForText(true); // nicer (but slower) text rendering + + // 2. now we create data for the charts (taken from https://commons.wikimedia.org/wiki/File:Energiemix_Deutschland.svg) + const int NX=100; // image dimension in x-direction [pixels] + const int NY=100; // image dimension in x-direction [pixels] + const double dx=1e-2; // size of a pixel in x-direction [micrometers] + const double dy=1e-2; // size of a pixel in x-direction [micrometers] + const double w=static_cast(NX)*dx; + const double h=static_cast(NY)*dy; + double airydisk[NX*NY]; // row-major image + + // 2.1 Parameters for airy disk plot (see https://en.wikipedia.org/wiki/Airy_disk) + double NA=1.1; // numerical aperture of lens + double wavelength=488e-3; // wavelength of the light [micrometers] + + // 2.2 calculate image of airy disk in a row-major array + double x, y=-h/2.0; + for (int iy=0; iyset_title(""); + // set array as datasource, with correct size NX*NY and datatype JKQTPMathImageBase::DataType::DoubleArray + graph->set_data(airydisk, NX, NY, JKQTPMathImageBase::DataType::DoubleArray); + // where does the image start in the plot, given in plot-axis-coordinates (bottom-left corner) + graph->set_x(-w/2.0); + graph->set_y(-h/2.0); + // width and height of the image in plot-axis-coordinates + graph->set_width(w); + graph->set_height(h); + // color-map is "BLUEYELLOW" + graph->set_palette(JKQTPMathImageBLUEYELLOW); + // get coordinate axis of color-bar and set its label + graph->get_colorBarRightAxis()->set_axisLabel("light intensity [A.U.]"); + // determine min/max of data automatically and use it to set the range of the color-scale + graph->set_autoImageRange(true); + // you can set the color-scale range manually by using: + // graph->set_autoImageRange(false); + // graph->set_imageMin(0); + // graph->set_imageMax(10); + + + // 4. add the graphs to the plot, so it is actually displayed + plot.addGraph(graph); + + + // 5. set axis labels + plot.get_xAxis()->set_axisLabel("x [{\\mu}m]"); + plot.get_yAxis()->set_axisLabel("y [{\\mu}m]"); + + + // 6. fix axis and plot aspect ratio to 1 + plot.get_plotter()->set_maintainAspectRatio(true); + plot.get_plotter()->set_maintainAxisAspectRatio(true); + + // 7. autoscale the plot so the graph is contained + plot.zoomToFit(); + + // show plotter and make it a decent size + plot.show(); + plot.resize(600,600); + plot.setWindowTitle("JKQTPMathImage"); + + + return app.exec(); +} +``` + +The result looks like this: + +![jkqtplotter_simpletest_imageplot_nodatastore](https://raw.githubusercontent.com/jkriege2/JKQtPlotter/master/screenshots/jkqtplotter_simpletest_imageplot_nodatastore.png) + +See [`test/jkqtplotter_simpletest_imageplot`](https://github.com/jkriege2/JKQtPlotter/tree/master/test/jkqtplotter_simpletest_imageplot) for a detailed description of the other possibilities that the class JKQTPColumnMathImage (and also JKQTPMathImage) offer with respect to determining how an image is plottet. + + +[Back to JKQTPlotter main page](https://github.com/jkriege2/JKQtPlotter/) \ No newline at end of file diff --git a/test/jkqtplotter_simpletest_imageplot_nodatastore/jkqtplotter_simpletest_imageplot_nodatastore.cpp b/test/jkqtplotter_simpletest_imageplot_nodatastore/jkqtplotter_simpletest_imageplot_nodatastore.cpp new file mode 100644 index 0000000000..574a06a869 --- /dev/null +++ b/test/jkqtplotter_simpletest_imageplot_nodatastore/jkqtplotter_simpletest_imageplot_nodatastore.cpp @@ -0,0 +1,96 @@ +#include +#include +#include "jkqtplotter/jkqtplotter.h" +#include "jkqtplotter/jkqtpimageelements.h" + +#ifndef M_PI +#define M_PI 3.14159265358979323846 +#endif + + +int main(int argc, char* argv[]) +{ + QApplication app(argc, argv); + + JKQtPlotter plot; + // 1. create a plotter window and get a pointer to the internal datastore (for convenience) + plot.get_plotter()->set_useAntiAliasingForGraphs(true); // nicer (but slower) plotting + plot.get_plotter()->set_useAntiAliasingForSystem(true); // nicer (but slower) plotting + plot.get_plotter()->set_useAntiAliasingForText(true); // nicer (but slower) text rendering + + // 2. now we create data for the charts (taken from https://commons.wikimedia.org/wiki/File:Energiemix_Deutschland.svg) + const int NX=100; // image dimension in x-direction [pixels] + const int NY=100; // image dimension in x-direction [pixels] + const double dx=1e-2; // size of a pixel in x-direction [micrometers] + const double dy=1e-2; // size of a pixel in x-direction [micrometers] + const double w=static_cast(NX)*dx; + const double h=static_cast(NY)*dy; + double airydisk[NX*NY]; // row-major image + + // 2.1 Parameters for airy disk plot (see https://en.wikipedia.org/wiki/Airy_disk) + double NA=1.1; // numerical aperture of lens + double wavelength=488e-3; // wavelength of the light [micrometers] + + // 2.2 calculate image of airy disk in a row-major array + double x, y=-h/2.0; + for (int iy=0; iyset_title(""); + // set array as datasource, with correct size NX*NY and datatype JKQTPMathImageBase::DataType::DoubleArray + graph->set_data(airydisk, NX, NY, JKQTPMathImageBase::DataType::DoubleArray); + // where does the image start in the plot, given in plot-axis-coordinates (bottom-left corner) + graph->set_x(-w/2.0); + graph->set_y(-h/2.0); + // width and height of the image in plot-axis-coordinates + graph->set_width(w); + graph->set_height(h); + // color-map is "BLUEYELLOW" + graph->set_palette(JKQTPMathImageBLUEYELLOW); + // get coordinate axis of color-bar and set its label + graph->get_colorBarRightAxis()->set_axisLabel("light intensity [A.U.]"); + // determine min/max of data automatically and use it to set the range of the color-scale + graph->set_autoImageRange(true); + // you can set the color-scale range manually by using: + // graph->set_autoImageRange(false); + // graph->set_imageMin(0); + // graph->set_imageMax(10); + + + // 4. add the graphs to the plot, so it is actually displayed + plot.addGraph(graph); + + + // 5. set axis labels + plot.get_xAxis()->set_axisLabel("x [{\\mu}m]"); + plot.get_yAxis()->set_axisLabel("y [{\\mu}m]"); + + + // 6. fix axis and plot aspect ratio to 1 + plot.get_plotter()->set_maintainAspectRatio(true); + plot.get_plotter()->set_maintainAxisAspectRatio(true); + + // 7. autoscale the plot so the graph is contained + plot.zoomToFit(); + + // show plotter and make it a decent size + plot.show(); + plot.resize(600,600); + plot.setWindowTitle("JKQTPMathImage"); + + + return app.exec(); +} diff --git a/test/jkqtplotter_simpletest_imageplot_nodatastore/jkqtplotter_simpletest_imageplot_nodatastore.pro b/test/jkqtplotter_simpletest_imageplot_nodatastore/jkqtplotter_simpletest_imageplot_nodatastore.pro new file mode 100644 index 0000000000..4ec689b9d0 --- /dev/null +++ b/test/jkqtplotter_simpletest_imageplot_nodatastore/jkqtplotter_simpletest_imageplot_nodatastore.pro @@ -0,0 +1,16 @@ +# source code for this simple demo +SOURCES = jkqtplotter_simpletest_imageplot_nodatastore.cpp + +# configure Qt +CONFIG += qt +QT += core gui svg +greaterThan(QT_MAJOR_VERSION, 4): QT += widgets printsupport + +# output executable name +TARGET = jkqtplotter_simpletest_imageplot_nodatastore + +# include JKQtPlotter source code +include(../../lib/jkqtplotter.pri) +# here you can activate some debug options +#DEFINES += SHOW_JKQTPLOTTER_DEBUG +#DEFINES += JKQTBP_AUTOTIMER diff --git a/test/jkqtplotter_simpletest_imageplot_opencv/README.md b/test/jkqtplotter_simpletest_imageplot_opencv/README.md index d5b81342f9..30b9e4da64 100644 --- a/test/jkqtplotter_simpletest_imageplot_opencv/README.md +++ b/test/jkqtplotter_simpletest_imageplot_opencv/README.md @@ -122,4 +122,6 @@ The result looks like this: ![jkqtplotter_simpletest_imageplot](https://raw.githubusercontent.com/jkriege2/JKQtPlotter/master/screenshots/jkqtplotter_simpletest_imageplot_opencv.png) +See [`test/jkqtplotter_simpletest_imageplot`](https://github.com/jkriege2/JKQtPlotter/tree/master/test/jkqtplotter_simpletest_imageplot) for a detailed description of the other possibilities that the class JKQTPColumnMathImage (and also JKQTPMathImage) offer with respect to determining how an image is plottet. + [Back to JKQTPlotter main page](https://github.com/jkriege2/JKQtPlotter/) \ No newline at end of file