moved build-projects for libs into their own subdirectories (works better with QMake, when building different libs) + necessary docu updates

2024-12-24 09:31:40 +08:00 · 2019-02-09 15:25:16 +01:00 · 2019-02-09 15:25:16 +01:00 · d886757a1c
commit d886757a1c
parent 69ad2a0182
86 changed files with 388 additions and 174 deletions
--- 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
--- a/doc/dox/buildinstructions.dox
+++ b/doc/dox/buildinstructions.dox
@ -21,9 +21,9 @@ include(<PATHTOJKQTPLOTTERDIR>/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:
-  - <a href="https://github.com/jkriege2/JKQtPlotter/blob/master/staticlib/jkqtplotterlib.pro">staticlib/jkqtplotterlib.pro</a> builds the complete library (JKQTPlotter, JKQTFastPlotter, JKQTMathText) as static link library
-  - <a href="https://github.com/jkriege2/JKQtPlotter/blob/master/staticlib/jkqtmathtextlib.pro">staticlib/jkqtmathtextlib.pro</a> builds only JKQTMathText as static link library
-  - <a href="https://github.com/jkriege2/JKQtPlotter/blob/master/staticlib/jkqtfastplotterlib.pro">staticlib/jkqtfastplotterlib.pro</a> builds only JKQTFastPlotter as static link library
+  - <a href="https://github.com/jkriege2/JKQtPlotter/blob/master/staticlib/jkqtplotterlib/jkqtplotterlib.pro">staticlib/jkqtplotterlib/jkqtplotterlib.pro</a> builds the complete library (JKQTPlotter, JKQTFastPlotter, JKQTMathText) as static link library
+  - <a href="https://github.com/jkriege2/JKQtPlotter/blob/master/staticlib/jkqtmathtextlib/jkqtmathtextlib.pro">staticlib/jkqtmathtextlib/jkqtmathtextlib.pro</a> builds only JKQTMathText as static link library
+  - <a href="https://github.com/jkriege2/JKQtPlotter/blob/master/staticlib/jkqtfastplotterlib/jkqtfastplotterlib.pro">staticlib/jkqtfastplotterlib/jkqtfastplotterlib.pro</a> 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 += \
              <PATHTOJKQTPLOTTERDIR>/lib \
-              <PATHTOJKQTPLOTTERDIR>/staticlib
+              <PATHTOJKQTPLOTTERDIR>/staticlib/jkqtplotterlib
 INCLUDEPATH += <PATHTOJKQTPLOTTERDIR>/lib
 CONFIG (debug, debug|release) {
-    LIBS += -L<PATHTOJKQTPLOTTERDIR>/staticlib/debug -ljkqtplotterlib_debug
+    DEPENDPATH += <PATHTOJKQTPLOTTERDIR>/staticlib/jkqtplotterlib/debug
+    LIBS += -L<PATHTOJKQTPLOTTERDIR>/staticlib/jkqtplotterlib/debug -ljkqtplotterlib_debug
 } else {
-    LIBS += -L<PATHTOJKQTPLOTTERDIR>/staticlib/release -ljkqtplotterlib
+    DEPENDPATH += <PATHTOJKQTPLOTTERDIR>/staticlib/jkqtplotterlib/release
+    LIBS += -L<PATHTOJKQTPLOTTERDIR>/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:
-  - <a href="https://github.com/jkriege2/JKQtPlotter/blob/master/sharedlib/jkqtplotterlib_sharedlib.pro">sharedlib/jkqtplotterlib_sharedlib.pro</a> builds the complete library (JKQTPlotter, JKQTFastPlotter, JKQTMathText) as shared library
-  - <a href="https://github.com/jkriege2/JKQtPlotter/blob/master/sharedlib/jkqtmathtextlib_sharedlib.pro">sharedlib/jkqtmathtextlib_sharedlib.pro</a> builds only JKQTMathText as shared library
-  - <a href="https://github.com/jkriege2/JKQtPlotter/blob/master/sharedlib/jkqtfastplotterlib_sharedlib.pro">sharedlib/jkqtfastplotterlib_sharedlib.pro</a> builds only JKQTFastPlotter as shared library
+  - <a href="https://github.com/jkriege2/JKQtPlotter/blob/master/sharedlib/jkqtplotterlib/jkqtplotterlib.pro">sharedlib/jkqtplotterlib/jkqtplotterlib.pro</a> builds the complete library (JKQTPlotter, JKQTFastPlotter, JKQTMathText) as shared library
+  - <a href="https://github.com/jkriege2/JKQtPlotter/blob/master/sharedlib/jkqtmathtextlib/jkqtmathtextlib.pro">sharedlib/jkqtmathtextlib/jkqtmathtextlib.pro</a> builds only JKQTMathText as shared library
+  - <a href="https://github.com/jkriege2/JKQtPlotter/blob/master/sharedlib/jkqtfastplotterlib/jkqtfastplotterlib.pro">sharedlib/jkqtfastplotterlib/jkqtfastplotterlib.pro</a> 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 += \
              <PATHTOJKQTPLOTTERDIR>/lib \
-              <PATHTOJKQTPLOTTERDIR>/sharedlib
+              <PATHTOJKQTPLOTTERDIR>/sharedlib/jkqtplotterlib
 INCLUDEPATH += <PATHTOJKQTPLOTTERDIR>/lib
 CONFIG (debug, debug|release) {
    # ensure that DLLs are copied to the output directory
-    install_jkqtplotter_dll.files = <PATHTOJKQTPLOTTERDIR>/sharedlib/debug/jkqtplotterlib_debug.*
+    install_jkqtplotter_dll.files = <PATHTOJKQTPLOTTERDIR>/sharedlib/jkqtplotterlib/debug/jkqtplotterlib_debug.*
    install_jkqtplotter_dll.path = $$OUT_PWD
    INSTALLS += install_jkqtplotter_dll
    # link agains DLLs
-    LIBS += -L<PATHTOJKQTPLOTTERDIR>/sharedlib/debug -ljkqtplotterlib_debug
+    DEPENDPATH += <PATHTOJKQTPLOTTERDIR>/sharedlib/jkqtplotterlib/debug
+    LIBS += -L<PATHTOJKQTPLOTTERDIR>/sharedlib/jkqtplotterlib/debug -ljkqtplotterlib_debug
 } else {
    # ensure that DLLs are copied to the output directory
-    install_jkqtplotter_dll.files = <PATHTOJKQTPLOTTERDIR>/sharedlib/release/jkqtplotterlib.*
+    install_jkqtplotter_dll.files = <PATHTOJKQTPLOTTERDIR>/sharedlib/jkqtplotterlib/release/jkqtplotterlib.*
    install_jkqtplotter_dll.path = $$OUT_PWD
    INSTALLS += install_jkqtplotter_dll
    # link agains DLLs
-    LIBS += -L<PATHTOJKQTPLOTTERDIR>/sharedlib/release -ljkqtplotterlib
+    DEPENDPATH += <PATHTOJKQTPLOTTERDIR>/sharedlib/jkqtplotterlib/release
+    LIBS += -L<PATHTOJKQTPLOTTERDIR>/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
--- 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
 <tr><td> \image html jkqtmathtext_testapp_small.png
    <td> \subpage JKQTMathTextTestApp 
 	<td> JKQTMathText<br>render LaTeX markup
+<tr><td> \image html jkqtfastplotter_test_small.png
+    <td> \subpage JKQTFastPlotterTest 
+	<td> JKQTFastPlotter
 </table>


--- 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 <a href="http://jkriege2.github.io/JKQtPlotter/index.html">Online-Documentation (http://jkriege2.github.io/JKQtPlotter/index.html)</a>
 - source code hosted&developed on GitHub <a href="https://github.com/jkriege2/JKQtPlotter">https://github.com/jkriege2/JKQtPlotter</a> (including continuous integration builds: <a href="https://ci.appveyor.com/project/jkriege2/jkqtplotter/branch/master">https://ci.appveyor.com/project/jkriege2/jkqtplotter/branch/master</a>)

+\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

 */
--- 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) |  |
--- a/examples/jkqtfastplotter_test/README.md
+++ 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; i<N1; i++) {
+        x[i]=(i+1)*XMAX/(double)N1;
+        xx.push_back(x[i]);
+        yy.push_back(sin(0.5*M_PI*x[i])+2.0);
+        std::cout<<xx[i]<<", "<<yy[i]<<std::endl;
+        y1[i]=i*XMAX/(double)N1;
+        y2[i]=log(x[i]);
+        y3[i]=log10(x[i]);
+    }
+    JKQTFPVBarPlot* p1=new JKQTFPVBarPlot(pl1, N1, x, y1);
+    JKQTFPLinePlot* p2=new JKQTFPLinePlot(pl1, N1, x, y2, QColor("blue"));
+    JKQTFPLinePlot* p3=new JKQTFPLinePlot(pl1, N1, x, y3, QColor("darkgreen"));
+    JKQTFPLinePlot* pv=new JKQTFPLinePlot(pl1, &xx, &yy, QColor("black"), Qt::SolidLine, 3);
+
+    img=QImage("lena.png");
+    JKQTFPQImagePlot* p4=new JKQTFPQImagePlot(pl2, &img, 0, 10, 0, 10);
+
+    for (int x=0; x<IMAGE_N; x++) {
+        for (int y=0; y<IMAGE_N; y++) {
+            image[y*IMAGE_N+x]=IMAGE_N*(1.1+sin(sqrt((x-50)*(x-50)+(y-50)*(y-50))));
+            if (x>50 && 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; x<IMAGE_N; x++) {
+        for (int y=0; y<IMAGE_N; y++) {
+            imageRed[y*IMAGE_N+x]=(fabs(x)+fabs(y))/2.0;
+            imageGreen[y*IMAGE_N+x]=(fabs(double(IMAGE_N)-x)+fabs(y))/2.0;
+            imageBlue[y*IMAGE_N+x]=sqrt(x*x+y*y);
+        }
+    }
+
+    prgb=new JKQTFPRGBImageOverlayPlot(p21);
+    prgb->setImage(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)
+
+
+
--- 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")
--- 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
--- 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"
--- 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")
--- 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
--- 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")
--- 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
--- 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")

--- 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
--- 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
 }
 ```

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

--- 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
--- a/screenshots/jkqtfastplotter_test.png
+++ b/screenshots/jkqtfastplotter_test.png
--- a/screenshots/jkqtfastplotter_test_small.png
+++ b/screenshots/jkqtfastplotter_test_small.png
--- 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 += <PATHTOJKQTPLOTTERDIR>/lib <PATHTOJKQTPLOTTERDIR>/sharedlib
+DEPENDPATH += <PATHTOJKQTPLOTTERDIR>/lib <PATHTOJKQTPLOTTERDIR>/sharedlib/jkqtplotterlib
 INCLUDEPATH += <PATHTOJKQTPLOTTERDIR>/lib
 CONFIG (debug, debug|release) {
    # ensure that DLLs are copied to the output directory
-    install_jkqtplotter_dll.files = <PATHTOJKQTPLOTTERDIR>/sharedlib/debu/jkqtplotterlib_debug.*
+    install_jkqtplotter_dll.files = <PATHTOJKQTPLOTTERDIR>/sharedlib/jkqtplotterlib/debug/jkqtplotterlib_debug.*
    install_jkqtplotter_dll.path = $$OUT_PWD
    INSTALLS += install_jkqtplotter_dll
    # link agains DLLs
-    LIBS += -L<PATHTOJKQTPLOTTERDIR>/sharedlib/debug -ljkqtplotterlib_debug
+    DEPENDPATH += <PATHTOJKQTPLOTTERDIR>/sharedlib/jkqtplotterlib/debug
+    LIBS += -L<PATHTOJKQTPLOTTERDIR>/sharedlib/jkqtplotterlib/debug -ljkqtplotterlib_debug
 } else {
    # ensure that DLLs are copied to the output directory
-    install_jkqtplotter_dll.files = <PATHTOJKQTPLOTTERDIR>/sharedlib/release/jkqtplotterlib.*
+    install_jkqtplotter_dll.files = <PATHTOJKQTPLOTTERDIR>/sharedlib/jkqtplotterlib/release/jkqtplotterlib.*
    install_jkqtplotter_dll.path = $$OUT_PWD
    INSTALLS += install_jkqtplotter_dll
+    DEPENDPATH += <PATHTOJKQTPLOTTERDIR>/sharedlib/jkqtplotterlib/release
    # link agains DLLs
-    LIBS += -L<PATHTOJKQTPLOTTERDIR>/sharedlib/release -ljkqtplotterlib
+    LIBS += -L<PATHTOJKQTPLOTTERDIR>/sharedlib/jkqtplotterlib/release -ljkqtplotterlib
 }
 ```

--- a/sharedlib/jkqtfastplotterlib/jkqtfastplotterlib.pro
+++ b/sharedlib/jkqtfastplotterlib/jkqtfastplotterlib.pro
@ -12,4 +12,4 @@ win32 {
    DEFINES += JKQTP_LIB_EXPORT_LIBRARY
 }

-include(../lib/jkqtfastplotter.pri)
+include(../../lib/jkqtfastplotter.pri)
--- a/sharedlib/jkqtmathtextlib/jkqtmathtextlib.pro
+++ b/sharedlib/jkqtmathtextlib/jkqtmathtextlib.pro
@ -12,4 +12,4 @@ win32 {
    DEFINES += JKQTP_LIB_EXPORT_LIBRARY
 }

-include(../lib/jkqtmathtext.pri)
+include(../../lib/jkqtmathtext.pri)
--- a/sharedlib/jkqtplotterlib/jkqtplotterlib.pro
+++ b/sharedlib/jkqtplotterlib/jkqtplotterlib.pro
@ -12,4 +12,4 @@ win32 {
    DEFINES += JKQTP_LIB_EXPORT_LIBRARY
 }

-include(../lib/jkqtplotter.pri)
+include(../../lib/jkqtplotter.pri)
--- 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 += <PATHTOJKQTPLOTTERDIR>/staticlib <PATHTOJKQTPLOTTERDIR>/lib
+DEPENDPATH += <PATHTOJKQTPLOTTERDIR>/staticlib/jkqtplotterlib <PATHTOJKQTPLOTTERDIR>/lib
 INCLUDEPATH += <PATHTOJKQTPLOTTERDIR>/lib
 CONFIG (debug, debug|release) {
-    LIBS += -L<PATHTOJKQTPLOTTERDIR>/staticlib/debug -ljkqtplotterlib_debug
+    DEPENDPATH += <PATHTOJKQTPLOTTERDIR>/staticlib/jkqtplotterlib/debug
+    LIBS += -L<PATHTOJKQTPLOTTERDIR>/staticlib/jkqtplotterlib/debug -ljkqtplotterlib_debug
 } else {
-    LIBS += -L<PATHTOJKQTPLOTTERDIR>/staticlib/release -ljkqtplotterlib
+    DEPENDPATH += <PATHTOJKQTPLOTTERDIR>/staticlib/jkqtplotterlib/release
+    LIBS += -L<PATHTOJKQTPLOTTERDIR>/staticlib/jkqtplotterlib/release -ljkqtplotterlib
 }
 ```

--- a/staticlib/jkqtfastplotterlib/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)
--- a/staticlib/jkqtmathtextlib/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)
--- a/staticlib/jkqtphighrestimerlib/jkqtphighrestimerlib.pro
+++ 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
+
--- a/staticlib/jkqtplotterlib/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)