Version: 1.1.0_devel (using KDE 3.2 BRANCH >= 20040204, Mandrake Linux Cooker i586 - Cooker) Compiler: gcc version 3.3.2 (Mandrake Linux 10.0 3.3.2-6mdk) OS: Linux (i686) release 2.6.3-7mdk When using symbols to show points on a curve, if you select a dashed line you'll get X symbols drawn dotted ! It wasn't the case in 1.0.0 and before as far as I can test. Expected behavior is for symbols to be drawn with solid lines.
CVS commit by arwalker: Reset line style after use. Remove unused variable. CCMAIL: 95022-done@bugs.kde.org M +7 -7 kst2dplot.cpp 1.314 --- kdeextragear-2/kst/kst/kst2dplot.cpp #1.313:1.314 @@ -5066,5 +5066,4 @@ void Kst2DPlot::plotCurves(QPainter& p, KstBaseCurvePtr c; QRegion clipRegion; - QRect clipRect; double maxY = 0.0, minY = 0.0; double rX, rY, rEX, rEY; @@ -5078,6 +5077,5 @@ void Kst2DPlot::plotCurves(QPainter& p, clipRegion = p.clipRegion(); clipping = p.hasClipping(); - p.setClipRegion(QRegion(int(Lx), int(Ly), int(Hx-Lx), int(Hy-Ly), - QRegion::Rectangle)); + p.setClipRegion(QRegion(int(Lx), int(Ly), int(Hx-Lx), int(Hy-Ly), QRegion::Rectangle)); for (int i_curve = 0; i_curve < (int)Curves.count(); i_curve++) { @@ -5104,8 +5102,4 @@ void Kst2DPlot::plotCurves(QPainter& p, } - p.setPen(QPen(c->color(), - (c->lineWidth() < penWidth ? penWidth : c->lineWidth()), - style)); - if (c->hasLines()) { QPointArray points(MAX_NUM_POLYLINES); @@ -5116,4 +5110,8 @@ void Kst2DPlot::plotCurves(QPainter& p, int i0Start = i0; + p.setPen(QPen(c->color(), + (c->lineWidth() < penWidth ? penWidth : c->lineWidth()), + style)); + // Optimize - isnan seems expensive, at least in gcc debug mode // cachegrind backs this up. @@ -5365,4 +5363,6 @@ void Kst2DPlot::plotCurves(QPainter& p, overlap = false; } + + p.setPen(QPen(c->color(), (c->lineWidth() < penWidth ? penWidth : c->lineWidth()))); } // end if c->hasLines()