diff --git a/doc/images/axisstyle/JKQTPCADMMaxArrow.png b/doc/images/axisstyle/JKQTPCADMMaxArrow.png index 6346960adf..0e81c3dd32 100644 Binary files a/doc/images/axisstyle/JKQTPCADMMaxArrow.png and b/doc/images/axisstyle/JKQTPCADMMaxArrow.png differ diff --git a/doc/images/axisstyle/JKQTPCADMMaxFilledArrow.png b/doc/images/axisstyle/JKQTPCADMMaxFilledArrow.png index a3ce25a752..bee9466776 100644 Binary files a/doc/images/axisstyle/JKQTPCADMMaxFilledArrow.png and b/doc/images/axisstyle/JKQTPCADMMaxFilledArrow.png differ diff --git a/doc/images/axisstyle/JKQTPCADMMinArrow.png b/doc/images/axisstyle/JKQTPCADMMinArrow.png index 9d9e526606..2027ef4a6a 100644 Binary files a/doc/images/axisstyle/JKQTPCADMMinArrow.png and b/doc/images/axisstyle/JKQTPCADMMinArrow.png differ diff --git a/doc/images/axisstyle/JKQTPCADMMinFilledArrow.png b/doc/images/axisstyle/JKQTPCADMMinFilledArrow.png index d1a39265cd..14b6f24d95 100644 Binary files a/doc/images/axisstyle/JKQTPCADMMinFilledArrow.png and b/doc/images/axisstyle/JKQTPCADMMinFilledArrow.png differ diff --git a/doc/images/axisstyle/JKQTPCADMcompleteMaxArrow.png b/doc/images/axisstyle/JKQTPCADMcompleteMaxArrow.png index b4dc8f3e75..594fc7fbd0 100644 Binary files a/doc/images/axisstyle/JKQTPCADMcompleteMaxArrow.png and b/doc/images/axisstyle/JKQTPCADMcompleteMaxArrow.png differ diff --git a/doc/images/axisstyle/JKQTPCADMcompleteMinMaxArrow.png b/doc/images/axisstyle/JKQTPCADMcompleteMinMaxArrow.png index daceb09ec7..09207a8f32 100644 Binary files a/doc/images/axisstyle/JKQTPCADMcompleteMinMaxArrow.png and b/doc/images/axisstyle/JKQTPCADMcompleteMinMaxArrow.png differ diff --git a/doc/images/jkqtmathtext/jkqtmathtext_unicode.png b/doc/images/jkqtmathtext/jkqtmathtext_unicode.png index 8795d2d29b..7a435b1e1e 100644 Binary files a/doc/images/jkqtmathtext/jkqtmathtext_unicode.png and b/doc/images/jkqtmathtext/jkqtmathtext_unicode.png differ diff --git a/lib/jkqtplotter/jkqtpcoordinateaxes.cpp b/lib/jkqtplotter/jkqtpcoordinateaxes.cpp index 37a905c478..f7fcb61c78 100644 --- a/lib/jkqtplotter/jkqtpcoordinateaxes.cpp +++ b/lib/jkqtplotter/jkqtpcoordinateaxes.cpp @@ -1171,7 +1171,7 @@ double JKQTPVerticalAxis::getParentPlotOffset() const { QSizeF JKQTPVerticalAxis::getSize1(JKQTPEnhancedPainter& painter) { if (axisStyle.drawMode1==JKQTPCADMnone) return QSize(0,0); 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; if (axisStyle.drawMode1.testFlag(JKQTPCADMTicks)) ptwidth+=axisStyle.tickOutsideLength; if (axisStyle.drawMode1.testFlag(JKQTPCADMTickLabels)) { @@ -1191,7 +1191,7 @@ QSizeF JKQTPVerticalAxis::getSize1(JKQTPEnhancedPainter& painter) { QSizeF JKQTPVerticalAxis::getSize2(JKQTPEnhancedPainter& painter) { if (axisStyle.drawMode2==JKQTPCADMnone) return QSize(0,0); 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; if (axisStyle.drawMode2.testFlag(JKQTPCADMTicks)) ptwidth+=axisStyle.tickOutsideLength; if (axisStyle.drawMode2.testFlag(JKQTPCADMTickLabels)) { @@ -1591,7 +1591,7 @@ void JKQTPVerticalAxis::drawAxes(JKQTPEnhancedPainter& painter) { const double mtdist=getNextLabelDistance(y)/static_cast(axisStyle.minorTicks+1); // distance of minor ticks const double yy=x2p(y); // y tick position //qDebug()<<" tick @ x="<