diverse code improvements, increased copyright year to 2020

This commit is contained in:
jkriege2 2020-08-26 12:58:23 +02:00
parent 5ad9ebdcbb
commit 87755ce515
128 changed files with 150 additions and 228 deletions

View File

@ -13,7 +13,6 @@ void ContourPlotAnimator::start(int delayMS) {
} }
void ContourPlotAnimator::step() { void ContourPlotAnimator::step() {
double x;
double y=-h/2.0; double y=-h/2.0;
const double eps0=8.854187e-12; const double eps0=8.854187e-12;
double r=1e-6*(5.0+cos(angle/4.0))/6.0; 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_x0=r2*cos(angle); // x-position of charged particle 4
const double Q4_y0=-r2*sin(angle); // y-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++ ) { 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++ ) { 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; x+=dx;
} }
y+=dx; y+=dx;

View File

@ -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 $) last modification: $LastChangedDate: 2015-04-02 13:55:22 +0200 (Do, 02 Apr 2015) $ (revision $Rev: 3902 $)

View File

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

View File

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

View File

@ -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$) last modification: $LastChangedDate$ (revision $Rev$)

View File

@ -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$) last modification: $LastChangedDate$ (revision $Rev$)

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

@ -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 $) 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);
};

View File

@ -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 $) 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(). * - 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 * \image html highrestimer.png
* Note that this histogram tells you more about how your system works than about the timer itself. * 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 * What we can find out about the timer is that it really provides a resolution in the microsecond region. This can
@ -123,12 +118,12 @@
*/ */
class JKQTCOMMON_LIB_EXPORT JKQTPHighResTimer { class JKQTCOMMON_LIB_EXPORT JKQTPHighResTimer {
protected: protected:
#ifdef __WINDOWS__ #ifdef __WINDOWS__
/** \brief internal: time stamp of the last call of start() */ /** \brief internal: time stamp of the last call of start() */
LARGE_INTEGER last; LARGE_INTEGER last;
#else #else
std::chrono::system_clock::time_point last; std::chrono::system_clock::time_point last;
#endif #endif
/** \brief internal: timer frequency */ /** \brief internal: timer frequency */
double freq; double freq;
public: public:
@ -140,26 +135,6 @@ class JKQTCOMMON_LIB_EXPORT JKQTPHighResTimer {
void start(); void start();
/** \brief get the time since the last call of start() in microseconds */ /** \brief get the time since the last call of start() in microseconds */
double getTime(); 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);
}; };

View File

@ -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$) last modification: $LastChangedDate$ (revision $Rev$)

View File

@ -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$) last modification: $LastChangedDate$ (revision $Rev$)

View File

@ -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 fBoolToStr(JKQTPMathParser::jkmpResult* params, unsigned char n, JKQTPMathParser* p){
JKQTPMathParser::jkmpResult r; JKQTPMathParser::jkmpResult r;
std::ostringstream ost;
r.type=JKQTPMathParser::jkmpString; r.type=JKQTPMathParser::jkmpString;
if (n!=1) p->jkmpError("booltostr accepts 1 argument"); if (n!=1) p->jkmpError("booltostr accepts 1 argument");
if (params[0].type!=JKQTPMathParser::jkmpBool) p->jkmpError("floattostr needs bool argument"); if (params[0].type!=JKQTPMathParser::jkmpBool) p->jkmpError("floattostr needs bool argument");

View File

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

View File

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

View File

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

View File

@ -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$) last modification: $LastChangedDate$ (revision $Rev$)

View File

@ -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$) last modification: $LastChangedDate$ (revision $Rev$)

View File

@ -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$) last modification: $LastChangedDate$ (revision $Rev$)

View File

@ -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$) last modification: $LastChangedDate$ (revision $Rev$)

View File

@ -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$) last modification: $LastChangedDate$ (revision $Rev$)

View File

@ -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$) last modification: $LastChangedDate$ (revision $Rev$)

View File

@ -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$) last modification: $LastChangedDate$ (revision $Rev$)

View File

@ -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$) last modification: $LastChangedDate$ (revision $Rev$)

View File

@ -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$) last modification: $LastChangedDate$ (revision $Rev$)

View File

@ -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$) last modification: $LastChangedDate$ (revision $Rev$)

View File

@ -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$) last modification: $LastChangedDate$ (revision $Rev$)

View File

@ -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$) last modification: $LastChangedDate$ (revision $Rev$)

View File

@ -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$) last modification: $LastChangedDate$ (revision $Rev$)

View File

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

View File

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

View File

@ -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$) last modification: $LastChangedDate$ (revision $Rev$)

View File

@ -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$) last modification: $LastChangedDate$ (revision $Rev$)

View File

@ -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

View File

@ -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; return this->yAxisLabelVisible;
} }
/*! \copydoc synchronizeX */ /*! \copydoc synchronizeX */
inline void setSynchronizeX(JKQTFastPlotter* & __value) inline void setSynchronizeX(JKQTFastPlotter* __value)
{ {
if (this->synchronizeX != __value) { if (this->synchronizeX != __value) {
this->synchronizeX = __value; this->synchronizeX = __value;
@ -909,7 +909,7 @@ class JKQTFASTPLOTTER_LIB_EXPORT JKQTFastPlotter : public QGLWidget {
return this->synchronizeX; return this->synchronizeX;
} }
/*! \copydoc synchronizeY */ /*! \copydoc synchronizeY */
inline void setSynchronizeY(JKQTFastPlotter* & __value) inline void setSynchronizeY(JKQTFastPlotter* __value)
{ {
if (this->synchronizeY != __value) { if (this->synchronizeY != __value) {
this->synchronizeY = __value; this->synchronizeY = __value;
@ -3283,7 +3283,7 @@ class JKQTFASTPLOTTER_LIB_EXPORT JKQTFPQScaleBarXPlot: public JKQTFPPlot {
/*! \brief class constructor /*! \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 */ /** \brief draw the graph */
virtual void drawGraph(QPainter& painter) override; virtual void drawGraph(QPainter& painter) override;
@ -3396,7 +3396,7 @@ class JKQTFASTPLOTTER_LIB_EXPORT JKQTFPQOverlayLinearGridPlot: public JKQTFPPlot
/*! \brief class constructor /*! \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 */ /** \brief draw the graph */
virtual void drawGraph(QPainter& painter) override; virtual void drawGraph(QPainter& painter) override;

View File

@ -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 $) last modification: $LastChangedDate: 2015-04-02 13:55:22 +0200 (Do, 02 Apr 2015) $ (revision $Rev: 3902 $)

View File

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

View File

@ -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 with contributions from: Razi Alavizadeh

View File

@ -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 $) last modification: $LastChangedDate: 2015-04-02 13:55:22 +0200 (Do, 02 Apr 2015) $ (revision $Rev: 3902 $)

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

@ -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(spinSizeY, 0,layout->columnCount());
layout->addWidget(chkAspect, 0,layout->columnCount()); layout->addWidget(chkAspect, 0,layout->columnCount());
if (!setAbsolutePaperSize && printer && !svg) { 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); QCheckBox* chkSetMagnification=new QCheckBox(tr("set by magnification: "), dlg);
chkSetMagnification->setChecked(false); chkSetMagnification->setChecked(false);
@ -1756,11 +1756,7 @@ bool JKQTBasePlotter::printpreviewNew(QPaintDevice* paintDevice, bool setAbsolut
if (svg) { if (svg) {
printpreviewPaintRequestedNew(svg); printpreviewPaintRequestedNew(svg);
} else if (printer && !delPrinter) { } else if (printer && !delPrinter) {
if (delPrinter) {
printpreviewPaintRequestedNew(paintDevice);
} else {
printpreviewPaintRequestedNew(printer); printpreviewPaintRequestedNew(printer);
}
} else { } else {
printpreviewPaintRequestedNew(paintDevice); printpreviewPaintRequestedNew(paintDevice);
} }

View File

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

View File

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

Some files were not shown because too many files have changed in this diff Show More