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 0000000000..395265dea1 Binary files /dev/null and b/screenshots/jkqtfastplotter_test.png differ diff --git a/screenshots/jkqtfastplotter_test_small.png b/screenshots/jkqtfastplotter_test_small.png new file mode 100644 index 0000000000..bd71e69b46 Binary files /dev/null and b/screenshots/jkqtfastplotter_test_small.png differ 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)