reorganized library files into lib-subdirectory and modified tests, doc, ... accordingly

README.md

@@ -27,12 +27,12 @@ greaterThan(QT_MAJOR_VERSION, 4): QT += widgets printsupport
 TARGET = jkqtplotter_simpletest
 
 # include JKQtPlotter source code
-include(../../jkqtplotter.pri)
+include(../../lib/jkqtplotter.pri)
 ```
 And the soruce code of the main application is (see `./test/jkqtplotter_simpletest/jkqtplotter_simpletest.cpp`):
 ```c++
 #include <QApplication>
-#include "jkqtplotter.h"
+#include "jkqtplotter/jkqtplotter.h"
 
 
 int main(int argc, char* argv[])
@@ -91,7 +91,7 @@ This project (see `./test/jkqtplotter_simpletest_symbols_and_errors/`) simply cr
 The soruce code of the main application is (see `./test/jkqtplotter_simpletest_symbols_and_errors/jkqtplotter_simpletest_symbols_and_errors.cpp`):
 ```c++
 #include <QApplication>
-#include "jkqtplotter.h"
+#include "jkqtplotter/jkqtplotter.h"
 
 // number of datapoints:
 #define Ndata 10
@@ -167,8 +167,8 @@ This project (see `./test/jkqtplotter_simpletest_barchart/`) simply creates a JK
 The soruce code of the main application is (see `./test/jkqtplotter_simpletest_barchart/jkqtplotter_simpletest_barchart.cpp`):
 ```c++
 #include <QApplication>
-#include "jkqtplotter.h"
+#include "jkqtplotter/jkqtplotter.h"
-#include "jkqtpbarchartelements.h"
+#include "jkqtplotter/jkqtpbarchartelements.h"
 
 #define Ndata 5
 int main(int argc, char* argv[])
@@ -263,8 +263,8 @@ This project (see `./test/jkqtplotter_simpletest_stackedbars/`) simply creates a
 The soruce code of the main application is (see `./test/jkqtplotter_simpletest_stackedbars/jkqtplotter_simpletest_stackedbars.cpp`):
 ```c++
 #include <QApplication>
-#include "jkqtplotter.h"
+#include "jkqtplotter/jkqtplotter.h"
-#include "jkqtpbarchartelements.h"
+#include "jkqtplotter/jkqtpbarchartelements.h"
 
 #define Ndata 5
 int main(int argc, char* argv[])
@@ -403,12 +403,12 @@ This project (see `./test/jkqtmathtext_simpletest/`) simply creates a QLabel (as
 The QMake project looks like this (see `./test/jkqtmathtext_simpletest/jkqtmathtext_simpletest.pro`):
 ```qmake
 # include JKQTmathText source-code, including the open-source XITS fonts
-include(../../jkqtmathtext_with_xits.pri)
+include(../../lib/jkqtmathtext_with_xits.pri)
 SOURCES += jkqtmathtext_simpletest.cpp
 
 # if you don't want to use the XITS fonts, use this line (and uncomment the 
 # last two line!):
-#include(../../jkqtmathtext.pri)
+#include(../../lib/jkqtmathtext.pri)
 
 CONFIG += qt
 QT += core gui
@@ -421,7 +421,7 @@ And the soruce code of the main application is (see `./test/jkqtmathtext_simplet
 #include <QApplication>
 #include <QLabel>
 #include <QPixmap>
-#include "jkqtmathtext.h"
+#include "jkqtmathtext/jkqtmathtext.h"
 
 int main(int argc, char* argv[])
 {

jkqtmathtext.pri

@@ -1,14 +0,0 @@
-HEADERS += $$PWD/jkqtmathtext.h \
-           $$PWD/jkqtptools.h \
-           $$PWD/jkqtp_imexport.h
-
-
-SOURCES += $$PWD/jkqtmathtext.cpp \
-           $$PWD/jkqtptools.cpp
-
-
-INCLUDEPATH += $$PWD 
-
-QT += core gui
-win32:LIBS += -lgdi32
-greaterThan(QT_MAJOR_VERSION, 4): QT += widgets printsupport

jkqtplotter.pri

@@ -1,58 +0,0 @@
-
-
-QMAKE_CXXFLAGS += -fexceptions
-
-HEADERS += $$PWD/jkqtpbaseplotter.h \
-           $$PWD/jkqtpdatastorage.h \
-           $$PWD/jkqtpbasegraphs.h \
-           $$PWD/jkqtpelements.h \
-           $$PWD/jkqtmathtext.h \
-           $$PWD/jkqtpbaseelements.h \
-           $$PWD/jkqtplotter.h \
-           $$PWD/jkqtptools.h \
-           $$PWD/jkqttools.h \
-           $$PWD/jkqtpimageelements.h \
-           $$PWD/jkqtpimagetools.h \
-           $$PWD/jkqtpbarchartelements.h \
-           $$PWD/jkqtpboxplotelements.h \
-           $$PWD/jkqtpevaluatedfunctionelements.h \
-           $$PWD/jkqtpparsedfunctionelements.h \
-           $$PWD/jkqtpoverlayelements.h \
-           $$PWD/jkqtpgeoelements.h \
-           $$PWD/jkqtpmathparser.h \
-           $$PWD/jkqtp_imexport.h \
-           $$PWD/jkqtpplotsmodel.h
-
-
-SOURCES += $$PWD/jkqtpbaseplotter.cpp \
-           $$PWD/jkqtpdatastorage.cpp \
-           $$PWD/jkqtpbasegraphs.cpp \
-           $$PWD/jkqtpelements.cpp \
-           $$PWD/jkqtmathtext.cpp \
-           $$PWD/jkqtpbaseelements.cpp \
-           $$PWD/jkqtplotter.cpp \
-           $$PWD/jkqtptools.cpp \
-           $$PWD/jkqttools.cpp  \
-           $$PWD/jkqtpimageelements.cpp  \
-           $$PWD/jkqtpimagetools.cpp  \
-           $$PWD/jkqtpbarchartelements.cpp  \
-           $$PWD/jkqtpboxplotelements.cpp  \
-           $$PWD/jkqtpevaluatedfunctionelements.cpp  \
-           $$PWD/jkqtpparsedfunctionelements.cpp  \
-           $$PWD/jkqtpoverlayelements.cpp  \
-           $$PWD/jkqtpgeoelements.cpp  \
-           $$PWD/jkqtpmathparser.cpp \
-           $$PWD/jkqtpplotsmodel.cpp
-
-
-RESOURCES += $$PWD/jkqtpbaseplotter.qrc
-
-INCLUDEPATH += $$PWD 
-
-QT += core gui svg
-win32:LIBS += -lgdi32
-greaterThan(QT_MAJOR_VERSION, 4): QT += widgets printsupport
-
-
-# for support of palettes stored as XML, use:
-QT += xml

jkqtplotter.readme

@@ -1,15 +0,0 @@
---------------------------------------------------------------------------------
--- JKQtPlotter                                                                --
--- (c) 2010-2015 by Jan W. Krieger                                            --
---     Biophysics of Macromolecules (B040)                                    --
---        German Cancer Research center (DKFZ)                                --
---     Institute for scientific computation (IWR)                             --
---        University of Heidelberg                                            --
---------------------------------------------------------------------------------
---   http://www.dkfz.de/Macromol/quickfit/source.html                         --
---------------------------------------------------------------------------------
-
-This is an extensive library of function/data plotter classes for Qt (>= 4.7).
-
-This software is licensed under the term of the GNU Lesser General Public License >=2.1
-(LGPL 2.1). 

lib/jkqtfastplotter.pri

@@ -0,0 +1,23 @@
+
+
+QMAKE_CXXFLAGS += -fexceptions
+
+
+HEADERS += $$PWD/jkqtfastplotter/jkqtfastplotter.h \
+           $$PWD/jkqtplottertools/jkqtptools.h \
+           $$PWD/jkqtplottertools/jkqtphighrestimer.h \
+           $$PWD/jkqtplottertools/jkqtp_imexport.h
+
+
+SOURCES += $$PWD/jkqtfastplotter/jkqtfastplotter.cpp \
+           $$PWD/jkqtplottertools/jkqtptools.cpp \
+           $$PWD/jkqtplottertools/jkqtphighrestimer.cpp
+
+
+RESOURCES += $$PWD/jkqtplotterressources/jkqtpbaseplotter.qrc
+
+INCLUDEPATH += $$PWD 
+
+QT += core gui opengl
+greaterThan(QT_MAJOR_VERSION, 4): QT += widgets
+

lib/jkqtfastplotter/jkqtfastplotter.h

@@ -35,7 +35,7 @@
 #ifndef JKQTFASTPLOTTER_H
 #define JKQTFASTPLOTTER_H
 
-#include "jkqtp_imexport.h"
+#include "jkqtplottertools/jkqtp_imexport.h"
 #include <QWidget>
 #include <QVector>
 #include <QSettings>
@@ -49,9 +49,9 @@
 #include <QMutex>
 #include <QGLWidget>
 
-#include "jkqtptools.h"
+#include "jkqtplottertools/jkqtptools.h"
 #ifdef DEBUG_TIMING
-#  include "jkqtphighrestimer.h"
+#  include "jkqtplottertools/jkqtphighrestimer.h"
 #endif
 
 #define JKQTFASTPLOTTER_ABS_MIN_LINEWIDTH 0.05

lib/jkqtmathtext.pri

@@ -0,0 +1,14 @@
+HEADERS += $$PWD/jkqtmathtext/jkqtmathtext.h \
+           $$PWD/jkqtplottertools/jkqtptools.h \
+           $$PWD/jkqtplottertools/jkqtp_imexport.h
+
+
+SOURCES += $$PWD/jkqtmathtext/jkqtmathtext.cpp \
+           $$PWD/jkqtplottertools/jkqtptools.cpp
+
+
+INCLUDEPATH += $$PWD 
+
+QT += core gui
+#win32:LIBS += -lgdi32
+greaterThan(QT_MAJOR_VERSION, 4): QT += widgets printsupport

lib/jkqtmathtext/jkqtmathtext.cpp

@@ -19,7 +19,7 @@
 
 
 
-#include "jkqtmathtext.h"
+#include "jkqtmathtext/jkqtmathtext.h"
 #include <QFontMetricsF>
 #include <QDebug>
 #include <QFontDatabase>

lib/jkqtmathtext/jkqtmathtext.h

@@ -43,8 +43,8 @@
 #include <QString>
 #include <QSet>
 #include <QFile>
-#include "jkqtptools.h"
+#include "jkqtplottertools/jkqtptools.h"
-#include "jkqtp_imexport.h"
+#include "jkqtplottertools/jkqtp_imexport.h"
 #include <QWidget>
 #include <QLabel>
 #include <QHash>

lib/jkqtmathtext_with_xits.pri

@@ -1,3 +1,3 @@
 include($$PWD/jkqtmathtext.pri)
-include($$PWD/math_fonts/xits.pri)
+include($$PWD/jkqtplotterressources/math_fonts/xits.pri)
 DEFINES += AUTOLOAD_XITS_FONTS 

lib/jkqtplotter.pri

@@ -0,0 +1,58 @@
+
+
+QMAKE_CXXFLAGS += -fexceptions
+
+HEADERS += $$PWD/jkqtplotter/jkqtpbaseplotter.h \
+           $$PWD/jkqtplotter/jkqtpdatastorage.h \
+           $$PWD/jkqtplotter/jkqtpbasegraphs.h \
+           $$PWD/jkqtplotter/jkqtpelements.h \
+           $$PWD/jkqtplotter/jkqtpbaseelements.h \
+           $$PWD/jkqtplotter/jkqtplotter.h \
+           $$PWD/jkqtplottertools/jkqtptools.h \
+           $$PWD/jkqtplottertools/jkqttools.h \
+           $$PWD/jkqtplotter/jkqtpimageelements.h \
+           $$PWD/jkqtplotter/jkqtpimagetools.h \
+           $$PWD/jkqtplotter/jkqtpbarchartelements.h \
+           $$PWD/jkqtplotter/jkqtpboxplotelements.h \
+           $$PWD/jkqtplotter/jkqtpevaluatedfunctionelements.h \
+           $$PWD/jkqtplotter/jkqtpparsedfunctionelements.h \
+           $$PWD/jkqtplotter/jkqtpoverlayelements.h \
+           $$PWD/jkqtplotter/jkqtpgeoelements.h \
+           $$PWD/jkqtplottertools/jkqtpmathparser.h \
+           $$PWD/jkqtplottertools/jkqtp_imexport.h \
+           $$PWD/jkqtplotter/jkqtpplotsmodel.h \
+           $$PWD/jkqtmathtext/jkqtmathtext.h
+
+
+SOURCES += $$PWD/jkqtplotter/jkqtpbaseplotter.cpp \
+           $$PWD/jkqtplotter/jkqtpdatastorage.cpp \
+           $$PWD/jkqtplotter/jkqtpbasegraphs.cpp \
+           $$PWD/jkqtplotter/jkqtpelements.cpp \
+           $$PWD/jkqtplotter/jkqtpbaseelements.cpp \
+           $$PWD/jkqtplotter/jkqtplotter.cpp \
+           $$PWD/jkqtplottertools/jkqtptools.cpp \
+           $$PWD/jkqtplottertools/jkqttools.cpp  \
+           $$PWD/jkqtplotter/jkqtpimageelements.cpp  \
+           $$PWD/jkqtplotter/jkqtpimagetools.cpp  \
+           $$PWD/jkqtplotter/jkqtpbarchartelements.cpp  \
+           $$PWD/jkqtplotter/jkqtpboxplotelements.cpp  \
+           $$PWD/jkqtplotter/jkqtpevaluatedfunctionelements.cpp  \
+           $$PWD/jkqtplotter/jkqtpparsedfunctionelements.cpp  \
+           $$PWD/jkqtplotter/jkqtpoverlayelements.cpp  \
+           $$PWD/jkqtplotter/jkqtpgeoelements.cpp  \
+           $$PWD/jkqtplottertools/jkqtpmathparser.cpp \
+           $$PWD/jkqtplotter/jkqtpplotsmodel.cpp \
+           $$PWD/jkqtmathtext/jkqtmathtext.cpp
+
+
+RESOURCES += $$PWD/jkqtplotterressources/jkqtpbaseplotter.qrc
+
+INCLUDEPATH += $$PWD 
+
+QT += core gui svg
+win32:LIBS += -lgdi32
+greaterThan(QT_MAJOR_VERSION, 4): QT += widgets printsupport
+
+
+# for support of palettes stored as XML, use:
+QT += xml

lib/jkqtplotter/jkqtpbarchartelements.cpp

@@ -19,15 +19,15 @@
 
 
 
-#include "jkqtpbarchartelements.h"
+#include "jkqtplotter/jkqtpbarchartelements.h"
-#include "jkqtpbaseplotter.h"
+#include "jkqtplotter/jkqtpbaseplotter.h"
 #include <stdlib.h>
 #include <QDebug>
 #include <iostream>
-#include "jkqtptools.h"
+#include "jkqtplottertools/jkqtptools.h"
-#include "jkqtpimageelements.h"
+#include "jkqtplotter/jkqtpimageelements.h"
-#include "jkqtpbaseelements.h"
+#include "jkqtplotter/jkqtpbaseelements.h"
-#include "jkqtplotter.h"
+#include "jkqtplotter/jkqtplotter.h"
 
 #define SmallestGreaterZeroCompare_xvsgz() if ((xvsgz>10.0*DBL_MIN)&&((smallestGreaterZero<10.0*DBL_MIN) || (xvsgz<smallestGreaterZero))) smallestGreaterZero=xvsgz;
 

lib/jkqtplotter/jkqtpbarchartelements.h

@@ -33,10 +33,10 @@
 #include <QString>
 #include <QPainter>
 #include <QPair>
-#include "jkqtptools.h"
+#include "jkqtplottertools/jkqtptools.h"
-#include "jkqtp_imexport.h"
+#include "jkqtplottertools/jkqtp_imexport.h"
-#include "jkqtpimagetools.h"
+#include "jkqtplotter/jkqtpimagetools.h"
-#include "jkqtpbasegraphs.h"
+#include "jkqtplotter/jkqtpbasegraphs.h"
 
 #ifndef JKQTPBARCHARTELEMENTS_H
 #define JKQTPBARCHARTELEMENTS_H

lib/jkqtplotter/jkqtpbaseelements.cpp

@@ -19,8 +19,8 @@
 
 
 
-#include "jkqtpbaseelements.h"
+#include "jkqtplotter/jkqtpbaseelements.h"
-#include "jkqtpbaseplotter.h"
+#include "jkqtplotter/jkqtpbaseplotter.h"
 #include <QDebug>
 #include <QDateTime>
 #include <cfloat>

lib/jkqtplotter/jkqtpbaseelements.h

@@ -39,9 +39,9 @@
 #include <QPainter>
 #include <QPair>
 #include <QSettings>
-#include "jkqtptools.h"
+#include "jkqtplottertools/jkqtptools.h"
-#include "jkqtmathtext.h"
+#include "jkqtmathtext/jkqtmathtext.h"
-#include "jkqtp_imexport.h"
+#include "jkqtplottertools/jkqtp_imexport.h"
 
 // forward declarations
 class JKQtBasePlotter;

lib/jkqtplotter/jkqtpbasegraphs.cpp

@@ -19,15 +19,15 @@
 
 
 
-#include "jkqtpbasegraphs.h"
+#include "jkqtplotter/jkqtpbasegraphs.h"
-#include "jkqtpbaseplotter.h"
+#include "jkqtplotter/jkqtpbaseplotter.h"
 #include <stdlib.h>
 #include <QDebug>
 #include <iostream>
-#include "jkqtptools.h"
+#include "jkqtplottertools/jkqtptools.h"
-#include "jkqtpimageelements.h"
+#include "jkqtplotter/jkqtpimageelements.h"
-#include "jkqtpbaseelements.h"
+#include "jkqtplotter/jkqtpbaseelements.h"
-#include "jkqtplotter.h"
+#include "jkqtplotter/jkqtplotter.h"
 #define SmallestGreaterZeroCompare_xvsgz() if ((xvsgz>10.0*DBL_MIN)&&((smallestGreaterZero<10.0*DBL_MIN) || (xvsgz<smallestGreaterZero))) smallestGreaterZero=xvsgz;
 
 JKQTPgraph::JKQTPgraph(JKQtBasePlotter* parent):

lib/jkqtplotter/jkqtpbasegraphs.h

@@ -33,9 +33,9 @@
 #include <QString>
 #include <QPainter>
 #include <QPair>
-#include "jkqtptools.h"
+#include "jkqtplottertools/jkqtptools.h"
-#include "jkqtp_imexport.h"
+#include "jkqtplottertools/jkqtp_imexport.h"
-#include "jkqtpimagetools.h"
+#include "jkqtplotter/jkqtpimagetools.h"
 
 #ifndef JKQTPBASEGRAPHS_H
 #define JKQTPBASEGRAPHS_H

lib/jkqtplotter/jkqtpbaseplotter.cpp

@@ -34,8 +34,8 @@
 #include <QElapsedTimer>
 #include <QPrintPreviewWidget>
 #include <QDialog>
-#include "jkqtpbaseplotter.h"
+#include "jkqtplotter/jkqtpbaseplotter.h"
-#include "jkqtpplotsmodel.h"
+#include "jkqtplotter/jkqtpplotsmodel.h"
 #include <QPrinter>
 #include <QPrinterInfo>
 #include <QPrintDialog>
@@ -49,8 +49,8 @@
 #ifdef QFWIDLIB_LIBRARY
 #  include "qftools.h"
 #endif
-#include "jkqtpboxplotelements.h"
+#include "jkqtplotter/jkqtpboxplotelements.h"
-#include "jkqtpbarchartelements.h"
+#include "jkqtplotter/jkqtpbarchartelements.h"
 
 static QString globalUserSettigsFilename="";
 static QString globalUserSettigsPrefix="";

lib/jkqtplotter/jkqtpbaseplotter.h

@@ -32,14 +32,14 @@
   * \ingroup jkqtpbaseplotter
   */
 
-#include "jkqtptools.h"
+#include "jkqtplottertools/jkqtptools.h"
-#include "jkqtpdatastorage.h"
+#include "jkqtplotter/jkqtpdatastorage.h"
-#include "jkqtmathtext.h"
+#include "jkqtmathtext/jkqtmathtext.h"
-#include "jkqtpbaseelements.h"
+#include "jkqtplotter/jkqtpbaseelements.h"
-#include "jkqtpelements.h"
+#include "jkqtplotter/jkqtpelements.h"
-#include "jkqtpgeoelements.h"
+#include "jkqtplotter/jkqtpgeoelements.h"
-#include "jkqtpimageelements.h"
+#include "jkqtplotter/jkqtpimageelements.h"
-#include "jkqtpoverlayelements.h"
+#include "jkqtplotter/jkqtpoverlayelements.h"
 
 
 #include <QObject>
@@ -61,7 +61,7 @@
 #include <vector>
 #include <cmath>
 #include <iostream>
- #include "jkqtp_imexport.h"
+ #include "jkqtplottertools/jkqtp_imexport.h"
 
 
 #ifndef JKQTPBASEPLOTTER_H

lib/jkqtplotter/jkqtpboxplotelements.cpp

@@ -19,15 +19,15 @@
 
 
 
-#include "jkqtpboxplotelements.h"
+#include "jkqtplotter/jkqtpboxplotelements.h"
-#include "jkqtpbaseplotter.h"
+#include "jkqtplotter/jkqtpbaseplotter.h"
 #include <stdlib.h>
 #include <QDebug>
 #include <iostream>
-#include "jkqtptools.h"
+#include "jkqtplottertools/jkqtptools.h"
-#include "jkqtpimageelements.h"
+#include "jkqtplotter/jkqtpimageelements.h"
-#include "jkqtpbaseelements.h"
+#include "jkqtplotter/jkqtpbaseelements.h"
-#include "jkqtplotter.h"
+#include "jkqtplotter/jkqtplotter.h"
 #define SmallestGreaterZeroCompare_xvsgz() if ((xvsgz>10.0*DBL_MIN)&&((smallestGreaterZero<10.0*DBL_MIN) || (xvsgz<smallestGreaterZero))) smallestGreaterZero=xvsgz;
 
 

lib/jkqtplotter/jkqtpboxplotelements.h

@@ -33,10 +33,10 @@
 #include <QString>
 #include <QPainter>
 #include <QPair>
-#include "jkqtptools.h"
+#include "jkqtplottertools/jkqtptools.h"
-#include "jkqtp_imexport.h"
+#include "jkqtplottertools/jkqtp_imexport.h"
-#include "jkqtpimagetools.h"
+#include "jkqtplotter/jkqtpimagetools.h"
-#include "jkqtpbasegraphs.h"
+#include "jkqtplotter/jkqtpbasegraphs.h"
 
 #ifndef JKQTPBOXPLOTELEMENTS_H
 #define JKQTPBOXPLOTELEMENTS_H

lib/jkqtplotter/jkqtpdatastorage.cpp

@@ -24,7 +24,7 @@
   * \ingroup jkqtpdatastorage
   */
 
-#include "jkqtpdatastorage.h"
+#include "jkqtplotter/jkqtpdatastorage.h"
 #include <QDebug>
 #include <QtGlobal>
 

lib/jkqtplotter/jkqtpdatastorage.h

@@ -34,8 +34,8 @@
   * \ingroup jkqtpdatastorage
   */
 
-#include "jkqtp_imexport.h"
+#include "jkqtplottertools/jkqtp_imexport.h"
-#include "jkqtptools.h"
+#include "jkqtplottertools/jkqtptools.h"
 #include <vector>
 #include <cmath>
 #include <iostream>

lib/jkqtplotter/jkqtpelements.cpp

@@ -19,15 +19,15 @@
 
 
 
-#include "jkqtpelements.h"
+#include "jkqtplotter/jkqtpelements.h"
-#include "jkqtpbaseplotter.h"
+#include "jkqtplotter/jkqtpbaseplotter.h"
 #include <stdlib.h>
 #include <QDebug>
 #include <iostream>
-#include "jkqtptools.h"
+#include "jkqtplottertools/jkqtptools.h"
-#include "jkqtpimageelements.h"
+#include "jkqtplotter/jkqtpimageelements.h"
-#include "jkqtpbaseelements.h"
+#include "jkqtplotter/jkqtpbaseelements.h"
-#include "jkqtplotter.h"
+#include "jkqtplotter/jkqtplotter.h"
 #define SmallestGreaterZeroCompare_xvsgz() if ((xvsgz>10.0*DBL_MIN)&&((smallestGreaterZero<10.0*DBL_MIN) || (xvsgz<smallestGreaterZero))) smallestGreaterZero=xvsgz;
 
 

lib/jkqtplotter/jkqtpelements.h

@@ -33,10 +33,10 @@
 #include <QString>
 #include <QPainter>
 #include <QPair>
-#include "jkqtptools.h"
+#include "jkqtplottertools/jkqtptools.h"
-#include "jkqtp_imexport.h"
+#include "jkqtplottertools/jkqtp_imexport.h"
-#include "jkqtpimagetools.h"
+#include "jkqtplotter/jkqtpimagetools.h"
-#include "jkqtpbasegraphs.h"
+#include "jkqtplotter/jkqtpbasegraphs.h"
 
 #ifndef JKQTPELEMENTS_H
 #define JKQTPELEMENTS_H

lib/jkqtplotter/jkqtpevaluatedfunctionelements.cpp

@@ -19,15 +19,15 @@
 
 
 
-#include "jkqtpevaluatedfunctionelements.h"
+#include "jkqtplotter/jkqtpevaluatedfunctionelements.h"
-#include "jkqtpbaseplotter.h"
+#include "jkqtplotter/jkqtpbaseplotter.h"
 #include <stdlib.h>
 #include <QDebug>
 #include <iostream>
-#include "jkqtptools.h"
+#include "jkqtplottertools/jkqtptools.h"
-#include "jkqtpimageelements.h"
+#include "jkqtplotter/jkqtpimageelements.h"
-#include "jkqtpbaseelements.h"
+#include "jkqtplotter/jkqtpbaseelements.h"
-#include "jkqtplotter.h"
+#include "jkqtplotter/jkqtplotter.h"
 
 
 

lib/jkqtplotter/jkqtpevaluatedfunctionelements.h

@@ -33,8 +33,8 @@
 #include <QString>
 #include <QPainter>
 #include <QPair>
-#include "jkqtpelements.h"
+#include "jkqtplotter/jkqtpelements.h"
-#include "jkqtp_imexport.h"
+#include "jkqtplottertools/jkqtp_imexport.h"
 
 #ifndef JKQTPEVALUATEDFUNCTIONELEMENTS_H
 #define JKQTPEVALUATEDFUNCTIONELEMENTS_H

lib/jkqtplotter/jkqtpgeoelements.cpp

@@ -19,8 +19,8 @@
 
 
 
-#include "jkqtpgeoelements.h"
+#include "jkqtplotter/jkqtpgeoelements.h"
-#include "jkqtpbaseplotter.h"
+#include "jkqtplotter/jkqtpbaseplotter.h"
 #include <stdlib.h>
 #include <QDebug>
 

lib/jkqtplotter/jkqtpgeoelements.h

@@ -33,10 +33,10 @@
 #include <QString>
 #include <QPainter>
 #include <QPair>
-#include "jkqtpelements.h"
+#include "jkqtplotter/jkqtpelements.h"
-#include "jkqtptools.h"
+#include "jkqtplottertools/jkqtptools.h"
-#include "jkqtp_imexport.h"
+#include "jkqtplottertools/jkqtp_imexport.h"
-#include "jkqtmathtext.h"
+#include "jkqtmathtext/jkqtmathtext.h"
 
 #ifndef JKQTPGEOELEMENTS_H_INCLUDED
 #define JKQTPGEOELEMENTS_H_INCLUDED

lib/jkqtplotter/jkqtpimageelements.cpp

@@ -18,11 +18,11 @@
 */
 
 
-#include "jkqtpimageelements.h"
+#include "jkqtplotter/jkqtpimageelements.h"
-#include "jkqtpbaseplotter.h"
+#include "jkqtplotter/jkqtpbaseplotter.h"
-#include "jkqtpimagetools.h"
+#include "jkqtplotter/jkqtpimagetools.h"
-#include "jkqtptools.h"
+#include "jkqtplottertools/jkqtptools.h"
-#include "jkqtplotter.h"
+#include "jkqtplotter/jkqtplotter.h"
 #include <QDebug>
 #include <QImageWriter>
 #include <QFileDialog>

lib/jkqtplotter/jkqtpimageelements.h

@@ -38,11 +38,11 @@
 #include <QPainter>
 #include <QImage>
 #include <QIcon>
-#include "jkqtpelements.h"
+#include "jkqtplotter/jkqtpelements.h"
-#include "jkqtptools.h"
+#include "jkqtplottertools/jkqtptools.h"
-#include "jkqtpbaseelements.h"
+#include "jkqtplotter/jkqtpbaseelements.h"
-#include "jkqtp_imexport.h"
+#include "jkqtplottertools/jkqtp_imexport.h"
-#include "jkqtpimagetools.h"
+#include "jkqtplotter/jkqtpimagetools.h"
 
 
 

lib/jkqtplotter/jkqtpimagetools.cpp

@@ -19,14 +19,14 @@
 
 
 
-#include "jkqtpimagetools.h"
+#include "jkqtplotter/jkqtpimagetools.h"
 #include <QPainter>
 #include <QApplication>
 #include <QDir>
 #include <QFileInfo>
 #ifndef NO_JKQTPLOTTER
-#include "jkqtpbaseelements.h"
+#include "jkqtplotter/jkqtpbaseelements.h"
-#include "jkqtpbaseplotter.h"
+#include "jkqtplotter/jkqtpbaseplotter.h"
 #endif
 #ifdef QT_XML_LIB
 #  include <QtXml/QtXml>

lib/jkqtplotter/jkqtpimagetools.h

@@ -25,15 +25,15 @@
 #include <QImage>
 #include <QComboBox>
 #include <QStringList>
-#include "jkqtp_imexport.h"
+#include "jkqtplottertools/jkqtp_imexport.h"
 #include <cmath>
 #include <cfloat>
 #include <stdint.h>
 #include <QColor>
-#include "jkqtptools.h"
+#include "jkqtplottertools/jkqtptools.h"
 
 #ifndef NO_JKQTPLOTTER
-#include "jkqtptools.h"
+#include "jkqtplottertools/jkqtptools.h"
 
 class JKQTPverticalIndependentAxis; // forward
 class JKQTPhorizontalIndependentAxis; // forward

lib/jkqtplotter/jkqtplotter.cpp

@@ -32,7 +32,7 @@
 #else
 #include <QtGui>
 #endif
-#include "jkqtplotter.h"
+#include "jkqtplotter/jkqtplotter.h"
 
 
 #define JKQTP_RESIZE_DELAY 100

lib/jkqtplotter/jkqtplotter.h

@@ -52,9 +52,9 @@
 #include <cmath>
 #include <iostream>
 
-#include "jkqtpbaseplotter.h"
+#include "jkqtplotter/jkqtpbaseplotter.h"
-#include "jkqtptools.h"
+#include "jkqtplottertools/jkqtptools.h"
-#include "jkqtp_imexport.h"
+#include "jkqtplottertools/jkqtp_imexport.h"
 #include <QKeyEvent>
 
 #ifndef JKQTPLOTTER_H

lib/jkqtplotter/jkqtpoverlayelements.cpp

@@ -19,9 +19,9 @@
 
 
 
-#include "jkqtpoverlayelements.h"
+#include "jkqtplotter/jkqtpoverlayelements.h"
-#include "jkqtpbaseplotter.h"
+#include "jkqtplotter/jkqtpbaseplotter.h"
-#include "jkqtptools.h"
+#include "jkqtplottertools/jkqtptools.h"
 #include <stdlib.h>
 #include <QDebug>
 

lib/jkqtplotter/jkqtpoverlayelements.h

@@ -32,8 +32,8 @@
 #include <QString>
 #include <QPainter>
 #include <QPair>
-#include "jkqtptools.h"
+#include "jkqtplottertools/jkqtptools.h"
-#include "jkqtp_imexport.h"
+#include "jkqtplottertools/jkqtp_imexport.h"
 
 #ifndef JKQTPOVERLAYELEMENTS_H
 #define JKQTPOVERLAYELEMENTS_H

lib/jkqtplotter/jkqtpparsedfunctionelements.cpp

@@ -19,10 +19,10 @@
 
 
 
-#include "jkqtpparsedfunctionelements.h"
+#include "jkqtplotter/jkqtpparsedfunctionelements.h"
-#include "jkqtpelements.h"
+#include "jkqtplotter/jkqtpelements.h"
-#include "jkqtpbaseplotter.h"
+#include "jkqtplotter/jkqtpbaseplotter.h"
-#include "jkqtptools.h"
+#include "jkqtplottertools/jkqtptools.h"
 #include <stdlib.h>
 #include <QDebug>
 #include <QElapsedTimer>

lib/jkqtplotter/jkqtpparsedfunctionelements.h

@@ -24,10 +24,10 @@
 #include <QString>
 #include <QPainter>
 #include <QPair>
-#include "jkqtptools.h"
+#include "jkqtplottertools/jkqtptools.h"
-#include "jkqtpmathparser.h"
+#include "jkqtplottertools/jkqtpmathparser.h"
-#include "jkqtp_imexport.h"
+#include "jkqtplottertools/jkqtp_imexport.h"
-#include "jkqtpevaluatedfunctionelements.h"
+#include "jkqtplotter/jkqtpevaluatedfunctionelements.h"
 
 // forward declarations
 class JKQtBasePlotter;

lib/jkqtplotter/jkqtpplotsmodel.cpp

@@ -23,9 +23,9 @@
   * \ingroup jkqtpbaseplotter
   */
 
-#include "jkqtpplotsmodel.h"
+#include "jkqtplotter/jkqtpplotsmodel.h"
-#include "jkqtpbaseplotter.h"
+#include "jkqtplotter/jkqtpbaseplotter.h"
-#include "jkqtptools.h"
+#include "jkqtplottertools/jkqtptools.h"
 #include <QImage>
 
 

lib/jkqtplotter/jkqtpplotsmodel.h

@@ -33,8 +33,8 @@
 #ifndef JKQTPPLOTSMODEL_H
 #define JKQTPPLOTSMODEL_H
 
-#include "jkqtpbaseplotter.h"
+#include "jkqtplotter/jkqtpbaseplotter.h"
-#include "jkqtp_imexport.h"
+#include "jkqtplottertools/jkqtp_imexport.h"
 
 #include <QAbstractTableModel>