mirrors/JKQtPlotter
1
0
Fork 0
mirror of https://github.com/jkriege2/JKQtPlotter.git synced 2024-12-25 10:01:38 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

bugfix for older Qt versions

Browse Source
This commit is contained in:
jkriege2 2022-09-23 21:45:30 +02:00
parent d2c2185f9c
commit b536d79aeb
16 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
doc/images/axisstyle/JKQTPCADMMaxArrow.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 894 B

After

Width:  |  Height:  |  Size: 863 B

BIN
doc/images/axisstyle/JKQTPCADMMaxFilledArrow.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 778 B

After

Width:  |  Height:  |  Size: 749 B

BIN
doc/images/axisstyle/JKQTPCADMMinArrow.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 894 B

After

Width:  |  Height:  |  Size: 874 B

BIN
doc/images/axisstyle/JKQTPCADMMinFilledArrow.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 773 B

After

Width:  |  Height:  |  Size: 762 B

BIN
doc/images/axisstyle/JKQTPCADMcompleteMaxArrow.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.8 KiB

After

Width:  |  Height:  |  Size: 1.8 KiB

BIN
doc/images/axisstyle/JKQTPCADMcompleteMinMaxArrow.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.2 KiB

After

Width:  |  Height:  |  Size: 2.1 KiB

BIN
doc/images/jkqtmathtext/jkqtmathtext_unicode.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 3.7 KiB

After

Width:  |  Height:  |  Size: 4.0 KiB

12
lib/jkqtplotter/jkqtpcoordinateaxes.cpp
View File

@ -1171,7 +1171,7 @@ double JKQTPVerticalAxis::getParentPlotOffset() const {
QSizeF JKQTPVerticalAxis::getSize1(JKQTPEnhancedPainter& painter) { QSizeF JKQTPVerticalAxis::getSize1(JKQTPEnhancedPainter& painter) {
if (axisStyle.drawMode1==JKQTPCADMnone) return QSize(0,0); if (axisStyle.drawMode1==JKQTPCADMnone) return QSize(0,0);
double ptwidth=axisStyle.axisLineOffset; double ptwidth=axisStyle.axisLineOffset;
const double arrowSize=(axisStyle.drawMode1.testAnyFlags(JKQTPCADMMinArrow|JKQTPCADMMinFilledArrow|JKQTPCADMMaxArrow|JKQTPCADMMaxFilledArrow))?(axisStyle.getArrowSize(painter, parent)/2.0):0.0; const double arrowSize=((axisStyle.drawMode1&(JKQTPCADMMinArrow|JKQTPCADMMinFilledArrow|JKQTPCADMMaxArrow|JKQTPCADMMaxFilledArrow))!=int(0))?(axisStyle.getArrowSize(painter, parent)/2.0):0.0;
double labwidth=0; double labwidth=0;
if (axisStyle.drawMode1.testFlag(JKQTPCADMTicks)) ptwidth+=axisStyle.tickOutsideLength; if (axisStyle.drawMode1.testFlag(JKQTPCADMTicks)) ptwidth+=axisStyle.tickOutsideLength;
if (axisStyle.drawMode1.testFlag(JKQTPCADMTickLabels)) { if (axisStyle.drawMode1.testFlag(JKQTPCADMTickLabels)) {
@ -1191,7 +1191,7 @@ QSizeF JKQTPVerticalAxis::getSize1(JKQTPEnhancedPainter& painter) {
QSizeF JKQTPVerticalAxis::getSize2(JKQTPEnhancedPainter& painter) { QSizeF JKQTPVerticalAxis::getSize2(JKQTPEnhancedPainter& painter) {
if (axisStyle.drawMode2==JKQTPCADMnone) return QSize(0,0); if (axisStyle.drawMode2==JKQTPCADMnone) return QSize(0,0);
double ptwidth=axisStyle.axisLineOffset; double ptwidth=axisStyle.axisLineOffset;
const double arrowSize=(axisStyle.drawMode1.testAnyFlags(JKQTPCADMMinArrow|JKQTPCADMMinFilledArrow|JKQTPCADMMaxArrow|JKQTPCADMMaxFilledArrow))?(axisStyle.getArrowSize(painter, parent)/2.0):0.0; const double arrowSize=((axisStyle.drawMode2&(JKQTPCADMMinArrow|JKQTPCADMMinFilledArrow|JKQTPCADMMaxArrow|JKQTPCADMMaxFilledArrow))!=int(0))?(axisStyle.getArrowSize(painter, parent)/2.0):0.0;
double labwidth=0; double labwidth=0;
if (axisStyle.drawMode2.testFlag(JKQTPCADMTicks)) ptwidth+=axisStyle.tickOutsideLength; if (axisStyle.drawMode2.testFlag(JKQTPCADMTicks)) ptwidth+=axisStyle.tickOutsideLength;
if (axisStyle.drawMode2.testFlag(JKQTPCADMTickLabels)) { if (axisStyle.drawMode2.testFlag(JKQTPCADMTickLabels)) {
@ -1591,7 +1591,7 @@ void JKQTPVerticalAxis::drawAxes(JKQTPEnhancedPainter& painter) {
const double mtdist=getNextLabelDistance(y)/static_cast<double>(axisStyle.minorTicks+1); // distance of minor ticks const double mtdist=getNextLabelDistance(y)/static_cast<double>(axisStyle.minorTicks+1); // distance of minor ticks
const double yy=x2p(y); // y tick position const double yy=x2p(y); // y tick position
//qDebug()<<" tick @ x="<<x<<" label="<<label<<" mtdist="<<mtdist; //qDebug()<<" tick @ x="<<x<<" label="<<label<<" mtdist="<<mtdist;
if (!axisStyle.drawMode1.testAnyFlags(JKQTPCADMMinArrow|JKQTPCADMMinFilledArrow|JKQTPCADMMaxArrow|JKQTPCADMMaxFilledArrow) if (!(((axisStyle.drawMode1&(JKQTPCADMMinArrow|JKQTPCADMMinFilledArrow|JKQTPCADMMaxArrow|JKQTPCADMMaxFilledArrow))!=int(0))||((axisStyle.drawMode2&(JKQTPCADMMinArrow|JKQTPCADMMinFilledArrow|JKQTPCADMMaxArrow|JKQTPCADMMaxFilledArrow))!=int(0)))
|| (yy>top+arrowFreeSpace && yy<bottom-arrowFreeSpace)) { || (yy>top+arrowFreeSpace && yy<bottom-arrowFreeSpace)) {
// calculate tick lines for axis 1 // calculate tick lines for axis 1
@ -1814,7 +1814,7 @@ double JKQTPHorizontalAxis::getParentPlotOffset() const {
QSizeF JKQTPHorizontalAxis::getSize1(JKQTPEnhancedPainter& painter) { QSizeF JKQTPHorizontalAxis::getSize1(JKQTPEnhancedPainter& painter) {
if (axisStyle.drawMode1==JKQTPCADMnone) return QSize(0,0); if (axisStyle.drawMode1==JKQTPCADMnone) return QSize(0,0);
double ptheight=axisStyle.axisLineOffset; double ptheight=axisStyle.axisLineOffset;
const double arrowSize=(axisStyle.drawMode1.testAnyFlags(JKQTPCADMMinArrow|JKQTPCADMMinFilledArrow|JKQTPCADMMaxArrow|JKQTPCADMMaxFilledArrow))?(axisStyle.getArrowSize(painter, parent)/2.0):0.0; const double arrowSize=((axisStyle.drawMode1&(JKQTPCADMMinArrow|JKQTPCADMMinFilledArrow|JKQTPCADMMaxArrow|JKQTPCADMMaxFilledArrow))!=int(0))?(axisStyle.getArrowSize(painter, parent)/2.0):0.0;
double labheight=0; double labheight=0;
if (axisStyle.drawMode1.testFlag(JKQTPCADMTicks)) ptheight+=axisStyle.tickOutsideLength; if (axisStyle.drawMode1.testFlag(JKQTPCADMTicks)) ptheight+=axisStyle.tickOutsideLength;
if (axisStyle.drawMode1.testFlag(JKQTPCADMTickLabels)) { if (axisStyle.drawMode1.testFlag(JKQTPCADMTickLabels)) {
@ -1834,7 +1834,7 @@ QSizeF JKQTPHorizontalAxis::getSize1(JKQTPEnhancedPainter& painter) {
QSizeF JKQTPHorizontalAxis::getSize2(JKQTPEnhancedPainter& painter) { QSizeF JKQTPHorizontalAxis::getSize2(JKQTPEnhancedPainter& painter) {
if (axisStyle.drawMode2==JKQTPCADMnone) return QSize(0,0); if (axisStyle.drawMode2==JKQTPCADMnone) return QSize(0,0);
double ptheight=axisStyle.axisLineOffset; double ptheight=axisStyle.axisLineOffset;
const double arrowSize=(axisStyle.drawMode1.testAnyFlags(JKQTPCADMMinArrow|JKQTPCADMMinFilledArrow|JKQTPCADMMaxArrow|JKQTPCADMMaxFilledArrow))?(axisStyle.getArrowSize(painter, parent)/2.0):0.0; const double arrowSize=((axisStyle.drawMode2&(JKQTPCADMMinArrow|JKQTPCADMMinFilledArrow|JKQTPCADMMaxArrow|JKQTPCADMMaxFilledArrow))!=int(0))?(axisStyle.getArrowSize(painter, parent)/2.0):0.0;
double labheight=0; double labheight=0;
if (axisStyle.drawMode2.testFlag(JKQTPCADMTicks)) ptheight+=axisStyle.tickOutsideLength; if (axisStyle.drawMode2.testFlag(JKQTPCADMTicks)) ptheight+=axisStyle.tickOutsideLength;
if (axisStyle.drawMode2.testFlag(JKQTPCADMTickLabels)) { if (axisStyle.drawMode2.testFlag(JKQTPCADMTickLabels)) {
@ -2198,7 +2198,7 @@ void JKQTPHorizontalAxis::drawAxes(JKQTPEnhancedPainter& painter) {
const double xx=x2p(x); const double xx=x2p(x);
//qDebug()<<" tick @ x="<<x<<" label="<<label<<" mtdist="<<mtdist<<" axisStyle.minorTicks="<<minorTicks; //qDebug()<<" tick @ x="<<x<<" label="<<label<<" mtdist="<<mtdist<<" axisStyle.minorTicks="<<minorTicks;
if (!axisStyle.drawMode1.testAnyFlags(JKQTPCADMMinArrow|JKQTPCADMMinFilledArrow|JKQTPCADMMaxArrow|JKQTPCADMMaxFilledArrow) if (!(((axisStyle.drawMode1&(JKQTPCADMMinArrow|JKQTPCADMMinFilledArrow|JKQTPCADMMaxArrow|JKQTPCADMMaxFilledArrow))!=int(0))||((axisStyle.drawMode2&(JKQTPCADMMinArrow|JKQTPCADMMinFilledArrow|JKQTPCADMMaxArrow|JKQTPCADMMaxFilledArrow))!=int(0)))
|| (xx>left+arrowFreeSpace && xx<right-arrowFreeSpace)) || (xx>left+arrowFreeSpace && xx<right-arrowFreeSpace))
{ {

BIN
screenshots/imageplot_userpal_program.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 18 KiB

After

Width:  |  Height:  |  Size: 18 KiB

BIN
screenshots/imageplot_userpal_program_small.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 9.5 KiB

After

Width:  |  Height:  |  Size: 9.5 KiB

BIN
screenshots/mandelbrot.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 89 KiB

After

Width:  |  Height:  |  Size: 89 KiB

BIN
screenshots/mandelbrot_small.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 10 KiB

After

Width:  |  Height:  |  Size: 10 KiB

BIN
screenshots/multiplot_controlwindow.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 37 KiB

After

Width:  |  Height:  |  Size: 37 KiB

BIN
screenshots/multiplot_controlwindow_small.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 5.9 KiB

After

Width:  |  Height:  |  Size: 5.9 KiB

BIN
screenshots/parsedfunctionplot.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 29 KiB

After

Width:  |  Height:  |  Size: 29 KiB

BIN
screenshots/parsedfunctionplot_small.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 8.2 KiB

After

Width:  |  Height:  |  Size: 8.2 KiB