diverse code improvements, increased copyright year to 2020

examples/contourplot/contourplotanimator.cpp

@@ -13,7 +13,6 @@ void ContourPlotAnimator::start(int delayMS) {
 }
 
 void ContourPlotAnimator::step() {
-    double x;
     double y=-h/2.0;
     const double eps0=8.854187e-12;
     double r=1e-6*(5.0+cos(angle/4.0))/6.0;
@@ -31,13 +30,13 @@ void ContourPlotAnimator::step() {
     const double Q4_x0=r2*cos(angle);         // x-position of charged particle 4
     const double Q4_y0=-r2*sin(angle);        // y-position of charged particle 4
     for (size_t iy=0; iy<static_cast<size_t>(NY); iy++ ) {
-        x=-w/2.0;
+        double x=-w/2.0;
         for (size_t ix=0; ix<static_cast<size_t>(NX); ix++ ) {
-            const double r1=sqrt((x-Q1_x0)*(x-Q1_x0)+(y-Q1_y0)*(y-Q1_y0));
+            const double xy_r1=sqrt((x-Q1_x0)*(x-Q1_x0)+(y-Q1_y0)*(y-Q1_y0));
-            const double r2=sqrt((x-Q2_x0)*(x-Q2_x0)+(y-Q2_y0)*(y-Q2_y0));
+            const double xy_r2=sqrt((x-Q2_x0)*(x-Q2_x0)+(y-Q2_y0)*(y-Q2_y0));
-            const double r3=sqrt((x-Q3_x0)*(x-Q3_x0)+(y-Q3_y0)*(y-Q3_y0));
+            const double xy_r3=sqrt((x-Q3_x0)*(x-Q3_x0)+(y-Q3_y0)*(y-Q3_y0));
-            const double r4=sqrt((x-Q4_x0)*(x-Q4_x0)+(y-Q4_y0)*(y-Q4_y0));
+            const double xy_r4=sqrt((x-Q4_x0)*(x-Q4_x0)+(y-Q4_y0)*(y-Q4_y0));
-            ds->setPixel(cPotential, ix, iy, Q1/(4.0*JKQTPSTATISTICS_PI*eps0)/r1+Q2/(4.0*JKQTPSTATISTICS_PI*eps0)/r2+Q3/(4.0*JKQTPSTATISTICS_PI*eps0)/r3+Q4/(4.0*JKQTPSTATISTICS_PI*eps0)/r4);
+            ds->setPixel(cPotential, ix, iy, Q1/(4.0*JKQTPSTATISTICS_PI*eps0)/xy_r1+Q2/(4.0*JKQTPSTATISTICS_PI*eps0)/xy_r2+Q3/(4.0*JKQTPSTATISTICS_PI*eps0)/xy_r3+Q4/(4.0*JKQTPSTATISTICS_PI*eps0)/xy_r4);
             x+=dx;
         }
         y+=dx;

lib/jkqtcommon/jkqtcommon_imexport.h

@@ -3,7 +3,7 @@
 
 
 /*
-    Copyright (c) 2008-2019 Jan W. Krieger (<jan@jkrieger.de>)
+    Copyright (c) 2008-2020 Jan W. Krieger (<jan@jkrieger.de>)
 
     last modification: $LastChangedDate: 2015-04-02 13:55:22 +0200 (Do, 02 Apr 2015) $  (revision $Rev: 3902 $)
 

lib/jkqtcommon/jkqtpalgorithms.cpp

@@ -1,5 +1,5 @@
 /*
-Copyright (c) 2008-2019 Jan W. Krieger (<jan@jkrieger.de>)
+Copyright (c) 2008-2020 Jan W. Krieger (<jan@jkrieger.de>)
 
     
 

lib/jkqtcommon/jkqtpalgorithms.h

@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2008-2019 Jan W. Krieger (<jan@jkrieger.de>, <j.krieger@dkfz.de>)
+    Copyright (c) 2008-2020 Jan W. Krieger (<jan@jkrieger.de>)
 
     
 

lib/jkqtcommon/jkqtparraytools.cpp

@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2008-2019 Jan W. Krieger (<jan@jkrieger.de>)
+    Copyright (c) 2008-2020 Jan W. Krieger (<jan@jkrieger.de>)
 
     last modification: $LastChangedDate$  (revision $Rev$)
 

lib/jkqtcommon/jkqtparraytools.h

@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2008-2019 Jan W. Krieger (<jan@jkrieger.de>)
+    Copyright (c) 2008-2020 Jan W. Krieger (<jan@jkrieger.de>)
 
     last modification: $LastChangedDate$  (revision $Rev$)
 

lib/jkqtcommon/jkqtpbasicimagetools.cpp

@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2008-2019 Jan W. Krieger (<jan@jkrieger.de>)
+    Copyright (c) 2008-2020 Jan W. Krieger (<jan@jkrieger.de>)
 
     
 

lib/jkqtcommon/jkqtpbasicimagetools.h

@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2008-2019 Jan W. Krieger (<jan@jkrieger.de>)
+    Copyright (c) 2008-2020 Jan W. Krieger (<jan@jkrieger.de>)
 
     
 

lib/jkqtcommon/jkqtpcodestructuring.cpp

@@ -1,5 +1,5 @@
 /*
-Copyright (c) 2008-2019 Jan W. Krieger (<jan@jkrieger.de>)
+Copyright (c) 2008-2020 Jan W. Krieger (<jan@jkrieger.de>)
 
     
 

lib/jkqtcommon/jkqtpcodestructuring.h

@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2008-2019 Jan W. Krieger (<jan@jkrieger.de>, <j.krieger@dkfz.de>)
+    Copyright (c) 2008-2020 Jan W. Krieger (<jan@jkrieger.de>)
 
     
 

lib/jkqtcommon/jkqtpdebuggingtools.cpp

@@ -1,5 +1,5 @@
 /*
-Copyright (c) 2008-2019 Jan W. Krieger (<jan@jkrieger.de>)
+Copyright (c) 2008-2020 Jan W. Krieger (<jan@jkrieger.de>)
 
     
 

lib/jkqtcommon/jkqtpdebuggingtools.h

@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2008-2019 Jan W. Krieger (<jan@jkrieger.de>, <j.krieger@dkfz.de>)
+    Copyright (c) 2008-2020 Jan W. Krieger (<jan@jkrieger.de>)
 
     
 

lib/jkqtcommon/jkqtpdrawingtools.cpp

@@ -1,5 +1,5 @@
 /*
-Copyright (c) 2008-2019 Jan W. Krieger (<jan@jkrieger.de>)
+Copyright (c) 2008-2020 Jan W. Krieger (<jan@jkrieger.de>)
 
     
 

lib/jkqtcommon/jkqtpdrawingtools.h

@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2008-2019 Jan W. Krieger (<jan@jkrieger.de>, <j.krieger@dkfz.de>)
+    Copyright (c) 2008-2020 Jan W. Krieger (<jan@jkrieger.de>)
 
     
 

lib/jkqtcommon/jkqtpenhancedpainter.cpp

@@ -1,5 +1,5 @@
 /*
-Copyright (c) 2008-2019 Jan W. Krieger (<jan@jkrieger.de>)
+Copyright (c) 2008-2020 Jan W. Krieger (<jan@jkrieger.de>)
 
     
 

lib/jkqtcommon/jkqtpenhancedpainter.h

@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2008-2019 Jan W. Krieger (<jan@jkrieger.de>, <j.krieger@dkfz.de>)
+    Copyright (c) 2008-2020 Jan W. Krieger (<jan@jkrieger.de>)
 
     
 

lib/jkqtcommon/jkqtphighrestimer.cpp

@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2008-2019 Jan W. Krieger (<jan@jkrieger.de>, <j.krieger@dkfz.de>) (DKFZ) & IWR, University of Heidelberg
+    Copyright (c) 2008-2020 Jan W. Krieger (<jan@jkrieger.de>) (DKFZ) & IWR, University of Heidelberg
 
     last modification: $LastChangedDate: 2015-06-10 19:19:10 +0200 (Mi, 10 Jun 2015) $  (revision $Rev: 3976 $)
 
@@ -63,47 +63,3 @@ double JKQTPHighResTimer::getTime(){
 };
 
 
-void JKQTPHighResTimer::test(double* mean, double* stddev, unsigned long* histogram, double* histogram_x, unsigned long histogram_size){
-  unsigned long runs=1000000;
-  double* h=static_cast<double*>(malloc(runs*sizeof(double)));
-  *mean = 0;
-  *stddev = 0;
-  /* time measurement */
-  double l=getTime(), n;
-  for (unsigned long i=0; i<runs; i++) {
-    n=getTime();
-    h[i]=n-l;
-    l=n;
-    //printf("%lf\n",h[i]);
-  }
-  /* end measurement */
-
-  /* compute mean value */
-  double mymin=h[0];
-  double mymax=h[0];
-  for (unsigned long i=1; i<runs; i++) {
-    *mean+=h[i]/(runs-1);
-    if (h[i]>mymax) mymax=h[i];
-    if (h[i]<mymin) mymin=h[i];
-  }
-  //printf("%lf   %lf\n", mymin, mymax);
-  double binwidth=0;
-  if (histogram_size>0) {
-    binwidth=(mymax-mymin)/(histogram_size-1);
-    for (unsigned int i=0; i<histogram_size; i++) {
-      histogram[i]=0;
-      histogram_x[i]=mymin+i*binwidth;
-    }
-  }
-
-  /* compute standard deviation */
-  for (unsigned long i=1; i<runs; i++) {
-    (*stddev)=(*stddev)+(static_cast<double>(h[i])-*mean)*(static_cast<double>(h[i])-*mean)/static_cast<double>(runs-2);
-    if (histogram_size>0) {
-      unsigned long bin=(unsigned int)floor((h[i]-mymin)/binwidth);
-      if (/*bin>=0 &&*/ bin<histogram_size) histogram[bin]++;
-    }
-  }
-  *stddev=sqrt(*stddev);
-  free(h);
-};

lib/jkqtcommon/jkqtphighrestimer.h

@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2008-2019 Jan W. Krieger (<jan@jkrieger.de>, <j.krieger@dkfz.de>) (DKFZ) & IWR, University of Heidelberg
+    Copyright (c) 2008-2020 Jan W. Krieger (<jan@jkrieger.de>) (DKFZ) & IWR, University of Heidelberg
 
     last modification: $LastChangedDate: 2015-06-10 19:19:10 +0200 (Mi, 10 Jun 2015) $  (revision $Rev: 3976 $)
 
@@ -71,12 +71,7 @@
  *   - then you can query the time difference to the last call of start() by using getTime().
  * .
  *
- * There is also a test method test() which will try to give you a feel for the performance of the timer in
+ * This is the result of a test on a WinXP system, Athlon64 X2 3800+ (2GHz):
- * a simple application on your computer.
- * It simply does some thousand iterations and records the time needed for each single iteration. Then it may
- * calculate a histogram, a mean value and a standard deviation from these times.
- *
- * This is the result of test() on a WinXP system, Athlon64 X2 3800+ (2GHz):
  * \image html highrestimer.png
  * Note that this histogram tells you more about how your system works than about the timer itself.
  * What we can find out about the timer is that it really provides a resolution in the microsecond region. This can
@@ -140,26 +135,6 @@ class JKQTCOMMON_LIB_EXPORT JKQTPHighResTimer {
         void start();
         /** \brief get the time since the last call of start() in microseconds */
         double getTime();
-        /** \brief test the resolution
-     *
-     * mean value and standard deviation of 1000000 timer polls will be evaluated and returned in \c mean
-     * and \c stddev. If you supply \c histogram with a pointer to a memory array with \c histogram_size
-     * items this will hold afterwards a histogram of the data. \c histogram_x wil contain the time interval
-     * values of the histogram bins in \c histogram.
-     *
-     * To measure the resolution this method uses this code:
-     * \code
-double l=getTime(), n;
-for (unsigned long i=0; i<runs; i++) {
-  n=getTime();
-  h[i]=n-l;
-  l=n;
-}
-\endcode
-     *
-     */
-        void test(double* mean, double* stddev, unsigned long* histogram=nullptr, double* histogram_x=nullptr, unsigned long histogram_size=0);
-
 };
 
 

lib/jkqtcommon/jkqtplinalgtools.cpp

@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2008-2019 Jan W. Krieger (<jan@jkrieger.de>)
+    Copyright (c) 2008-2020 Jan W. Krieger (<jan@jkrieger.de>)
 
     last modification: $LastChangedDate$  (revision $Rev$)
 

lib/jkqtcommon/jkqtplinalgtools.h

@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2008-2019 Jan W. Krieger (<jan@jkrieger.de>)
+    Copyright (c) 2008-2020 Jan W. Krieger (<jan@jkrieger.de>)
 
     last modification: $LastChangedDate$  (revision $Rev$)
 

lib/jkqtcommon/jkqtpmathparser.cpp

@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2008-2019 Jan W. Krieger (<jan@jkrieger.de>, <j.krieger@dkfz.de>)
+    Copyright (c) 2008-2020 Jan W. Krieger (<jan@jkrieger.de>)
 
 
 
@@ -58,7 +58,6 @@ namespace { // anonymous namespace to limit availability to this module (CPP-fil
 
     JKQTPMathParser::jkmpResult fBoolToStr(JKQTPMathParser::jkmpResult* params, unsigned char n, JKQTPMathParser* p){
       JKQTPMathParser::jkmpResult r;
-      std::ostringstream ost;
       r.type=JKQTPMathParser::jkmpString;
       if (n!=1) p->jkmpError("booltostr accepts 1 argument");
       if (params[0].type!=JKQTPMathParser::jkmpBool) p->jkmpError("floattostr needs bool argument");

lib/jkqtcommon/jkqtpmathparser.h

@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2008-2019 Jan W. Krieger (<jan@jkrieger.de>)
+    Copyright (c) 2008-2020 Jan W. Krieger (<jan@jkrieger.de>)
 
     
 

lib/jkqtcommon/jkqtpmathtools.cpp

@@ -1,5 +1,5 @@
 /*
-Copyright (c) 2008-2019 Jan W. Krieger (<jan@jkrieger.de>)
+Copyright (c) 2008-2020 Jan W. Krieger (<jan@jkrieger.de>)
 
     
 

lib/jkqtcommon/jkqtpmathtools.h

@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2008-2019 Jan W. Krieger (<jan@jkrieger.de>, <j.krieger@dkfz.de>)
+    Copyright (c) 2008-2020 Jan W. Krieger (<jan@jkrieger.de>)
 
     
 

lib/jkqtcommon/jkqtpstatbasics.cpp

@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2008-2019 Jan W. Krieger (<jan@jkrieger.de>)
+    Copyright (c) 2008-2020 Jan W. Krieger (<jan@jkrieger.de>)
 
     last modification: $LastChangedDate$  (revision $Rev$)
 

lib/jkqtcommon/jkqtpstatbasics.h

@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2008-2019 Jan W. Krieger (<jan@jkrieger.de>)
+    Copyright (c) 2008-2020 Jan W. Krieger (<jan@jkrieger.de>)
 
     last modification: $LastChangedDate$  (revision $Rev$)
 

lib/jkqtcommon/jkqtpstatgrouped.cpp

@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2008-2019 Jan W. Krieger (<jan@jkrieger.de>)
+    Copyright (c) 2008-2020 Jan W. Krieger (<jan@jkrieger.de>)
 
     last modification: $LastChangedDate$  (revision $Rev$)
 

lib/jkqtcommon/jkqtpstatgrouped.h

@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2008-2019 Jan W. Krieger (<jan@jkrieger.de>)
+    Copyright (c) 2008-2020 Jan W. Krieger (<jan@jkrieger.de>)
 
     last modification: $LastChangedDate$  (revision $Rev$)
 

lib/jkqtcommon/jkqtpstathistogram.cpp

@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2008-2019 Jan W. Krieger (<jan@jkrieger.de>)
+    Copyright (c) 2008-2020 Jan W. Krieger (<jan@jkrieger.de>)
 
     last modification: $LastChangedDate$  (revision $Rev$)
 

lib/jkqtcommon/jkqtpstathistogram.h

@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2008-2019 Jan W. Krieger (<jan@jkrieger.de>)
+    Copyright (c) 2008-2020 Jan W. Krieger (<jan@jkrieger.de>)
 
     last modification: $LastChangedDate$  (revision $Rev$)
 

lib/jkqtcommon/jkqtpstatisticstools.h

@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2008-2019 Jan W. Krieger (<jan@jkrieger.de>)
+    Copyright (c) 2008-2020 Jan W. Krieger (<jan@jkrieger.de>)
 
     last modification: $LastChangedDate$  (revision $Rev$)
 

lib/jkqtcommon/jkqtpstatkde.cpp

@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2008-2019 Jan W. Krieger (<jan@jkrieger.de>)
+    Copyright (c) 2008-2020 Jan W. Krieger (<jan@jkrieger.de>)
 
     last modification: $LastChangedDate$  (revision $Rev$)
 

lib/jkqtcommon/jkqtpstatkde.h

@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2008-2019 Jan W. Krieger (<jan@jkrieger.de>)
+    Copyright (c) 2008-2020 Jan W. Krieger (<jan@jkrieger.de>)
 
     last modification: $LastChangedDate$  (revision $Rev$)
 

lib/jkqtcommon/jkqtpstatpoly.cpp

@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2008-2019 Jan W. Krieger (<jan@jkrieger.de>)
+    Copyright (c) 2008-2020 Jan W. Krieger (<jan@jkrieger.de>)
 
     last modification: $LastChangedDate$  (revision $Rev$)
 

lib/jkqtcommon/jkqtpstatpoly.h

@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2008-2019 Jan W. Krieger (<jan@jkrieger.de>)
+    Copyright (c) 2008-2020 Jan W. Krieger (<jan@jkrieger.de>)
 
     last modification: $LastChangedDate$  (revision $Rev$)
 

lib/jkqtcommon/jkqtpstatregression.cpp

@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2008-2019 Jan W. Krieger (<jan@jkrieger.de>)
+    Copyright (c) 2008-2020 Jan W. Krieger (<jan@jkrieger.de>)
 
     last modification: $LastChangedDate$  (revision $Rev$)
 

lib/jkqtcommon/jkqtpstatregression.h

@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2008-2019 Jan W. Krieger (<jan@jkrieger.de>)
+    Copyright (c) 2008-2020 Jan W. Krieger (<jan@jkrieger.de>)
 
     last modification: $LastChangedDate$  (revision $Rev$)
 

lib/jkqtcommon/jkqtpstringtools.cpp

@@ -1,5 +1,5 @@
 /*
-Copyright (c) 2008-2019 Jan W. Krieger (<jan@jkrieger.de>)
+Copyright (c) 2008-2020 Jan W. Krieger (<jan@jkrieger.de>)
 
     
 

lib/jkqtcommon/jkqtpstringtools.h

@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2008-2019 Jan W. Krieger (<jan@jkrieger.de>, <j.krieger@dkfz.de>)
+    Copyright (c) 2008-2020 Jan W. Krieger (<jan@jkrieger.de>)
 
     
 

lib/jkqtcommon/jkqttools.cpp

@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2008-2019 Jan W. Krieger (<jan@jkrieger.de>)
+    Copyright (c) 2008-2020 Jan W. Krieger (<jan@jkrieger.de>)
 
     last modification: $LastChangedDate$  (revision $Rev$)
 

lib/jkqtcommon/jkqttools.h

@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2008-2019 Jan W. Krieger (<jan@jkrieger.de>)
+    Copyright (c) 2008-2020 Jan W. Krieger (<jan@jkrieger.de>)
 
     last modification: $LastChangedDate$  (revision $Rev$)
 

lib/jkqtfastplotter/jkqtfastplotter.cpp

@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2008-2019 Jan W. Krieger (<jan@jkrieger.de>, <j.krieger@dkfz.de>) (DKFZ) & IWR, University of Heidelberg
+    Copyright (c) 2008-2020 Jan W. Krieger (<jan@jkrieger.de>) (DKFZ) & IWR, University of Heidelberg
 
     
 

lib/jkqtfastplotter/jkqtfastplotter.h

@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2008-2019 Jan W. Krieger (<jan@jkrieger.de>, <j.krieger@dkfz.de>) (DKFZ) & IWR, University of Heidelberg
+    Copyright (c) 2008-2020 Jan W. Krieger (<jan@jkrieger.de>) (DKFZ) & IWR, University of Heidelberg
 
     
 
@@ -896,7 +896,7 @@ class JKQTFASTPLOTTER_LIB_EXPORT JKQTFastPlotter : public QGLWidget {
             return this->yAxisLabelVisible; 
         }
         /*! \copydoc synchronizeX */ 
-        inline void setSynchronizeX(JKQTFastPlotter* & __value)
+        inline void setSynchronizeX(JKQTFastPlotter*  __value)
         {
             if (this->synchronizeX != __value) {
                 this->synchronizeX = __value; 
@@ -909,7 +909,7 @@ class JKQTFASTPLOTTER_LIB_EXPORT JKQTFastPlotter : public QGLWidget {
             return this->synchronizeX; 
         }
         /*! \copydoc synchronizeY */ 
-        inline void setSynchronizeY(JKQTFastPlotter* & __value)
+        inline void setSynchronizeY(JKQTFastPlotter*  __value)
         {
             if (this->synchronizeY != __value) {
                 this->synchronizeY = __value; 
@@ -3283,7 +3283,7 @@ class JKQTFASTPLOTTER_LIB_EXPORT JKQTFPQScaleBarXPlot: public JKQTFPPlot {
         /*! \brief class constructor
 
          */
-        JKQTFPQScaleBarXPlot(JKQTFastPlotter* parent, double width=1, const QString& label=QString("%1"), QColor color=QColor("grey"), double lineWidth=2) ;
+        explicit JKQTFPQScaleBarXPlot(JKQTFastPlotter* parent, double width=1, const QString& label=QString("%1"), QColor color=QColor("grey"), double lineWidth=2) ;
 
         /** \brief draw the graph */
         virtual void drawGraph(QPainter& painter) override;
@@ -3396,7 +3396,7 @@ class JKQTFASTPLOTTER_LIB_EXPORT JKQTFPQOverlayLinearGridPlot: public JKQTFPPlot
         /*! \brief class constructor
 
          */
-        JKQTFPQOverlayLinearGridPlot(JKQTFastPlotter* parent, double width=1, QColor color=QColor("grey"), double lineWidth=1, Qt::PenStyle style=Qt::DashLine) ;
+        explicit JKQTFPQOverlayLinearGridPlot(JKQTFastPlotter* parent, double width=1, QColor color=QColor("grey"), double lineWidth=1, Qt::PenStyle style=Qt::DashLine) ;
 
         /** \brief draw the graph */
         virtual void drawGraph(QPainter& painter) override;

lib/jkqtfastplotter/jkqtfastplotter_imexport.h

@@ -3,7 +3,7 @@
 
 
 /*
-    Copyright (c) 2008-2019 Jan W. Krieger (<jan@jkrieger.de>)
+    Copyright (c) 2008-2020 Jan W. Krieger (<jan@jkrieger.de>)
 
     last modification: $LastChangedDate: 2015-04-02 13:55:22 +0200 (Do, 02 Apr 2015) $  (revision $Rev: 3902 $)
 

lib/jkqtmathtext/jkqtmathtext.cpp

@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2008-2019 Jan W. Krieger (<jan@jkrieger.de>)
+    Copyright (c) 2008-2020 Jan W. Krieger (<jan@jkrieger.de>)
 
     
 

lib/jkqtmathtext/jkqtmathtext.h

@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2008-2019 Jan W. Krieger (<jan@jkrieger.de>)
+    Copyright (c) 2008-2020 Jan W. Krieger (<jan@jkrieger.de>)
     with contributions from: Razi Alavizadeh
 
     

lib/jkqtmathtext/jkqtmathtext_imexport.h

@@ -3,7 +3,7 @@
 
 
 /*
-    Copyright (c) 2008-2019 Jan W. Krieger (<jan@jkrieger.de>)
+    Copyright (c) 2008-2020 Jan W. Krieger (<jan@jkrieger.de>)
 
     last modification: $LastChangedDate: 2015-04-02 13:55:22 +0200 (Do, 02 Apr 2015) $  (revision $Rev: 3902 $)
 

lib/jkqtplotter/graphs/jkqtpbarchart.cpp

@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2008-2019 Jan W. Krieger (<jan@jkrieger.de>)
+    Copyright (c) 2008-2020 Jan W. Krieger (<jan@jkrieger.de>)
 
     
 

lib/jkqtplotter/graphs/jkqtpbarchart.h

@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2008-2019 Jan W. Krieger (<jan@jkrieger.de>)
+    Copyright (c) 2008-2020 Jan W. Krieger (<jan@jkrieger.de>)
 
     
 

lib/jkqtplotter/graphs/jkqtpboxplot.cpp

@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2008-2019 Jan W. Krieger (<jan@jkrieger.de>)
+    Copyright (c) 2008-2020 Jan W. Krieger (<jan@jkrieger.de>)
 
     
 

lib/jkqtplotter/graphs/jkqtpboxplot.h

@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2008-2019 Jan W. Krieger (<jan@jkrieger.de>)
+    Copyright (c) 2008-2020 Jan W. Krieger (<jan@jkrieger.de>)
 
     
 

lib/jkqtplotter/graphs/jkqtpboxplotstylingmixins.cpp

@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2008-2019 Jan W. Krieger (<jan@jkrieger.de>)
+    Copyright (c) 2008-2020 Jan W. Krieger (<jan@jkrieger.de>)
 
     
 

lib/jkqtplotter/graphs/jkqtpboxplotstylingmixins.h

@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2008-2019 Jan W. Krieger (<jan@jkrieger.de>)
+    Copyright (c) 2008-2020 Jan W. Krieger (<jan@jkrieger.de>)
 
     
 

lib/jkqtplotter/graphs/jkqtpcontour.cpp

@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2008-2019 Jan W. Krieger & Sebastian Isbaner (contour plot)
+    Copyright (c) 2008-2020 Jan W. Krieger & Sebastian Isbaner (contour plot)
 
     
 

lib/jkqtplotter/graphs/jkqtpcontour.h

@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2008-2019 Jan W. Krieger & Sebastian Isbaner (contour plot)
+    Copyright (c) 2008-2020 Jan W. Krieger & Sebastian Isbaner (contour plot)
 
     
 

lib/jkqtplotter/graphs/jkqtpevaluatedfunction.cpp

@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2008-2019 Jan W. Krieger (<jan@jkrieger.de>)
+    Copyright (c) 2008-2020 Jan W. Krieger (<jan@jkrieger.de>)
 
     
 

lib/jkqtplotter/graphs/jkqtpevaluatedfunction.h

@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2008-2019 Jan W. Krieger (<jan@jkrieger.de>)
+    Copyright (c) 2008-2020 Jan W. Krieger (<jan@jkrieger.de>)
 
     
 

lib/jkqtplotter/graphs/jkqtpfilledcurve.cpp

@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2008-2019 Jan W. Krieger (<jan@jkrieger.de>)
+    Copyright (c) 2008-2020 Jan W. Krieger (<jan@jkrieger.de>)
 
     
 

lib/jkqtplotter/graphs/jkqtpfilledcurve.h

@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2008-2019 Jan W. Krieger (<jan@jkrieger.de>)
+    Copyright (c) 2008-2020 Jan W. Krieger (<jan@jkrieger.de>)
 
     
 

lib/jkqtplotter/graphs/jkqtpimage.cpp

@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2008-2019 Jan W. Krieger
+    Copyright (c) 2008-2020 Jan W. Krieger
 
     
 

lib/jkqtplotter/graphs/jkqtpimage.h

@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2008-2019 Jan W. Krieger
+    Copyright (c) 2008-2020 Jan W. Krieger
 
 
 

lib/jkqtplotter/graphs/jkqtpimageoverlays.cpp

@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2008-2019 Jan W. Krieger & Sebastian Isbaner (contour plot)
+    Copyright (c) 2008-2020 Jan W. Krieger & Sebastian Isbaner (contour plot)
 
     
 

lib/jkqtplotter/graphs/jkqtpimageoverlays.h

@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2008-2019 Jan W. Krieger & Sebastian Isbaner (contour plot)
+    Copyright (c) 2008-2020 Jan W. Krieger & Sebastian Isbaner (contour plot)
 
     
 

lib/jkqtplotter/graphs/jkqtpimagergb.cpp

@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2008-2019 Jan W. Krieger
+    Copyright (c) 2008-2020 Jan W. Krieger
 
     
 

lib/jkqtplotter/graphs/jkqtpimagergb.h

@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2008-2019 Jan W. Krieger 
+    Copyright (c) 2008-2020 Jan W. Krieger 
 
     
 

lib/jkqtplotter/graphs/jkqtpimpulses.cpp

@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2008-2019 Jan W. Krieger (<jan@jkrieger.de>)
+    Copyright (c) 2008-2020 Jan W. Krieger (<jan@jkrieger.de>)
 
     
 

lib/jkqtplotter/graphs/jkqtpimpulses.h

@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2008-2019 Jan W. Krieger (<jan@jkrieger.de>)
+    Copyright (c) 2008-2020 Jan W. Krieger (<jan@jkrieger.de>)
 
     
 

lib/jkqtplotter/graphs/jkqtpparsedfunction.cpp

@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2008-2019 Jan W. Krieger (<jan@jkrieger.de>)
+    Copyright (c) 2008-2020 Jan W. Krieger (<jan@jkrieger.de>)
 
     
 

lib/jkqtplotter/graphs/jkqtpparsedfunction.h

@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2008-2019 Jan W. Krieger (<jan@jkrieger.de>)
+    Copyright (c) 2008-2020 Jan W. Krieger (<jan@jkrieger.de>)
 
     
 

lib/jkqtplotter/graphs/jkqtppeakstream.cpp

@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2008-2019 Jan W. Krieger (<jan@jkrieger.de>)
+    Copyright (c) 2008-2020 Jan W. Krieger (<jan@jkrieger.de>)
 
     
 

lib/jkqtplotter/graphs/jkqtppeakstream.h

@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2008-2019 Jan W. Krieger (<jan@jkrieger.de>)
+    Copyright (c) 2008-2020 Jan W. Krieger (<jan@jkrieger.de>)
 
     
 

lib/jkqtplotter/graphs/jkqtprange.cpp

@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2008-2019 Jan W. Krieger (<jan@jkrieger.de>)
+    Copyright (c) 2008-2020 Jan W. Krieger (<jan@jkrieger.de>)
 
     
 

lib/jkqtplotter/graphs/jkqtprange.h

@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2008-2019 Jan W. Krieger (<jan@jkrieger.de>)
+    Copyright (c) 2008-2020 Jan W. Krieger (<jan@jkrieger.de>)
 
     
 

lib/jkqtplotter/graphs/jkqtpscatter.cpp

@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2008-2019 Jan W. Krieger (<jan@jkrieger.de>)
+    Copyright (c) 2008-2020 Jan W. Krieger (<jan@jkrieger.de>)
 
     
 

lib/jkqtplotter/graphs/jkqtpscatter.h

@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2008-2019 Jan W. Krieger (<jan@jkrieger.de>)
+    Copyright (c) 2008-2020 Jan W. Krieger (<jan@jkrieger.de>)
 
     
 

lib/jkqtplotter/graphs/jkqtpsinglecolumnsymbols.cpp

@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2008-2019 Jan W. Krieger (<jan@jkrieger.de>)
+    Copyright (c) 2008-2020 Jan W. Krieger (<jan@jkrieger.de>)
 
     
 

lib/jkqtplotter/graphs/jkqtpsinglecolumnsymbols.h

@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2008-2019 Jan W. Krieger (<jan@jkrieger.de>)
+    Copyright (c) 2008-2020 Jan W. Krieger (<jan@jkrieger.de>)
 
     
 

lib/jkqtplotter/graphs/jkqtpspecialline.cpp

@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2008-2019 Jan W. Krieger (<jan@jkrieger.de>)
+    Copyright (c) 2008-2020 Jan W. Krieger (<jan@jkrieger.de>)
 
     
 

lib/jkqtplotter/graphs/jkqtpspecialline.h

@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2008-2019 Jan W. Krieger (<jan@jkrieger.de>)
+    Copyright (c) 2008-2020 Jan W. Krieger (<jan@jkrieger.de>)
 
     
 

lib/jkqtplotter/graphs/jkqtpstatisticsadaptors.cpp

@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2008-2019 Jan W. Krieger (<jan@jkrieger.de>)
+    Copyright (c) 2008-2020 Jan W. Krieger (<jan@jkrieger.de>)
 
     
 

lib/jkqtplotter/graphs/jkqtpstatisticsadaptors.h

@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2008-2019 Jan W. Krieger (<jan@jkrieger.de>)
+    Copyright (c) 2008-2020 Jan W. Krieger (<jan@jkrieger.de>)
 
     
 

lib/jkqtplotter/graphs/jkqtpviolinplot.cpp

@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2008-2019 Jan W. Krieger (<jan@jkrieger.de>)
+    Copyright (c) 2008-2020 Jan W. Krieger (<jan@jkrieger.de>)
 
     
 

lib/jkqtplotter/graphs/jkqtpviolinplot.h

@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2008-2019 Jan W. Krieger (<jan@jkrieger.de>)
+    Copyright (c) 2008-2020 Jan W. Krieger (<jan@jkrieger.de>)
 
     
 

lib/jkqtplotter/graphs/jkqtpviolinplotstylingmixins.cpp

@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2008-2019 Jan W. Krieger (<jan@jkrieger.de>)
+    Copyright (c) 2008-2020 Jan W. Krieger (<jan@jkrieger.de>)
 
     
 

lib/jkqtplotter/graphs/jkqtpviolinplotstylingmixins.h

@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2008-2019 Jan W. Krieger (<jan@jkrieger.de>)
+    Copyright (c) 2008-2020 Jan W. Krieger (<jan@jkrieger.de>)
 
     
 

lib/jkqtplotter/gui/jkqtpcomboboxes.cpp

@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2008-2019 Jan W. Krieger (<jan@jkrieger.de>, <j.krieger@dkfz.de>)
+    Copyright (c) 2008-2020 Jan W. Krieger (<jan@jkrieger.de>)
 
     
 

lib/jkqtplotter/gui/jkqtpcomboboxes.h

@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2008-2019 Jan W. Krieger (<jan@jkrieger.de>)
+    Copyright (c) 2008-2020 Jan W. Krieger (<jan@jkrieger.de>)
 
     
 

lib/jkqtplotter/gui/jkqtpenhancedspinboxes.cpp

@@ -1,5 +1,5 @@
 /*
-Copyright (c) 2008-2019 Jan W. Krieger (<jan@jkrieger.de>)
+Copyright (c) 2008-2020 Jan W. Krieger (<jan@jkrieger.de>)
 
     
 

lib/jkqtplotter/gui/jkqtpenhancedspinboxes.h

@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2008-2019 Jan W. Krieger (<jan@jkrieger.de>, <j.krieger@dkfz.de>)
+    Copyright (c) 2008-2020 Jan W. Krieger (<jan@jkrieger.de>)
 
     
 

lib/jkqtplotter/gui/jkqtpenhancedtableview.cpp

@@ -1,5 +1,5 @@
 /*
-Copyright (c) 2008-2019 Jan W. Krieger (<jan@jkrieger.de>)
+Copyright (c) 2008-2020 Jan W. Krieger (<jan@jkrieger.de>)
 
     
 

lib/jkqtplotter/gui/jkqtpenhancedtableview.h

@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2008-2019 Jan W. Krieger (<jan@jkrieger.de>, <j.krieger@dkfz.de>)
+    Copyright (c) 2008-2020 Jan W. Krieger (<jan@jkrieger.de>)
 
     
 

lib/jkqtplotter/gui/jkqtpgraphsmodel.cpp

@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2008-2019 Jan W. Krieger (<jan@jkrieger.de>, <j.krieger@dkfz.de>)
+    Copyright (c) 2008-2020 Jan W. Krieger (<jan@jkrieger.de>)
 
     
 

lib/jkqtplotter/gui/jkqtpgraphsmodel.h

@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2008-2019 Jan W. Krieger (<jan@jkrieger.de>)
+    Copyright (c) 2008-2020 Jan W. Krieger (<jan@jkrieger.de>)
 
     
 

lib/jkqtplotter/gui/jkvanishqtoolbar.cpp

@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2008-2019 Jan W. Krieger (<jan@jkrieger.de>, <j.krieger@dkfz.de>)
+    Copyright (c) 2008-2020 Jan W. Krieger (<jan@jkrieger.de>)
 
     
 

lib/jkqtplotter/gui/jkvanishqtoolbar.h

@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2008-2019 Jan W. Krieger (<jan@jkrieger.de>)
+    Copyright (c) 2008-2020 Jan W. Krieger (<jan@jkrieger.de>)
 
 
 

lib/jkqtplotter/jkqtpbaseelements.cpp

@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2008-2019 Jan W. Krieger (<jan@jkrieger.de>)
+    Copyright (c) 2008-2020 Jan W. Krieger (<jan@jkrieger.de>)
 
 
 

lib/jkqtplotter/jkqtpbaseelements.h

@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2008-2019 Jan W. Krieger (<jan@jkrieger.de>)
+    Copyright (c) 2008-2020 Jan W. Krieger (<jan@jkrieger.de>)
 
     
 

lib/jkqtplotter/jkqtpbaseplotter.cpp

@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2008-2019 Jan W. Krieger (<jan@jkrieger.de>, <j.krieger@dkfz.de>)
+    Copyright (c) 2008-2020 Jan W. Krieger (<jan@jkrieger.de>)
 
     
 
@@ -1674,7 +1674,7 @@ bool JKQTBasePlotter::printpreviewNew(QPaintDevice* paintDevice, bool setAbsolut
     layout->addWidget(spinSizeY, 0,layout->columnCount());
     layout->addWidget(chkAspect, 0,layout->columnCount());
     if (!setAbsolutePaperSize && printer && !svg) {
-        if (printer) layout->addWidget(new QLabel(tr("%1x%2 mm^2").arg(printer->pageRect(QPrinter::Millimeter).width()).arg(printer->pageRect(QPrinter::Millimeter).height())), 1,layout->columnCount()-4, 1, 4);
+        layout->addWidget(new QLabel(tr("%1x%2 mm^2").arg(printer->pageRect(QPrinter::Millimeter).width()).arg(printer->pageRect(QPrinter::Millimeter).height())), 1,layout->columnCount()-4, 1, 4);
 
         QCheckBox* chkSetMagnification=new QCheckBox(tr("set by magnification: "), dlg);
         chkSetMagnification->setChecked(false);
@@ -1756,11 +1756,7 @@ bool JKQTBasePlotter::printpreviewNew(QPaintDevice* paintDevice, bool setAbsolut
             if (svg) {
                 printpreviewPaintRequestedNew(svg);
             } else if (printer && !delPrinter) {
-                if (delPrinter) {
-                    printpreviewPaintRequestedNew(paintDevice);
-                } else {
                 printpreviewPaintRequestedNew(printer);
-                }
             } else {
                 printpreviewPaintRequestedNew(paintDevice);
             }

lib/jkqtplotter/jkqtpbaseplotter.h

@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2008-2019 Jan W. Krieger (<jan@jkrieger.de>)
+    Copyright (c) 2008-2020 Jan W. Krieger (<jan@jkrieger.de>)
 
     
 

lib/jkqtplotter/jkqtpbaseplotterstyle.h

@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2008-2019 Jan W. Krieger (<jan@jkrieger.de>, <j.krieger@dkfz.de>)
+    Copyright (c) 2008-2020 Jan W. Krieger (<jan@jkrieger.de>)