Anti-aliasing as an option

author: leseb <leseb> 2002-06-23 17:47:47 (UTC)
committer: leseb <leseb> 2002-06-23 17:47:47 (UTC)
commit: 6fd46f6d23538ec6e0f48209f6c0f0d939a2effe (patch) (unidiff)
tree: 2a5d407155f72dc5496d3a7d412922cc6be97e61 /noncore
parent: 3251c55f854ecbd4ece8bf169177ffac28081aaa (diff)
download: opie-6fd46f6d23538ec6e0f48209f6c0f0d939a2effe.zip
opie-6fd46f6d23538ec6e0f48209f6c0f0d939a2effe.tar.gz
opie-6fd46f6d23538ec6e0f48209f6c0f0d939a2effe.tar.bz2
6 files changed, 140 insertions, 103 deletions
diff --git a/noncore/graphics/drawpad/drawpad.cpp b/noncore/graphics/drawpad/drawpad.cpp
index 45fb886..b29f5ba 100644
--- a/noncore/graphics/drawpad/drawpad.cpp
+++ b/noncore/graphics/drawpad/drawpad.cpp
@@ -67,7 +67,7 @@ DrawPad::DrawPad(QWidget* parent, const char* name)
    QPEToolBar* menuToolBar = new QPEToolBar(this);
    QPEMenuBar* menuBar = new QPEMenuBar(menuToolBar);
-    QPopupMenu *toolsPopupMenu = new QPopupMenu(menuBar);
+    QPopupMenu* toolsPopupMenu = new QPopupMenu(menuBar);
    QAction* deleteAllAction = new QAction(tr("Delete All"), QString::null, 0, this);
    connect(deleteAllAction, SIGNAL(activated()), this, SLOT(deleteAll()));
@@ -93,6 +93,12 @@ DrawPad::DrawPad(QWidget* parent, const char* name)
    connect(pageInformationAction, SIGNAL(activated()), this, SLOT(pageInformation()));
    pageInformationAction->addTo(toolsPopupMenu);
+    toolsPopupMenu->insertSeparator();
+    m_pAntiAliasingAction = new QAction(tr("Anti-Aliasing"), QString::null, 0, this);
+    m_pAntiAliasingAction->setToggleAction(true);
+    m_pAntiAliasingAction->addTo(toolsPopupMenu);
    menuBar->insertItem(tr("Tools"), toolsPopupMenu);
    // init page toolbar
@@ -275,6 +281,11 @@ DrawPad::~DrawPad()
    }
 }
+bool DrawPad::antiAliasing()
+{
+    return (m_pAntiAliasingAction->isOn());
+}
 void DrawPad::newPage()
 {
    QRect rect = m_pDrawPadCanvas->contentsRect();
diff --git a/noncore/graphics/drawpad/drawpad.h b/noncore/graphics/drawpad/drawpad.h
index ce62802..8e29c61 100644
--- a/noncore/graphics/drawpad/drawpad.h
+++ b/noncore/graphics/drawpad/drawpad.h
@@ -38,6 +38,8 @@ public:
    QPen pen() { return m_pen; }
    QBrush brush() { return m_brush; }
+    bool antiAliasing();
 private slots:
    void newPage();
    void clearPage();
@@ -74,6 +76,8 @@ private:
    QPen m_pen;
    QBrush m_brush;
+    QAction* m_pAntiAliasingAction;
    QAction* m_pUndoAction;
    QAction* m_pRedoAction;
diff --git a/noncore/graphics/drawpad/ellipsetool.cpp b/noncore/graphics/drawpad/ellipsetool.cpp
index 733bade..0cdb731 100644
--- a/noncore/graphics/drawpad/ellipsetool.cpp
+++ b/noncore/graphics/drawpad/ellipsetool.cpp
@@ -32,40 +32,45 @@ void EllipseTool::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();
+    if (m_pDrawPad->antiAliasing()) {
-    r = r.normalize();
+        QRect r = m_polyline.boundingRect();
-    r.setLeft(r.left() - m_pDrawPad->pen().width());
+        r = r.normalize();
-    r.setTop(r.top() - m_pDrawPad->pen().width());
+        r.setLeft(r.left() - m_pDrawPad->pen().width());
-    r.setRight(r.right() + m_pDrawPad->pen().width());
+        r.setTop(r.top() - m_pDrawPad->pen().width());
-    r.setBottom(r.bottom() + 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());
+        QPixmap areaPixmap(r.width(), r.height());
-    bitBlt(&areaPixmap, QPoint(0, 0), p.device(), r);
+        bitBlt(&areaPixmap, QPoint(0, 0), p.device(), r);
-    QImage areaImage = areaPixmap.convertToImage();
+        QImage areaImage = areaPixmap.convertToImage();
-    QImage bigAreaImage = areaImage.smoothScale(areaImage.width() * 3, areaImage.height() * 3);
+        QImage bigAreaImage = areaImage.smoothScale(areaImage.width() * 3, areaImage.height() * 3);
-    QPixmap bigAreaPixmap;
+        QPixmap bigAreaPixmap;
-    bigAreaPixmap.convertFromImage(bigAreaImage);
+        bigAreaPixmap.convertFromImage(bigAreaImage);
-    QPen bigAreaPen = m_pDrawPad->pen();
+        QPen bigAreaPen = m_pDrawPad->pen();
-    bigAreaPen.setWidth(bigAreaPen.width() * 3);
+        bigAreaPen.setWidth(bigAreaPen.width() * 3);
-    QPainter bigAreaPainter;
+        QPainter bigAreaPainter;
-    bigAreaPainter.begin(&bigAreaPixmap);
+        bigAreaPainter.begin(&bigAreaPixmap);
-    bigAreaPainter.setPen(bigAreaPen);
+        bigAreaPainter.setPen(bigAreaPen);
-    bigAreaPainter.drawEllipse(QRect(bigAreaPen.width() + 1, bigAreaPen.width() + 1,
+        bigAreaPainter.drawEllipse(QRect(bigAreaPen.width() + 1, bigAreaPen.width() + 1,
-                                     bigAreaPixmap.width() - 2 * (bigAreaPen.width() + 1),
+                                        bigAreaPixmap.width() - 2 * (bigAreaPen.width() + 1),
-                                     bigAreaPixmap.height() - 2 * (bigAreaPen.width() + 1)));
+                                        bigAreaPixmap.height() - 2 * (bigAreaPen.width() + 1)));
-    bigAreaPainter.end();
+        bigAreaPainter.end();
-    bigAreaImage = bigAreaPixmap.convertToImage();
+        bigAreaImage = bigAreaPixmap.convertToImage();
-    areaImage = bigAreaImage.smoothScale(bigAreaImage.width() / 3, bigAreaImage.height() / 3);
+        areaImage = bigAreaImage.smoothScale(bigAreaImage.width() / 3, bigAreaImage.height() / 3);
-    areaPixmap.convertFromImage(areaImage);
+        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.drawEllipse(QRect(m_polyline[2], m_polyline[0]));
+    }
 }
 void EllipseTool::drawTemporaryShape(QPainter& p)
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();
+    if (m_pDrawPad->antiAliasing()) {
-    r = r.normalize();
+        QRect r = m_polyline.boundingRect();
-    r.setLeft(r.left() - m_pDrawPad->pen().width());
+        r = r.normalize();
-    r.setTop(r.top() - m_pDrawPad->pen().width());
+        r.setLeft(r.left() - m_pDrawPad->pen().width());
-    r.setRight(r.right() + m_pDrawPad->pen().width());
+        r.setTop(r.top() - m_pDrawPad->pen().width());
-    r.setBottom(r.bottom() + 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());
+        QPixmap areaPixmap(r.width(), r.height());
-    bitBlt(&areaPixmap, QPoint(0, 0), p.device(), r);
+        bitBlt(&areaPixmap, QPoint(0, 0), p.device(), r);
-    QImage areaImage = areaPixmap.convertToImage();
+        QImage areaImage = areaPixmap.convertToImage();
-    QImage bigAreaImage = areaImage.smoothScale(areaImage.width() * 3, areaImage.height() * 3);
+        QImage bigAreaImage = areaImage.smoothScale(areaImage.width() * 3, areaImage.height() * 3);
-    QPixmap bigAreaPixmap;
+        QPixmap bigAreaPixmap;
-    bigAreaPixmap.convertFromImage(bigAreaImage);
+        bigAreaPixmap.convertFromImage(bigAreaImage);
-    QPen bigAreaPen = m_pDrawPad->pen();
+        QPen bigAreaPen = m_pDrawPad->pen();
-    bigAreaPen.setWidth(bigAreaPen.width() * 3);
+        bigAreaPen.setWidth(bigAreaPen.width() * 3);
-    QPainter bigAreaPainter;
+        QPainter bigAreaPainter;
-    bigAreaPainter.begin(&bigAreaPixmap);
+        bigAreaPainter.begin(&bigAreaPixmap);
-    bigAreaPainter.setPen(bigAreaPen);
+        bigAreaPainter.setPen(bigAreaPen);
-    bigAreaPainter.setBrush(m_pDrawPad->brush());
+        bigAreaPainter.setBrush(m_pDrawPad->brush());
-    bigAreaPainter.drawEllipse(QRect(bigAreaPen.width() + 1, bigAreaPen.width() + 1,
+        bigAreaPainter.drawEllipse(QRect(bigAreaPen.width() + 1, bigAreaPen.width() + 1,
-                                     bigAreaPixmap.width() - 2 * (bigAreaPen.width() + 1),
+                                        bigAreaPixmap.width() - 2 * (bigAreaPen.width() + 1),
-                                     bigAreaPixmap.height() - 2 * (bigAreaPen.width() + 1)));
+                                        bigAreaPixmap.height() - 2 * (bigAreaPen.width() + 1)));
-    bigAreaPainter.end();
+        bigAreaPainter.end();
-    bigAreaImage = bigAreaPixmap.convertToImage();
+        bigAreaImage = bigAreaPixmap.convertToImage();
-    areaImage = bigAreaImage.smoothScale(bigAreaImage.width() / 3, bigAreaImage.height() / 3);
+        areaImage = bigAreaImage.smoothScale(bigAreaImage.width() / 3, bigAreaImage.height() / 3);
-    areaPixmap.convertFromImage(areaImage);
+        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)
diff --git a/noncore/graphics/drawpad/linetool.cpp b/noncore/graphics/drawpad/linetool.cpp
index 99cd6de..b6baa2a 100644
--- a/noncore/graphics/drawpad/linetool.cpp
+++ b/noncore/graphics/drawpad/linetool.cpp
@@ -32,41 +32,46 @@ void LineTool::drawFinalShape(QPainter& p)
 {
    p.setRasterOp(Qt::NotROP);
    p.drawLine(m_polyline[2], m_polyline[0]);
+    p.setRasterOp(Qt::CopyROP);
-    QRect r = m_polyline.boundingRect();
+    if (m_pDrawPad->antiAliasing()) {
-    r = r.normalize();
+        QRect r = m_polyline.boundingRect();
-    r.setLeft(r.left() - m_pDrawPad->pen().width());
+        r = r.normalize();
-    r.setTop(r.top() - m_pDrawPad->pen().width());
+        r.setLeft(r.left() - m_pDrawPad->pen().width());
-    r.setRight(r.right() + m_pDrawPad->pen().width());
+        r.setTop(r.top() - m_pDrawPad->pen().width());
-    r.setBottom(r.bottom() + 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());
+        QPixmap areaPixmap(r.width(), r.height());
-    bitBlt(&areaPixmap, QPoint(0, 0), p.device(), r);
+        bitBlt(&areaPixmap, QPoint(0, 0), p.device(), r);
-    QImage areaImage = areaPixmap.convertToImage();
+        QImage areaImage = areaPixmap.convertToImage();
-    QImage bigAreaImage = areaImage.smoothScale(areaImage.width() * 3, areaImage.height() * 3);
+        QImage bigAreaImage = areaImage.smoothScale(areaImage.width() * 3, areaImage.height() * 3);
-    QPixmap bigAreaPixmap;
+        QPixmap bigAreaPixmap;
-    bigAreaPixmap.convertFromImage(bigAreaImage);
+        bigAreaPixmap.convertFromImage(bigAreaImage);
-    QPen bigAreaPen = m_pDrawPad->pen();
+        QPen bigAreaPen = m_pDrawPad->pen();
-    bigAreaPen.setWidth(bigAreaPen.width() * 3);
+        bigAreaPen.setWidth(bigAreaPen.width() * 3);
-    QPainter bigAreaPainter;
+        QPainter bigAreaPainter;
-    bigAreaPainter.begin(&bigAreaPixmap);
+        bigAreaPainter.begin(&bigAreaPixmap);
-    bigAreaPainter.setPen(bigAreaPen);
+        bigAreaPainter.setPen(bigAreaPen);
-    bigAreaPainter.drawLine((m_polyline[2].x() - r.x()) * 3 + 1, (m_polyline[2].y() - r.y()) * 3 + 1,
+        bigAreaPainter.drawLine((m_polyline[2].x() - r.x()) * 3 + 1, (m_polyline[2].y() - r.y()) * 3 + 1,
-                            (m_polyline[0].x() - r.x()) * 3 + 1, (m_polyline[0].y() - r.y()) * 3 + 1);
+                                (m_polyline[0].x() - r.x()) * 3 + 1, (m_polyline[0].y() - r.y()) * 3 + 1);
-    bigAreaPainter.end();
+        bigAreaPainter.end();
-    bigAreaImage = bigAreaPixmap.convertToImage();
+        bigAreaImage = bigAreaPixmap.convertToImage();
-    areaImage = bigAreaImage.smoothScale(bigAreaImage.width() / 3, bigAreaImage.height() / 3);
+        areaImage = bigAreaImage.smoothScale(bigAreaImage.width() / 3, bigAreaImage.height() / 3);
-    areaPixmap.convertFromImage(areaImage);
+        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.drawLine(m_polyline[2], m_polyline[0]);
+    }
 }
 void LineTool::drawTemporaryShape(QPainter& p)
diff --git a/noncore/graphics/drawpad/pointtool.cpp b/noncore/graphics/drawpad/pointtool.cpp
index 22bb089..a4f846e 100644
--- a/noncore/graphics/drawpad/pointtool.cpp
+++ b/noncore/graphics/drawpad/pointtool.cpp
@@ -53,9 +53,6 @@ void PointTool::mouseMoveEvent(QMouseEvent* e)
        m_polyline[1] = m_polyline[0];
        m_polyline[0] = e->pos();
-        QPainter painter;
-        painter.begin(m_pDrawPadCanvas->currentPage());
        QRect r = m_polyline.boundingRect();
        r = r.normalize();
        r.setLeft(r.left() - m_pDrawPad->pen().width());
@@ -63,35 +60,44 @@ void PointTool::mouseMoveEvent(QMouseEvent* e)
        r.setRight(r.right() + m_pDrawPad->pen().width());
        r.setBottom(r.bottom() + m_pDrawPad->pen().width());
-        QPixmap areaPixmap(r.width(), r.height());
+        QPainter painter;
-        bitBlt(&areaPixmap, QPoint(0, 0), painter.device(), r);
+        painter.begin(m_pDrawPadCanvas->currentPage());
+        if (m_pDrawPad->antiAliasing()) {
+            QPixmap areaPixmap(r.width(), r.height());
+            bitBlt(&areaPixmap, QPoint(0, 0), painter.device(), r);
+            QImage areaImage = areaPixmap.convertToImage();
+            QImage bigAreaImage = areaImage.smoothScale(areaImage.width() * 3, areaImage.height() * 3);
-        QImage areaImage = areaPixmap.convertToImage();
+            QPixmap bigAreaPixmap;
-        QImage bigAreaImage = areaImage.smoothScale(areaImage.width() * 3, areaImage.height() * 3);
+            bigAreaPixmap.convertFromImage(bigAreaImage);
-        QPixmap bigAreaPixmap;
+            QPen bigAreaPen = m_pDrawPad->pen();
-        bigAreaPixmap.convertFromImage(bigAreaImage);
+            bigAreaPen.setWidth(bigAreaPen.width() * 3);
-        QPen bigAreaPen = m_pDrawPad->pen();
+            QPainter bigAreaPainter;
-        bigAreaPen.setWidth(bigAreaPen.width() * 3);
+            bigAreaPainter.begin(&bigAreaPixmap);
+            bigAreaPainter.setPen(bigAreaPen);
-        QPainter bigAreaPainter;
+            QPointArray bigAreaPolyline(3);
-        bigAreaPainter.begin(&bigAreaPixmap);
+            bigAreaPolyline.setPoint(0, (m_polyline[0].x() - r.x()) * 3 + 1, (m_polyline[0].y() - r.y()) * 3 + 1);
-        bigAreaPainter.setPen(bigAreaPen);
+            bigAreaPolyline.setPoint(1, (m_polyline[1].x() - r.x()) * 3 + 1, (m_polyline[1].y() - r.y()) * 3 + 1);
+            bigAreaPolyline.setPoint(2, (m_polyline[2].x() - r.x()) * 3 + 1, (m_polyline[2].y() - r.y()) * 3 + 1);
-        QPointArray bigAreaPolyline(3);
+            bigAreaPainter.drawPolyline(bigAreaPolyline);
-        bigAreaPolyline.setPoint(0, (m_polyline[0].x() - r.x()) * 3 + 1, (m_polyline[0].y() - r.y()) * 3 + 1);
+            bigAreaPainter.end();
-        bigAreaPolyline.setPoint(1, (m_polyline[1].x() - r.x()) * 3 + 1, (m_polyline[1].y() - r.y()) * 3 + 1);
-        bigAreaPolyline.setPoint(2, (m_polyline[2].x() - r.x()) * 3 + 1, (m_polyline[2].y() - r.y()) * 3 + 1);
-        bigAreaPainter.drawPolyline(bigAreaPolyline);
+            bigAreaImage = bigAreaPixmap.convertToImage();
-        bigAreaPainter.end();
+            areaImage = bigAreaImage.smoothScale(bigAreaImage.width() / 3, bigAreaImage.height() / 3);
+            areaPixmap.convertFromImage(areaImage);
-        bigAreaImage = bigAreaPixmap.convertToImage();
+            painter.drawPixmap(r.x(), r.y(), areaPixmap);
-        areaImage = bigAreaImage.smoothScale(bigAreaImage.width() / 3, bigAreaImage.height() / 3);
+        } else {
-        areaPixmap.convertFromImage(areaImage);
+            painter.setPen(m_pDrawPad->pen());
+            painter.drawPolyline(m_polyline);
+        }
-        painter.drawPixmap(r.x(), r.y(), areaPixmap);
        painter.end();
        QRect viewportRect(m_pDrawPadCanvas->contentsToViewport(r.topLeft()),
author	leseb <leseb>	2002-06-23 17:47:47 (UTC)
committer	leseb <leseb>	2002-06-23 17:47:47 (UTC)
commit	6fd46f6d23538ec6e0f48209f6c0f0d939a2effe (patch) (unidiff)
tree	2a5d407155f72dc5496d3a7d412922cc6be97e61 /noncore
parent	3251c55f854ecbd4ece8bf169177ffac28081aaa (diff)
download	opie-6fd46f6d23538ec6e0f48209f6c0f0d939a2effe.zip opie-6fd46f6d23538ec6e0f48209f6c0f0d939a2effe.tar.gz opie-6fd46f6d23538ec6e0f48209f6c0f0d939a2effe.tar.bz2

diff --git a/noncore/graphics/drawpad/drawpad.cpp b/noncore/graphics/drawpad/drawpad.cpp index 45fb886..b29f5ba 100644 --- a/noncore/graphics/drawpad/drawpad.cpp +++ b/noncore/graphics/drawpad/drawpad.cpp
@@ -67,7 +67,7 @@ DrawPad::DrawPad(QWidget* parent, const char* name)
67	QPEToolBar* menuToolBar = new QPEToolBar(this);	67	QPEToolBar* menuToolBar = new QPEToolBar(this);
68	QPEMenuBar* menuBar = new QPEMenuBar(menuToolBar);	68	QPEMenuBar* menuBar = new QPEMenuBar(menuToolBar);
69		69
70	QPopupMenu *toolsPopupMenu = new QPopupMenu(menuBar);	70	QPopupMenu* toolsPopupMenu = new QPopupMenu(menuBar);
71		71
72	QAction* deleteAllAction = new QAction(tr("Delete All"), QString::null, 0, this);	72	QAction* deleteAllAction = new QAction(tr("Delete All"), QString::null, 0, this);
73	connect(deleteAllAction, SIGNAL(activated()), this, SLOT(deleteAll()));	73	connect(deleteAllAction, SIGNAL(activated()), this, SLOT(deleteAll()));
@@ -93,6 +93,12 @@ DrawPad::DrawPad(QWidget* parent, const char* name)
93	connect(pageInformationAction, SIGNAL(activated()), this, SLOT(pageInformation()));	93	connect(pageInformationAction, SIGNAL(activated()), this, SLOT(pageInformation()));
94	pageInformationAction->addTo(toolsPopupMenu);	94	pageInformationAction->addTo(toolsPopupMenu);
95		95
		96	toolsPopupMenu->insertSeparator();
		97
		98	m_pAntiAliasingAction = new QAction(tr("Anti-Aliasing"), QString::null, 0, this);
		99	m_pAntiAliasingAction->setToggleAction(true);
		100	m_pAntiAliasingAction->addTo(toolsPopupMenu);
		101
96	menuBar->insertItem(tr("Tools"), toolsPopupMenu);	102	menuBar->insertItem(tr("Tools"), toolsPopupMenu);
97		103
98	// init page toolbar	104	// init page toolbar
@@ -275,6 +281,11 @@ DrawPad::~DrawPad()
275	}	281	}
276	}	282	}
277		283
		284	bool DrawPad::antiAliasing()
		285	{
		286	return (m_pAntiAliasingAction->isOn());
		287	}
		288
278	void DrawPad::newPage()	289	void DrawPad::newPage()
279	{	290	{
280	QRect rect = m_pDrawPadCanvas->contentsRect();	291	QRect rect = m_pDrawPadCanvas->contentsRect();


diff --git a/noncore/graphics/drawpad/drawpad.h b/noncore/graphics/drawpad/drawpad.h index ce62802..8e29c61 100644 --- a/noncore/graphics/drawpad/drawpad.h +++ b/noncore/graphics/drawpad/drawpad.h
@@ -38,6 +38,8 @@ public:
38	QPen pen() { return m_pen; }	38	QPen pen() { return m_pen; }
39	QBrush brush() { return m_brush; }	39	QBrush brush() { return m_brush; }
40		40
		41	bool antiAliasing();
		42
41	private slots:	43	private slots:
42	void newPage();	44	void newPage();
43	void clearPage();	45	void clearPage();
@@ -74,6 +76,8 @@ private:
74	QPen m_pen;	76	QPen m_pen;
75	QBrush m_brush;	77	QBrush m_brush;
76		78
		79	QAction* m_pAntiAliasingAction;
		80
77	QAction* m_pUndoAction;	81	QAction* m_pUndoAction;
78	QAction* m_pRedoAction;	82	QAction* m_pRedoAction;
79		83


diff --git a/noncore/graphics/drawpad/ellipsetool.cpp b/noncore/graphics/drawpad/ellipsetool.cpp index 733bade..0cdb731 100644 --- a/noncore/graphics/drawpad/ellipsetool.cpp +++ b/noncore/graphics/drawpad/ellipsetool.cpp
@@ -32,40 +32,45 @@ void EllipseTool::drawFinalShape(QPainter& p)
32	{	32	{
33	p.setRasterOp(Qt::NotROP);	33	p.setRasterOp(Qt::NotROP);
34	p.drawRect(QRect(m_polyline[2], m_polyline[0]));	34	p.drawRect(QRect(m_polyline[2], m_polyline[0]));
		35	p.setRasterOp(Qt::CopyROP);
35		36
36	QRect r = m_polyline.boundingRect();	37	if (m_pDrawPad->antiAliasing()) {
37	r = r.normalize();	38	QRect r = m_polyline.boundingRect();
38	r.setLeft(r.left() - m_pDrawPad->pen().width());	39	r = r.normalize();
39	r.setTop(r.top() - m_pDrawPad->pen().width());	40	r.setLeft(r.left() - m_pDrawPad->pen().width());
40	r.setRight(r.right() + m_pDrawPad->pen().width());	41	r.setTop(r.top() - m_pDrawPad->pen().width());
41	r.setBottom(r.bottom() + m_pDrawPad->pen().width());	42	r.setRight(r.right() + m_pDrawPad->pen().width());
		43	r.setBottom(r.bottom() + m_pDrawPad->pen().width());
42		44
43	QPixmap areaPixmap(r.width(), r.height());	45	QPixmap areaPixmap(r.width(), r.height());
44	bitBlt(&areaPixmap, QPoint(0, 0), p.device(), r);	46	bitBlt(&areaPixmap, QPoint(0, 0), p.device(), r);
45		47
46	QImage areaImage = areaPixmap.convertToImage();	48	QImage areaImage = areaPixmap.convertToImage();
47	QImage bigAreaImage = areaImage.smoothScale(areaImage.width() * 3, areaImage.height() * 3);	49	QImage bigAreaImage = areaImage.smoothScale(areaImage.width() * 3, areaImage.height() * 3);
48		50
49	QPixmap bigAreaPixmap;	51	QPixmap bigAreaPixmap;
50	bigAreaPixmap.convertFromImage(bigAreaImage);	52	bigAreaPixmap.convertFromImage(bigAreaImage);
51		53
52	QPen bigAreaPen = m_pDrawPad->pen();	54	QPen bigAreaPen = m_pDrawPad->pen();
53	bigAreaPen.setWidth(bigAreaPen.width() * 3);	55	bigAreaPen.setWidth(bigAreaPen.width() * 3);
54		56
55	QPainter bigAreaPainter;	57	QPainter bigAreaPainter;
56	bigAreaPainter.begin(&bigAreaPixmap);	58	bigAreaPainter.begin(&bigAreaPixmap);
57	bigAreaPainter.setPen(bigAreaPen);	59	bigAreaPainter.setPen(bigAreaPen);
58	bigAreaPainter.drawEllipse(QRect(bigAreaPen.width() + 1, bigAreaPen.width() + 1,	60	bigAreaPainter.drawEllipse(QRect(bigAreaPen.width() + 1, bigAreaPen.width() + 1,
59	bigAreaPixmap.width() - 2 * (bigAreaPen.width() + 1),	61	bigAreaPixmap.width() - 2 * (bigAreaPen.width() + 1),
60	bigAreaPixmap.height() - 2 * (bigAreaPen.width() + 1)));	62	bigAreaPixmap.height() - 2 * (bigAreaPen.width() + 1)));
61	bigAreaPainter.end();	63	bigAreaPainter.end();
62		64
63	bigAreaImage = bigAreaPixmap.convertToImage();	65	bigAreaImage = bigAreaPixmap.convertToImage();
64	areaImage = bigAreaImage.smoothScale(bigAreaImage.width() / 3, bigAreaImage.height() / 3);	66	areaImage = bigAreaImage.smoothScale(bigAreaImage.width() / 3, bigAreaImage.height() / 3);
65	areaPixmap.convertFromImage(areaImage);	67	areaPixmap.convertFromImage(areaImage);
66		68
67	p.setRasterOp(Qt::CopyROP);	69	p.drawPixmap(r.x(), r.y(), areaPixmap);
68	p.drawPixmap(r.x(), r.y(), areaPixmap);	70	} else {
		71	p.setPen(m_pDrawPad->pen());
		72	p.drawEllipse(QRect(m_polyline[2], m_polyline[0]));
		73	}
69	}	74	}
70		75
71	void EllipseTool::drawTemporaryShape(QPainter& p)	76	void EllipseTool::drawTemporaryShape(QPainter& p)


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)
32	{	32	{
33	p.setRasterOp(Qt::NotROP);	33	p.setRasterOp(Qt::NotROP);
34	p.drawRect(QRect(m_polyline[2], m_polyline[0]));	34	p.drawRect(QRect(m_polyline[2], m_polyline[0]));
		35	p.setRasterOp(Qt::CopyROP);
35		36
36	QRect r = m_polyline.boundingRect();	37	if (m_pDrawPad->antiAliasing()) {
37	r = r.normalize();	38	QRect r = m_polyline.boundingRect();
38	r.setLeft(r.left() - m_pDrawPad->pen().width());	39	r = r.normalize();
39	r.setTop(r.top() - m_pDrawPad->pen().width());	40	r.setLeft(r.left() - m_pDrawPad->pen().width());
40	r.setRight(r.right() + m_pDrawPad->pen().width());	41	r.setTop(r.top() - m_pDrawPad->pen().width());
41	r.setBottom(r.bottom() + m_pDrawPad->pen().width());	42	r.setRight(r.right() + m_pDrawPad->pen().width());
		43	r.setBottom(r.bottom() + m_pDrawPad->pen().width());
42		44
43	QPixmap areaPixmap(r.width(), r.height());	45	QPixmap areaPixmap(r.width(), r.height());
44	bitBlt(&areaPixmap, QPoint(0, 0), p.device(), r);	46	bitBlt(&areaPixmap, QPoint(0, 0), p.device(), r);
45		47
46	QImage areaImage = areaPixmap.convertToImage();	48	QImage areaImage = areaPixmap.convertToImage();
47	QImage bigAreaImage = areaImage.smoothScale(areaImage.width() * 3, areaImage.height() * 3);	49	QImage bigAreaImage = areaImage.smoothScale(areaImage.width() * 3, areaImage.height() * 3);
48		50
49	QPixmap bigAreaPixmap;	51	QPixmap bigAreaPixmap;
50	bigAreaPixmap.convertFromImage(bigAreaImage);	52	bigAreaPixmap.convertFromImage(bigAreaImage);
51		53
52	QPen bigAreaPen = m_pDrawPad->pen();	54	QPen bigAreaPen = m_pDrawPad->pen();
53	bigAreaPen.setWidth(bigAreaPen.width() * 3);	55	bigAreaPen.setWidth(bigAreaPen.width() * 3);
54		56
55	QPainter bigAreaPainter;	57	QPainter bigAreaPainter;
56	bigAreaPainter.begin(&bigAreaPixmap);	58	bigAreaPainter.begin(&bigAreaPixmap);
57	bigAreaPainter.setPen(bigAreaPen);	59	bigAreaPainter.setPen(bigAreaPen);
58	bigAreaPainter.setBrush(m_pDrawPad->brush());	60	bigAreaPainter.setBrush(m_pDrawPad->brush());
59	bigAreaPainter.drawEllipse(QRect(bigAreaPen.width() + 1, bigAreaPen.width() + 1,	61	bigAreaPainter.drawEllipse(QRect(bigAreaPen.width() + 1, bigAreaPen.width() + 1,
60	bigAreaPixmap.width() - 2 * (bigAreaPen.width() + 1),	62	bigAreaPixmap.width() - 2 * (bigAreaPen.width() + 1),
61	bigAreaPixmap.height() - 2 * (bigAreaPen.width() + 1)));	63	bigAreaPixmap.height() - 2 * (bigAreaPen.width() + 1)));
62	bigAreaPainter.end();	64	bigAreaPainter.end();
63		65
64	bigAreaImage = bigAreaPixmap.convertToImage();	66	bigAreaImage = bigAreaPixmap.convertToImage();
65	areaImage = bigAreaImage.smoothScale(bigAreaImage.width() / 3, bigAreaImage.height() / 3);	67	areaImage = bigAreaImage.smoothScale(bigAreaImage.width() / 3, bigAreaImage.height() / 3);
66	areaPixmap.convertFromImage(areaImage);	68	areaPixmap.convertFromImage(areaImage);
67		69
68	p.setRasterOp(Qt::CopyROP);	70	p.drawPixmap(r.x(), r.y(), areaPixmap);
69	p.drawPixmap(r.x(), r.y(), areaPixmap);	71	} else {
		72	p.setPen(m_pDrawPad->pen());
		73	p.setBrush(m_pDrawPad->brush());
		74	p.drawEllipse(QRect(m_polyline[2], m_polyline[0]));
		75	}
70	}	76	}
71		77
72	void FilledEllipseTool::drawTemporaryShape(QPainter& p)	78	void FilledEllipseTool::drawTemporaryShape(QPainter& p)


diff --git a/noncore/graphics/drawpad/linetool.cpp b/noncore/graphics/drawpad/linetool.cpp index 99cd6de..b6baa2a 100644 --- a/noncore/graphics/drawpad/linetool.cpp +++ b/noncore/graphics/drawpad/linetool.cpp
@@ -32,41 +32,46 @@ void LineTool::drawFinalShape(QPainter& p)
32	{	32	{
33	p.setRasterOp(Qt::NotROP);	33	p.setRasterOp(Qt::NotROP);
34	p.drawLine(m_polyline[2], m_polyline[0]);	34	p.drawLine(m_polyline[2], m_polyline[0]);
		35	p.setRasterOp(Qt::CopyROP);
35		36
36	QRect r = m_polyline.boundingRect();	37	if (m_pDrawPad->antiAliasing()) {
37	r = r.normalize();	38	QRect r = m_polyline.boundingRect();
38	r.setLeft(r.left() - m_pDrawPad->pen().width());	39	r = r.normalize();
39	r.setTop(r.top() - m_pDrawPad->pen().width());	40	r.setLeft(r.left() - m_pDrawPad->pen().width());
40	r.setRight(r.right() + m_pDrawPad->pen().width());	41	r.setTop(r.top() - m_pDrawPad->pen().width());
41	r.setBottom(r.bottom() + m_pDrawPad->pen().width());	42	r.setRight(r.right() + m_pDrawPad->pen().width());
		43	r.setBottom(r.bottom() + m_pDrawPad->pen().width());
42		44
43	QPixmap areaPixmap(r.width(), r.height());	45	QPixmap areaPixmap(r.width(), r.height());
44	bitBlt(&areaPixmap, QPoint(0, 0), p.device(), r);	46	bitBlt(&areaPixmap, QPoint(0, 0), p.device(), r);
45		47
46	QImage areaImage = areaPixmap.convertToImage();	48	QImage areaImage = areaPixmap.convertToImage();
47	QImage bigAreaImage = areaImage.smoothScale(areaImage.width() * 3, areaImage.height() * 3);	49	QImage bigAreaImage = areaImage.smoothScale(areaImage.width() * 3, areaImage.height() * 3);
48		50
49	QPixmap bigAreaPixmap;	51	QPixmap bigAreaPixmap;
50	bigAreaPixmap.convertFromImage(bigAreaImage);	52	bigAreaPixmap.convertFromImage(bigAreaImage);
51		53
52	QPen bigAreaPen = m_pDrawPad->pen();	54	QPen bigAreaPen = m_pDrawPad->pen();
53	bigAreaPen.setWidth(bigAreaPen.width() * 3);	55	bigAreaPen.setWidth(bigAreaPen.width() * 3);
54		56
55	QPainter bigAreaPainter;	57	QPainter bigAreaPainter;
56	bigAreaPainter.begin(&bigAreaPixmap);	58	bigAreaPainter.begin(&bigAreaPixmap);
57	bigAreaPainter.setPen(bigAreaPen);	59	bigAreaPainter.setPen(bigAreaPen);
58		60
59	bigAreaPainter.drawLine((m_polyline[2].x() - r.x()) * 3 + 1, (m_polyline[2].y() - r.y()) * 3 + 1,	61	bigAreaPainter.drawLine((m_polyline[2].x() - r.x()) * 3 + 1, (m_polyline[2].y() - r.y()) * 3 + 1,
60	(m_polyline[0].x() - r.x()) * 3 + 1, (m_polyline[0].y() - r.y()) * 3 + 1);	62	(m_polyline[0].x() - r.x()) * 3 + 1, (m_polyline[0].y() - r.y()) * 3 + 1);
61		63
62	bigAreaPainter.end();	64	bigAreaPainter.end();
63		65
64	bigAreaImage = bigAreaPixmap.convertToImage();	66	bigAreaImage = bigAreaPixmap.convertToImage();
65	areaImage = bigAreaImage.smoothScale(bigAreaImage.width() / 3, bigAreaImage.height() / 3);	67	areaImage = bigAreaImage.smoothScale(bigAreaImage.width() / 3, bigAreaImage.height() / 3);
66	areaPixmap.convertFromImage(areaImage);	68	areaPixmap.convertFromImage(areaImage);
67		69
68	p.setRasterOp(Qt::CopyROP);	70	p.drawPixmap(r.x(), r.y(), areaPixmap);
69	p.drawPixmap(r.x(), r.y(), areaPixmap);	71	} else {
		72	p.setPen(m_pDrawPad->pen());
		73	p.drawLine(m_polyline[2], m_polyline[0]);
		74	}
70	}	75	}
71		76
72	void LineTool::drawTemporaryShape(QPainter& p)	77	void LineTool::drawTemporaryShape(QPainter& p)


diff --git a/noncore/graphics/drawpad/pointtool.cpp b/noncore/graphics/drawpad/pointtool.cpp index 22bb089..a4f846e 100644 --- a/noncore/graphics/drawpad/pointtool.cpp +++ b/noncore/graphics/drawpad/pointtool.cpp
@@ -53,9 +53,6 @@ void PointTool::mouseMoveEvent(QMouseEvent* e)
53	m_polyline[1] = m_polyline[0];	53	m_polyline[1] = m_polyline[0];
54	m_polyline[0] = e->pos();	54	m_polyline[0] = e->pos();
55		55
56	QPainter painter;
57	painter.begin(m_pDrawPadCanvas->currentPage());
58
59	QRect r = m_polyline.boundingRect();	56	QRect r = m_polyline.boundingRect();
60	r = r.normalize();	57	r = r.normalize();
61	r.setLeft(r.left() - m_pDrawPad->pen().width());	58	r.setLeft(r.left() - m_pDrawPad->pen().width());
@@ -63,35 +60,44 @@ void PointTool::mouseMoveEvent(QMouseEvent* e)
63	r.setRight(r.right() + m_pDrawPad->pen().width());	60	r.setRight(r.right() + m_pDrawPad->pen().width());
64	r.setBottom(r.bottom() + m_pDrawPad->pen().width());	61	r.setBottom(r.bottom() + m_pDrawPad->pen().width());
65		62
66	QPixmap areaPixmap(r.width(), r.height());	63	QPainter painter;
67	bitBlt(&areaPixmap, QPoint(0, 0), painter.device(), r);	64	painter.begin(m_pDrawPadCanvas->currentPage());
		65
		66	if (m_pDrawPad->antiAliasing()) {
		67	QPixmap areaPixmap(r.width(), r.height());
		68	bitBlt(&areaPixmap, QPoint(0, 0), painter.device(), r);
		69
		70	QImage areaImage = areaPixmap.convertToImage();
		71	QImage bigAreaImage = areaImage.smoothScale(areaImage.width() * 3, areaImage.height() * 3);
68		72
69	QImage areaImage = areaPixmap.convertToImage();	73	QPixmap bigAreaPixmap;
70	QImage bigAreaImage = areaImage.smoothScale(areaImage.width() * 3, areaImage.height() * 3);	74	bigAreaPixmap.convertFromImage(bigAreaImage);
71		75
72	QPixmap bigAreaPixmap;	76	QPen bigAreaPen = m_pDrawPad->pen();
73	bigAreaPixmap.convertFromImage(bigAreaImage);	77	bigAreaPen.setWidth(bigAreaPen.width() * 3);
74		78
75	QPen bigAreaPen = m_pDrawPad->pen();	79	QPainter bigAreaPainter;
76	bigAreaPen.setWidth(bigAreaPen.width() * 3);	80	bigAreaPainter.begin(&bigAreaPixmap);
		81	bigAreaPainter.setPen(bigAreaPen);
77		82
78	QPainter bigAreaPainter;	83	QPointArray bigAreaPolyline(3);
79	bigAreaPainter.begin(&bigAreaPixmap);	84	bigAreaPolyline.setPoint(0, (m_polyline[0].x() - r.x()) * 3 + 1, (m_polyline[0].y() - r.y()) * 3 + 1);
80	bigAreaPainter.setPen(bigAreaPen);	85	bigAreaPolyline.setPoint(1, (m_polyline[1].x() - r.x()) * 3 + 1, (m_polyline[1].y() - r.y()) * 3 + 1);
		86	bigAreaPolyline.setPoint(2, (m_polyline[2].x() - r.x()) * 3 + 1, (m_polyline[2].y() - r.y()) * 3 + 1);
81		87
82	QPointArray bigAreaPolyline(3);	88	bigAreaPainter.drawPolyline(bigAreaPolyline);
83	bigAreaPolyline.setPoint(0, (m_polyline[0].x() - r.x()) * 3 + 1, (m_polyline[0].y() - r.y()) * 3 + 1);	89	bigAreaPainter.end();
84	bigAreaPolyline.setPoint(1, (m_polyline[1].x() - r.x()) * 3 + 1, (m_polyline[1].y() - r.y()) * 3 + 1);
85	bigAreaPolyline.setPoint(2, (m_polyline[2].x() - r.x()) * 3 + 1, (m_polyline[2].y() - r.y()) * 3 + 1);
86		90
87	bigAreaPainter.drawPolyline(bigAreaPolyline);	91	bigAreaImage = bigAreaPixmap.convertToImage();
88	bigAreaPainter.end();	92	areaImage = bigAreaImage.smoothScale(bigAreaImage.width() / 3, bigAreaImage.height() / 3);
		93	areaPixmap.convertFromImage(areaImage);
89		94
90	bigAreaImage = bigAreaPixmap.convertToImage();	95	painter.drawPixmap(r.x(), r.y(), areaPixmap);
91	areaImage = bigAreaImage.smoothScale(bigAreaImage.width() / 3, bigAreaImage.height() / 3);	96	} else {
92	areaPixmap.convertFromImage(areaImage);	97	painter.setPen(m_pDrawPad->pen());
		98	painter.drawPolyline(m_polyline);
		99	}
93		100
94	painter.drawPixmap(r.x(), r.y(), areaPixmap);
95	painter.end();	101	painter.end();
96		102
97	QRect viewportRect(m_pDrawPadCanvas->contentsToViewport(r.topLeft()),	103	QRect viewportRect(m_pDrawPadCanvas->contentsToViewport(r.topLeft()),