From 87755ce515e12dc60b15d600c11f7aba68aeb82b Mon Sep 17 00:00:00 2001 From: jkriege2 Date: Wed, 26 Aug 2020 12:58:23 +0200 Subject: [PATCH] diverse code improvements, increased copyright year to 2020 --- examples/contourplot/contourplotanimator.cpp | 13 +++--- lib/jkqtcommon/jkqtcommon_imexport.h | 2 +- lib/jkqtcommon/jkqtpalgorithms.cpp | 2 +- lib/jkqtcommon/jkqtpalgorithms.h | 2 +- lib/jkqtcommon/jkqtparraytools.cpp | 2 +- lib/jkqtcommon/jkqtparraytools.h | 2 +- lib/jkqtcommon/jkqtpbasicimagetools.cpp | 2 +- lib/jkqtcommon/jkqtpbasicimagetools.h | 2 +- lib/jkqtcommon/jkqtpcodestructuring.cpp | 2 +- lib/jkqtcommon/jkqtpcodestructuring.h | 2 +- lib/jkqtcommon/jkqtpdebuggingtools.cpp | 2 +- lib/jkqtcommon/jkqtpdebuggingtools.h | 2 +- lib/jkqtcommon/jkqtpdrawingtools.cpp | 2 +- lib/jkqtcommon/jkqtpdrawingtools.h | 2 +- lib/jkqtcommon/jkqtpenhancedpainter.cpp | 2 +- lib/jkqtcommon/jkqtpenhancedpainter.h | 2 +- lib/jkqtcommon/jkqtphighrestimer.cpp | 46 +------------------ lib/jkqtcommon/jkqtphighrestimer.h | 45 ++++-------------- lib/jkqtcommon/jkqtplinalgtools.cpp | 2 +- lib/jkqtcommon/jkqtplinalgtools.h | 2 +- lib/jkqtcommon/jkqtpmathparser.cpp | 3 +- lib/jkqtcommon/jkqtpmathparser.h | 2 +- lib/jkqtcommon/jkqtpmathtools.cpp | 2 +- lib/jkqtcommon/jkqtpmathtools.h | 2 +- lib/jkqtcommon/jkqtpstatbasics.cpp | 2 +- lib/jkqtcommon/jkqtpstatbasics.h | 2 +- lib/jkqtcommon/jkqtpstatgrouped.cpp | 2 +- lib/jkqtcommon/jkqtpstatgrouped.h | 2 +- lib/jkqtcommon/jkqtpstathistogram.cpp | 2 +- lib/jkqtcommon/jkqtpstathistogram.h | 2 +- lib/jkqtcommon/jkqtpstatisticstools.h | 2 +- lib/jkqtcommon/jkqtpstatkde.cpp | 2 +- lib/jkqtcommon/jkqtpstatkde.h | 2 +- lib/jkqtcommon/jkqtpstatpoly.cpp | 2 +- lib/jkqtcommon/jkqtpstatpoly.h | 2 +- lib/jkqtcommon/jkqtpstatregression.cpp | 2 +- lib/jkqtcommon/jkqtpstatregression.h | 2 +- lib/jkqtcommon/jkqtpstringtools.cpp | 2 +- lib/jkqtcommon/jkqtpstringtools.h | 2 +- lib/jkqtcommon/jkqttools.cpp | 2 +- lib/jkqtcommon/jkqttools.h | 2 +- lib/jkqtfastplotter/jkqtfastplotter.cpp | 2 +- lib/jkqtfastplotter/jkqtfastplotter.h | 10 ++-- .../jkqtfastplotter_imexport.h | 2 +- lib/jkqtmathtext/jkqtmathtext.cpp | 2 +- lib/jkqtmathtext/jkqtmathtext.h | 2 +- lib/jkqtmathtext/jkqtmathtext_imexport.h | 2 +- lib/jkqtplotter/graphs/jkqtpbarchart.cpp | 2 +- lib/jkqtplotter/graphs/jkqtpbarchart.h | 2 +- lib/jkqtplotter/graphs/jkqtpboxplot.cpp | 2 +- lib/jkqtplotter/graphs/jkqtpboxplot.h | 2 +- .../graphs/jkqtpboxplotstylingmixins.cpp | 2 +- .../graphs/jkqtpboxplotstylingmixins.h | 2 +- lib/jkqtplotter/graphs/jkqtpcontour.cpp | 2 +- lib/jkqtplotter/graphs/jkqtpcontour.h | 2 +- .../graphs/jkqtpevaluatedfunction.cpp | 2 +- .../graphs/jkqtpevaluatedfunction.h | 2 +- lib/jkqtplotter/graphs/jkqtpfilledcurve.cpp | 2 +- lib/jkqtplotter/graphs/jkqtpfilledcurve.h | 2 +- lib/jkqtplotter/graphs/jkqtpimage.cpp | 2 +- lib/jkqtplotter/graphs/jkqtpimage.h | 2 +- lib/jkqtplotter/graphs/jkqtpimageoverlays.cpp | 2 +- lib/jkqtplotter/graphs/jkqtpimageoverlays.h | 2 +- lib/jkqtplotter/graphs/jkqtpimagergb.cpp | 2 +- lib/jkqtplotter/graphs/jkqtpimagergb.h | 2 +- lib/jkqtplotter/graphs/jkqtpimpulses.cpp | 2 +- lib/jkqtplotter/graphs/jkqtpimpulses.h | 2 +- .../graphs/jkqtpparsedfunction.cpp | 2 +- lib/jkqtplotter/graphs/jkqtpparsedfunction.h | 2 +- lib/jkqtplotter/graphs/jkqtppeakstream.cpp | 2 +- lib/jkqtplotter/graphs/jkqtppeakstream.h | 2 +- lib/jkqtplotter/graphs/jkqtprange.cpp | 2 +- lib/jkqtplotter/graphs/jkqtprange.h | 2 +- lib/jkqtplotter/graphs/jkqtpscatter.cpp | 2 +- lib/jkqtplotter/graphs/jkqtpscatter.h | 2 +- .../graphs/jkqtpsinglecolumnsymbols.cpp | 2 +- .../graphs/jkqtpsinglecolumnsymbols.h | 2 +- lib/jkqtplotter/graphs/jkqtpspecialline.cpp | 2 +- lib/jkqtplotter/graphs/jkqtpspecialline.h | 2 +- .../graphs/jkqtpstatisticsadaptors.cpp | 2 +- .../graphs/jkqtpstatisticsadaptors.h | 2 +- lib/jkqtplotter/graphs/jkqtpviolinplot.cpp | 2 +- lib/jkqtplotter/graphs/jkqtpviolinplot.h | 2 +- .../graphs/jkqtpviolinplotstylingmixins.cpp | 2 +- .../graphs/jkqtpviolinplotstylingmixins.h | 2 +- lib/jkqtplotter/gui/jkqtpcomboboxes.cpp | 2 +- lib/jkqtplotter/gui/jkqtpcomboboxes.h | 2 +- .../gui/jkqtpenhancedspinboxes.cpp | 2 +- lib/jkqtplotter/gui/jkqtpenhancedspinboxes.h | 2 +- .../gui/jkqtpenhancedtableview.cpp | 2 +- lib/jkqtplotter/gui/jkqtpenhancedtableview.h | 2 +- lib/jkqtplotter/gui/jkqtpgraphsmodel.cpp | 2 +- lib/jkqtplotter/gui/jkqtpgraphsmodel.h | 2 +- lib/jkqtplotter/gui/jkvanishqtoolbar.cpp | 2 +- lib/jkqtplotter/gui/jkvanishqtoolbar.h | 2 +- lib/jkqtplotter/jkqtpbaseelements.cpp | 2 +- lib/jkqtplotter/jkqtpbaseelements.h | 2 +- lib/jkqtplotter/jkqtpbaseplotter.cpp | 10 ++-- lib/jkqtplotter/jkqtpbaseplotter.h | 2 +- lib/jkqtplotter/jkqtpbaseplotterstyle.h | 2 +- lib/jkqtplotter/jkqtpcoordinateaxes.cpp | 2 +- lib/jkqtplotter/jkqtpcoordinateaxes.h | 2 +- lib/jkqtplotter/jkqtpcoordinateaxesstyle.h | 2 +- lib/jkqtplotter/jkqtpdatastorage.cpp | 2 +- lib/jkqtplotter/jkqtpdatastorage.h | 2 +- lib/jkqtplotter/jkqtpgraphsbase.cpp | 6 +-- lib/jkqtplotter/jkqtpgraphsbase.h | 2 +- lib/jkqtplotter/jkqtpgraphsbaseerrors.cpp | 2 +- lib/jkqtplotter/jkqtpgraphsbaseerrors.h | 2 +- .../jkqtpgraphsbasestylingmixins.cpp | 2 +- .../jkqtpgraphsbasestylingmixins.h | 2 +- lib/jkqtplotter/jkqtpimagetools.cpp | 2 +- lib/jkqtplotter/jkqtpimagetools.h | 2 +- lib/jkqtplotter/jkqtpinterfacecimg.h | 2 +- lib/jkqtplotter/jkqtpinterfaceopencv.h | 2 +- lib/jkqtplotter/jkqtpkeystyle.cpp | 2 +- lib/jkqtplotter/jkqtpkeystyle.h | 2 +- lib/jkqtplotter/jkqtplotter.cpp | 2 +- lib/jkqtplotter/jkqtplotter.h | 2 +- lib/jkqtplotter/jkqtplotter_imexport.h | 2 +- lib/jkqtplotter/jkqtplotterstyle.h | 2 +- lib/jkqtplotter/jkqtpoverlaysbase.cpp | 2 +- lib/jkqtplotter/jkqtpoverlaysbase.h | 2 +- lib/jkqtplotter/jkqtptools.cpp | 5 +- lib/jkqtplotter/jkqtptools.h | 2 +- .../overlays/jkqtpbasicoverlays.cpp | 2 +- lib/jkqtplotter/overlays/jkqtpbasicoverlays.h | 2 +- lib/jkqtplotter_version.h.in | 2 +- 128 files changed, 150 insertions(+), 228 deletions(-) diff --git a/examples/contourplot/contourplotanimator.cpp b/examples/contourplot/contourplotanimator.cpp index 86e0309fbb..9e08b03be8 100644 --- a/examples/contourplot/contourplotanimator.cpp +++ b/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(NY); iy++ ) { - x=-w/2.0; + double x=-w/2.0; for (size_t ix=0; ix(NX); ix++ ) { - const double 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 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)); - 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); + const double xy_r1=sqrt((x-Q1_x0)*(x-Q1_x0)+(y-Q1_y0)*(y-Q1_y0)); + const double xy_r2=sqrt((x-Q2_x0)*(x-Q2_x0)+(y-Q2_y0)*(y-Q2_y0)); + const double xy_r3=sqrt((x-Q3_x0)*(x-Q3_x0)+(y-Q3_y0)*(y-Q3_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)/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; diff --git a/lib/jkqtcommon/jkqtcommon_imexport.h b/lib/jkqtcommon/jkqtcommon_imexport.h index 490104a1f9..018782fc62 100644 --- a/lib/jkqtcommon/jkqtcommon_imexport.h +++ b/lib/jkqtcommon/jkqtcommon_imexport.h @@ -3,7 +3,7 @@ /* - Copyright (c) 2008-2019 Jan W. Krieger () + Copyright (c) 2008-2020 Jan W. Krieger () last modification: $LastChangedDate: 2015-04-02 13:55:22 +0200 (Do, 02 Apr 2015) $ (revision $Rev: 3902 $) diff --git a/lib/jkqtcommon/jkqtpalgorithms.cpp b/lib/jkqtcommon/jkqtpalgorithms.cpp index 247700530a..cabb1b4bbf 100644 --- a/lib/jkqtcommon/jkqtpalgorithms.cpp +++ b/lib/jkqtcommon/jkqtpalgorithms.cpp @@ -1,5 +1,5 @@ /* -Copyright (c) 2008-2019 Jan W. Krieger () +Copyright (c) 2008-2020 Jan W. Krieger () diff --git a/lib/jkqtcommon/jkqtpalgorithms.h b/lib/jkqtcommon/jkqtpalgorithms.h index 6d93c50061..dec9f6635f 100644 --- a/lib/jkqtcommon/jkqtpalgorithms.h +++ b/lib/jkqtcommon/jkqtpalgorithms.h @@ -1,5 +1,5 @@ /* - Copyright (c) 2008-2019 Jan W. Krieger (, ) + Copyright (c) 2008-2020 Jan W. Krieger () diff --git a/lib/jkqtcommon/jkqtparraytools.cpp b/lib/jkqtcommon/jkqtparraytools.cpp index 15a14b0d06..2573a18600 100644 --- a/lib/jkqtcommon/jkqtparraytools.cpp +++ b/lib/jkqtcommon/jkqtparraytools.cpp @@ -1,5 +1,5 @@ /* - Copyright (c) 2008-2019 Jan W. Krieger () + Copyright (c) 2008-2020 Jan W. Krieger () last modification: $LastChangedDate$ (revision $Rev$) diff --git a/lib/jkqtcommon/jkqtparraytools.h b/lib/jkqtcommon/jkqtparraytools.h index 85bd952bac..ad03ed1205 100644 --- a/lib/jkqtcommon/jkqtparraytools.h +++ b/lib/jkqtcommon/jkqtparraytools.h @@ -1,5 +1,5 @@ /* - Copyright (c) 2008-2019 Jan W. Krieger () + Copyright (c) 2008-2020 Jan W. Krieger () last modification: $LastChangedDate$ (revision $Rev$) diff --git a/lib/jkqtcommon/jkqtpbasicimagetools.cpp b/lib/jkqtcommon/jkqtpbasicimagetools.cpp index 56f88b4cd4..8fe0032b48 100644 --- a/lib/jkqtcommon/jkqtpbasicimagetools.cpp +++ b/lib/jkqtcommon/jkqtpbasicimagetools.cpp @@ -1,5 +1,5 @@ /* - Copyright (c) 2008-2019 Jan W. Krieger () + Copyright (c) 2008-2020 Jan W. Krieger () diff --git a/lib/jkqtcommon/jkqtpbasicimagetools.h b/lib/jkqtcommon/jkqtpbasicimagetools.h index 69d8ce964c..d1b0c6dc0e 100644 --- a/lib/jkqtcommon/jkqtpbasicimagetools.h +++ b/lib/jkqtcommon/jkqtpbasicimagetools.h @@ -1,5 +1,5 @@ /* - Copyright (c) 2008-2019 Jan W. Krieger () + Copyright (c) 2008-2020 Jan W. Krieger () diff --git a/lib/jkqtcommon/jkqtpcodestructuring.cpp b/lib/jkqtcommon/jkqtpcodestructuring.cpp index c8b0b78fb8..1dae1a1a57 100644 --- a/lib/jkqtcommon/jkqtpcodestructuring.cpp +++ b/lib/jkqtcommon/jkqtpcodestructuring.cpp @@ -1,5 +1,5 @@ /* -Copyright (c) 2008-2019 Jan W. Krieger () +Copyright (c) 2008-2020 Jan W. Krieger () diff --git a/lib/jkqtcommon/jkqtpcodestructuring.h b/lib/jkqtcommon/jkqtpcodestructuring.h index 408605d171..3112259981 100644 --- a/lib/jkqtcommon/jkqtpcodestructuring.h +++ b/lib/jkqtcommon/jkqtpcodestructuring.h @@ -1,5 +1,5 @@ /* - Copyright (c) 2008-2019 Jan W. Krieger (, ) + Copyright (c) 2008-2020 Jan W. Krieger () diff --git a/lib/jkqtcommon/jkqtpdebuggingtools.cpp b/lib/jkqtcommon/jkqtpdebuggingtools.cpp index 19d4637b1c..0ab22a361c 100644 --- a/lib/jkqtcommon/jkqtpdebuggingtools.cpp +++ b/lib/jkqtcommon/jkqtpdebuggingtools.cpp @@ -1,5 +1,5 @@ /* -Copyright (c) 2008-2019 Jan W. Krieger () +Copyright (c) 2008-2020 Jan W. Krieger () diff --git a/lib/jkqtcommon/jkqtpdebuggingtools.h b/lib/jkqtcommon/jkqtpdebuggingtools.h index 3c1e119b1f..00626f412a 100644 --- a/lib/jkqtcommon/jkqtpdebuggingtools.h +++ b/lib/jkqtcommon/jkqtpdebuggingtools.h @@ -1,5 +1,5 @@ /* - Copyright (c) 2008-2019 Jan W. Krieger (, ) + Copyright (c) 2008-2020 Jan W. Krieger () diff --git a/lib/jkqtcommon/jkqtpdrawingtools.cpp b/lib/jkqtcommon/jkqtpdrawingtools.cpp index ff16aa4d10..ac9bca0289 100644 --- a/lib/jkqtcommon/jkqtpdrawingtools.cpp +++ b/lib/jkqtcommon/jkqtpdrawingtools.cpp @@ -1,5 +1,5 @@ /* -Copyright (c) 2008-2019 Jan W. Krieger () +Copyright (c) 2008-2020 Jan W. Krieger () diff --git a/lib/jkqtcommon/jkqtpdrawingtools.h b/lib/jkqtcommon/jkqtpdrawingtools.h index a50114b657..433ce9f9e5 100644 --- a/lib/jkqtcommon/jkqtpdrawingtools.h +++ b/lib/jkqtcommon/jkqtpdrawingtools.h @@ -1,5 +1,5 @@ /* - Copyright (c) 2008-2019 Jan W. Krieger (, ) + Copyright (c) 2008-2020 Jan W. Krieger () diff --git a/lib/jkqtcommon/jkqtpenhancedpainter.cpp b/lib/jkqtcommon/jkqtpenhancedpainter.cpp index af4c193b72..9c2a597132 100644 --- a/lib/jkqtcommon/jkqtpenhancedpainter.cpp +++ b/lib/jkqtcommon/jkqtpenhancedpainter.cpp @@ -1,5 +1,5 @@ /* -Copyright (c) 2008-2019 Jan W. Krieger () +Copyright (c) 2008-2020 Jan W. Krieger () diff --git a/lib/jkqtcommon/jkqtpenhancedpainter.h b/lib/jkqtcommon/jkqtpenhancedpainter.h index 4b310a2b1f..58d3fac1f7 100644 --- a/lib/jkqtcommon/jkqtpenhancedpainter.h +++ b/lib/jkqtcommon/jkqtpenhancedpainter.h @@ -1,5 +1,5 @@ /* - Copyright (c) 2008-2019 Jan W. Krieger (, ) + Copyright (c) 2008-2020 Jan W. Krieger () diff --git a/lib/jkqtcommon/jkqtphighrestimer.cpp b/lib/jkqtcommon/jkqtphighrestimer.cpp index c18a489ba2..c7654ede33 100644 --- a/lib/jkqtcommon/jkqtphighrestimer.cpp +++ b/lib/jkqtcommon/jkqtphighrestimer.cpp @@ -1,5 +1,5 @@ /* - Copyright (c) 2008-2019 Jan W. Krieger (, ) (DKFZ) & IWR, University of Heidelberg + Copyright (c) 2008-2020 Jan W. Krieger () (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(malloc(runs*sizeof(double))); - *mean = 0; - *stddev = 0; - /* time measurement */ - double l=getTime(), n; - for (unsigned long i=0; imymax) mymax=h[i]; - if (h[i]0) { - binwidth=(mymax-mymin)/(histogram_size-1); - for (unsigned int i=0; i(h[i])-*mean)*(static_cast(h[i])-*mean)/static_cast(runs-2); - if (histogram_size>0) { - unsigned long bin=(unsigned int)floor((h[i]-mymin)/binwidth); - if (/*bin>=0 &&*/ bin, ) (DKFZ) & IWR, University of Heidelberg + Copyright (c) 2008-2020 Jan W. Krieger () (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 - * 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): + * This is the result of a 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 @@ -123,14 +118,14 @@ */ class JKQTCOMMON_LIB_EXPORT JKQTPHighResTimer { protected: - #ifdef __WINDOWS__ - /** \brief internal: time stamp of the last call of start() */ - LARGE_INTEGER last; - #else - std::chrono::system_clock::time_point last; - #endif - /** \brief internal: timer frequency */ - double freq; +#ifdef __WINDOWS__ + /** \brief internal: time stamp of the last call of start() */ + LARGE_INTEGER last; +#else + std::chrono::system_clock::time_point last; +#endif + /** \brief internal: timer frequency */ + double freq; public: /** \brief class constructor. */ JKQTPHighResTimer(); @@ -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) + Copyright (c) 2008-2020 Jan W. Krieger () last modification: $LastChangedDate$ (revision $Rev$) diff --git a/lib/jkqtcommon/jkqtplinalgtools.h b/lib/jkqtcommon/jkqtplinalgtools.h index d0784d4ed6..4453475eea 100644 --- a/lib/jkqtcommon/jkqtplinalgtools.h +++ b/lib/jkqtcommon/jkqtplinalgtools.h @@ -1,5 +1,5 @@ /* - Copyright (c) 2008-2019 Jan W. Krieger () + Copyright (c) 2008-2020 Jan W. Krieger () last modification: $LastChangedDate$ (revision $Rev$) diff --git a/lib/jkqtcommon/jkqtpmathparser.cpp b/lib/jkqtcommon/jkqtpmathparser.cpp index bd108d5ecc..6523590ebe 100644 --- a/lib/jkqtcommon/jkqtpmathparser.cpp +++ b/lib/jkqtcommon/jkqtpmathparser.cpp @@ -1,5 +1,5 @@ /* - Copyright (c) 2008-2019 Jan W. Krieger (, ) + Copyright (c) 2008-2020 Jan W. Krieger () @@ -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"); diff --git a/lib/jkqtcommon/jkqtpmathparser.h b/lib/jkqtcommon/jkqtpmathparser.h index b6d3aa3431..96ec023f91 100644 --- a/lib/jkqtcommon/jkqtpmathparser.h +++ b/lib/jkqtcommon/jkqtpmathparser.h @@ -1,5 +1,5 @@ /* - Copyright (c) 2008-2019 Jan W. Krieger () + Copyright (c) 2008-2020 Jan W. Krieger () diff --git a/lib/jkqtcommon/jkqtpmathtools.cpp b/lib/jkqtcommon/jkqtpmathtools.cpp index cf20a159cc..b4034e6007 100644 --- a/lib/jkqtcommon/jkqtpmathtools.cpp +++ b/lib/jkqtcommon/jkqtpmathtools.cpp @@ -1,5 +1,5 @@ /* -Copyright (c) 2008-2019 Jan W. Krieger () +Copyright (c) 2008-2020 Jan W. Krieger () diff --git a/lib/jkqtcommon/jkqtpmathtools.h b/lib/jkqtcommon/jkqtpmathtools.h index b2610653cc..b8cd839d32 100644 --- a/lib/jkqtcommon/jkqtpmathtools.h +++ b/lib/jkqtcommon/jkqtpmathtools.h @@ -1,5 +1,5 @@ /* - Copyright (c) 2008-2019 Jan W. Krieger (, ) + Copyright (c) 2008-2020 Jan W. Krieger () diff --git a/lib/jkqtcommon/jkqtpstatbasics.cpp b/lib/jkqtcommon/jkqtpstatbasics.cpp index 11c70a1c12..7f6305c960 100644 --- a/lib/jkqtcommon/jkqtpstatbasics.cpp +++ b/lib/jkqtcommon/jkqtpstatbasics.cpp @@ -1,5 +1,5 @@ /* - Copyright (c) 2008-2019 Jan W. Krieger () + Copyright (c) 2008-2020 Jan W. Krieger () last modification: $LastChangedDate$ (revision $Rev$) diff --git a/lib/jkqtcommon/jkqtpstatbasics.h b/lib/jkqtcommon/jkqtpstatbasics.h index 1ae7aadc0f..57ab2a3515 100644 --- a/lib/jkqtcommon/jkqtpstatbasics.h +++ b/lib/jkqtcommon/jkqtpstatbasics.h @@ -1,5 +1,5 @@ /* - Copyright (c) 2008-2019 Jan W. Krieger () + Copyright (c) 2008-2020 Jan W. Krieger () last modification: $LastChangedDate$ (revision $Rev$) diff --git a/lib/jkqtcommon/jkqtpstatgrouped.cpp b/lib/jkqtcommon/jkqtpstatgrouped.cpp index 422ad0eadf..1a1bd6d083 100644 --- a/lib/jkqtcommon/jkqtpstatgrouped.cpp +++ b/lib/jkqtcommon/jkqtpstatgrouped.cpp @@ -1,5 +1,5 @@ /* - Copyright (c) 2008-2019 Jan W. Krieger () + Copyright (c) 2008-2020 Jan W. Krieger () last modification: $LastChangedDate$ (revision $Rev$) diff --git a/lib/jkqtcommon/jkqtpstatgrouped.h b/lib/jkqtcommon/jkqtpstatgrouped.h index 8fdec85f76..f0d91940ed 100644 --- a/lib/jkqtcommon/jkqtpstatgrouped.h +++ b/lib/jkqtcommon/jkqtpstatgrouped.h @@ -1,5 +1,5 @@ /* - Copyright (c) 2008-2019 Jan W. Krieger () + Copyright (c) 2008-2020 Jan W. Krieger () last modification: $LastChangedDate$ (revision $Rev$) diff --git a/lib/jkqtcommon/jkqtpstathistogram.cpp b/lib/jkqtcommon/jkqtpstathistogram.cpp index 144c071cdb..1246d80ecd 100644 --- a/lib/jkqtcommon/jkqtpstathistogram.cpp +++ b/lib/jkqtcommon/jkqtpstathistogram.cpp @@ -1,5 +1,5 @@ /* - Copyright (c) 2008-2019 Jan W. Krieger () + Copyright (c) 2008-2020 Jan W. Krieger () last modification: $LastChangedDate$ (revision $Rev$) diff --git a/lib/jkqtcommon/jkqtpstathistogram.h b/lib/jkqtcommon/jkqtpstathistogram.h index 9a0b1c1608..e1537788bd 100644 --- a/lib/jkqtcommon/jkqtpstathistogram.h +++ b/lib/jkqtcommon/jkqtpstathistogram.h @@ -1,5 +1,5 @@ /* - Copyright (c) 2008-2019 Jan W. Krieger () + Copyright (c) 2008-2020 Jan W. Krieger () last modification: $LastChangedDate$ (revision $Rev$) diff --git a/lib/jkqtcommon/jkqtpstatisticstools.h b/lib/jkqtcommon/jkqtpstatisticstools.h index bc2f4527c0..7e7b6d6283 100644 --- a/lib/jkqtcommon/jkqtpstatisticstools.h +++ b/lib/jkqtcommon/jkqtpstatisticstools.h @@ -1,5 +1,5 @@ /* - Copyright (c) 2008-2019 Jan W. Krieger () + Copyright (c) 2008-2020 Jan W. Krieger () last modification: $LastChangedDate$ (revision $Rev$) diff --git a/lib/jkqtcommon/jkqtpstatkde.cpp b/lib/jkqtcommon/jkqtpstatkde.cpp index 544c66211f..7248305029 100644 --- a/lib/jkqtcommon/jkqtpstatkde.cpp +++ b/lib/jkqtcommon/jkqtpstatkde.cpp @@ -1,5 +1,5 @@ /* - Copyright (c) 2008-2019 Jan W. Krieger () + Copyright (c) 2008-2020 Jan W. Krieger () last modification: $LastChangedDate$ (revision $Rev$) diff --git a/lib/jkqtcommon/jkqtpstatkde.h b/lib/jkqtcommon/jkqtpstatkde.h index ae976be442..dd039f92fc 100644 --- a/lib/jkqtcommon/jkqtpstatkde.h +++ b/lib/jkqtcommon/jkqtpstatkde.h @@ -1,5 +1,5 @@ /* - Copyright (c) 2008-2019 Jan W. Krieger () + Copyright (c) 2008-2020 Jan W. Krieger () last modification: $LastChangedDate$ (revision $Rev$) diff --git a/lib/jkqtcommon/jkqtpstatpoly.cpp b/lib/jkqtcommon/jkqtpstatpoly.cpp index 1c1f707dfb..2c276c4c7a 100644 --- a/lib/jkqtcommon/jkqtpstatpoly.cpp +++ b/lib/jkqtcommon/jkqtpstatpoly.cpp @@ -1,5 +1,5 @@ /* - Copyright (c) 2008-2019 Jan W. Krieger () + Copyright (c) 2008-2020 Jan W. Krieger () last modification: $LastChangedDate$ (revision $Rev$) diff --git a/lib/jkqtcommon/jkqtpstatpoly.h b/lib/jkqtcommon/jkqtpstatpoly.h index 7c2ed8cebc..d5898a67cb 100644 --- a/lib/jkqtcommon/jkqtpstatpoly.h +++ b/lib/jkqtcommon/jkqtpstatpoly.h @@ -1,5 +1,5 @@ /* - Copyright (c) 2008-2019 Jan W. Krieger () + Copyright (c) 2008-2020 Jan W. Krieger () last modification: $LastChangedDate$ (revision $Rev$) diff --git a/lib/jkqtcommon/jkqtpstatregression.cpp b/lib/jkqtcommon/jkqtpstatregression.cpp index be106ec15a..c399f997d7 100644 --- a/lib/jkqtcommon/jkqtpstatregression.cpp +++ b/lib/jkqtcommon/jkqtpstatregression.cpp @@ -1,5 +1,5 @@ /* - Copyright (c) 2008-2019 Jan W. Krieger () + Copyright (c) 2008-2020 Jan W. Krieger () last modification: $LastChangedDate$ (revision $Rev$) diff --git a/lib/jkqtcommon/jkqtpstatregression.h b/lib/jkqtcommon/jkqtpstatregression.h index db6af830fb..782b507b3c 100644 --- a/lib/jkqtcommon/jkqtpstatregression.h +++ b/lib/jkqtcommon/jkqtpstatregression.h @@ -1,5 +1,5 @@ /* - Copyright (c) 2008-2019 Jan W. Krieger () + Copyright (c) 2008-2020 Jan W. Krieger () last modification: $LastChangedDate$ (revision $Rev$) diff --git a/lib/jkqtcommon/jkqtpstringtools.cpp b/lib/jkqtcommon/jkqtpstringtools.cpp index 72a56fdb34..261ae2e0eb 100644 --- a/lib/jkqtcommon/jkqtpstringtools.cpp +++ b/lib/jkqtcommon/jkqtpstringtools.cpp @@ -1,5 +1,5 @@ /* -Copyright (c) 2008-2019 Jan W. Krieger () +Copyright (c) 2008-2020 Jan W. Krieger () diff --git a/lib/jkqtcommon/jkqtpstringtools.h b/lib/jkqtcommon/jkqtpstringtools.h index 0910a204f1..83ca5a4b90 100644 --- a/lib/jkqtcommon/jkqtpstringtools.h +++ b/lib/jkqtcommon/jkqtpstringtools.h @@ -1,5 +1,5 @@ /* - Copyright (c) 2008-2019 Jan W. Krieger (, ) + Copyright (c) 2008-2020 Jan W. Krieger () diff --git a/lib/jkqtcommon/jkqttools.cpp b/lib/jkqtcommon/jkqttools.cpp index 3816aea190..1c27c20f89 100644 --- a/lib/jkqtcommon/jkqttools.cpp +++ b/lib/jkqtcommon/jkqttools.cpp @@ -1,5 +1,5 @@ /* - Copyright (c) 2008-2019 Jan W. Krieger () + Copyright (c) 2008-2020 Jan W. Krieger () last modification: $LastChangedDate$ (revision $Rev$) diff --git a/lib/jkqtcommon/jkqttools.h b/lib/jkqtcommon/jkqttools.h index 6ae255016e..37dcc6a2ca 100644 --- a/lib/jkqtcommon/jkqttools.h +++ b/lib/jkqtcommon/jkqttools.h @@ -1,5 +1,5 @@ /* - Copyright (c) 2008-2019 Jan W. Krieger () + Copyright (c) 2008-2020 Jan W. Krieger () last modification: $LastChangedDate$ (revision $Rev$) diff --git a/lib/jkqtfastplotter/jkqtfastplotter.cpp b/lib/jkqtfastplotter/jkqtfastplotter.cpp index 694c8f192d..bdf8f2ae41 100644 --- a/lib/jkqtfastplotter/jkqtfastplotter.cpp +++ b/lib/jkqtfastplotter/jkqtfastplotter.cpp @@ -1,5 +1,5 @@ /* - Copyright (c) 2008-2019 Jan W. Krieger (, ) (DKFZ) & IWR, University of Heidelberg + Copyright (c) 2008-2020 Jan W. Krieger () (DKFZ) & IWR, University of Heidelberg diff --git a/lib/jkqtfastplotter/jkqtfastplotter.h b/lib/jkqtfastplotter/jkqtfastplotter.h index cee7dc2c44..8a2c7cca28 100644 --- a/lib/jkqtfastplotter/jkqtfastplotter.h +++ b/lib/jkqtfastplotter/jkqtfastplotter.h @@ -1,5 +1,5 @@ /* - Copyright (c) 2008-2019 Jan W. Krieger (, ) (DKFZ) & IWR, University of Heidelberg + Copyright (c) 2008-2020 Jan W. Krieger () (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; diff --git a/lib/jkqtfastplotter/jkqtfastplotter_imexport.h b/lib/jkqtfastplotter/jkqtfastplotter_imexport.h index b3eaad5ad4..431afb7389 100644 --- a/lib/jkqtfastplotter/jkqtfastplotter_imexport.h +++ b/lib/jkqtfastplotter/jkqtfastplotter_imexport.h @@ -3,7 +3,7 @@ /* - Copyright (c) 2008-2019 Jan W. Krieger () + Copyright (c) 2008-2020 Jan W. Krieger () last modification: $LastChangedDate: 2015-04-02 13:55:22 +0200 (Do, 02 Apr 2015) $ (revision $Rev: 3902 $) diff --git a/lib/jkqtmathtext/jkqtmathtext.cpp b/lib/jkqtmathtext/jkqtmathtext.cpp index f3f416fc3f..55cf3f3a18 100644 --- a/lib/jkqtmathtext/jkqtmathtext.cpp +++ b/lib/jkqtmathtext/jkqtmathtext.cpp @@ -1,5 +1,5 @@ /* - Copyright (c) 2008-2019 Jan W. Krieger () + Copyright (c) 2008-2020 Jan W. Krieger () diff --git a/lib/jkqtmathtext/jkqtmathtext.h b/lib/jkqtmathtext/jkqtmathtext.h index 163a07c828..bb212c8436 100644 --- a/lib/jkqtmathtext/jkqtmathtext.h +++ b/lib/jkqtmathtext/jkqtmathtext.h @@ -1,5 +1,5 @@ /* - Copyright (c) 2008-2019 Jan W. Krieger () + Copyright (c) 2008-2020 Jan W. Krieger () with contributions from: Razi Alavizadeh diff --git a/lib/jkqtmathtext/jkqtmathtext_imexport.h b/lib/jkqtmathtext/jkqtmathtext_imexport.h index 59e9515710..e1e2354996 100644 --- a/lib/jkqtmathtext/jkqtmathtext_imexport.h +++ b/lib/jkqtmathtext/jkqtmathtext_imexport.h @@ -3,7 +3,7 @@ /* - Copyright (c) 2008-2019 Jan W. Krieger () + Copyright (c) 2008-2020 Jan W. Krieger () last modification: $LastChangedDate: 2015-04-02 13:55:22 +0200 (Do, 02 Apr 2015) $ (revision $Rev: 3902 $) diff --git a/lib/jkqtplotter/graphs/jkqtpbarchart.cpp b/lib/jkqtplotter/graphs/jkqtpbarchart.cpp index 9d69f2ca0a..8cd6bcf73e 100644 --- a/lib/jkqtplotter/graphs/jkqtpbarchart.cpp +++ b/lib/jkqtplotter/graphs/jkqtpbarchart.cpp @@ -1,5 +1,5 @@ /* - Copyright (c) 2008-2019 Jan W. Krieger () + Copyright (c) 2008-2020 Jan W. Krieger () diff --git a/lib/jkqtplotter/graphs/jkqtpbarchart.h b/lib/jkqtplotter/graphs/jkqtpbarchart.h index 380813f74c..e1eac8946e 100644 --- a/lib/jkqtplotter/graphs/jkqtpbarchart.h +++ b/lib/jkqtplotter/graphs/jkqtpbarchart.h @@ -1,5 +1,5 @@ /* - Copyright (c) 2008-2019 Jan W. Krieger () + Copyright (c) 2008-2020 Jan W. Krieger () diff --git a/lib/jkqtplotter/graphs/jkqtpboxplot.cpp b/lib/jkqtplotter/graphs/jkqtpboxplot.cpp index a8576ccbfd..d87f596636 100644 --- a/lib/jkqtplotter/graphs/jkqtpboxplot.cpp +++ b/lib/jkqtplotter/graphs/jkqtpboxplot.cpp @@ -1,5 +1,5 @@ /* - Copyright (c) 2008-2019 Jan W. Krieger () + Copyright (c) 2008-2020 Jan W. Krieger () diff --git a/lib/jkqtplotter/graphs/jkqtpboxplot.h b/lib/jkqtplotter/graphs/jkqtpboxplot.h index 5c92352061..f80b06b24e 100644 --- a/lib/jkqtplotter/graphs/jkqtpboxplot.h +++ b/lib/jkqtplotter/graphs/jkqtpboxplot.h @@ -1,5 +1,5 @@ /* - Copyright (c) 2008-2019 Jan W. Krieger () + Copyright (c) 2008-2020 Jan W. Krieger () diff --git a/lib/jkqtplotter/graphs/jkqtpboxplotstylingmixins.cpp b/lib/jkqtplotter/graphs/jkqtpboxplotstylingmixins.cpp index 236da42636..e54531e50d 100644 --- a/lib/jkqtplotter/graphs/jkqtpboxplotstylingmixins.cpp +++ b/lib/jkqtplotter/graphs/jkqtpboxplotstylingmixins.cpp @@ -1,5 +1,5 @@ /* - Copyright (c) 2008-2019 Jan W. Krieger () + Copyright (c) 2008-2020 Jan W. Krieger () diff --git a/lib/jkqtplotter/graphs/jkqtpboxplotstylingmixins.h b/lib/jkqtplotter/graphs/jkqtpboxplotstylingmixins.h index c64427efdc..796c087463 100644 --- a/lib/jkqtplotter/graphs/jkqtpboxplotstylingmixins.h +++ b/lib/jkqtplotter/graphs/jkqtpboxplotstylingmixins.h @@ -1,5 +1,5 @@ /* - Copyright (c) 2008-2019 Jan W. Krieger () + Copyright (c) 2008-2020 Jan W. Krieger () diff --git a/lib/jkqtplotter/graphs/jkqtpcontour.cpp b/lib/jkqtplotter/graphs/jkqtpcontour.cpp index 8ff404dfaf..58559e1db0 100644 --- a/lib/jkqtplotter/graphs/jkqtpcontour.cpp +++ b/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) diff --git a/lib/jkqtplotter/graphs/jkqtpcontour.h b/lib/jkqtplotter/graphs/jkqtpcontour.h index 1e03f3271b..9f8e57e00c 100644 --- a/lib/jkqtplotter/graphs/jkqtpcontour.h +++ b/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) diff --git a/lib/jkqtplotter/graphs/jkqtpevaluatedfunction.cpp b/lib/jkqtplotter/graphs/jkqtpevaluatedfunction.cpp index c2d1bd7eb5..a3bf8f6a9b 100644 --- a/lib/jkqtplotter/graphs/jkqtpevaluatedfunction.cpp +++ b/lib/jkqtplotter/graphs/jkqtpevaluatedfunction.cpp @@ -1,5 +1,5 @@ /* - Copyright (c) 2008-2019 Jan W. Krieger () + Copyright (c) 2008-2020 Jan W. Krieger () diff --git a/lib/jkqtplotter/graphs/jkqtpevaluatedfunction.h b/lib/jkqtplotter/graphs/jkqtpevaluatedfunction.h index ee75dc2463..aefcabb7ef 100644 --- a/lib/jkqtplotter/graphs/jkqtpevaluatedfunction.h +++ b/lib/jkqtplotter/graphs/jkqtpevaluatedfunction.h @@ -1,5 +1,5 @@ /* - Copyright (c) 2008-2019 Jan W. Krieger () + Copyright (c) 2008-2020 Jan W. Krieger () diff --git a/lib/jkqtplotter/graphs/jkqtpfilledcurve.cpp b/lib/jkqtplotter/graphs/jkqtpfilledcurve.cpp index cdca16d449..3c67d72cdc 100644 --- a/lib/jkqtplotter/graphs/jkqtpfilledcurve.cpp +++ b/lib/jkqtplotter/graphs/jkqtpfilledcurve.cpp @@ -1,5 +1,5 @@ /* - Copyright (c) 2008-2019 Jan W. Krieger () + Copyright (c) 2008-2020 Jan W. Krieger () diff --git a/lib/jkqtplotter/graphs/jkqtpfilledcurve.h b/lib/jkqtplotter/graphs/jkqtpfilledcurve.h index a038151354..c4e082a28d 100644 --- a/lib/jkqtplotter/graphs/jkqtpfilledcurve.h +++ b/lib/jkqtplotter/graphs/jkqtpfilledcurve.h @@ -1,5 +1,5 @@ /* - Copyright (c) 2008-2019 Jan W. Krieger () + Copyright (c) 2008-2020 Jan W. Krieger () diff --git a/lib/jkqtplotter/graphs/jkqtpimage.cpp b/lib/jkqtplotter/graphs/jkqtpimage.cpp index 39e735e3a5..1492197530 100644 --- a/lib/jkqtplotter/graphs/jkqtpimage.cpp +++ b/lib/jkqtplotter/graphs/jkqtpimage.cpp @@ -1,5 +1,5 @@ /* - Copyright (c) 2008-2019 Jan W. Krieger + Copyright (c) 2008-2020 Jan W. Krieger diff --git a/lib/jkqtplotter/graphs/jkqtpimage.h b/lib/jkqtplotter/graphs/jkqtpimage.h index a192523609..19b6f10eff 100644 --- a/lib/jkqtplotter/graphs/jkqtpimage.h +++ b/lib/jkqtplotter/graphs/jkqtpimage.h @@ -1,5 +1,5 @@ /* - Copyright (c) 2008-2019 Jan W. Krieger + Copyright (c) 2008-2020 Jan W. Krieger diff --git a/lib/jkqtplotter/graphs/jkqtpimageoverlays.cpp b/lib/jkqtplotter/graphs/jkqtpimageoverlays.cpp index e43a5f14c4..7bef08c422 100644 --- a/lib/jkqtplotter/graphs/jkqtpimageoverlays.cpp +++ b/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) diff --git a/lib/jkqtplotter/graphs/jkqtpimageoverlays.h b/lib/jkqtplotter/graphs/jkqtpimageoverlays.h index 98cc5723cb..0cf995996a 100644 --- a/lib/jkqtplotter/graphs/jkqtpimageoverlays.h +++ b/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) diff --git a/lib/jkqtplotter/graphs/jkqtpimagergb.cpp b/lib/jkqtplotter/graphs/jkqtpimagergb.cpp index 9cc191cbf5..db41ac8592 100644 --- a/lib/jkqtplotter/graphs/jkqtpimagergb.cpp +++ b/lib/jkqtplotter/graphs/jkqtpimagergb.cpp @@ -1,5 +1,5 @@ /* - Copyright (c) 2008-2019 Jan W. Krieger + Copyright (c) 2008-2020 Jan W. Krieger diff --git a/lib/jkqtplotter/graphs/jkqtpimagergb.h b/lib/jkqtplotter/graphs/jkqtpimagergb.h index 311cf99961..2294ac2a09 100644 --- a/lib/jkqtplotter/graphs/jkqtpimagergb.h +++ b/lib/jkqtplotter/graphs/jkqtpimagergb.h @@ -1,5 +1,5 @@ /* - Copyright (c) 2008-2019 Jan W. Krieger + Copyright (c) 2008-2020 Jan W. Krieger diff --git a/lib/jkqtplotter/graphs/jkqtpimpulses.cpp b/lib/jkqtplotter/graphs/jkqtpimpulses.cpp index 5a741336e5..414c7d05fc 100644 --- a/lib/jkqtplotter/graphs/jkqtpimpulses.cpp +++ b/lib/jkqtplotter/graphs/jkqtpimpulses.cpp @@ -1,5 +1,5 @@ /* - Copyright (c) 2008-2019 Jan W. Krieger () + Copyright (c) 2008-2020 Jan W. Krieger () diff --git a/lib/jkqtplotter/graphs/jkqtpimpulses.h b/lib/jkqtplotter/graphs/jkqtpimpulses.h index 303ef4747d..9a8ab02638 100644 --- a/lib/jkqtplotter/graphs/jkqtpimpulses.h +++ b/lib/jkqtplotter/graphs/jkqtpimpulses.h @@ -1,5 +1,5 @@ /* - Copyright (c) 2008-2019 Jan W. Krieger () + Copyright (c) 2008-2020 Jan W. Krieger () diff --git a/lib/jkqtplotter/graphs/jkqtpparsedfunction.cpp b/lib/jkqtplotter/graphs/jkqtpparsedfunction.cpp index 98c84f22ff..f6e74968dc 100644 --- a/lib/jkqtplotter/graphs/jkqtpparsedfunction.cpp +++ b/lib/jkqtplotter/graphs/jkqtpparsedfunction.cpp @@ -1,5 +1,5 @@ /* - Copyright (c) 2008-2019 Jan W. Krieger () + Copyright (c) 2008-2020 Jan W. Krieger () diff --git a/lib/jkqtplotter/graphs/jkqtpparsedfunction.h b/lib/jkqtplotter/graphs/jkqtpparsedfunction.h index 597c2807ff..a0735e09fa 100644 --- a/lib/jkqtplotter/graphs/jkqtpparsedfunction.h +++ b/lib/jkqtplotter/graphs/jkqtpparsedfunction.h @@ -1,5 +1,5 @@ /* - Copyright (c) 2008-2019 Jan W. Krieger () + Copyright (c) 2008-2020 Jan W. Krieger () diff --git a/lib/jkqtplotter/graphs/jkqtppeakstream.cpp b/lib/jkqtplotter/graphs/jkqtppeakstream.cpp index ab213a0ae1..2fb6f5f218 100644 --- a/lib/jkqtplotter/graphs/jkqtppeakstream.cpp +++ b/lib/jkqtplotter/graphs/jkqtppeakstream.cpp @@ -1,5 +1,5 @@ /* - Copyright (c) 2008-2019 Jan W. Krieger () + Copyright (c) 2008-2020 Jan W. Krieger () diff --git a/lib/jkqtplotter/graphs/jkqtppeakstream.h b/lib/jkqtplotter/graphs/jkqtppeakstream.h index 369e16d1d1..83d4e3e9b8 100644 --- a/lib/jkqtplotter/graphs/jkqtppeakstream.h +++ b/lib/jkqtplotter/graphs/jkqtppeakstream.h @@ -1,5 +1,5 @@ /* - Copyright (c) 2008-2019 Jan W. Krieger () + Copyright (c) 2008-2020 Jan W. Krieger () diff --git a/lib/jkqtplotter/graphs/jkqtprange.cpp b/lib/jkqtplotter/graphs/jkqtprange.cpp index 6c6fc8d9df..6081c0c2b8 100644 --- a/lib/jkqtplotter/graphs/jkqtprange.cpp +++ b/lib/jkqtplotter/graphs/jkqtprange.cpp @@ -1,5 +1,5 @@ /* - Copyright (c) 2008-2019 Jan W. Krieger () + Copyright (c) 2008-2020 Jan W. Krieger () diff --git a/lib/jkqtplotter/graphs/jkqtprange.h b/lib/jkqtplotter/graphs/jkqtprange.h index 6140535331..7ac06cf81a 100644 --- a/lib/jkqtplotter/graphs/jkqtprange.h +++ b/lib/jkqtplotter/graphs/jkqtprange.h @@ -1,5 +1,5 @@ /* - Copyright (c) 2008-2019 Jan W. Krieger () + Copyright (c) 2008-2020 Jan W. Krieger () diff --git a/lib/jkqtplotter/graphs/jkqtpscatter.cpp b/lib/jkqtplotter/graphs/jkqtpscatter.cpp index 1d09e920f7..c9f3eec694 100644 --- a/lib/jkqtplotter/graphs/jkqtpscatter.cpp +++ b/lib/jkqtplotter/graphs/jkqtpscatter.cpp @@ -1,5 +1,5 @@ /* - Copyright (c) 2008-2019 Jan W. Krieger () + Copyright (c) 2008-2020 Jan W. Krieger () diff --git a/lib/jkqtplotter/graphs/jkqtpscatter.h b/lib/jkqtplotter/graphs/jkqtpscatter.h index c86415c28b..93f25bd808 100644 --- a/lib/jkqtplotter/graphs/jkqtpscatter.h +++ b/lib/jkqtplotter/graphs/jkqtpscatter.h @@ -1,5 +1,5 @@ /* - Copyright (c) 2008-2019 Jan W. Krieger () + Copyright (c) 2008-2020 Jan W. Krieger () diff --git a/lib/jkqtplotter/graphs/jkqtpsinglecolumnsymbols.cpp b/lib/jkqtplotter/graphs/jkqtpsinglecolumnsymbols.cpp index 6f34140287..445a701ef5 100644 --- a/lib/jkqtplotter/graphs/jkqtpsinglecolumnsymbols.cpp +++ b/lib/jkqtplotter/graphs/jkqtpsinglecolumnsymbols.cpp @@ -1,5 +1,5 @@ /* - Copyright (c) 2008-2019 Jan W. Krieger () + Copyright (c) 2008-2020 Jan W. Krieger () diff --git a/lib/jkqtplotter/graphs/jkqtpsinglecolumnsymbols.h b/lib/jkqtplotter/graphs/jkqtpsinglecolumnsymbols.h index 94ca7d00b7..eb47b7e63c 100644 --- a/lib/jkqtplotter/graphs/jkqtpsinglecolumnsymbols.h +++ b/lib/jkqtplotter/graphs/jkqtpsinglecolumnsymbols.h @@ -1,5 +1,5 @@ /* - Copyright (c) 2008-2019 Jan W. Krieger () + Copyright (c) 2008-2020 Jan W. Krieger () diff --git a/lib/jkqtplotter/graphs/jkqtpspecialline.cpp b/lib/jkqtplotter/graphs/jkqtpspecialline.cpp index 516b7656d1..916f2b96ce 100644 --- a/lib/jkqtplotter/graphs/jkqtpspecialline.cpp +++ b/lib/jkqtplotter/graphs/jkqtpspecialline.cpp @@ -1,5 +1,5 @@ /* - Copyright (c) 2008-2019 Jan W. Krieger () + Copyright (c) 2008-2020 Jan W. Krieger () diff --git a/lib/jkqtplotter/graphs/jkqtpspecialline.h b/lib/jkqtplotter/graphs/jkqtpspecialline.h index 89c81dfa14..3a1f8a280f 100644 --- a/lib/jkqtplotter/graphs/jkqtpspecialline.h +++ b/lib/jkqtplotter/graphs/jkqtpspecialline.h @@ -1,5 +1,5 @@ /* - Copyright (c) 2008-2019 Jan W. Krieger () + Copyright (c) 2008-2020 Jan W. Krieger () diff --git a/lib/jkqtplotter/graphs/jkqtpstatisticsadaptors.cpp b/lib/jkqtplotter/graphs/jkqtpstatisticsadaptors.cpp index 0fce3a9b2e..1d9e3ba43d 100644 --- a/lib/jkqtplotter/graphs/jkqtpstatisticsadaptors.cpp +++ b/lib/jkqtplotter/graphs/jkqtpstatisticsadaptors.cpp @@ -1,5 +1,5 @@ /* - Copyright (c) 2008-2019 Jan W. Krieger () + Copyright (c) 2008-2020 Jan W. Krieger () diff --git a/lib/jkqtplotter/graphs/jkqtpstatisticsadaptors.h b/lib/jkqtplotter/graphs/jkqtpstatisticsadaptors.h index 4e12e4f8be..a32b9bb381 100644 --- a/lib/jkqtplotter/graphs/jkqtpstatisticsadaptors.h +++ b/lib/jkqtplotter/graphs/jkqtpstatisticsadaptors.h @@ -1,5 +1,5 @@ /* - Copyright (c) 2008-2019 Jan W. Krieger () + Copyright (c) 2008-2020 Jan W. Krieger () diff --git a/lib/jkqtplotter/graphs/jkqtpviolinplot.cpp b/lib/jkqtplotter/graphs/jkqtpviolinplot.cpp index b4a1e12ced..13a0a0858b 100644 --- a/lib/jkqtplotter/graphs/jkqtpviolinplot.cpp +++ b/lib/jkqtplotter/graphs/jkqtpviolinplot.cpp @@ -1,5 +1,5 @@ /* - Copyright (c) 2008-2019 Jan W. Krieger () + Copyright (c) 2008-2020 Jan W. Krieger () diff --git a/lib/jkqtplotter/graphs/jkqtpviolinplot.h b/lib/jkqtplotter/graphs/jkqtpviolinplot.h index 5bb375bf87..0b3c40e1b7 100644 --- a/lib/jkqtplotter/graphs/jkqtpviolinplot.h +++ b/lib/jkqtplotter/graphs/jkqtpviolinplot.h @@ -1,5 +1,5 @@ /* - Copyright (c) 2008-2019 Jan W. Krieger () + Copyright (c) 2008-2020 Jan W. Krieger () diff --git a/lib/jkqtplotter/graphs/jkqtpviolinplotstylingmixins.cpp b/lib/jkqtplotter/graphs/jkqtpviolinplotstylingmixins.cpp index 2dedc75ff7..ad8548e532 100644 --- a/lib/jkqtplotter/graphs/jkqtpviolinplotstylingmixins.cpp +++ b/lib/jkqtplotter/graphs/jkqtpviolinplotstylingmixins.cpp @@ -1,5 +1,5 @@ /* - Copyright (c) 2008-2019 Jan W. Krieger () + Copyright (c) 2008-2020 Jan W. Krieger () diff --git a/lib/jkqtplotter/graphs/jkqtpviolinplotstylingmixins.h b/lib/jkqtplotter/graphs/jkqtpviolinplotstylingmixins.h index c1f0fcaca1..a1015709c5 100644 --- a/lib/jkqtplotter/graphs/jkqtpviolinplotstylingmixins.h +++ b/lib/jkqtplotter/graphs/jkqtpviolinplotstylingmixins.h @@ -1,5 +1,5 @@ /* - Copyright (c) 2008-2019 Jan W. Krieger () + Copyright (c) 2008-2020 Jan W. Krieger () diff --git a/lib/jkqtplotter/gui/jkqtpcomboboxes.cpp b/lib/jkqtplotter/gui/jkqtpcomboboxes.cpp index 60a986d7ef..19d3f70f79 100644 --- a/lib/jkqtplotter/gui/jkqtpcomboboxes.cpp +++ b/lib/jkqtplotter/gui/jkqtpcomboboxes.cpp @@ -1,5 +1,5 @@ /* - Copyright (c) 2008-2019 Jan W. Krieger (, ) + Copyright (c) 2008-2020 Jan W. Krieger () diff --git a/lib/jkqtplotter/gui/jkqtpcomboboxes.h b/lib/jkqtplotter/gui/jkqtpcomboboxes.h index 3290a046e9..7b81159d28 100644 --- a/lib/jkqtplotter/gui/jkqtpcomboboxes.h +++ b/lib/jkqtplotter/gui/jkqtpcomboboxes.h @@ -1,5 +1,5 @@ /* - Copyright (c) 2008-2019 Jan W. Krieger () + Copyright (c) 2008-2020 Jan W. Krieger () diff --git a/lib/jkqtplotter/gui/jkqtpenhancedspinboxes.cpp b/lib/jkqtplotter/gui/jkqtpenhancedspinboxes.cpp index 06162e7876..ff7da91121 100644 --- a/lib/jkqtplotter/gui/jkqtpenhancedspinboxes.cpp +++ b/lib/jkqtplotter/gui/jkqtpenhancedspinboxes.cpp @@ -1,5 +1,5 @@ /* -Copyright (c) 2008-2019 Jan W. Krieger () +Copyright (c) 2008-2020 Jan W. Krieger () diff --git a/lib/jkqtplotter/gui/jkqtpenhancedspinboxes.h b/lib/jkqtplotter/gui/jkqtpenhancedspinboxes.h index 4843a8b9ca..878c2d77e9 100644 --- a/lib/jkqtplotter/gui/jkqtpenhancedspinboxes.h +++ b/lib/jkqtplotter/gui/jkqtpenhancedspinboxes.h @@ -1,5 +1,5 @@ /* - Copyright (c) 2008-2019 Jan W. Krieger (, ) + Copyright (c) 2008-2020 Jan W. Krieger () diff --git a/lib/jkqtplotter/gui/jkqtpenhancedtableview.cpp b/lib/jkqtplotter/gui/jkqtpenhancedtableview.cpp index 9ab6d180f6..7eaefd4ec2 100644 --- a/lib/jkqtplotter/gui/jkqtpenhancedtableview.cpp +++ b/lib/jkqtplotter/gui/jkqtpenhancedtableview.cpp @@ -1,5 +1,5 @@ /* -Copyright (c) 2008-2019 Jan W. Krieger () +Copyright (c) 2008-2020 Jan W. Krieger () diff --git a/lib/jkqtplotter/gui/jkqtpenhancedtableview.h b/lib/jkqtplotter/gui/jkqtpenhancedtableview.h index 2c24214bd7..939b51d9a5 100644 --- a/lib/jkqtplotter/gui/jkqtpenhancedtableview.h +++ b/lib/jkqtplotter/gui/jkqtpenhancedtableview.h @@ -1,5 +1,5 @@ /* - Copyright (c) 2008-2019 Jan W. Krieger (, ) + Copyright (c) 2008-2020 Jan W. Krieger () diff --git a/lib/jkqtplotter/gui/jkqtpgraphsmodel.cpp b/lib/jkqtplotter/gui/jkqtpgraphsmodel.cpp index 70ad3f34dd..f17dcdd630 100644 --- a/lib/jkqtplotter/gui/jkqtpgraphsmodel.cpp +++ b/lib/jkqtplotter/gui/jkqtpgraphsmodel.cpp @@ -1,5 +1,5 @@ /* - Copyright (c) 2008-2019 Jan W. Krieger (, ) + Copyright (c) 2008-2020 Jan W. Krieger () diff --git a/lib/jkqtplotter/gui/jkqtpgraphsmodel.h b/lib/jkqtplotter/gui/jkqtpgraphsmodel.h index 23f259a1f4..ec173a1719 100644 --- a/lib/jkqtplotter/gui/jkqtpgraphsmodel.h +++ b/lib/jkqtplotter/gui/jkqtpgraphsmodel.h @@ -1,5 +1,5 @@ /* - Copyright (c) 2008-2019 Jan W. Krieger () + Copyright (c) 2008-2020 Jan W. Krieger () diff --git a/lib/jkqtplotter/gui/jkvanishqtoolbar.cpp b/lib/jkqtplotter/gui/jkvanishqtoolbar.cpp index 8584afc9b3..d54300daa3 100644 --- a/lib/jkqtplotter/gui/jkvanishqtoolbar.cpp +++ b/lib/jkqtplotter/gui/jkvanishqtoolbar.cpp @@ -1,5 +1,5 @@ /* - Copyright (c) 2008-2019 Jan W. Krieger (, ) + Copyright (c) 2008-2020 Jan W. Krieger () diff --git a/lib/jkqtplotter/gui/jkvanishqtoolbar.h b/lib/jkqtplotter/gui/jkvanishqtoolbar.h index 2a9c6a6b26..e1f719a6f9 100644 --- a/lib/jkqtplotter/gui/jkvanishqtoolbar.h +++ b/lib/jkqtplotter/gui/jkvanishqtoolbar.h @@ -1,5 +1,5 @@ /* - Copyright (c) 2008-2019 Jan W. Krieger () + Copyright (c) 2008-2020 Jan W. Krieger () diff --git a/lib/jkqtplotter/jkqtpbaseelements.cpp b/lib/jkqtplotter/jkqtpbaseelements.cpp index 86f11e987f..eb6d082931 100644 --- a/lib/jkqtplotter/jkqtpbaseelements.cpp +++ b/lib/jkqtplotter/jkqtpbaseelements.cpp @@ -1,5 +1,5 @@ /* - Copyright (c) 2008-2019 Jan W. Krieger () + Copyright (c) 2008-2020 Jan W. Krieger () diff --git a/lib/jkqtplotter/jkqtpbaseelements.h b/lib/jkqtplotter/jkqtpbaseelements.h index 5a200a0ce5..8aaf115170 100644 --- a/lib/jkqtplotter/jkqtpbaseelements.h +++ b/lib/jkqtplotter/jkqtpbaseelements.h @@ -1,5 +1,5 @@ /* - Copyright (c) 2008-2019 Jan W. Krieger () + Copyright (c) 2008-2020 Jan W. Krieger () diff --git a/lib/jkqtplotter/jkqtpbaseplotter.cpp b/lib/jkqtplotter/jkqtpbaseplotter.cpp index 5043929a05..d8a0f0a738 100644 --- a/lib/jkqtplotter/jkqtpbaseplotter.cpp +++ b/lib/jkqtplotter/jkqtpbaseplotter.cpp @@ -1,5 +1,5 @@ /* - Copyright (c) 2008-2019 Jan W. Krieger (, ) + Copyright (c) 2008-2020 Jan W. Krieger () @@ -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); - } + printpreviewPaintRequestedNew(printer); } else { printpreviewPaintRequestedNew(paintDevice); } diff --git a/lib/jkqtplotter/jkqtpbaseplotter.h b/lib/jkqtplotter/jkqtpbaseplotter.h index 6e9e5f4091..2f9be8c2bc 100644 --- a/lib/jkqtplotter/jkqtpbaseplotter.h +++ b/lib/jkqtplotter/jkqtpbaseplotter.h @@ -1,5 +1,5 @@ /* - Copyright (c) 2008-2019 Jan W. Krieger () + Copyright (c) 2008-2020 Jan W. Krieger () diff --git a/lib/jkqtplotter/jkqtpbaseplotterstyle.h b/lib/jkqtplotter/jkqtpbaseplotterstyle.h index 06dc35d7cd..b6714e0b1c 100644 --- a/lib/jkqtplotter/jkqtpbaseplotterstyle.h +++ b/lib/jkqtplotter/jkqtpbaseplotterstyle.h @@ -1,5 +1,5 @@ /* - Copyright (c) 2008-2019 Jan W. Krieger (, ) + Copyright (c) 2008-2020 Jan W. Krieger () diff --git a/lib/jkqtplotter/jkqtpcoordinateaxes.cpp b/lib/jkqtplotter/jkqtpcoordinateaxes.cpp index 3a758a8511..4b913566f8 100644 --- a/lib/jkqtplotter/jkqtpcoordinateaxes.cpp +++ b/lib/jkqtplotter/jkqtpcoordinateaxes.cpp @@ -1,5 +1,5 @@ /* - Copyright (c) 2008-2019 Jan W. Krieger () + Copyright (c) 2008-2020 Jan W. Krieger () diff --git a/lib/jkqtplotter/jkqtpcoordinateaxes.h b/lib/jkqtplotter/jkqtpcoordinateaxes.h index e6780cb8f5..2b7ea42758 100644 --- a/lib/jkqtplotter/jkqtpcoordinateaxes.h +++ b/lib/jkqtplotter/jkqtpcoordinateaxes.h @@ -1,5 +1,5 @@ /* - Copyright (c) 2008-2019 Jan W. Krieger () + Copyright (c) 2008-2020 Jan W. Krieger () diff --git a/lib/jkqtplotter/jkqtpcoordinateaxesstyle.h b/lib/jkqtplotter/jkqtpcoordinateaxesstyle.h index fbf4112ef8..103f6434d9 100644 --- a/lib/jkqtplotter/jkqtpcoordinateaxesstyle.h +++ b/lib/jkqtplotter/jkqtpcoordinateaxesstyle.h @@ -1,5 +1,5 @@ /* - Copyright (c) 2008-2019 Jan W. Krieger (, ) + Copyright (c) 2008-2020 Jan W. Krieger () diff --git a/lib/jkqtplotter/jkqtpdatastorage.cpp b/lib/jkqtplotter/jkqtpdatastorage.cpp index 89330c6f6f..5c637f7249 100644 --- a/lib/jkqtplotter/jkqtpdatastorage.cpp +++ b/lib/jkqtplotter/jkqtpdatastorage.cpp @@ -1,5 +1,5 @@ /* - Copyright (c) 2008-2019 Jan W. Krieger () + Copyright (c) 2008-2020 Jan W. Krieger () diff --git a/lib/jkqtplotter/jkqtpdatastorage.h b/lib/jkqtplotter/jkqtpdatastorage.h index 2d88aa8527..8f48c4493f 100644 --- a/lib/jkqtplotter/jkqtpdatastorage.h +++ b/lib/jkqtplotter/jkqtpdatastorage.h @@ -1,5 +1,5 @@ /* - Copyright (c) 2008-2019 Jan W. Krieger () + Copyright (c) 2008-2020 Jan W. Krieger () diff --git a/lib/jkqtplotter/jkqtpgraphsbase.cpp b/lib/jkqtplotter/jkqtpgraphsbase.cpp index 1937a05155..08523a7ad1 100644 --- a/lib/jkqtplotter/jkqtpgraphsbase.cpp +++ b/lib/jkqtplotter/jkqtpgraphsbase.cpp @@ -1,5 +1,5 @@ /* - Copyright (c) 2008-2019 Jan W. Krieger () + Copyright (c) 2008-2020 Jan W. Krieger () @@ -509,10 +509,8 @@ double JKQTPXYGraph::hitTest(const QPointF &posSystem, QPointF *closestSpotSyste JKQTPSingleColumnGraph::JKQTPSingleColumnGraph(JKQTBasePlotter *parent): - JKQTPGraph(parent) + JKQTPGraph(parent), dataColumn(-1), dataDirection(DataDirection::Y), sortData(Unsorted) { - sortData=Unsorted; - dataColumn=-1; } diff --git a/lib/jkqtplotter/jkqtpgraphsbase.h b/lib/jkqtplotter/jkqtpgraphsbase.h index 3419ed989c..64ed0b4ea1 100644 --- a/lib/jkqtplotter/jkqtpgraphsbase.h +++ b/lib/jkqtplotter/jkqtpgraphsbase.h @@ -1,5 +1,5 @@ /* - Copyright (c) 2008-2019 Jan W. Krieger () + Copyright (c) 2008-2020 Jan W. Krieger () diff --git a/lib/jkqtplotter/jkqtpgraphsbaseerrors.cpp b/lib/jkqtplotter/jkqtpgraphsbaseerrors.cpp index 2f95573a5e..c87ab9e237 100644 --- a/lib/jkqtplotter/jkqtpgraphsbaseerrors.cpp +++ b/lib/jkqtplotter/jkqtpgraphsbaseerrors.cpp @@ -1,5 +1,5 @@ /* - Copyright (c) 2008-2019 Jan W. Krieger () + Copyright (c) 2008-2020 Jan W. Krieger () diff --git a/lib/jkqtplotter/jkqtpgraphsbaseerrors.h b/lib/jkqtplotter/jkqtpgraphsbaseerrors.h index 81b68dd777..e7a3ccb361 100644 --- a/lib/jkqtplotter/jkqtpgraphsbaseerrors.h +++ b/lib/jkqtplotter/jkqtpgraphsbaseerrors.h @@ -1,5 +1,5 @@ /* - Copyright (c) 2008-2019 Jan W. Krieger () + Copyright (c) 2008-2020 Jan W. Krieger () diff --git a/lib/jkqtplotter/jkqtpgraphsbasestylingmixins.cpp b/lib/jkqtplotter/jkqtpgraphsbasestylingmixins.cpp index dcd010480b..92d78a4dab 100644 --- a/lib/jkqtplotter/jkqtpgraphsbasestylingmixins.cpp +++ b/lib/jkqtplotter/jkqtpgraphsbasestylingmixins.cpp @@ -1,5 +1,5 @@ /* - Copyright (c) 2008-2019 Jan W. Krieger () + Copyright (c) 2008-2020 Jan W. Krieger () diff --git a/lib/jkqtplotter/jkqtpgraphsbasestylingmixins.h b/lib/jkqtplotter/jkqtpgraphsbasestylingmixins.h index ca5a2394e5..381bbaf276 100644 --- a/lib/jkqtplotter/jkqtpgraphsbasestylingmixins.h +++ b/lib/jkqtplotter/jkqtpgraphsbasestylingmixins.h @@ -1,5 +1,5 @@ /* - Copyright (c) 2008-2019 Jan W. Krieger () + Copyright (c) 2008-2020 Jan W. Krieger () diff --git a/lib/jkqtplotter/jkqtpimagetools.cpp b/lib/jkqtplotter/jkqtpimagetools.cpp index 1f7208e6a8..589d6fddb2 100644 --- a/lib/jkqtplotter/jkqtpimagetools.cpp +++ b/lib/jkqtplotter/jkqtpimagetools.cpp @@ -1,5 +1,5 @@ /* - Copyright (c) 2008-2019 Jan W. Krieger () + Copyright (c) 2008-2020 Jan W. Krieger () diff --git a/lib/jkqtplotter/jkqtpimagetools.h b/lib/jkqtplotter/jkqtpimagetools.h index 3700ec0087..d1e0aea7c7 100644 --- a/lib/jkqtplotter/jkqtpimagetools.h +++ b/lib/jkqtplotter/jkqtpimagetools.h @@ -1,5 +1,5 @@ /* - Copyright (c) 2008-2019 Jan W. Krieger () + Copyright (c) 2008-2020 Jan W. Krieger () diff --git a/lib/jkqtplotter/jkqtpinterfacecimg.h b/lib/jkqtplotter/jkqtpinterfacecimg.h index e6900c57ab..b517ea09d7 100644 --- a/lib/jkqtplotter/jkqtpinterfacecimg.h +++ b/lib/jkqtplotter/jkqtpinterfacecimg.h @@ -1,5 +1,5 @@ /* - Copyright (c) 2018-2019 Jan W. Krieger () + Copyright (c) 2018-2020 Jan W. Krieger () diff --git a/lib/jkqtplotter/jkqtpinterfaceopencv.h b/lib/jkqtplotter/jkqtpinterfaceopencv.h index 1f93167e8b..43d1b11aba 100644 --- a/lib/jkqtplotter/jkqtpinterfaceopencv.h +++ b/lib/jkqtplotter/jkqtpinterfaceopencv.h @@ -1,5 +1,5 @@ /* - Copyright (c) 2018-2019 Jan W. Krieger () + Copyright (c) 2018-2020 Jan W. Krieger () diff --git a/lib/jkqtplotter/jkqtpkeystyle.cpp b/lib/jkqtplotter/jkqtpkeystyle.cpp index b4c25172fc..a6dfff807f 100644 --- a/lib/jkqtplotter/jkqtpkeystyle.cpp +++ b/lib/jkqtplotter/jkqtpkeystyle.cpp @@ -1,5 +1,5 @@ /* - Copyright (c) 2008-2019 Jan W. Krieger (, ) + Copyright (c) 2008-2020 Jan W. Krieger () diff --git a/lib/jkqtplotter/jkqtpkeystyle.h b/lib/jkqtplotter/jkqtpkeystyle.h index 680efe232f..a2662b4c48 100644 --- a/lib/jkqtplotter/jkqtpkeystyle.h +++ b/lib/jkqtplotter/jkqtpkeystyle.h @@ -1,5 +1,5 @@ /* - Copyright (c) 2008-2019 Jan W. Krieger (, ) + Copyright (c) 2008-2020 Jan W. Krieger () diff --git a/lib/jkqtplotter/jkqtplotter.cpp b/lib/jkqtplotter/jkqtplotter.cpp index 47610eeead..23581372af 100644 --- a/lib/jkqtplotter/jkqtplotter.cpp +++ b/lib/jkqtplotter/jkqtplotter.cpp @@ -1,5 +1,5 @@ /* - Copyright (c) 2008-2019 Jan W. Krieger () + Copyright (c) 2008-2020 Jan W. Krieger () diff --git a/lib/jkqtplotter/jkqtplotter.h b/lib/jkqtplotter/jkqtplotter.h index 24c753f2fd..54ca185b8e 100644 --- a/lib/jkqtplotter/jkqtplotter.h +++ b/lib/jkqtplotter/jkqtplotter.h @@ -1,5 +1,5 @@ /* - Copyright (c) 2008-2019 Jan W. Krieger (, ) + Copyright (c) 2008-2020 Jan W. Krieger () diff --git a/lib/jkqtplotter/jkqtplotter_imexport.h b/lib/jkqtplotter/jkqtplotter_imexport.h index 4a7d28a537..31a0c1c33b 100644 --- a/lib/jkqtplotter/jkqtplotter_imexport.h +++ b/lib/jkqtplotter/jkqtplotter_imexport.h @@ -3,7 +3,7 @@ /* - Copyright (c) 2008-2019 Jan W. Krieger () + Copyright (c) 2008-2020 Jan W. Krieger () last modification: $LastChangedDate: 2015-04-02 13:55:22 +0200 (Do, 02 Apr 2015) $ (revision $Rev: 3902 $) diff --git a/lib/jkqtplotter/jkqtplotterstyle.h b/lib/jkqtplotter/jkqtplotterstyle.h index ad1b614090..156f09e7cb 100644 --- a/lib/jkqtplotter/jkqtplotterstyle.h +++ b/lib/jkqtplotter/jkqtplotterstyle.h @@ -1,5 +1,5 @@ /* - Copyright (c) 2008-2019 Jan W. Krieger (, ) + Copyright (c) 2008-2020 Jan W. Krieger () diff --git a/lib/jkqtplotter/jkqtpoverlaysbase.cpp b/lib/jkqtplotter/jkqtpoverlaysbase.cpp index 3c1cf7b35e..160986b58c 100644 --- a/lib/jkqtplotter/jkqtpoverlaysbase.cpp +++ b/lib/jkqtplotter/jkqtpoverlaysbase.cpp @@ -1,5 +1,5 @@ /* - Copyright (c) 2008-2019 Jan W. Krieger () + Copyright (c) 2008-2020 Jan W. Krieger () diff --git a/lib/jkqtplotter/jkqtpoverlaysbase.h b/lib/jkqtplotter/jkqtpoverlaysbase.h index 18c8a74d18..a37625ea04 100644 --- a/lib/jkqtplotter/jkqtpoverlaysbase.h +++ b/lib/jkqtplotter/jkqtpoverlaysbase.h @@ -1,5 +1,5 @@ /* - Copyright (c) 2008-2019 Jan W. Krieger () + Copyright (c) 2008-2020 Jan W. Krieger () diff --git a/lib/jkqtplotter/jkqtptools.cpp b/lib/jkqtplotter/jkqtptools.cpp index 3beeeb7615..5d17ec9bf0 100644 --- a/lib/jkqtplotter/jkqtptools.cpp +++ b/lib/jkqtplotter/jkqtptools.cpp @@ -1,5 +1,5 @@ /* -Copyright (c) 2008-2019 Jan W. Krieger () +Copyright (c) 2008-2020 Jan W. Krieger () @@ -56,7 +56,7 @@ QString JKQTPCADrawMode2String(JKQTPCADrawMode pos) { case JKQTPCADMTicksTickLabels: return "ticks+labels"; case JKQTPCADMTicks: return "ticks"; case JKQTPCADMLineTicksTickLabels: return "line+ticks+labels"; - case JKQTPCADMTickLabelsAxisLabel: return "ticks+labels"; + case JKQTPCADMTickLabelsAxisLabel: return "ticks+axislabel"; case JKQTPCADMTickLabels: return "labels"; case JKQTPCADMLineTicks: return "line+ticks"; case JKQTPCADMLine: return "line"; @@ -70,7 +70,6 @@ QString JKQTPCADrawMode2String(JKQTPCADrawMode pos) { JKQTPCADrawMode String2JKQTPCADrawMode(const QString& pos) { QString s=pos.trimmed().toLower(); if (s=="all" || s=="complete" || s=="line+ticks+labels+axislabel") return JKQTPCADMcomplete; - if (s=="ticks+labels") return JKQTPCADMLineTicksTickLabels; if (s=="ticks+labels+axislabel") return JKQTPCADMTicksTickLabelsAxisLabel; if (s=="labels+axislabel") return JKQTPCADMTickLabelsAxisLabel; if (s=="ticks+labels") return JKQTPCADMTicksTickLabels; diff --git a/lib/jkqtplotter/jkqtptools.h b/lib/jkqtplotter/jkqtptools.h index 4c358a28db..2bf9431cdc 100644 --- a/lib/jkqtplotter/jkqtptools.h +++ b/lib/jkqtplotter/jkqtptools.h @@ -1,5 +1,5 @@ /* - Copyright (c) 2008-2019 Jan W. Krieger (, ) + Copyright (c) 2008-2020 Jan W. Krieger () diff --git a/lib/jkqtplotter/overlays/jkqtpbasicoverlays.cpp b/lib/jkqtplotter/overlays/jkqtpbasicoverlays.cpp index 90c24b5a2e..1283c86aae 100644 --- a/lib/jkqtplotter/overlays/jkqtpbasicoverlays.cpp +++ b/lib/jkqtplotter/overlays/jkqtpbasicoverlays.cpp @@ -1,5 +1,5 @@ /* - Copyright (c) 2008-2019 Jan W. Krieger () + Copyright (c) 2008-2020 Jan W. Krieger () diff --git a/lib/jkqtplotter/overlays/jkqtpbasicoverlays.h b/lib/jkqtplotter/overlays/jkqtpbasicoverlays.h index 2628625809..ef3fa67db1 100644 --- a/lib/jkqtplotter/overlays/jkqtpbasicoverlays.h +++ b/lib/jkqtplotter/overlays/jkqtpbasicoverlays.h @@ -1,5 +1,5 @@ /* - Copyright (c) 2008-2019 Jan W. Krieger () + Copyright (c) 2008-2020 Jan W. Krieger () diff --git a/lib/jkqtplotter_version.h.in b/lib/jkqtplotter_version.h.in index 6fa43e44ec..7d8f25a313 100644 --- a/lib/jkqtplotter_version.h.in +++ b/lib/jkqtplotter_version.h.in @@ -1,5 +1,5 @@ /* - Copyright (c) 2008-2019 Jan W. Krieger () + Copyright (c) 2008-2020 Jan W. Krieger ()