Diffstat (limited to 'noncore/graphics/drawpad/filledellipsetool.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r-- | noncore/graphics/drawpad/filledellipsetool.cpp | 60 |
1 files changed, 33 insertions, 27 deletions
diff --git a/noncore/graphics/drawpad/filledellipsetool.cpp b/noncore/graphics/drawpad/filledellipsetool.cpp index 2f7ec8f..6b5bbc6 100644 --- a/noncore/graphics/drawpad/filledellipsetool.cpp +++ b/noncore/graphics/drawpad/filledellipsetool.cpp @@ -32,41 +32,47 @@ void FilledEllipseTool::drawFinalShape(QPainter& p) { p.setRasterOp(Qt::NotROP); p.drawRect(QRect(m_polyline[2], m_polyline[0])); + p.setRasterOp(Qt::CopyROP); - QRect r = m_polyline.boundingRect(); - r = r.normalize(); - r.setLeft(r.left() - m_pDrawPad->pen().width()); - r.setTop(r.top() - m_pDrawPad->pen().width()); - r.setRight(r.right() + m_pDrawPad->pen().width()); - r.setBottom(r.bottom() + m_pDrawPad->pen().width()); + if (m_pDrawPad->antiAliasing()) { + QRect r = m_polyline.boundingRect(); + r = r.normalize(); + r.setLeft(r.left() - m_pDrawPad->pen().width()); + r.setTop(r.top() - m_pDrawPad->pen().width()); + r.setRight(r.right() + m_pDrawPad->pen().width()); + r.setBottom(r.bottom() + m_pDrawPad->pen().width()); - QPixmap areaPixmap(r.width(), r.height()); - bitBlt(&areaPixmap, QPoint(0, 0), p.device(), r); + QPixmap areaPixmap(r.width(), r.height()); + bitBlt(&areaPixmap, QPoint(0, 0), p.device(), r); - QImage areaImage = areaPixmap.convertToImage(); - QImage bigAreaImage = areaImage.smoothScale(areaImage.width() * 3, areaImage.height() * 3); + QImage areaImage = areaPixmap.convertToImage(); + QImage bigAreaImage = areaImage.smoothScale(areaImage.width() * 3, areaImage.height() * 3); - QPixmap bigAreaPixmap; - bigAreaPixmap.convertFromImage(bigAreaImage); + QPixmap bigAreaPixmap; + bigAreaPixmap.convertFromImage(bigAreaImage); - QPen bigAreaPen = m_pDrawPad->pen(); - bigAreaPen.setWidth(bigAreaPen.width() * 3); + QPen bigAreaPen = m_pDrawPad->pen(); + bigAreaPen.setWidth(bigAreaPen.width() * 3); - QPainter bigAreaPainter; - bigAreaPainter.begin(&bigAreaPixmap); - bigAreaPainter.setPen(bigAreaPen); - bigAreaPainter.setBrush(m_pDrawPad->brush()); - bigAreaPainter.drawEllipse(QRect(bigAreaPen.width() + 1, bigAreaPen.width() + 1, - bigAreaPixmap.width() - 2 * (bigAreaPen.width() + 1), - bigAreaPixmap.height() - 2 * (bigAreaPen.width() + 1))); - bigAreaPainter.end(); + QPainter bigAreaPainter; + bigAreaPainter.begin(&bigAreaPixmap); + bigAreaPainter.setPen(bigAreaPen); + bigAreaPainter.setBrush(m_pDrawPad->brush()); + bigAreaPainter.drawEllipse(QRect(bigAreaPen.width() + 1, bigAreaPen.width() + 1, + bigAreaPixmap.width() - 2 * (bigAreaPen.width() + 1), + bigAreaPixmap.height() - 2 * (bigAreaPen.width() + 1))); + bigAreaPainter.end(); - bigAreaImage = bigAreaPixmap.convertToImage(); - areaImage = bigAreaImage.smoothScale(bigAreaImage.width() / 3, bigAreaImage.height() / 3); - areaPixmap.convertFromImage(areaImage); + bigAreaImage = bigAreaPixmap.convertToImage(); + areaImage = bigAreaImage.smoothScale(bigAreaImage.width() / 3, bigAreaImage.height() / 3); + areaPixmap.convertFromImage(areaImage); - p.setRasterOp(Qt::CopyROP); - p.drawPixmap(r.x(), r.y(), areaPixmap); + p.drawPixmap(r.x(), r.y(), areaPixmap); + } else { + p.setPen(m_pDrawPad->pen()); + p.setBrush(m_pDrawPad->brush()); + p.drawEllipse(QRect(m_polyline[2], m_polyline[0])); + } } void FilledEllipseTool::drawTemporaryShape(QPainter& p) |