| -rw-r--r-- | noncore/graphics/drawpad/filltool.cpp | 72 | ||||
| -rw-r--r-- | noncore/graphics/drawpad/filltool.h | 4 |
2 files changed, 75 insertions, 1 deletions
diff --git a/noncore/graphics/drawpad/filltool.cpp b/noncore/graphics/drawpad/filltool.cpp index d323cc2..0177e1c 100644 --- a/noncore/graphics/drawpad/filltool.cpp +++ b/noncore/graphics/drawpad/filltool.cpp @@ -14,16 +14,18 @@ #include "filltool.h" #include "drawpad.h" #include "drawpadcanvas.h" #include "page.h" #include <qimage.h> +const int FILL_THRESHOLD = 65536; + FillTool::FillTool(DrawPad* drawPad, DrawPadCanvas* drawPadCanvas) : Tool(drawPad, drawPadCanvas) { } FillTool::~FillTool() { } @@ -33,17 +35,33 @@ void FillTool::mousePressEvent(QMouseEvent* e) int x = e->x(); int y = e->y(); m_image = m_pDrawPadCanvas->currentPage()->convertToImage(); m_fillRgb = m_pDrawPad->brush().color().rgb(); m_oldRgb = m_image.pixel(x, y); if (m_oldRgb != m_fillRgb) { - fillLine(x, y); + if (m_pDrawPad->antiAliasing()) { + m_mask.create(m_image.width(), m_image.height(), 8, 2); + m_mask.fill(0); + + fillMaskLine(x, y); + + for (int i = 0; i < m_image.width(); i++) { + for (int j = 0; j < m_image.height(); j++) { + if (m_mask.pixelIndex(i, j) == 1) { + setInterpolatedPixel(i, j); + } + } + } + + } else { + fillLine(x, y); + } m_pDrawPadCanvas->currentPage()->convertFromImage(m_image); m_pDrawPadCanvas->viewport()->update(); m_pDrawPadCanvas->backupPage(); } } @@ -83,8 +101,60 @@ void FillTool::fillLine(int x, int y) } for (int i = x1 + 1; i < x2; i++) { fillLine(i, y + 1); } } } } + +void FillTool::fillMaskLine(int x, int y) +{ + if ((x >= 0) && (x < m_image.width()) && (y >= 0) && (y < m_image.height())) { + if (m_mask.pixelIndex(x, y) == 0) { + if (rgbDistance(m_image.pixel(x, y), m_oldRgb) < FILL_THRESHOLD) { + int x1, x2; + + x1 = x - 1; + x2 = x + 1; + + while ((x1 >= 0) && (rgbDistance(m_image.pixel(x1, y), m_oldRgb) < FILL_THRESHOLD)) { + x1--; + } + + while ((x2 < m_image.width()) && (rgbDistance(m_image.pixel(x2, y), m_oldRgb) < FILL_THRESHOLD)) { + x2++; + } + + for (int i = x1 + 1; i < x2; i++) { + m_mask.setPixel(i, y, 1); + } + + for (int i = x1 + 1; i < x2; i++) { + fillMaskLine(i, y - 1); + } + + for (int i = x1 + 1; i < x2; i++) { + fillMaskLine(i, y + 1); + } + } + } + } +} + +void FillTool::setInterpolatedPixel(int x, int y) +{ + int fillRed = QMIN(QMAX(qRed(m_fillRgb) + qRed(m_image.pixel(x, y)) - qRed(m_oldRgb), 0), 255); + int fillGreen = QMIN(QMAX(qGreen(m_fillRgb) + qGreen(m_image.pixel(x, y)) - qGreen(m_oldRgb), 0), 255); + int fillBlue = QMIN(QMAX(qBlue(m_fillRgb) + qBlue(m_image.pixel(x, y)) - qBlue(m_oldRgb), 0), 255); + + m_image.setPixel(x, y, qRgb(fillRed, fillGreen, fillBlue)); +} + +int FillTool::rgbDistance(QRgb rgb1, QRgb rgb2) +{ + int redDistance = qRed(rgb2) - qRed(rgb1); + int greenDistance = qGreen(rgb2) - qGreen(rgb1); + int blueDistance = qBlue(rgb2) - qBlue(rgb1); + + return (redDistance * redDistance + greenDistance * greenDistance + blueDistance * blueDistance); +} diff --git a/noncore/graphics/drawpad/filltool.h b/noncore/graphics/drawpad/filltool.h index eaf9a27..03ee489 100644 --- a/noncore/graphics/drawpad/filltool.h +++ b/noncore/graphics/drawpad/filltool.h @@ -25,15 +25,19 @@ public: ~FillTool(); void mousePressEvent(QMouseEvent* e); void mouseReleaseEvent(QMouseEvent* e); void mouseMoveEvent(QMouseEvent* e); private: void fillLine(int x, int y); + void fillMaskLine(int x, int y); + void setInterpolatedPixel(int x, int y); + int rgbDistance(QRgb rgb1, QRgb rgb2); QImage m_image; + QImage m_mask; QRgb m_fillRgb; QRgb m_oldRgb; }; #endif // FILLTOOL_H |