From d886757a1ce063d167a6ef8adba81b79c83a624d Mon Sep 17 00:00:00 2001 From: jkriege2 Date: Sat, 9 Feb 2019 15:25:16 +0100 Subject: [PATCH] moved build-projects for libs into their own subdirectories (works better with QMake, when building different libs) + necessary docu updates --- JKQtPlotterBuildAllExamples.pro | 20 ++- doc/dox/buildinstructions.dox | 36 ++-- doc/dox/examples_and_tutorials.dox | 3 + doc/dox/mainpage.dox | 12 ++ examples/README.md | 3 +- examples/jkqtfastplotter_test/README.md | 159 ++++++++++++++++++ .../jkqtfastplotter_test.pro | 6 +- .../jkqtfastplotter_test_and_lib.pro | 6 +- .../jkqtfastplotter_test_testmain.cpp | 1 + .../jkqtmathtext_simpletest.pro | 6 +- .../jkqtmathtext_simpletest_and_lib.pro | 2 +- .../jkqtmathtext_test/jkqtmathtext_test.pro | 14 +- .../jkqtmathtext_test_and_lib.pro | 7 +- examples/jkqtplot_test/jkqtplot_test.pro | 4 +- .../jkqtplot_test/jkqtplot_test_and_lib.pro | 2 +- examples/simpletest/README.md | 6 +- .../simpletest/jkqtplotter_simpletest.pro | 6 +- .../jkqtplotter_simpletest_and_lib.pro | 2 +- .../jkqtplotter_simpletest_barchart.pro | 6 +- ...kqtplotter_simpletest_barchart_and_lib.pro | 2 +- .../jkqtplotter_simpletest_boxplot.pro | 6 +- ...jkqtplotter_simpletest_boxplot_and_lib.pro | 2 +- .../jkqtplotter_simpletest_dateaxes.pro | 6 +- ...kqtplotter_simpletest_dateaxes_and_lib.pro | 2 +- .../jkqtplotter_simpletest_errorbarstyles.pro | 6 +- ...tter_simpletest_errorbarstyles_and_lib.pro | 2 +- .../jkqtplotter_simpletest_filledgraphs.pro | 6 +- ...lotter_simpletest_filledgraphs_and_lib.pro | 2 +- .../jkqtplotter_simpletest_functionplot.pro | 6 +- ...lotter_simpletest_functionplot_and_lib.pro | 2 +- .../jkqtplotter_simpletest_geometric.pro | 4 +- ...qtplotter_simpletest_geometric_and_lib.pro | 2 +- .../jkqtplotter_simpletest_imageplot.pro | 6 +- ...qtplotter_simpletest_imageplot_and_lib.pro | 2 +- ...tplotter_simpletest_imageplot_modifier.pro | 6 +- ..._simpletest_imageplot_modifier_and_lib.pro | 2 +- ...otter_simpletest_imageplot_nodatastore.pro | 6 +- ...mpletest_imageplot_nodatastore_and_lib.pro | 2 +- ...kqtplotter_simpletest_imageplot_opencv.pro | 4 +- .../jkqtplotter_simpletest_impulsesplot.pro | 6 +- ...lotter_simpletest_impulsesplot_and_lib.pro | 2 +- .../jkqtplotter_simpletest_logaxes.pro | 6 +- ...jkqtplotter_simpletest_logaxes_and_lib.pro | 2 +- ...jkqtplotter_simpletest_parametriccurve.pro | 6 +- ...ter_simpletest_parametriccurve_and_lib.pro | 2 +- ...kqtplotter_simpletest_paramscatterplot.pro | 6 +- ...er_simpletest_paramscatterplot_and_lib.pro | 2 +- ...tter_simpletest_paramscatterplot_image.pro | 6 +- ...pletest_paramscatterplot_image_and_lib.pro | 2 +- ...tplotter_simpletest_parsedfunctionplot.pro | 6 +- ..._simpletest_parsedfunctionplot_and_lib.pro | 2 +- ...plotter_simpletest_rgbimageplot_opencv.pro | 4 +- ...jkqtplotter_simpletest_rgbimageplot_qt.pro | 6 +- ...ter_simpletest_rgbimageplot_qt_and_lib.pro | 2 +- .../jkqtplotter_simpletest_speed.pro | 6 +- .../jkqtplotter_simpletest_speed_and_lib.pro | 2 +- .../jkqtplotter_simpletest_stackedbars.pro | 6 +- ...plotter_simpletest_stackedbars_and_lib.pro | 2 +- .../jkqtplotter_simpletest_stepplots.pro | 6 +- ...qtplotter_simpletest_stepplots_and_lib.pro | 2 +- ...tplotter_simpletest_symbols_and_errors.pro | 6 +- ..._simpletest_symbols_and_errors_and_lib.pro | 2 +- ...tplotter_simpletest_symbols_and_styles.pro | 6 +- ..._simpletest_symbols_and_styles_and_lib.pro | 2 +- examples/simpletest_ui/README.md | 6 +- .../jkqtplotter_simpletest_ui.pro | 4 +- .../jkqtplotter_simpletest_ui_and_lib.pro | 2 +- .../test_distributionplot.pro | 6 +- .../test_distributionplot_and_lib.pro | 2 +- examples/test_multiplot/test_multiplot.pro | 4 +- .../test_multiplot/test_multiplot_and_lib.pro | 2 +- examples/test_styling/test_styling.pro | 4 +- .../test_styling/test_styling_and_lib.pro | 2 +- .../test_user_interaction.pro | 4 +- .../test_user_interaction_and_lib.pro | 2 +- screenshots/jkqtfastplotter_test.png | Bin 0 -> 43199 bytes screenshots/jkqtfastplotter_test_small.png | Bin 0 -> 20129 bytes sharedlib/README.md | 12 +- .../jkqtfastplotterlib.pro} | 2 +- .../jkqtmathtextlib.pro} | 2 +- .../jkqtplotterlib.pro} | 2 +- staticlib/README.md | 8 +- .../jkqtfastplotterlib.pro | 2 +- .../{ => jkqtmathtextlib}/jkqtmathtextlib.pro | 4 +- .../jkqtphighrestimerlib.pro | 13 ++ .../{ => jkqtplotterlib}/jkqtplotterlib.pro | 2 +- 86 files changed, 388 insertions(+), 174 deletions(-) create mode 100644 examples/jkqtfastplotter_test/README.md create mode 100644 screenshots/jkqtfastplotter_test.png create mode 100644 screenshots/jkqtfastplotter_test_small.png rename sharedlib/{jkqtfastplotterlib_sharedlib.pro => jkqtfastplotterlib/jkqtfastplotterlib.pro} (88%) rename sharedlib/{jkqtmathtextlib_sharedlib.pro => jkqtmathtextlib/jkqtmathtextlib.pro} (89%) rename sharedlib/{jkqtplotterlib_sharedlib.pro => jkqtplotterlib/jkqtplotterlib.pro} (89%) rename staticlib/{ => jkqtfastplotterlib}/jkqtfastplotterlib.pro (85%) rename staticlib/{ => jkqtmathtextlib}/jkqtmathtextlib.pro (79%) create mode 100644 staticlib/jkqtphighrestimerlib/jkqtphighrestimerlib.pro rename staticlib/{ => jkqtplotterlib}/jkqtplotterlib.pro (88%) diff --git a/JKQtPlotterBuildAllExamples.pro b/JKQtPlotterBuildAllExamples.pro index 559f303dee..b711d68ce5 100644 --- a/JKQtPlotterBuildAllExamples.pro +++ b/JKQtPlotterBuildAllExamples.pro @@ -2,6 +2,11 @@ TEMPLATE = subdirs SUBDIRS += jkqtplotterlib \ jkqtplotterlib_sharedlib \ + jkqtmathtextlib \ + jkqtmathtextlib_sharedlib \ + jkqtfastplotterlib \ + jkqtfastplotterlib_sharedlib \ + jkqtphighrestimerlib \ jkqtmathtext_simpletest \ jkqtplot_test \ jkqtplotter_simpletest \ @@ -9,12 +14,19 @@ SUBDIRS += jkqtplotterlib \ jkqtfastplotter_test -jkqtplotterlib.file = staticlib/jkqtplotterlib.pro +jkqtplotterlib.file = staticlib/jkqtplotterlib/jkqtplotterlib.pro +jkqtplotterlib_sharedlib.file = sharedlib/jkqtplotterlib/jkqtplotterlib.pro -jkqtplotterlib_sharedlib.file = sharedlib/jkqtplotterlib_sharedlib.pro +jkqtmathtextlib.file = staticlib/jkqtmathtextlib/jkqtmathtextlib.pro +jkqtmathtextlib_sharedlib.file = sharedlib/jkqtmathtextlib/jkqtmathtextlib.pro + +jkqtfastplotterlib.file = staticlib/jkqtfastplotterlib/jkqtfastplotterlib.pro +jkqtfastplotterlib_sharedlib.file = sharedlib/jkqtfastplotterlib/jkqtfastplotterlib.pro + +jkqtphighrestimerlib.file = staticlib/jkqtphighrestimerlib/jkqtphighrestimerlib.pro jkqtmathtext_simpletest.subdir = examples/jkqtmathtext_simpletest -jkqtmathtext_simpletest.depends = jkqtplotterlib +jkqtmathtext_simpletest.depends = jkqtmathtextlib jkqtphighrestimerlib jkqtmathtext_test.subdir = examples/jkqtmathtext_test jkqtmathtext_test.depends = jkqtplotterlib @@ -26,7 +38,7 @@ jkqtplotter_simpletest.file = examples/simpletest/jkqtplotter_simpletest.pro jkqtplotter_simpletest.depends = jkqtplotterlib jkqtfastplotter_test.file = $$PWD/examples/jkqtfastplotter_test/jkqtfastplotter_test.pro -jkqtfastplotter_test.depends = jkqtplotterlib +jkqtfastplotter_test.depends = jkqtfastplotterlib defineTest(addSimpleTest) { test_name = $$1 diff --git a/doc/dox/buildinstructions.dox b/doc/dox/buildinstructions.dox index f9b2f3d52f..7ddb2506c8 100644 --- a/doc/dox/buildinstructions.dox +++ b/doc/dox/buildinstructions.dox @@ -21,9 +21,9 @@ include(/lib/jkqtplotter.pri) \subsection BUILDINSTRUCTIONS_QMAKESTATIC QMake Static Library There are several `.PRO`-files, that can be used to build the full library, or a limited subsets of it as static link library: - - staticlib/jkqtplotterlib.pro builds the complete library (JKQTPlotter, JKQTFastPlotter, JKQTMathText) as static link library - - staticlib/jkqtmathtextlib.pro builds only JKQTMathText as static link library - - staticlib/jkqtfastplotterlib.pro builds only JKQTFastPlotter as static link library + - staticlib/jkqtplotterlib/jkqtplotterlib.pro builds the complete library (JKQTPlotter, JKQTFastPlotter, JKQTMathText) as static link library + - staticlib/jkqtmathtextlib/jkqtmathtextlib.pro builds only JKQTMathText as static link library + - staticlib/jkqtfastplotterlib/jkqtfastplotterlib.pro builds only JKQTFastPlotter as static link library . They will produce a static link library that you can include into your projects, e.g. with the following QMake-snippet: @@ -31,12 +31,14 @@ They will produce a static link library that you can include into your projects, # include JKQTPlotter library DEPENDPATH += \ /lib \ - /staticlib + /staticlib/jkqtplotterlib INCLUDEPATH += /lib CONFIG (debug, debug|release) { - LIBS += -L/staticlib/debug -ljkqtplotterlib_debug + DEPENDPATH += /staticlib/jkqtplotterlib/debug + LIBS += -L/staticlib/jkqtplotterlib/debug -ljkqtplotterlib_debug } else { - LIBS += -L/staticlib/release -ljkqtplotterlib + DEPENDPATH += /staticlib/jkqtplotterlib/release + LIBS += -L/staticlib/jkqtplotterlib/release -ljkqtplotterlib } \endcode @@ -45,7 +47,7 @@ This snippet assumes that you built the libraries with the provided `.PRO`-files TEMPLATE = subdirs # the (static library version) of JKQTPlotter -jkqtplotterlib_static.file = ../../staticlib/jkqtplotterlib.pro +jkqtplotterlib_static.file = ../../staticlib/jkqtplotterlib/jkqtplotterlib.pro # your project file, with declared dependencies on jkqtplotterlib_static test_styling.file=$$PWD/test_styling.pro @@ -60,9 +62,9 @@ SUBDIRS += jkqtplotterlib_static test_styling \subsection BUILDINSTRUCTIONS_QMAKEDYNAMIC QMake Dynamic Library There are several `.PRO`-files, that can be used to build the full library, or a limited subsets of it as shred library: - - sharedlib/jkqtplotterlib_sharedlib.pro builds the complete library (JKQTPlotter, JKQTFastPlotter, JKQTMathText) as shared library - - sharedlib/jkqtmathtextlib_sharedlib.pro builds only JKQTMathText as shared library - - sharedlib/jkqtfastplotterlib_sharedlib.pro builds only JKQTFastPlotter as shared library + - sharedlib/jkqtplotterlib/jkqtplotterlib.pro builds the complete library (JKQTPlotter, JKQTFastPlotter, JKQTMathText) as shared library + - sharedlib/jkqtmathtextlib/jkqtmathtextlib.pro builds only JKQTMathText as shared library + - sharedlib/jkqtfastplotterlib/jkqtfastplotterlib.pro builds only JKQTFastPlotter as shared library . They will produce a dynamic link library that you can include into your projects, e.g. with the following QMake-snippet: @@ -70,22 +72,24 @@ They will produce a dynamic link library that you can include into your projects # include JKQTPlotter library DEPENDPATH += \ /lib \ - /sharedlib + /sharedlib/jkqtplotterlib INCLUDEPATH += /lib CONFIG (debug, debug|release) { # ensure that DLLs are copied to the output directory - install_jkqtplotter_dll.files = /sharedlib/debug/jkqtplotterlib_debug.* + install_jkqtplotter_dll.files = /sharedlib/jkqtplotterlib/debug/jkqtplotterlib_debug.* install_jkqtplotter_dll.path = $$OUT_PWD INSTALLS += install_jkqtplotter_dll # link agains DLLs - LIBS += -L/sharedlib/debug -ljkqtplotterlib_debug + DEPENDPATH += /sharedlib/jkqtplotterlib/debug + LIBS += -L/sharedlib/jkqtplotterlib/debug -ljkqtplotterlib_debug } else { # ensure that DLLs are copied to the output directory - install_jkqtplotter_dll.files = /sharedlib/release/jkqtplotterlib.* + install_jkqtplotter_dll.files = /sharedlib/jkqtplotterlib/release/jkqtplotterlib.* install_jkqtplotter_dll.path = $$OUT_PWD INSTALLS += install_jkqtplotter_dll # link agains DLLs - LIBS += -L/sharedlib/release -ljkqtplotterlib + DEPENDPATH += /sharedlib/jkqtplotterlib/release + LIBS += -L/sharedlib/jkqtplotterlib/release -ljkqtplotterlib } \endcode @@ -94,7 +98,7 @@ This snippet assumes that you built the libraries with the provided `.PRO`-files TEMPLATE = subdirs # the (shared library version) of JKQTPlotter -jkqtplotterlib_shared.file = ../../sharedlib/jkqtplotterlib_sharedlib.pro +jkqtplotterlib_shared.file = ../../sharedlib/jkqtplotterlib.pro # your project file, with declared dependencies on jkqtplotterlib_shared test_styling.file=$$PWD/test_styling.pro diff --git a/doc/dox/examples_and_tutorials.dox b/doc/dox/examples_and_tutorials.dox index 0d39b506c9..c68564d498 100644 --- a/doc/dox/examples_and_tutorials.dox +++ b/doc/dox/examples_and_tutorials.dox @@ -156,6 +156,9 @@ All test-projects are Qt-projects that use qmake to build. You can load them int \image html jkqtmathtext_testapp_small.png \subpage JKQTMathTextTestApp JKQTMathText
render LaTeX markup + \image html jkqtfastplotter_test_small.png + \subpage JKQTFastPlotterTest + JKQTFastPlotter diff --git a/doc/dox/mainpage.dox b/doc/dox/mainpage.dox index 2812a5b5c8..5e38f5bef1 100644 --- a/doc/dox/mainpage.dox +++ b/doc/dox/mainpage.dox @@ -52,6 +52,18 @@ This software is licensed under the term of the GNU Lesser General Public Licens - extensive doxygen-generated Online-Documentation (http://jkriege2.github.io/JKQtPlotter/index.html) - source code hosted&developed on GitHub https://github.com/jkriege2/JKQtPlotter (including continuous integration builds: https://ci.appveyor.com/project/jkriege2/jkqtplotter/branch/master) +\section jkqtplottertic Table Of Contents +- Documentation of Major Classes: + - JKQTPlotter / JKQTBasePlotter - Extensive Scientific 2D Plotting framework + - JKQTMathText - LaTeX parser and math renderer + - JKQTFastPlotter - additional, simplified but speed-optimized plotter widget with limited capabilities +- \ref licensepage +- \ref BUILDINSTRUCTIONS +- \ref WHATSNEW +- \ref exampleTutorialProjects + + + \image html screenshotsbanner.png */ \ No newline at end of file diff --git a/examples/README.md b/examples/README.md index 931352102c..656abb5c55 100644 --- a/examples/README.md +++ b/examples/README.md @@ -79,5 +79,4 @@ All test-projects are Qt-projects that use qmake to build. You can load them int |:-------------:| ------------- | ------------- | | [![](https://raw.githubusercontent.com/jkriege2/JKQtPlotter/master/screenshots/jkqtmathtext_simpletest_small.png)](https://github.com/jkriege2/JKQtPlotter/tree/master/examples/jkqtmathtext_simpletest) | [JKQTMathText: Simple Demonstration](https://github.com/jkriege2/JKQtPlotter/tree/master/examples/jkqtmathtext_simpletest) | | | [![](https://raw.githubusercontent.com/jkriege2/JKQtPlotter/master/screenshots/jkqtmathtext_testapp_small.png)](https://github.com/jkriege2/JKQtPlotter/tree/master/examples/jkqtmathtext_test) | [JKQTMathText: Full Testing Application](https://github.com/jkriege2/JKQtPlotter/tree/master/examples/jkqtmathtext_test) | | - - +| [![](https://raw.githubusercontent.com/jkriege2/JKQtPlotter/master/screenshots/jkqtfastplotter_test_small.png)](https://github.com/jkriege2/JKQtPlotter/tree/master/examples/jkqtfastplotter_test) | [JKQTFastPlotter: Example](https://github.com/jkriege2/JKQtPlotter/tree/master/examples/jkqtfastplotter_test) | | diff --git a/examples/jkqtfastplotter_test/README.md b/examples/jkqtfastplotter_test/README.md new file mode 100644 index 0000000000..8e1e750a28 --- /dev/null +++ b/examples/jkqtfastplotter_test/README.md @@ -0,0 +1,159 @@ +# Example (JKQTFastPlotter) {#JKQTFastPlotterTest} +The project (see `./examples/jkqtfastplotter_test/`) demonstrates how to use the JKQTFastPlotter, a speed-optimized plotter alternative to JKQTPlotter, but with less features. + + +The source code of the main application is (see [`jkqtfastplotter_test.cpp`](https://github.com/jkriege2/JKQtPlotter/tree/master/examples/jkqtfastplotter_test/jkqtfastplotter_test_testmain.cpp): +```.cpp + +TestMain::TestMain(QWidget *parent) : + QWidget(parent) +{ + + + imageRed=(double*)calloc(IMAGE_N*IMAGE_N, sizeof(double)); + imageGreen=(double*)calloc(IMAGE_N*IMAGE_N, sizeof(double)); + imageBlue=(double*)calloc(IMAGE_N*IMAGE_N, sizeof(double)); + image=(double*)calloc(IMAGE_N*IMAGE_N, sizeof(double)); + ovrl=(bool*)calloc(IMAGE_N*IMAGE_N, sizeof(bool)); + x=(double*)calloc(N1, sizeof(double)); + y1=(double*)calloc(N1, sizeof(double)); + y2=(double*)calloc(N1, sizeof(double)); + y3=(double*)calloc(N1, sizeof(double)); + + + QGridLayout* gl=new QGridLayout(this); + setLayout(gl); + QTabWidget* t=new QTabWidget(this); + gl->addWidget(t,0,0); + + QWidget* w=new QWidget(this); + gl=new QGridLayout(w); + w->setLayout(gl); + + JKQTFastPlotter* pl1=new JKQTFastPlotter(w); + pl1->setMaintainAspectRatio(true); + gl->addWidget(pl1, 0, 0); + JKQTFastPlotter* pl2=new JKQTFastPlotter(w); + pl2->setMaximumWidth(100); + pl2->setSynchronizeY(pl1); + pl2->setYAxisLabelVisible(false); + pl2->setPlotBorderLeft(10); + pl2->setPlotBorderRight(2); + w->connect(pl1, SIGNAL(replotting()), pl2, SLOT(redrawPlot())); + gl->addWidget(pl2, 0, 1); + JKQTFastPlotter* pl3=new JKQTFastPlotter(w); + pl3->setSynchronizeX(pl1); + w->connect(pl1, SIGNAL(replotting()), pl3, SLOT(redrawPlot())); + gl->addWidget(pl3, 1, 0); + + + xx.clear(); + yy.clear(); + for (int i=0; i50 && y>50) image[y*IMAGE_N+x]=0; + if (x<50 && y<50) image[y*IMAGE_N+x]=50; + if (abs(x-(IMAGE_N-y))<4) ovrl[y*IMAGE_N+x]=true; else ovrl[y*IMAGE_N+x]=false; + } + } + + JKQTFPimagePlot* p5=new JKQTFPimagePlot(pl3, image, JKQTFP_double, IMAGE_N, IMAGE_N, 0, 10, 0, 10, JKQTFP_GRAY); + QColor col=QColor("red"); + col.setAlpha(127); + JKQTFPimageOverlayPlot* p5o=new JKQTFPimageOverlayPlot(pl3, ovrl, IMAGE_N, IMAGE_N, 0, 10, 0, 10, col); + JKQTFPXRangePlot* p6=new JKQTFPXRangePlot(pl1, 2.25, 7.75); + p6->setFillStyle(Qt::SolidPattern); + JKQTFPQScaleBarXPlot* sb=new JKQTFPQScaleBarXPlot(pl1, 1, QString("%1 mm")); + + pl1->addPlot(p6); + pl1->addPlot(p1); + pl1->addPlot(p2); + pl1->addPlot(p3); + pl1->addPlot(pv); + pl1->addPlot(sb); + + pl2->addPlot(p4); + + pl3->addPlot(p5); + pl3->addPlot(p5o); + pl3->setObjectName("pl3"); + + QComboBox* spin=new QComboBox(w); + spin->addItems(JKQTFPimagePlot_getPalettes()); + gl->addWidget(spin, 2,0); + connect(spin, SIGNAL(currentIndexChanged(int)), p5, SLOT(setPalette(int))); + QComboBox* scale=new QComboBox(w); + scale->addItem("TopLeft"); + scale->addItem("TopRight"); + scale->addItem("BottomLeft"); + scale->addItem("BottomRight"); + gl->addWidget(scale, 3,0); + connect(scale, SIGNAL(currentIndexChanged(int)), sb, SLOT(setPosition(int))); + + t->addTab(w, tr("Basic Test")); + + + w=new QWidget(this); + gl=new QGridLayout(w); + w->setLayout(gl); + JKQTFastPlotter* p21=new JKQTFastPlotter(w); + gl->addWidget(p21, 0, 0, 1, 3); + for (int x=0; xsetImage(imageRed, JKQTFP_double, imageGreen, JKQTFP_double, imageBlue, JKQTFP_double, IMAGE_N, IMAGE_N,0,10,0,10); + p21->addPlot(prgb); + + QCheckBox* c=new QCheckBox(tr("red channel"), w); + c->setChecked(true); + connect(c, SIGNAL(toggled(bool)), this, SLOT(enableRed(bool))); + gl->addWidget(c, 1,0); + + c=new QCheckBox(tr("green channel"), w); + c->setChecked(true); + connect(c, SIGNAL(toggled(bool)), this, SLOT(enableGreen(bool))); + gl->addWidget(c, 1,1); + + c=new QCheckBox(tr("blue channel"), w); + c->setChecked(true); + connect(c, SIGNAL(toggled(bool)), this, SLOT(enableBlue(bool))); + gl->addWidget(c, 1,2); + + + t->addTab(w, tr("Overlay Test")); + t->setCurrentIndex(1); + + resize(500,400); + +} +``` +The result looks like this: + +![jkqtfastplotter_test](https://raw.githubusercontent.com/jkriege2/JKQtPlotter/master/screenshots/jkqtfastplotter_test.png) + + + diff --git a/examples/jkqtfastplotter_test/jkqtfastplotter_test.pro b/examples/jkqtfastplotter_test/jkqtfastplotter_test.pro index 53c0a9aa53..f8d0084a7e 100644 --- a/examples/jkqtfastplotter_test/jkqtfastplotter_test.pro +++ b/examples/jkqtfastplotter_test/jkqtfastplotter_test.pro @@ -29,11 +29,11 @@ DEFINES += DEBUG_TIMING greaterThan(QT_MAJOR_VERSION, 4): QT += widgets printsupport # include JKQTPlotter library -DEPENDPATH += ../../lib ../../staticlib +DEPENDPATH += ../../lib ../../staticlib/jkqtfastplotterlib INCLUDEPATH += ../../lib CONFIG (debug, debug|release) { - LIBS += -L../../staticlib/debug -ljkqtplotterlib_debug + LIBS += -L../../staticlib/jkqtfastplotterlib/debug -ljkqtfastplotterlib_debug } else { - LIBS += -L../../staticlib/release -ljkqtplotterlib + LIBS += -L../../staticlib/jkqtfastplotterlib/release -ljkqtfastplotterlib } message("LIBS = $$LIBS") diff --git a/examples/jkqtfastplotter_test/jkqtfastplotter_test_and_lib.pro b/examples/jkqtfastplotter_test/jkqtfastplotter_test_and_lib.pro index 08a09eecbc..cfc8993276 100644 --- a/examples/jkqtfastplotter_test/jkqtfastplotter_test_and_lib.pro +++ b/examples/jkqtfastplotter_test/jkqtfastplotter_test_and_lib.pro @@ -1,8 +1,8 @@ TEMPLATE = subdirs -SUBDIRS += jkqtplotterlib jkqtfastplotter_test +SUBDIRS += jkqtfastplotterlib jkqtfastplotter_test -jkqtplotterlib.file = ../../staticlib/jkqtplotterlib.pro +jkqtfastplotterlib.file = ../../staticlib/jkqtfastplotterlib/jkqtfastplotterlib.pro jkqtfastplotter_test.file=$$PWD/jkqtfastplotter_test.pro -jkqtfastplotter_test.depends = jkqtplotterlib +jkqtfastplotter_test.depends = jkqtfastplotterlib diff --git a/examples/jkqtfastplotter_test/jkqtfastplotter_test_testmain.cpp b/examples/jkqtfastplotter_test/jkqtfastplotter_test_testmain.cpp index df4185facd..35aa001b07 100644 --- a/examples/jkqtfastplotter_test/jkqtfastplotter_test_testmain.cpp +++ b/examples/jkqtfastplotter_test/jkqtfastplotter_test_testmain.cpp @@ -1,5 +1,6 @@ /** \example jkqtfastplotter_test_testmain.cpp * Example of how to use JKQTFastPlotter + * \see \ref JKQTFastPlotterTest */ #include "jkqtfastplotter_test_testmain.h" diff --git a/examples/jkqtmathtext_simpletest/jkqtmathtext_simpletest.pro b/examples/jkqtmathtext_simpletest/jkqtmathtext_simpletest.pro index 9cfe5384f3..3672a058ad 100644 --- a/examples/jkqtmathtext_simpletest/jkqtmathtext_simpletest.pro +++ b/examples/jkqtmathtext_simpletest/jkqtmathtext_simpletest.pro @@ -8,11 +8,11 @@ QT += core gui xml svg greaterThan(QT_MAJOR_VERSION, 4): QT += widgets printsupport -DEPENDPATH += ../../lib ../../staticlib +DEPENDPATH += ../../lib ../../staticlib/jkqtplotterlib INCLUDEPATH += ../../lib CONFIG (debug, debug|release) { - LIBS += -L../../staticlib/debug -ljkqtplotterlib_debug + LIBS += -L../../staticlib/jkqtplotterlib/debug -ljkqtplotterlib_debug } else { - LIBS += -L../../staticlib/release -ljkqtplotterlib + LIBS += -L../../staticlib/jkqtplotterlib/release -ljkqtplotterlib } message("LIBS = $$LIBS") diff --git a/examples/jkqtmathtext_simpletest/jkqtmathtext_simpletest_and_lib.pro b/examples/jkqtmathtext_simpletest/jkqtmathtext_simpletest_and_lib.pro index dce61fcc24..c46ebc3519 100644 --- a/examples/jkqtmathtext_simpletest/jkqtmathtext_simpletest_and_lib.pro +++ b/examples/jkqtmathtext_simpletest/jkqtmathtext_simpletest_and_lib.pro @@ -2,7 +2,7 @@ TEMPLATE = subdirs SUBDIRS += jkqtplotterlib jkqtmathtext_simpletest -jkqtplotterlib.file = ../../staticlib/jkqtplotterlib.pro +jkqtplotterlib.file = ../../staticlib/jkqtplotterlib/jkqtplotterlib.pro jkqtmathtext_simpletest.file=$$PWD/jkqtmathtext_simpletest.pro jkqtmathtext_simpletest.depends = jkqtplotterlib diff --git a/examples/jkqtmathtext_test/jkqtmathtext_test.pro b/examples/jkqtmathtext_test/jkqtmathtext_test.pro index 495e428b22..74047f327f 100644 --- a/examples/jkqtmathtext_test/jkqtmathtext_test.pro +++ b/examples/jkqtmathtext_test/jkqtmathtext_test.pro @@ -8,7 +8,7 @@ SOURCES += jkqtmathtext_test.cpp \ RCC_DIR = rccs -CONFIG += link_prl link_prl qt windows +CONFIG += link_prl qt windows TARGET = jkqtmathtext_test @@ -35,11 +35,17 @@ DEFINES += AUTOLOAD_XITS_FONTS AUTOLOAD_Asana_FONTS greaterThan(QT_MAJOR_VERSION, 4): QT += widgets printsupport -DEPENDPATH += ../../lib ../../staticlib +DEPENDPATH += ../../lib ../../staticlib/jkqtmathtextlib INCLUDEPATH += ../../lib CONFIG (debug, debug|release) { - LIBS += -L../../staticlib/debug -ljkqtplotterlib_debug + DEPENDPATH += ../../staticlib/jkqtmathtextlib/debug + DEPENDPATH += ../../staticlib/jkqtphighrestimerlib/debug + LIBS += -L../../staticlib/jkqtmathtextlib/debug -ljkqtmathtextlib_debug + LIBS += -L../../staticlib/jkqtphighrestimerlib/debug -ljkqtphighrestimerlib_debug } else { - LIBS += -L../../staticlib/release -ljkqtplotterlib + DEPENDPATH += ../../staticlib/jkqtmathtextlib/release + DEPENDPATH += ../../staticlib/jkqtphighrestimerlib/release + LIBS += -L../../staticlib/jkqtmathtextlib/release -ljkqtmathtextlib + LIBS += -L../../staticlib/jkqtphighrestimerlib/release -ljkqtphighrestimerlib } message("LIBS = $$LIBS") diff --git a/examples/jkqtmathtext_test/jkqtmathtext_test_and_lib.pro b/examples/jkqtmathtext_test/jkqtmathtext_test_and_lib.pro index b20495bf1a..46dee4912a 100644 --- a/examples/jkqtmathtext_test/jkqtmathtext_test_and_lib.pro +++ b/examples/jkqtmathtext_test/jkqtmathtext_test_and_lib.pro @@ -1,8 +1,9 @@ TEMPLATE = subdirs -SUBDIRS += jkqtplotterlib jkqtmathtext_test +SUBDIRS += jkqtmathtextlib jkqtphighrestimerlib jkqtmathtext_test -jkqtplotterlib.file = ../../staticlib/jkqtplotterlib.pro +jkqtmathtextlib.file = ../../staticlib/jkqtmathtextlib/jkqtmathtextlib.pro +jkqtphighrestimerlib.file = ../../staticlib/jkqtphighrestimerlib/jkqtphighrestimerlib.pro jkqtmathtext_test.file=$$PWD/jkqtmathtext_test.pro -jkqtmathtext_test.depends = jkqtplotterlib +jkqtmathtext_test.depends = jkqtmathtextlib jkqtphighrestimerlib diff --git a/examples/jkqtplot_test/jkqtplot_test.pro b/examples/jkqtplot_test/jkqtplot_test.pro index 4930b84025..0c4ba4db0e 100644 --- a/examples/jkqtplot_test/jkqtplot_test.pro +++ b/examples/jkqtplot_test/jkqtplot_test.pro @@ -63,9 +63,9 @@ DEPENDPATH += $$PWD #$$PWD/../../lib INCLUDEPATH += ../../lib CONFIG (debug, debug|release) { - LIBS += -L../../staticlib/debug -ljkqtplotterlib_debug + LIBS += -L../../staticlib/jkqtplotterlib/debug -ljkqtplotterlib_debug } else { - LIBS += -L../../staticlib/release -ljkqtplotterlib + LIBS += -L../../staticlib/jkqtplotterlib/release -ljkqtplotterlib } message("LIBS = $$LIBS") diff --git a/examples/jkqtplot_test/jkqtplot_test_and_lib.pro b/examples/jkqtplot_test/jkqtplot_test_and_lib.pro index c3467d8b34..ba5aa84c27 100644 --- a/examples/jkqtplot_test/jkqtplot_test_and_lib.pro +++ b/examples/jkqtplot_test/jkqtplot_test_and_lib.pro @@ -5,4 +5,4 @@ SUBDIRS += jkqtplot_test jkqtplotterlib jkqtplot_test.file=$$PWD/jkqtplot_test.pro jkqtplot_test.depends = jkqtplotterlib -jkqtplotterlib.file = ../../staticlib/jkqtplotterlib.pro +jkqtplotterlib.file = ../../staticlib/jkqtplotterlib/jkqtplotterlib.pro diff --git a/examples/simpletest/README.md b/examples/simpletest/README.md index a4218e7d02..5fc4d247e9 100644 --- a/examples/simpletest/README.md +++ b/examples/simpletest/README.md @@ -14,12 +14,12 @@ greaterThan(QT_MAJOR_VERSION, 4): QT += widgets printsupport TARGET = jkqtplotter_simpletest # include JKQTPlotter source headers and link against library -DEPENDPATH += ../../lib ../../staticlib +DEPENDPATH += ../../lib ../../staticlib/jkqtplotterlib INCLUDEPATH += ../../lib CONFIG (debug, debug|release) { - LIBS += -L../../staticlib/debug -ljkqtplotterlib_debug + LIBS += -L../../staticlib/jkqtplotterlib/debug -ljkqtplotterlib_debug } else { - LIBS += -L../../staticlib/release -ljkqtplotterlib + LIBS += -L../../staticlib/jkqtplotterlib/release -ljkqtplotterlib } ``` diff --git a/examples/simpletest/jkqtplotter_simpletest.pro b/examples/simpletest/jkqtplotter_simpletest.pro index d18f67bace..f71a8205c7 100644 --- a/examples/simpletest/jkqtplotter_simpletest.pro +++ b/examples/simpletest/jkqtplotter_simpletest.pro @@ -10,12 +10,12 @@ greaterThan(QT_MAJOR_VERSION, 4): QT += widgets printsupport TARGET = jkqtplotter_simpletest # include JKQTPlotter source headers and link against library -DEPENDPATH += ../../lib ../../staticlib +DEPENDPATH += ../../lib ../../staticlib/jkqtplotterlib INCLUDEPATH += ../../lib CONFIG (debug, debug|release) { - LIBS += -L../../staticlib/debug -ljkqtplotterlib_debug + LIBS += -L../../staticlib/jkqtplotterlib/debug -ljkqtplotterlib_debug } else { - LIBS += -L../../staticlib/release -ljkqtplotterlib + LIBS += -L../../staticlib/jkqtplotterlib/release -ljkqtplotterlib } message("LIBS = $$LIBS") diff --git a/examples/simpletest/jkqtplotter_simpletest_and_lib.pro b/examples/simpletest/jkqtplotter_simpletest_and_lib.pro index b958b1ee6d..59d6f2a5f1 100644 --- a/examples/simpletest/jkqtplotter_simpletest_and_lib.pro +++ b/examples/simpletest/jkqtplotter_simpletest_and_lib.pro @@ -2,7 +2,7 @@ TEMPLATE = subdirs SUBDIRS += jkqtplotterlib jkqtplotter_simpletest -jkqtplotterlib.file = ../../staticlib/jkqtplotterlib.pro +jkqtplotterlib.file = ../../staticlib/jkqtplotterlib/jkqtplotterlib.pro jkqtplotter_simpletest.file=$$PWD/jkqtplotter_simpletest.pro jkqtplotter_simpletest.depends = jkqtplotterlib diff --git a/examples/simpletest_barchart/jkqtplotter_simpletest_barchart.pro b/examples/simpletest_barchart/jkqtplotter_simpletest_barchart.pro index 094bc9b68a..c09d633f9d 100644 --- a/examples/simpletest_barchart/jkqtplotter_simpletest_barchart.pro +++ b/examples/simpletest_barchart/jkqtplotter_simpletest_barchart.pro @@ -10,12 +10,12 @@ greaterThan(QT_MAJOR_VERSION, 4): QT += widgets printsupport TARGET = jkqtplotter_simpletest_barchart # include JKQTPlotter source code -DEPENDPATH += ../../lib ../../staticlib +DEPENDPATH += ../../lib ../../staticlib/jkqtplotterlib INCLUDEPATH += ../../lib CONFIG (debug, debug|release) { - LIBS += -L../../staticlib/debug -ljkqtplotterlib_debug + LIBS += -L../../staticlib/jkqtplotterlib/debug -ljkqtplotterlib_debug } else { - LIBS += -L../../staticlib/release -ljkqtplotterlib + LIBS += -L../../staticlib/jkqtplotterlib/release -ljkqtplotterlib } message("LIBS = $$LIBS") diff --git a/examples/simpletest_barchart/jkqtplotter_simpletest_barchart_and_lib.pro b/examples/simpletest_barchart/jkqtplotter_simpletest_barchart_and_lib.pro index e24c6f5e6b..59576927ca 100644 --- a/examples/simpletest_barchart/jkqtplotter_simpletest_barchart_and_lib.pro +++ b/examples/simpletest_barchart/jkqtplotter_simpletest_barchart_and_lib.pro @@ -2,7 +2,7 @@ TEMPLATE = subdirs SUBDIRS += jkqtplotterlib jkqtplotter_simpletest_barchart -jkqtplotterlib.file = ../../staticlib/jkqtplotterlib.pro +jkqtplotterlib.file = ../../staticlib/jkqtplotterlib/jkqtplotterlib.pro jkqtplotter_simpletest_barchart.file=$$PWD/jkqtplotter_simpletest_barchart.pro jkqtplotter_simpletest_barchart.depends = jkqtplotterlib diff --git a/examples/simpletest_boxplot/jkqtplotter_simpletest_boxplot.pro b/examples/simpletest_boxplot/jkqtplotter_simpletest_boxplot.pro index 3a8f61704d..5ab3e217bf 100644 --- a/examples/simpletest_boxplot/jkqtplotter_simpletest_boxplot.pro +++ b/examples/simpletest_boxplot/jkqtplotter_simpletest_boxplot.pro @@ -10,12 +10,12 @@ greaterThan(QT_MAJOR_VERSION, 4): QT += widgets printsupport TARGET = jkqtplotter_simpletest_boxplot # include JKQTPlotter source code -DEPENDPATH += ../../lib ../../staticlib +DEPENDPATH += ../../lib ../../staticlib/jkqtplotterlib INCLUDEPATH += ../../lib CONFIG (debug, debug|release) { - LIBS += -L../../staticlib/debug -ljkqtplotterlib_debug + LIBS += -L../../staticlib/jkqtplotterlib/debug -ljkqtplotterlib_debug } else { - LIBS += -L../../staticlib/release -ljkqtplotterlib + LIBS += -L../../staticlib/jkqtplotterlib/release -ljkqtplotterlib } message("LIBS = $$LIBS") diff --git a/examples/simpletest_boxplot/jkqtplotter_simpletest_boxplot_and_lib.pro b/examples/simpletest_boxplot/jkqtplotter_simpletest_boxplot_and_lib.pro index 95928175e1..a3624eac97 100644 --- a/examples/simpletest_boxplot/jkqtplotter_simpletest_boxplot_and_lib.pro +++ b/examples/simpletest_boxplot/jkqtplotter_simpletest_boxplot_and_lib.pro @@ -2,7 +2,7 @@ TEMPLATE = subdirs SUBDIRS += jkqtplotterlib jkqtplotter_simpletest_boxplot -jkqtplotterlib.file = ../../staticlib/jkqtplotterlib.pro +jkqtplotterlib.file = ../../staticlib/jkqtplotterlib/jkqtplotterlib.pro jkqtplotter_simpletest_boxplot.file=$$PWD/jkqtplotter_simpletest_boxplot.pro jkqtplotter_simpletest_boxplot.depends = jkqtplotterlib diff --git a/examples/simpletest_dateaxes/jkqtplotter_simpletest_dateaxes.pro b/examples/simpletest_dateaxes/jkqtplotter_simpletest_dateaxes.pro index 9dd83cba8c..77818dd4e3 100644 --- a/examples/simpletest_dateaxes/jkqtplotter_simpletest_dateaxes.pro +++ b/examples/simpletest_dateaxes/jkqtplotter_simpletest_dateaxes.pro @@ -10,12 +10,12 @@ greaterThan(QT_MAJOR_VERSION, 4): QT += widgets printsupport TARGET = jkqtplotter_simpletest_dateaxes # include JKQTPlotter source code -DEPENDPATH += ../../lib ../../staticlib +DEPENDPATH += ../../lib ../../staticlib/jkqtplotterlib INCLUDEPATH += ../../lib CONFIG (debug, debug|release) { - LIBS += -L../../staticlib/debug -ljkqtplotterlib_debug + LIBS += -L../../staticlib/jkqtplotterlib/debug -ljkqtplotterlib_debug } else { - LIBS += -L../../staticlib/release -ljkqtplotterlib + LIBS += -L../../staticlib/jkqtplotterlib/release -ljkqtplotterlib } message("LIBS = $$LIBS") diff --git a/examples/simpletest_dateaxes/jkqtplotter_simpletest_dateaxes_and_lib.pro b/examples/simpletest_dateaxes/jkqtplotter_simpletest_dateaxes_and_lib.pro index 436b7fa90d..7823da2f14 100644 --- a/examples/simpletest_dateaxes/jkqtplotter_simpletest_dateaxes_and_lib.pro +++ b/examples/simpletest_dateaxes/jkqtplotter_simpletest_dateaxes_and_lib.pro @@ -2,7 +2,7 @@ TEMPLATE = subdirs SUBDIRS += jkqtplotterlib jkqtplotter_simpletest_dateaxes -jkqtplotterlib.file = ../../staticlib/jkqtplotterlib.pro +jkqtplotterlib.file = ../../staticlib/jkqtplotterlib/jkqtplotterlib.pro jkqtplotter_simpletest_dateaxes.file=$$PWD/jkqtplotter_simpletest_dateaxes.pro jkqtplotter_simpletest_dateaxes.depends = jkqtplotterlib diff --git a/examples/simpletest_errorbarstyles/jkqtplotter_simpletest_errorbarstyles.pro b/examples/simpletest_errorbarstyles/jkqtplotter_simpletest_errorbarstyles.pro index cd9fe66abe..2a5b4f93d7 100644 --- a/examples/simpletest_errorbarstyles/jkqtplotter_simpletest_errorbarstyles.pro +++ b/examples/simpletest_errorbarstyles/jkqtplotter_simpletest_errorbarstyles.pro @@ -10,12 +10,12 @@ greaterThan(QT_MAJOR_VERSION, 4): QT += widgets printsupport TARGET = jkqtplotter_simpletest_errorbarstyles # include JKQTPlotter source code -DEPENDPATH += ../../lib ../../staticlib +DEPENDPATH += ../../lib ../../staticlib/jkqtplotterlib INCLUDEPATH += ../../lib CONFIG (debug, debug|release) { - LIBS += -L../../staticlib/debug -ljkqtplotterlib_debug + LIBS += -L../../staticlib/jkqtplotterlib/debug -ljkqtplotterlib_debug } else { - LIBS += -L../../staticlib/release -ljkqtplotterlib + LIBS += -L../../staticlib/jkqtplotterlib/release -ljkqtplotterlib } message("LIBS = $$LIBS") diff --git a/examples/simpletest_errorbarstyles/jkqtplotter_simpletest_errorbarstyles_and_lib.pro b/examples/simpletest_errorbarstyles/jkqtplotter_simpletest_errorbarstyles_and_lib.pro index 38f61e893a..6f93c1b848 100644 --- a/examples/simpletest_errorbarstyles/jkqtplotter_simpletest_errorbarstyles_and_lib.pro +++ b/examples/simpletest_errorbarstyles/jkqtplotter_simpletest_errorbarstyles_and_lib.pro @@ -2,7 +2,7 @@ TEMPLATE = subdirs SUBDIRS += jkqtplotterlib jkqtplotter_simpletest_errorbarstyles -jkqtplotterlib.file = ../../staticlib/jkqtplotterlib.pro +jkqtplotterlib.file = ../../staticlib/jkqtplotterlib/jkqtplotterlib.pro jkqtplotter_simpletest_errorbarstyles.file=$$PWD/jkqtplotter_simpletest_errorbarstyles.pro jkqtplotter_simpletest_errorbarstyles.depends = jkqtplotterlib diff --git a/examples/simpletest_filledgraphs/jkqtplotter_simpletest_filledgraphs.pro b/examples/simpletest_filledgraphs/jkqtplotter_simpletest_filledgraphs.pro index bd45664067..52f7315052 100644 --- a/examples/simpletest_filledgraphs/jkqtplotter_simpletest_filledgraphs.pro +++ b/examples/simpletest_filledgraphs/jkqtplotter_simpletest_filledgraphs.pro @@ -13,12 +13,12 @@ TARGET = jkqtplotter_simpletest_filledgraphs # include JKQTPlotter source code -DEPENDPATH += ../../lib ../../staticlib +DEPENDPATH += ../../lib ../../staticlib/jkqtplotterlib INCLUDEPATH += ../../lib CONFIG (debug, debug|release) { - LIBS += -L../../staticlib/debug -ljkqtplotterlib_debug + LIBS += -L../../staticlib/jkqtplotterlib/debug -ljkqtplotterlib_debug } else { - LIBS += -L../../staticlib/release -ljkqtplotterlib + LIBS += -L../../staticlib/jkqtplotterlib/release -ljkqtplotterlib } message("LIBS = $$LIBS") diff --git a/examples/simpletest_filledgraphs/jkqtplotter_simpletest_filledgraphs_and_lib.pro b/examples/simpletest_filledgraphs/jkqtplotter_simpletest_filledgraphs_and_lib.pro index 66b5ee8ef5..2498609440 100644 --- a/examples/simpletest_filledgraphs/jkqtplotter_simpletest_filledgraphs_and_lib.pro +++ b/examples/simpletest_filledgraphs/jkqtplotter_simpletest_filledgraphs_and_lib.pro @@ -2,7 +2,7 @@ TEMPLATE = subdirs SUBDIRS += jkqtplotterlib jkqtplotter_simpletest_filledgraphs -jkqtplotterlib.file = ../../staticlib/jkqtplotterlib.pro +jkqtplotterlib.file = ../../staticlib/jkqtplotterlib/jkqtplotterlib.pro jkqtplotter_simpletest_filledgraphs.file=$$PWD/jkqtplotter_simpletest_filledgraphs.pro jkqtplotter_simpletest_filledgraphs.depends = jkqtplotterlib diff --git a/examples/simpletest_functionplot/jkqtplotter_simpletest_functionplot.pro b/examples/simpletest_functionplot/jkqtplotter_simpletest_functionplot.pro index 9f3375270b..8c8e0257d5 100644 --- a/examples/simpletest_functionplot/jkqtplotter_simpletest_functionplot.pro +++ b/examples/simpletest_functionplot/jkqtplotter_simpletest_functionplot.pro @@ -11,12 +11,12 @@ TARGET = jkqtplotter_simpletest_functionplot # include JKQTPlotter source code -DEPENDPATH += ../../lib ../../staticlib +DEPENDPATH += ../../lib ../../staticlib/jkqtplotterlib INCLUDEPATH += ../../lib CONFIG (debug, debug|release) { - LIBS += -L../../staticlib/debug -ljkqtplotterlib_debug + LIBS += -L../../staticlib/jkqtplotterlib/debug -ljkqtplotterlib_debug } else { - LIBS += -L../../staticlib/release -ljkqtplotterlib + LIBS += -L../../staticlib/jkqtplotterlib/release -ljkqtplotterlib } message("LIBS = $$LIBS") diff --git a/examples/simpletest_functionplot/jkqtplotter_simpletest_functionplot_and_lib.pro b/examples/simpletest_functionplot/jkqtplotter_simpletest_functionplot_and_lib.pro index 7fc7577e74..656af33fad 100644 --- a/examples/simpletest_functionplot/jkqtplotter_simpletest_functionplot_and_lib.pro +++ b/examples/simpletest_functionplot/jkqtplotter_simpletest_functionplot_and_lib.pro @@ -2,7 +2,7 @@ TEMPLATE = subdirs SUBDIRS += jkqtplotterlib jkqtplotter_simpletest_functionplot -jkqtplotterlib.file = ../../staticlib/jkqtplotterlib.pro +jkqtplotterlib.file = ../../staticlib/jkqtplotterlib/jkqtplotterlib.pro jkqtplotter_simpletest_functionplot.file=$$PWD/jkqtplotter_simpletest_functionplot.pro jkqtplotter_simpletest_functionplot.depends = jkqtplotterlib diff --git a/examples/simpletest_geometric/jkqtplotter_simpletest_geometric.pro b/examples/simpletest_geometric/jkqtplotter_simpletest_geometric.pro index 8b1193dc1a..4069f295b5 100644 --- a/examples/simpletest_geometric/jkqtplotter_simpletest_geometric.pro +++ b/examples/simpletest_geometric/jkqtplotter_simpletest_geometric.pro @@ -13,9 +13,9 @@ TARGET = jkqtplotter_simpletest_geometric DEPENDPATH += ../../lib ../../staticlib INCLUDEPATH += ../../lib CONFIG (debug, debug|release) { - LIBS += -L../../staticlib/debug -ljkqtplotterlib_debug + LIBS += -L../../staticlib/jkqtplotterlib/debug -ljkqtplotterlib_debug } else { - LIBS += -L../../staticlib/release -ljkqtplotterlib + LIBS += -L../../staticlib/jkqtplotterlib/release -ljkqtplotterlib } message("LIBS = $$LIBS") diff --git a/examples/simpletest_geometric/jkqtplotter_simpletest_geometric_and_lib.pro b/examples/simpletest_geometric/jkqtplotter_simpletest_geometric_and_lib.pro index 01fbcc040b..b0e4f7ccfe 100644 --- a/examples/simpletest_geometric/jkqtplotter_simpletest_geometric_and_lib.pro +++ b/examples/simpletest_geometric/jkqtplotter_simpletest_geometric_and_lib.pro @@ -2,7 +2,7 @@ TEMPLATE = subdirs SUBDIRS += jkqtplotterlib jkqtplotter_simpletest_geometric -jkqtplotterlib.file = ../../staticlib/jkqtplotterlib.pro +jkqtplotterlib.file = ../../staticlib/jkqtplotterlib/jkqtplotterlib.pro jkqtplotter_simpletest_geometric.file=$$PWD/jkqtplotter_simpletest_geometric.pro jkqtplotter_simpletest_geometric.depends = jkqtplotterlib diff --git a/examples/simpletest_imageplot/jkqtplotter_simpletest_imageplot.pro b/examples/simpletest_imageplot/jkqtplotter_simpletest_imageplot.pro index de1967ca09..94c93174c1 100644 --- a/examples/simpletest_imageplot/jkqtplotter_simpletest_imageplot.pro +++ b/examples/simpletest_imageplot/jkqtplotter_simpletest_imageplot.pro @@ -10,12 +10,12 @@ greaterThan(QT_MAJOR_VERSION, 4): QT += widgets printsupport TARGET = jkqtplotter_simpletest_imageplot # include JKQTPlotter source code -DEPENDPATH += ../../lib ../../staticlib +DEPENDPATH += ../../lib ../../staticlib/jkqtplotterlib INCLUDEPATH += ../../lib CONFIG (debug, debug|release) { - LIBS += -L../../staticlib/debug -ljkqtplotterlib_debug + LIBS += -L../../staticlib/jkqtplotterlib/debug -ljkqtplotterlib_debug } else { - LIBS += -L../../staticlib/release -ljkqtplotterlib + LIBS += -L../../staticlib/jkqtplotterlib/release -ljkqtplotterlib } message("LIBS = $$LIBS") diff --git a/examples/simpletest_imageplot/jkqtplotter_simpletest_imageplot_and_lib.pro b/examples/simpletest_imageplot/jkqtplotter_simpletest_imageplot_and_lib.pro index f1927f5462..ac9371dcad 100644 --- a/examples/simpletest_imageplot/jkqtplotter_simpletest_imageplot_and_lib.pro +++ b/examples/simpletest_imageplot/jkqtplotter_simpletest_imageplot_and_lib.pro @@ -2,7 +2,7 @@ TEMPLATE = subdirs SUBDIRS += jkqtplotterlib jkqtplotter_simpletest_imageplot -jkqtplotterlib.file = ../../staticlib/jkqtplotterlib.pro +jkqtplotterlib.file = ../../staticlib/jkqtplotterlib/jkqtplotterlib.pro jkqtplotter_simpletest_imageplot.file=$$PWD/jkqtplotter_simpletest_imageplot.pro jkqtplotter_simpletest_imageplot.depends = jkqtplotterlib diff --git a/examples/simpletest_imageplot_modifier/jkqtplotter_simpletest_imageplot_modifier.pro b/examples/simpletest_imageplot_modifier/jkqtplotter_simpletest_imageplot_modifier.pro index 79d790ed37..1d55267418 100644 --- a/examples/simpletest_imageplot_modifier/jkqtplotter_simpletest_imageplot_modifier.pro +++ b/examples/simpletest_imageplot_modifier/jkqtplotter_simpletest_imageplot_modifier.pro @@ -10,12 +10,12 @@ greaterThan(QT_MAJOR_VERSION, 4): QT += widgets printsupport TARGET = jkqtplotter_simpletest_imageplot_modifier # include JKQTPlotter source code -DEPENDPATH += ../../lib ../../staticlib +DEPENDPATH += ../../lib ../../staticlib/jkqtplotterlib INCLUDEPATH += ../../lib CONFIG (debug, debug|release) { - LIBS += -L../../staticlib/debug -ljkqtplotterlib_debug + LIBS += -L../../staticlib/jkqtplotterlib/debug -ljkqtplotterlib_debug } else { - LIBS += -L../../staticlib/release -ljkqtplotterlib + LIBS += -L../../staticlib/jkqtplotterlib/release -ljkqtplotterlib } message("LIBS = $$LIBS") diff --git a/examples/simpletest_imageplot_modifier/jkqtplotter_simpletest_imageplot_modifier_and_lib.pro b/examples/simpletest_imageplot_modifier/jkqtplotter_simpletest_imageplot_modifier_and_lib.pro index 55e9209344..969659eccd 100644 --- a/examples/simpletest_imageplot_modifier/jkqtplotter_simpletest_imageplot_modifier_and_lib.pro +++ b/examples/simpletest_imageplot_modifier/jkqtplotter_simpletest_imageplot_modifier_and_lib.pro @@ -2,7 +2,7 @@ TEMPLATE = subdirs SUBDIRS += jkqtplotterlib jkqtplotter_simpletest_imageplot_modifier -jkqtplotterlib.file = ../../staticlib/jkqtplotterlib.pro +jkqtplotterlib.file = ../../staticlib/jkqtplotterlib/jkqtplotterlib.pro jkqtplotter_simpletest_imageplot_modifier.file=$$PWD/jkqtplotter_simpletest_imageplot_modifier.pro jkqtplotter_simpletest_imageplot_modifier.depends = jkqtplotterlib diff --git a/examples/simpletest_imageplot_nodatastore/jkqtplotter_simpletest_imageplot_nodatastore.pro b/examples/simpletest_imageplot_nodatastore/jkqtplotter_simpletest_imageplot_nodatastore.pro index 65849f207e..7dea1893b6 100644 --- a/examples/simpletest_imageplot_nodatastore/jkqtplotter_simpletest_imageplot_nodatastore.pro +++ b/examples/simpletest_imageplot_nodatastore/jkqtplotter_simpletest_imageplot_nodatastore.pro @@ -12,12 +12,12 @@ QT += core gui xml svg greaterThan(QT_MAJOR_VERSION, 4): QT += widgets printsupport # include JKQTPlotter source code -DEPENDPATH += ../../lib ../../staticlib +DEPENDPATH += ../../lib ../../staticlib/jkqtplotterlib INCLUDEPATH += ../../lib CONFIG (debug, debug|release) { - LIBS += -L../../staticlib/debug -ljkqtplotterlib_debug + LIBS += -L../../staticlib/jkqtplotterlib/debug -ljkqtplotterlib_debug } else { - LIBS += -L../../staticlib/release -ljkqtplotterlib + LIBS += -L../../staticlib/jkqtplotterlib/release -ljkqtplotterlib } message("LIBS = $$LIBS") diff --git a/examples/simpletest_imageplot_nodatastore/jkqtplotter_simpletest_imageplot_nodatastore_and_lib.pro b/examples/simpletest_imageplot_nodatastore/jkqtplotter_simpletest_imageplot_nodatastore_and_lib.pro index d66bd7f140..6e1b2c92b7 100644 --- a/examples/simpletest_imageplot_nodatastore/jkqtplotter_simpletest_imageplot_nodatastore_and_lib.pro +++ b/examples/simpletest_imageplot_nodatastore/jkqtplotter_simpletest_imageplot_nodatastore_and_lib.pro @@ -2,7 +2,7 @@ TEMPLATE = subdirs SUBDIRS += jkqtplotterlib jkqtplotter_simpletest_imageplot_nodatastore -jkqtplotterlib.file = ../../staticlib/jkqtplotterlib.pro +jkqtplotterlib.file = ../../staticlib/jkqtplotterlib/jkqtplotterlib.pro jkqtplotter_simpletest_imageplot_nodatastore.file=$$PWD/jkqtplotter_simpletest_imageplot_nodatastore.pro jkqtplotter_simpletest_imageplot_nodatastore.depends = jkqtplotterlib diff --git a/examples/simpletest_imageplot_opencv/jkqtplotter_simpletest_imageplot_opencv.pro b/examples/simpletest_imageplot_opencv/jkqtplotter_simpletest_imageplot_opencv.pro index 15c459c35d..7a3c0da9b2 100644 --- a/examples/simpletest_imageplot_opencv/jkqtplotter_simpletest_imageplot_opencv.pro +++ b/examples/simpletest_imageplot_opencv/jkqtplotter_simpletest_imageplot_opencv.pro @@ -24,8 +24,8 @@ INCLUDEPATH += $$PWD/OpenCV-3.4.1/include/ LIBS += -L$$PWD/OpenCV-3.4.1/bin/ -llibopencv_core341 CONFIG (debug, debug|release) { - LIBS += -L../../staticlib/debug -ljkqtplotterlib_debug + LIBS += -L../../staticlib/jkqtplotterlib/debug -ljkqtplotterlib_debug } else { - LIBS += -L../../staticlib/release -ljkqtplotterlib + LIBS += -L../../staticlib/jkqtplotterlib/release -ljkqtplotterlib } message("LIBS = $$LIBS") \ No newline at end of file diff --git a/examples/simpletest_impulsesplot/jkqtplotter_simpletest_impulsesplot.pro b/examples/simpletest_impulsesplot/jkqtplotter_simpletest_impulsesplot.pro index 416f07af27..16f47c9e15 100644 --- a/examples/simpletest_impulsesplot/jkqtplotter_simpletest_impulsesplot.pro +++ b/examples/simpletest_impulsesplot/jkqtplotter_simpletest_impulsesplot.pro @@ -11,12 +11,12 @@ TARGET = jkqtplotter_simpletest_impulsesplot # include JKQTPlotter source code -DEPENDPATH += ../../lib ../../staticlib +DEPENDPATH += ../../lib ../../staticlib/jkqtplotterlib INCLUDEPATH += ../../lib CONFIG (debug, debug|release) { - LIBS += -L../../staticlib/debug -ljkqtplotterlib_debug + LIBS += -L../../staticlib/jkqtplotterlib/debug -ljkqtplotterlib_debug } else { - LIBS += -L../../staticlib/release -ljkqtplotterlib + LIBS += -L../../staticlib/jkqtplotterlib/release -ljkqtplotterlib } message("LIBS = $$LIBS") diff --git a/examples/simpletest_impulsesplot/jkqtplotter_simpletest_impulsesplot_and_lib.pro b/examples/simpletest_impulsesplot/jkqtplotter_simpletest_impulsesplot_and_lib.pro index e5c341c16b..de96a09325 100644 --- a/examples/simpletest_impulsesplot/jkqtplotter_simpletest_impulsesplot_and_lib.pro +++ b/examples/simpletest_impulsesplot/jkqtplotter_simpletest_impulsesplot_and_lib.pro @@ -2,7 +2,7 @@ TEMPLATE = subdirs SUBDIRS += jkqtplotterlib jkqtplotter_simpletest_impulsesplot -jkqtplotterlib.file = ../../staticlib/jkqtplotterlib.pro +jkqtplotterlib.file = ../../staticlib/jkqtplotterlib/jkqtplotterlib.pro jkqtplotter_simpletest_impulsesplot.file=$$PWD/jkqtplotter_simpletest_impulsesplot.pro jkqtplotter_simpletest_impulsesplot.depends = jkqtplotterlib diff --git a/examples/simpletest_logaxes/jkqtplotter_simpletest_logaxes.pro b/examples/simpletest_logaxes/jkqtplotter_simpletest_logaxes.pro index c97ca65611..7e3eb3fd71 100644 --- a/examples/simpletest_logaxes/jkqtplotter_simpletest_logaxes.pro +++ b/examples/simpletest_logaxes/jkqtplotter_simpletest_logaxes.pro @@ -10,12 +10,12 @@ greaterThan(QT_MAJOR_VERSION, 4): QT += widgets printsupport TARGET = jkqtplotter_simpletest_logaxes # include JKQTPlotter source code -DEPENDPATH += ../../lib ../../staticlib +DEPENDPATH += ../../lib ../../staticlib/jkqtplotterlib INCLUDEPATH += ../../lib CONFIG (debug, debug|release) { - LIBS += -L../../staticlib/debug -ljkqtplotterlib_debug + LIBS += -L../../staticlib/jkqtplotterlib/debug -ljkqtplotterlib_debug } else { - LIBS += -L../../staticlib/release -ljkqtplotterlib + LIBS += -L../../staticlib/jkqtplotterlib/release -ljkqtplotterlib } message("LIBS = $$LIBS") diff --git a/examples/simpletest_logaxes/jkqtplotter_simpletest_logaxes_and_lib.pro b/examples/simpletest_logaxes/jkqtplotter_simpletest_logaxes_and_lib.pro index 119d83ca0d..82f9fb8724 100644 --- a/examples/simpletest_logaxes/jkqtplotter_simpletest_logaxes_and_lib.pro +++ b/examples/simpletest_logaxes/jkqtplotter_simpletest_logaxes_and_lib.pro @@ -2,7 +2,7 @@ TEMPLATE = subdirs SUBDIRS += jkqtplotterlib jkqtplotter_simpletest_logaxes -jkqtplotterlib.file = ../../staticlib/jkqtplotterlib.pro +jkqtplotterlib.file = ../../staticlib/jkqtplotterlib/jkqtplotterlib.pro jkqtplotter_simpletest_logaxes.file=$$PWD/jkqtplotter_simpletest_logaxes.pro jkqtplotter_simpletest_logaxes.depends = jkqtplotterlib diff --git a/examples/simpletest_parametriccurve/jkqtplotter_simpletest_parametriccurve.pro b/examples/simpletest_parametriccurve/jkqtplotter_simpletest_parametriccurve.pro index 6a2599d741..5374e45c8b 100644 --- a/examples/simpletest_parametriccurve/jkqtplotter_simpletest_parametriccurve.pro +++ b/examples/simpletest_parametriccurve/jkqtplotter_simpletest_parametriccurve.pro @@ -11,12 +11,12 @@ TARGET = jkqtplotter_simpletest_parametriccurve # include JKQTPlotter source code -DEPENDPATH += ../../lib ../../staticlib +DEPENDPATH += ../../lib ../../staticlib/jkqtplotterlib INCLUDEPATH += ../../lib CONFIG (debug, debug|release) { - LIBS += -L../../staticlib/debug -ljkqtplotterlib_debug + LIBS += -L../../staticlib/jkqtplotterlib/debug -ljkqtplotterlib_debug } else { - LIBS += -L../../staticlib/release -ljkqtplotterlib + LIBS += -L../../staticlib/jkqtplotterlib/release -ljkqtplotterlib } message("LIBS = $$LIBS") diff --git a/examples/simpletest_parametriccurve/jkqtplotter_simpletest_parametriccurve_and_lib.pro b/examples/simpletest_parametriccurve/jkqtplotter_simpletest_parametriccurve_and_lib.pro index d0aebfad6c..160b7085a7 100644 --- a/examples/simpletest_parametriccurve/jkqtplotter_simpletest_parametriccurve_and_lib.pro +++ b/examples/simpletest_parametriccurve/jkqtplotter_simpletest_parametriccurve_and_lib.pro @@ -2,7 +2,7 @@ TEMPLATE = subdirs SUBDIRS += jkqtplotterlib jkqtplotter_simpletest_parametriccurve -jkqtplotterlib.file = ../../staticlib/jkqtplotterlib.pro +jkqtplotterlib.file = ../../staticlib/jkqtplotterlib/jkqtplotterlib.pro jkqtplotter_simpletest_parametriccurve.file=$$PWD/jkqtplotter_simpletest_parametriccurve.pro jkqtplotter_simpletest_parametriccurve.depends = jkqtplotterlib diff --git a/examples/simpletest_paramscatterplot/jkqtplotter_simpletest_paramscatterplot.pro b/examples/simpletest_paramscatterplot/jkqtplotter_simpletest_paramscatterplot.pro index 7e540406e8..86eda59861 100644 --- a/examples/simpletest_paramscatterplot/jkqtplotter_simpletest_paramscatterplot.pro +++ b/examples/simpletest_paramscatterplot/jkqtplotter_simpletest_paramscatterplot.pro @@ -11,12 +11,12 @@ TARGET = jkqtplotter_simpletest_paramscatterplot # include JKQTPlotter source code -DEPENDPATH += ../../lib ../../staticlib +DEPENDPATH += ../../lib ../../staticlib/jkqtplotterlib INCLUDEPATH += ../../lib CONFIG (debug, debug|release) { - LIBS += -L../../staticlib/debug -ljkqtplotterlib_debug + LIBS += -L../../staticlib/jkqtplotterlib/debug -ljkqtplotterlib_debug } else { - LIBS += -L../../staticlib/release -ljkqtplotterlib + LIBS += -L../../staticlib/jkqtplotterlib/release -ljkqtplotterlib } message("LIBS = $$LIBS") diff --git a/examples/simpletest_paramscatterplot/jkqtplotter_simpletest_paramscatterplot_and_lib.pro b/examples/simpletest_paramscatterplot/jkqtplotter_simpletest_paramscatterplot_and_lib.pro index 946feae710..3878e7a844 100644 --- a/examples/simpletest_paramscatterplot/jkqtplotter_simpletest_paramscatterplot_and_lib.pro +++ b/examples/simpletest_paramscatterplot/jkqtplotter_simpletest_paramscatterplot_and_lib.pro @@ -2,7 +2,7 @@ TEMPLATE = subdirs SUBDIRS += jkqtplotterlib jkqtplotter_simpletest_paramscatterplot -jkqtplotterlib.file = ../../staticlib/jkqtplotterlib.pro +jkqtplotterlib.file = ../../staticlib/jkqtplotterlib/jkqtplotterlib.pro jkqtplotter_simpletest_paramscatterplot.file=$$PWD/jkqtplotter_simpletest_paramscatterplot.pro jkqtplotter_simpletest_paramscatterplot.depends = jkqtplotterlib diff --git a/examples/simpletest_paramscatterplot_image/jkqtplotter_simpletest_paramscatterplot_image.pro b/examples/simpletest_paramscatterplot_image/jkqtplotter_simpletest_paramscatterplot_image.pro index 79fdc81ca5..1c9fbb9d85 100644 --- a/examples/simpletest_paramscatterplot_image/jkqtplotter_simpletest_paramscatterplot_image.pro +++ b/examples/simpletest_paramscatterplot_image/jkqtplotter_simpletest_paramscatterplot_image.pro @@ -13,12 +13,12 @@ TARGET = jkqtplotter_simpletest_paramscatterplot_image # include JKQTPlotter source code -DEPENDPATH += ../../lib ../../staticlib +DEPENDPATH += ../../lib ../../staticlib/jkqtplotterlib INCLUDEPATH += ../../lib CONFIG (debug, debug|release) { - LIBS += -L../../staticlib/debug -ljkqtplotterlib_debug + LIBS += -L../../staticlib/jkqtplotterlib/debug -ljkqtplotterlib_debug } else { - LIBS += -L../../staticlib/release -ljkqtplotterlib + LIBS += -L../../staticlib/jkqtplotterlib/release -ljkqtplotterlib } message("LIBS = $$LIBS") diff --git a/examples/simpletest_paramscatterplot_image/jkqtplotter_simpletest_paramscatterplot_image_and_lib.pro b/examples/simpletest_paramscatterplot_image/jkqtplotter_simpletest_paramscatterplot_image_and_lib.pro index 8f7f4679dd..1db6672d12 100644 --- a/examples/simpletest_paramscatterplot_image/jkqtplotter_simpletest_paramscatterplot_image_and_lib.pro +++ b/examples/simpletest_paramscatterplot_image/jkqtplotter_simpletest_paramscatterplot_image_and_lib.pro @@ -2,7 +2,7 @@ TEMPLATE = subdirs SUBDIRS += jkqtplotterlib jkqtplotter_simpletest_paramscatterplot_image -jkqtplotterlib.file = ../../staticlib/jkqtplotterlib.pro +jkqtplotterlib.file = ../../staticlib/jkqtplotterlib/jkqtplotterlib.pro jkqtplotter_simpletest_paramscatterplot_image.file=$$PWD/jkqtplotter_simpletest_paramscatterplot_image.pro jkqtplotter_simpletest_paramscatterplot_image.depends = jkqtplotterlib diff --git a/examples/simpletest_parsedfunctionplot/jkqtplotter_simpletest_parsedfunctionplot.pro b/examples/simpletest_parsedfunctionplot/jkqtplotter_simpletest_parsedfunctionplot.pro index a0b7664dd1..582fd60e7b 100644 --- a/examples/simpletest_parsedfunctionplot/jkqtplotter_simpletest_parsedfunctionplot.pro +++ b/examples/simpletest_parsedfunctionplot/jkqtplotter_simpletest_parsedfunctionplot.pro @@ -11,12 +11,12 @@ TARGET = jkqtplotter_simpletest_parsedfunctionplot # include JKQTPlotter source code -DEPENDPATH += ../../lib ../../staticlib +DEPENDPATH += ../../lib ../../staticlib/jkqtplotterlib INCLUDEPATH += ../../lib CONFIG (debug, debug|release) { - LIBS += -L../../staticlib/debug -ljkqtplotterlib_debug + LIBS += -L../../staticlib/jkqtplotterlib/debug -ljkqtplotterlib_debug } else { - LIBS += -L../../staticlib/release -ljkqtplotterlib + LIBS += -L../../staticlib/jkqtplotterlib/release -ljkqtplotterlib } message("LIBS = $$LIBS") diff --git a/examples/simpletest_parsedfunctionplot/jkqtplotter_simpletest_parsedfunctionplot_and_lib.pro b/examples/simpletest_parsedfunctionplot/jkqtplotter_simpletest_parsedfunctionplot_and_lib.pro index 3abab62d4a..e905c85edb 100644 --- a/examples/simpletest_parsedfunctionplot/jkqtplotter_simpletest_parsedfunctionplot_and_lib.pro +++ b/examples/simpletest_parsedfunctionplot/jkqtplotter_simpletest_parsedfunctionplot_and_lib.pro @@ -2,7 +2,7 @@ TEMPLATE = subdirs SUBDIRS += jkqtplotterlib jkqtplotter_simpletest_parsedfunctionplot -jkqtplotterlib.file = ../../staticlib/jkqtplotterlib.pro +jkqtplotterlib.file = ../../staticlib/jkqtplotterlib/jkqtplotterlib.pro jkqtplotter_simpletest_parsedfunctionplot.file=$$PWD/jkqtplotter_simpletest_parsedfunctionplot.pro jkqtplotter_simpletest_parsedfunctionplot.depends = jkqtplotterlib diff --git a/examples/simpletest_rgbimageplot_opencv/jkqtplotter_simpletest_rgbimageplot_opencv.pro b/examples/simpletest_rgbimageplot_opencv/jkqtplotter_simpletest_rgbimageplot_opencv.pro index 83db03a1af..5616374517 100644 --- a/examples/simpletest_rgbimageplot_opencv/jkqtplotter_simpletest_rgbimageplot_opencv.pro +++ b/examples/simpletest_rgbimageplot_opencv/jkqtplotter_simpletest_rgbimageplot_opencv.pro @@ -23,8 +23,8 @@ INCLUDEPATH += $$PWD/OpenCV-3.4.1/include/ LIBS += -L$$PWD/OpenCV-3.4.1/bin/ -llibopencv_core341 -llibopencv_imgcodecs341 CONFIG (debug, debug|release) { - LIBS += -L../../staticlib/debug -ljkqtplotterlib_debug + LIBS += -L../../staticlib/jkqtplotterlib/debug -ljkqtplotterlib_debug } else { - LIBS += -L../../staticlib/release -ljkqtplotterlib + LIBS += -L../../staticlib/jkqtplotterlib/release -ljkqtplotterlib } message("LIBS = $$LIBS") \ No newline at end of file diff --git a/examples/simpletest_rgbimageplot_qt/jkqtplotter_simpletest_rgbimageplot_qt.pro b/examples/simpletest_rgbimageplot_qt/jkqtplotter_simpletest_rgbimageplot_qt.pro index ab376fbfc1..caef2e7cd9 100644 --- a/examples/simpletest_rgbimageplot_qt/jkqtplotter_simpletest_rgbimageplot_qt.pro +++ b/examples/simpletest_rgbimageplot_qt/jkqtplotter_simpletest_rgbimageplot_qt.pro @@ -13,12 +13,12 @@ greaterThan(QT_MAJOR_VERSION, 4): QT += widgets printsupport TARGET = jkqtplotter_simpletest_rgbimageplot_qt # include JKQTPlotter source code -DEPENDPATH += ../../lib ../../staticlib +DEPENDPATH += ../../lib ../../staticlib/jkqtplotterlib INCLUDEPATH += ../../lib CONFIG (debug, debug|release) { - LIBS += -L../../staticlib/debug -ljkqtplotterlib_debug + LIBS += -L../../staticlib/jkqtplotterlib/debug -ljkqtplotterlib_debug } else { - LIBS += -L../../staticlib/release -ljkqtplotterlib + LIBS += -L../../staticlib/jkqtplotterlib/release -ljkqtplotterlib } message("LIBS = $$LIBS") diff --git a/examples/simpletest_rgbimageplot_qt/jkqtplotter_simpletest_rgbimageplot_qt_and_lib.pro b/examples/simpletest_rgbimageplot_qt/jkqtplotter_simpletest_rgbimageplot_qt_and_lib.pro index 706de624bc..aa9bbfba3f 100644 --- a/examples/simpletest_rgbimageplot_qt/jkqtplotter_simpletest_rgbimageplot_qt_and_lib.pro +++ b/examples/simpletest_rgbimageplot_qt/jkqtplotter_simpletest_rgbimageplot_qt_and_lib.pro @@ -2,7 +2,7 @@ TEMPLATE = subdirs SUBDIRS += jkqtplotterlib jkqtplotter_simpletest_rgbimageplot_qt -jkqtplotterlib.file = ../../staticlib/jkqtplotterlib.pro +jkqtplotterlib.file = ../../staticlib/jkqtplotterlib/jkqtplotterlib.pro jkqtplotter_simpletest_rgbimageplot_qt.file=$$PWD/jkqtplotter_simpletest_rgbimageplot_qt.pro jkqtplotter_simpletest_rgbimageplot_qt.depends = jkqtplotterlib diff --git a/examples/simpletest_speed/jkqtplotter_simpletest_speed.pro b/examples/simpletest_speed/jkqtplotter_simpletest_speed.pro index 1de558af5f..ed1199b86e 100644 --- a/examples/simpletest_speed/jkqtplotter_simpletest_speed.pro +++ b/examples/simpletest_speed/jkqtplotter_simpletest_speed.pro @@ -11,12 +11,12 @@ greaterThan(QT_MAJOR_VERSION, 4): QT += widgets printsupport TARGET = jkqtplotter_simpletest_speed # include JKQTPlotter source code -DEPENDPATH += ../../lib ../../staticlib +DEPENDPATH += ../../lib ../../staticlib/jkqtplotterlib INCLUDEPATH += ../../lib CONFIG (debug, debug|release) { - LIBS += -L../../staticlib/debug -ljkqtplotterlib_debug + LIBS += -L../../staticlib/jkqtplotterlib/debug -ljkqtplotterlib_debug } else { - LIBS += -L../../staticlib/release -ljkqtplotterlib + LIBS += -L../../staticlib/jkqtplotterlib/release -ljkqtplotterlib } message("LIBS = $$LIBS") diff --git a/examples/simpletest_speed/jkqtplotter_simpletest_speed_and_lib.pro b/examples/simpletest_speed/jkqtplotter_simpletest_speed_and_lib.pro index 2b2f810011..195e71c7a0 100644 --- a/examples/simpletest_speed/jkqtplotter_simpletest_speed_and_lib.pro +++ b/examples/simpletest_speed/jkqtplotter_simpletest_speed_and_lib.pro @@ -2,7 +2,7 @@ TEMPLATE = subdirs SUBDIRS += jkqtplotterlib jkqtplotter_simpletest_speed -jkqtplotterlib.file = ../../staticlib/jkqtplotterlib.pro +jkqtplotterlib.file = ../../staticlib/jkqtplotterlib/jkqtplotterlib.pro jkqtplotter_simpletest_speed.file=$$PWD/jkqtplotter_simpletest_speed.pro jkqtplotter_simpletest_speed.depends = jkqtplotterlib diff --git a/examples/simpletest_stackedbars/jkqtplotter_simpletest_stackedbars.pro b/examples/simpletest_stackedbars/jkqtplotter_simpletest_stackedbars.pro index 2587617070..3b04f92edb 100644 --- a/examples/simpletest_stackedbars/jkqtplotter_simpletest_stackedbars.pro +++ b/examples/simpletest_stackedbars/jkqtplotter_simpletest_stackedbars.pro @@ -11,12 +11,12 @@ TARGET = jkqtplotter_simpletest_stackedbars # include JKQTPlotter source code -DEPENDPATH += ../../lib ../../staticlib +DEPENDPATH += ../../lib ../../staticlib/jkqtplotterlib INCLUDEPATH += ../../lib CONFIG (debug, debug|release) { - LIBS += -L../../staticlib/debug -ljkqtplotterlib_debug + LIBS += -L../../staticlib/jkqtplotterlib/debug -ljkqtplotterlib_debug } else { - LIBS += -L../../staticlib/release -ljkqtplotterlib + LIBS += -L../../staticlib/jkqtplotterlib/release -ljkqtplotterlib } message("LIBS = $$LIBS") diff --git a/examples/simpletest_stackedbars/jkqtplotter_simpletest_stackedbars_and_lib.pro b/examples/simpletest_stackedbars/jkqtplotter_simpletest_stackedbars_and_lib.pro index 6a2229b058..53f9d81b7d 100644 --- a/examples/simpletest_stackedbars/jkqtplotter_simpletest_stackedbars_and_lib.pro +++ b/examples/simpletest_stackedbars/jkqtplotter_simpletest_stackedbars_and_lib.pro @@ -2,7 +2,7 @@ TEMPLATE = subdirs SUBDIRS += jkqtplotterlib jkqtplotter_simpletest_stackedbars -jkqtplotterlib.file = ../../staticlib/jkqtplotterlib.pro +jkqtplotterlib.file = ../../staticlib/jkqtplotterlib/jkqtplotterlib.pro jkqtplotter_simpletest_stackedbars.file=$$PWD/jkqtplotter_simpletest_stackedbars.pro jkqtplotter_simpletest_stackedbars.depends = jkqtplotterlib diff --git a/examples/simpletest_stepplots/jkqtplotter_simpletest_stepplots.pro b/examples/simpletest_stepplots/jkqtplotter_simpletest_stepplots.pro index 793f75bd37..d566ac4515 100644 --- a/examples/simpletest_stepplots/jkqtplotter_simpletest_stepplots.pro +++ b/examples/simpletest_stepplots/jkqtplotter_simpletest_stepplots.pro @@ -11,12 +11,12 @@ TARGET = jkqtplotter_simpletest_stepplots # include JKQTPlotter source code -DEPENDPATH += ../../lib ../../staticlib +DEPENDPATH += ../../lib ../../staticlib/jkqtplotterlib INCLUDEPATH += ../../lib CONFIG (debug, debug|release) { - LIBS += -L../../staticlib/debug -ljkqtplotterlib_debug + LIBS += -L../../staticlib/jkqtplotterlib/debug -ljkqtplotterlib_debug } else { - LIBS += -L../../staticlib/release -ljkqtplotterlib + LIBS += -L../../staticlib/jkqtplotterlib/release -ljkqtplotterlib } message("LIBS = $$LIBS") diff --git a/examples/simpletest_stepplots/jkqtplotter_simpletest_stepplots_and_lib.pro b/examples/simpletest_stepplots/jkqtplotter_simpletest_stepplots_and_lib.pro index a7600ef23b..af8c787114 100644 --- a/examples/simpletest_stepplots/jkqtplotter_simpletest_stepplots_and_lib.pro +++ b/examples/simpletest_stepplots/jkqtplotter_simpletest_stepplots_and_lib.pro @@ -2,7 +2,7 @@ TEMPLATE = subdirs SUBDIRS += jkqtplotterlib jkqtplotter_simpletest_stepplots -jkqtplotterlib.file = ../../staticlib/jkqtplotterlib.pro +jkqtplotterlib.file = ../../staticlib/jkqtplotterlib/jkqtplotterlib.pro jkqtplotter_simpletest_stepplots.file=$$PWD/jkqtplotter_simpletest_stepplots.pro jkqtplotter_simpletest_stepplots.depends = jkqtplotterlib diff --git a/examples/simpletest_symbols_and_errors/jkqtplotter_simpletest_symbols_and_errors.pro b/examples/simpletest_symbols_and_errors/jkqtplotter_simpletest_symbols_and_errors.pro index bd53693b28..31fb4cf3d7 100644 --- a/examples/simpletest_symbols_and_errors/jkqtplotter_simpletest_symbols_and_errors.pro +++ b/examples/simpletest_symbols_and_errors/jkqtplotter_simpletest_symbols_and_errors.pro @@ -11,12 +11,12 @@ TARGET = jkqtplotter_simpletest_symbols_and_errors # include JKQTPlotter source code -DEPENDPATH += ../../lib ../../staticlib +DEPENDPATH += ../../lib ../../staticlib/jkqtplotterlib INCLUDEPATH += ../../lib CONFIG (debug, debug|release) { - LIBS += -L../../staticlib/debug -ljkqtplotterlib_debug + LIBS += -L../../staticlib/jkqtplotterlib/debug -ljkqtplotterlib_debug } else { - LIBS += -L../../staticlib/release -ljkqtplotterlib + LIBS += -L../../staticlib/jkqtplotterlib/release -ljkqtplotterlib } message("LIBS = $$LIBS") diff --git a/examples/simpletest_symbols_and_errors/jkqtplotter_simpletest_symbols_and_errors_and_lib.pro b/examples/simpletest_symbols_and_errors/jkqtplotter_simpletest_symbols_and_errors_and_lib.pro index 60dde5ad35..1d53e7cafa 100644 --- a/examples/simpletest_symbols_and_errors/jkqtplotter_simpletest_symbols_and_errors_and_lib.pro +++ b/examples/simpletest_symbols_and_errors/jkqtplotter_simpletest_symbols_and_errors_and_lib.pro @@ -2,7 +2,7 @@ TEMPLATE = subdirs SUBDIRS += jkqtplotterlib jkqtplotter_simpletest_symbols_and_errors -jkqtplotterlib.file = ../../staticlib/jkqtplotterlib.pro +jkqtplotterlib.file = ../../staticlib/jkqtplotterlib/jkqtplotterlib.pro jkqtplotter_simpletest_symbols_and_errors.file=$$PWD/jkqtplotter_simpletest_symbols_and_errors.pro jkqtplotter_simpletest_symbols_and_errors.depends = jkqtplotterlib diff --git a/examples/simpletest_symbols_and_styles/jkqtplotter_simpletest_symbols_and_styles.pro b/examples/simpletest_symbols_and_styles/jkqtplotter_simpletest_symbols_and_styles.pro index 4bc363b129..54fb217c21 100644 --- a/examples/simpletest_symbols_and_styles/jkqtplotter_simpletest_symbols_and_styles.pro +++ b/examples/simpletest_symbols_and_styles/jkqtplotter_simpletest_symbols_and_styles.pro @@ -11,12 +11,12 @@ TARGET = jkqtplotter_simpletest_symbols_and_styles # include JKQTPlotter source code -DEPENDPATH += ../../lib ../../staticlib +DEPENDPATH += ../../lib ../../staticlib/jkqtplotterlib INCLUDEPATH += ../../lib CONFIG (debug, debug|release) { - LIBS += -L../../staticlib/debug -ljkqtplotterlib_debug + LIBS += -L../../staticlib/jkqtplotterlib/debug -ljkqtplotterlib_debug } else { - LIBS += -L../../staticlib/release -ljkqtplotterlib + LIBS += -L../../staticlib/jkqtplotterlib/release -ljkqtplotterlib } message("LIBS = $$LIBS") diff --git a/examples/simpletest_symbols_and_styles/jkqtplotter_simpletest_symbols_and_styles_and_lib.pro b/examples/simpletest_symbols_and_styles/jkqtplotter_simpletest_symbols_and_styles_and_lib.pro index d3dda48093..6ad6caa069 100644 --- a/examples/simpletest_symbols_and_styles/jkqtplotter_simpletest_symbols_and_styles_and_lib.pro +++ b/examples/simpletest_symbols_and_styles/jkqtplotter_simpletest_symbols_and_styles_and_lib.pro @@ -2,7 +2,7 @@ TEMPLATE = subdirs SUBDIRS += jkqtplotterlib jkqtplotter_simpletest_symbols_and_styles -jkqtplotterlib.file = ../../staticlib/jkqtplotterlib.pro +jkqtplotterlib.file = ../../staticlib/jkqtplotterlib/jkqtplotterlib.pro jkqtplotter_simpletest_symbols_and_styles.file=$$PWD/jkqtplotter_simpletest_symbols_and_styles.pro jkqtplotter_simpletest_symbols_and_styles.depends = jkqtplotterlib diff --git a/examples/simpletest_ui/README.md b/examples/simpletest_ui/README.md index 223ac371bf..acaba5a4ec 100644 --- a/examples/simpletest_ui/README.md +++ b/examples/simpletest_ui/README.md @@ -37,12 +37,12 @@ greaterThan(QT_MAJOR_VERSION, 4): QT += widgets printsupport TARGET = jkqtplotter_simpletest_ui # include JKQTPlotter source headers and link against library -DEPENDPATH += ../../lib ../../staticlib +DEPENDPATH += ../../lib ../../staticlib/jkqtplotterlib INCLUDEPATH += ../../lib CONFIG (debug, debug|release) { - LIBS += -L../../staticlib/debug -ljkqtplotterlib_debug + LIBS += -L../../staticlib/jkqtplotterlib/debug -ljkqtplotterlib_debug } else { - LIBS += -L../../staticlib/release -ljkqtplotterlib + LIBS += -L../../staticlib/jkqtplotterlib/release -ljkqtplotterlib } message("LIBS = $$LIBS") diff --git a/examples/simpletest_ui/jkqtplotter_simpletest_ui.pro b/examples/simpletest_ui/jkqtplotter_simpletest_ui.pro index 398fd8bfcd..24d6850b09 100644 --- a/examples/simpletest_ui/jkqtplotter_simpletest_ui.pro +++ b/examples/simpletest_ui/jkqtplotter_simpletest_ui.pro @@ -18,9 +18,9 @@ TARGET = jkqtplotter_simpletest_ui DEPENDPATH += ../../lib ../../staticlib INCLUDEPATH += ../../lib CONFIG (debug, debug|release) { - LIBS += -L../../staticlib/debug -ljkqtplotterlib_debug + LIBS += -L../../staticlib/jkqtplotterlib/debug -ljkqtplotterlib_debug } else { - LIBS += -L../../staticlib/release -ljkqtplotterlib + LIBS += -L../../staticlib/jkqtplotterlib/release -ljkqtplotterlib } message("LIBS = $$LIBS") diff --git a/examples/simpletest_ui/jkqtplotter_simpletest_ui_and_lib.pro b/examples/simpletest_ui/jkqtplotter_simpletest_ui_and_lib.pro index 367761d5b1..f4a2d362d4 100644 --- a/examples/simpletest_ui/jkqtplotter_simpletest_ui_and_lib.pro +++ b/examples/simpletest_ui/jkqtplotter_simpletest_ui_and_lib.pro @@ -2,7 +2,7 @@ TEMPLATE = subdirs SUBDIRS += jkqtplotterlib jkqtplotter_simpletest_ui -jkqtplotterlib.file = ../../staticlib/jkqtplotterlib.pro +jkqtplotterlib.file = ../../staticlib/jkqtplotterlib/jkqtplotterlib.pro jkqtplotter_simpletest_ui.file=$$PWD/jkqtplotter_simpletest_ui.pro jkqtplotter_simpletest_ui.depends = jkqtplotterlib diff --git a/examples/test_distributionplot/test_distributionplot.pro b/examples/test_distributionplot/test_distributionplot.pro index b7c9645dca..b0746fa89e 100644 --- a/examples/test_distributionplot/test_distributionplot.pro +++ b/examples/test_distributionplot/test_distributionplot.pro @@ -10,12 +10,12 @@ greaterThan(QT_MAJOR_VERSION, 4): QT += widgets printsupport TARGET = test_distributionplot # include JKQTPlotter source code -DEPENDPATH += ../../lib ../../staticlib +DEPENDPATH += ../../lib ../../staticlib/jkqtplotterlib INCLUDEPATH += ../../lib CONFIG (debug, debug|release) { - LIBS += -L../../staticlib/debug -ljkqtplotterlib_debug + LIBS += -L../../staticlib/jkqtplotterlib/debug -ljkqtplotterlib_debug } else { - LIBS += -L../../staticlib/release -ljkqtplotterlib + LIBS += -L../../staticlib/jkqtplotterlib/release -ljkqtplotterlib } message("LIBS = $$LIBS") diff --git a/examples/test_distributionplot/test_distributionplot_and_lib.pro b/examples/test_distributionplot/test_distributionplot_and_lib.pro index 7187517654..d1fdad4328 100644 --- a/examples/test_distributionplot/test_distributionplot_and_lib.pro +++ b/examples/test_distributionplot/test_distributionplot_and_lib.pro @@ -2,7 +2,7 @@ TEMPLATE = subdirs SUBDIRS += jkqtplotterlib test_distributionplot -jkqtplotterlib.file = ../../staticlib/jkqtplotterlib.pro +jkqtplotterlib.file = ../../staticlib/jkqtplotterlib/jkqtplotterlib.pro test_distributionplot.file=$$PWD/test_distributionplot.pro test_distributionplot.depends = jkqtplotterlib diff --git a/examples/test_multiplot/test_multiplot.pro b/examples/test_multiplot/test_multiplot.pro index 44d4b7ab48..593145756e 100644 --- a/examples/test_multiplot/test_multiplot.pro +++ b/examples/test_multiplot/test_multiplot.pro @@ -16,9 +16,9 @@ TARGET = test_multiplot DEPENDPATH += ../../lib ../../staticlib INCLUDEPATH += ../../lib CONFIG (debug, debug|release) { - LIBS += -L../../staticlib/debug -ljkqtplotterlib_debug + LIBS += -L../../staticlib/jkqtplotterlib/debug -ljkqtplotterlib_debug } else { - LIBS += -L../../staticlib/release -ljkqtplotterlib + LIBS += -L../../staticlib/jkqtplotterlib/release -ljkqtplotterlib } message("LIBS = $$LIBS") diff --git a/examples/test_multiplot/test_multiplot_and_lib.pro b/examples/test_multiplot/test_multiplot_and_lib.pro index 8020341c54..6257d486f0 100644 --- a/examples/test_multiplot/test_multiplot_and_lib.pro +++ b/examples/test_multiplot/test_multiplot_and_lib.pro @@ -2,7 +2,7 @@ TEMPLATE = subdirs SUBDIRS += jkqtplotterlib test_multiplot -jkqtplotterlib.file = ../../staticlib/jkqtplotterlib.pro +jkqtplotterlib.file = ../../staticlib/jkqtplotterlib/jkqtplotterlib.pro test_multiplot.file=$$PWD/test_multiplot.pro test_multiplot.depends = jkqtplotterlib diff --git a/examples/test_styling/test_styling.pro b/examples/test_styling/test_styling.pro index de8043e5a0..3fa63c823c 100644 --- a/examples/test_styling/test_styling.pro +++ b/examples/test_styling/test_styling.pro @@ -24,10 +24,10 @@ INCLUDEPATH += ../../lib CONFIG (debug, debug|release) { - LIBS += -L../../staticlib/debug -ljkqtplotterlib_debug + LIBS += -L../../staticlib/jkqtplotterlib/debug -ljkqtplotterlib_debug } else { - LIBS += -L../../staticlib/release -ljkqtplotterlib + LIBS += -L../../staticlib/jkqtplotterlib/release -ljkqtplotterlib } message("LIBS = $$LIBS") diff --git a/examples/test_styling/test_styling_and_lib.pro b/examples/test_styling/test_styling_and_lib.pro index 0fdbd85851..70c7086ed2 100644 --- a/examples/test_styling/test_styling_and_lib.pro +++ b/examples/test_styling/test_styling_and_lib.pro @@ -1,6 +1,6 @@ TEMPLATE = subdirs -jkqtplotterlib.file = ../../staticlib/jkqtplotterlib.pro +jkqtplotterlib.file = ../../staticlib/jkqtplotterlib/jkqtplotterlib.pro test_styling.file=$$PWD/test_styling.pro test_styling.depends = jkqtplotterlib diff --git a/examples/test_user_interaction/test_user_interaction.pro b/examples/test_user_interaction/test_user_interaction.pro index b8d8f78921..9eec061c96 100644 --- a/examples/test_user_interaction/test_user_interaction.pro +++ b/examples/test_user_interaction/test_user_interaction.pro @@ -19,9 +19,9 @@ HEADERS += \ DEPENDPATH += ../../lib ../../staticlib INCLUDEPATH += ../../lib CONFIG (debug, debug|release) { - LIBS += -L../../staticlib/debug -ljkqtplotterlib_debug + LIBS += -L../../staticlib/jkqtplotterlib/debug -ljkqtplotterlib_debug } else { - LIBS += -L../../staticlib/release -ljkqtplotterlib + LIBS += -L../../staticlib/jkqtplotterlib/release -ljkqtplotterlib } message("LIBS = $$LIBS") diff --git a/examples/test_user_interaction/test_user_interaction_and_lib.pro b/examples/test_user_interaction/test_user_interaction_and_lib.pro index 3b7e01c1db..e12816f879 100644 --- a/examples/test_user_interaction/test_user_interaction_and_lib.pro +++ b/examples/test_user_interaction/test_user_interaction_and_lib.pro @@ -2,7 +2,7 @@ TEMPLATE = subdirs SUBDIRS += jkqtplotterlib test_user_interaction -jkqtplotterlib.file = ../../staticlib/jkqtplotterlib.pro +jkqtplotterlib.file = ../../staticlib/jkqtplotterlib/jkqtplotterlib.pro test_user_interaction.file=$$PWD/test_user_interaction.pro test_user_interaction.depends = jkqtplotterlib diff --git a/screenshots/jkqtfastplotter_test.png b/screenshots/jkqtfastplotter_test.png new file mode 100644 index 0000000000000000000000000000000000000000..395265dea1c3dc53fc739a2626d53419397fcc18 GIT binary patch literal 43199 zcmc$`1yq(>*EVW^l(c|!gOo@}w@8zZ@TrMHxXAUrGjc;otMye zfKSjiiHm{%-8PdJ>ut6s`!ZH*y_Lz9GUV z&cIZ6de7QkH=to}`UUSUKhA%eY@E+v5)7Mr+C!|DlKa!!Psgs*X5{1h5F>LBxV>m1l2g%T9*aWALLQ zfuGP0ri$XjD%CR-Q(R$IZx)>CdcX75C?~tOtpW_d&-dVAeQYPFPIO#yWY5$Pm&&51 z7U1VA>3ueYMUVGT9b5WYk)>00;yR!o8ZFVV5vbeb$WD{9{b#dZm_grdQEGIo+|@)g zd3V~}Yy^I5exRJ!K{sus9_XPyzL$hk?I(LQ;P;{D!Xi8Eg%-A6JW0uaqS}Af2K@5X z+HR$ImwEK8UA|ShOQD7!jP%=!FX#_NcURFdR%9D04XytN^^le2FJ$1_v{nP z=}P9lZ;~s;F}bM)z`%y1?A`@i%o(Vw%o!>QyVX(SUsbkG(lKhG*v^)Fv+IIC0XEUb zKKev!V7=d;p=$J1J#N5^UHgRr8d1g8I1~BMn>eF(J(8&m6~D_@DQ=%H7G|FxhtR%z z2mUsq&gL?Pil_VVN^wb7_EU?mRC{c5I`_Jko|IfuLJWJBSqj)%3`PRBJ=>(~t2 zac9RXq?+ev_zk1h^L8;Yapxw=S`E=oP-lF#aj#C5s1LW7!zFQTIwjBR#^0A8bejnx zt}0}iti^Gf&*+7Tj*!DSg(|GcJtnH>>J=UH# z=X}%DlFfO0T8g+BgIoQSU|3*Xlz3SI%$Y#JX4BJ8S+Q213TuXAZPmMboyKD*v~zU2 zLuhsFMTmxJ-)(&dS@66y<2+W^NdviZVZQmSArn!u{Im*xynLt2sf1R%HqKW48TFx& zio*jG)_pyv>2aetx}z3IT0ID9<6Yoc+E&hfIHF~V(3uuZ$KbV9ZMer+wrjY}Q^@Hw ztTuixWvWZe=os{cOOKB1`VDQ@7sJQjf{hwWO^~>dne5!5aMGCmU14(yJHDI(`@9-^ zz#Fb=@2UN;6!WoL+SJ?|@J=1&xA89@%`kXbH*lXV&9K4=wvn1bVjSM57UQafrbE2t+@_mv->RhFIfRhI1}pE)5hg#*99vq3 zx`ochgyaTF3}~8FtKnL1OYjqwHtnW$Y3kIZQpUFoxwG zY&*yCouQmi72=m`Z%MVXZ6(DlbD5}(#=G$Ka)l8c65=*m$*5WgSpdS8bpv@W}--{-PTbbX#&y>rl34{q%<#B)h`j6Px$LvFn zvsQVx@rNAWAS@THpsQhX;oRR5gB3ia1S81t@KCV}rPudp|AaZIDYs$k_(*PV^ov z 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%0D0PxhoCUoi=_z6FDV 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 literal 0 HcmV?d00001 diff --git a/screenshots/jkqtfastplotter_test_small.png b/screenshots/jkqtfastplotter_test_small.png new file mode 100644 index 0000000000000000000000000000000000000000..bd71e69b4638e398fc05a3fb83f16d693d06c57f GIT binary patch literal 20129 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

s#MKOZ7)T`VktaAT7Zfs;jHRl|yhJM#HLA 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 Uid1Z*vH$=807*qoM6N<$f}2!()Bpeg literal 0 HcmV?d00001 diff --git a/sharedlib/README.md b/sharedlib/README.md index 2eb5bc62f5..9d197bef03 100644 --- a/sharedlib/README.md +++ b/sharedlib/README.md @@ -9,22 +9,24 @@ There are several `.PRO`-files, that can be used to build the full library, or a ```.qmake # include JKQTPlotter library -DEPENDPATH += /lib /sharedlib +DEPENDPATH += /lib /sharedlib/jkqtplotterlib INCLUDEPATH += /lib CONFIG (debug, debug|release) { # ensure that DLLs are copied to the output directory - install_jkqtplotter_dll.files = /sharedlib/debu/jkqtplotterlib_debug.* + install_jkqtplotter_dll.files = /sharedlib/jkqtplotterlib/debug/jkqtplotterlib_debug.* install_jkqtplotter_dll.path = $$OUT_PWD INSTALLS += install_jkqtplotter_dll # link agains DLLs - LIBS += -L/sharedlib/debug -ljkqtplotterlib_debug + DEPENDPATH += /sharedlib/jkqtplotterlib/debug + LIBS += -L/sharedlib/jkqtplotterlib/debug -ljkqtplotterlib_debug } else { # ensure that DLLs are copied to the output directory - install_jkqtplotter_dll.files = /sharedlib/release/jkqtplotterlib.* + install_jkqtplotter_dll.files = /sharedlib/jkqtplotterlib/release/jkqtplotterlib.* install_jkqtplotter_dll.path = $$OUT_PWD INSTALLS += install_jkqtplotter_dll + DEPENDPATH += /sharedlib/jkqtplotterlib/release # link agains DLLs - LIBS += -L/sharedlib/release -ljkqtplotterlib + LIBS += -L/sharedlib/jkqtplotterlib/release -ljkqtplotterlib } ``` diff --git a/sharedlib/jkqtfastplotterlib_sharedlib.pro b/sharedlib/jkqtfastplotterlib/jkqtfastplotterlib.pro similarity index 88% rename from sharedlib/jkqtfastplotterlib_sharedlib.pro rename to sharedlib/jkqtfastplotterlib/jkqtfastplotterlib.pro index 6744c58027..248ca6a706 100644 --- a/sharedlib/jkqtfastplotterlib_sharedlib.pro +++ b/sharedlib/jkqtfastplotterlib/jkqtfastplotterlib.pro @@ -12,4 +12,4 @@ win32 { DEFINES += JKQTP_LIB_EXPORT_LIBRARY } -include(../lib/jkqtfastplotter.pri) +include(../../lib/jkqtfastplotter.pri) diff --git a/sharedlib/jkqtmathtextlib_sharedlib.pro b/sharedlib/jkqtmathtextlib/jkqtmathtextlib.pro similarity index 89% rename from sharedlib/jkqtmathtextlib_sharedlib.pro rename to sharedlib/jkqtmathtextlib/jkqtmathtextlib.pro index 385d8542b9..a17e8e3460 100644 --- a/sharedlib/jkqtmathtextlib_sharedlib.pro +++ b/sharedlib/jkqtmathtextlib/jkqtmathtextlib.pro @@ -12,4 +12,4 @@ win32 { DEFINES += JKQTP_LIB_EXPORT_LIBRARY } -include(../lib/jkqtmathtext.pri) +include(../../lib/jkqtmathtext.pri) diff --git a/sharedlib/jkqtplotterlib_sharedlib.pro b/sharedlib/jkqtplotterlib/jkqtplotterlib.pro similarity index 89% rename from sharedlib/jkqtplotterlib_sharedlib.pro rename to sharedlib/jkqtplotterlib/jkqtplotterlib.pro index 62067fdc06..8542d97036 100644 --- a/sharedlib/jkqtplotterlib_sharedlib.pro +++ b/sharedlib/jkqtplotterlib/jkqtplotterlib.pro @@ -12,4 +12,4 @@ win32 { DEFINES += JKQTP_LIB_EXPORT_LIBRARY } -include(../lib/jkqtplotter.pri) +include(../../lib/jkqtplotter.pri) diff --git a/staticlib/README.md b/staticlib/README.md index 777670a38a..96988dfbae 100644 --- a/staticlib/README.md +++ b/staticlib/README.md @@ -9,12 +9,14 @@ There are several `.PRO`-files, that can be used to build the full library, or a ```.qmake # include JKQTPlotter library -DEPENDPATH += /staticlib /lib +DEPENDPATH += /staticlib/jkqtplotterlib /lib INCLUDEPATH += /lib CONFIG (debug, debug|release) { - LIBS += -L/staticlib/debug -ljkqtplotterlib_debug + DEPENDPATH += /staticlib/jkqtplotterlib/debug + LIBS += -L/staticlib/jkqtplotterlib/debug -ljkqtplotterlib_debug } else { - LIBS += -L/staticlib/release -ljkqtplotterlib + DEPENDPATH += /staticlib/jkqtplotterlib/release + LIBS += -L/staticlib/jkqtplotterlib/release -ljkqtplotterlib } ``` diff --git a/staticlib/jkqtfastplotterlib.pro b/staticlib/jkqtfastplotterlib/jkqtfastplotterlib.pro similarity index 85% rename from staticlib/jkqtfastplotterlib.pro rename to staticlib/jkqtfastplotterlib/jkqtfastplotterlib.pro index 56ae5b8199..c4fa091740 100644 --- a/staticlib/jkqtfastplotterlib.pro +++ b/staticlib/jkqtfastplotterlib/jkqtfastplotterlib.pro @@ -7,4 +7,4 @@ TEMPLATE = lib CONFIG+=staticlib CONFIG += create_prl -include(../lib/jkqtfastplotter.pri) +include(../../lib/jkqtfastplotter.pri) diff --git a/staticlib/jkqtmathtextlib.pro b/staticlib/jkqtmathtextlib/jkqtmathtextlib.pro similarity index 79% rename from staticlib/jkqtmathtextlib.pro rename to staticlib/jkqtmathtextlib/jkqtmathtextlib.pro index 48e9e85708..b1188b6b36 100644 --- a/staticlib/jkqtmathtextlib.pro +++ b/staticlib/jkqtmathtextlib/jkqtmathtextlib.pro @@ -4,7 +4,7 @@ TARGET = jkqtmathtextlib CONFIG (debug, debug|release): TARGET = jkqtmathtextlib_debug TEMPLATE = lib -CONFIG+=staticlib +CONFIG += staticlib CONFIG += create_prl -include(../lib/jkqtmathtext.pri) +include(../../lib/jkqtmathtext.pri) diff --git a/staticlib/jkqtphighrestimerlib/jkqtphighrestimerlib.pro b/staticlib/jkqtphighrestimerlib/jkqtphighrestimerlib.pro new file mode 100644 index 0000000000..a7aa4dca03 --- /dev/null +++ b/staticlib/jkqtphighrestimerlib/jkqtphighrestimerlib.pro @@ -0,0 +1,13 @@ +TARGET = jkqtphighrestimerlib +CONFIG (debug, debug|release): TARGET = jkqtphighrestimerlib_debug + +TEMPLATE = lib +CONFIG += staticlib +CONFIG += create_prl + +HEADERS += \ + ../../lib/jkqtplottertools/jkqtphighrestimer.h + +SOURCES += \ + ../../lib/jkqtplottertools/jkqtphighrestimer.cpp + diff --git a/staticlib/jkqtplotterlib.pro b/staticlib/jkqtplotterlib/jkqtplotterlib.pro similarity index 88% rename from staticlib/jkqtplotterlib.pro rename to staticlib/jkqtplotterlib/jkqtplotterlib.pro index e52c7ce564..3545e8d65a 100644 --- a/staticlib/jkqtplotterlib.pro +++ b/staticlib/jkqtplotterlib/jkqtplotterlib.pro @@ -9,4 +9,4 @@ CONFIG += create_prl #DEFINES += JKQTBP_AUTOTIMER -include(../lib/jkqtplotter.pri) +include(../../lib/jkqtplotter.pri)