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 | |
parent | 3251c55f854ecbd4ece8bf169177ffac28081aaa (diff) | |
download | opie-6fd46f6d23538ec6e0f48209f6c0f0d939a2effe.zip opie-6fd46f6d23538ec6e0f48209f6c0f0d939a2effe.tar.gz opie-6fd46f6d23538ec6e0f48209f6c0f0d939a2effe.tar.bz2 |
Anti-aliasing as an option
-rw-r--r-- | noncore/graphics/drawpad/drawpad.cpp | 11 | ||||
-rw-r--r-- | noncore/graphics/drawpad/drawpad.h | 4 | ||||
-rw-r--r-- | noncore/graphics/drawpad/ellipsetool.cpp | 7 | ||||
-rw-r--r-- | noncore/graphics/drawpad/filledellipsetool.cpp | 8 | ||||
-rw-r--r-- | noncore/graphics/drawpad/linetool.cpp | 7 | ||||
-rw-r--r-- | noncore/graphics/drawpad/pointtool.cpp | 12 |
6 files changed, 43 insertions, 6 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 | |||
@@ -95,2 +95,8 @@ DrawPad::DrawPad(QWidget* parent, const char* name) | |||
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); |
@@ -277,2 +283,7 @@ DrawPad::~DrawPad() | |||
277 | 283 | ||
284 | bool DrawPad::antiAliasing() | ||
285 | { | ||
286 | return (m_pAntiAliasingAction->isOn()); | ||
287 | } | ||
288 | |||
278 | void DrawPad::newPage() | 289 | void DrawPad::newPage() |
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 | |||
@@ -40,2 +40,4 @@ public: | |||
40 | 40 | ||
41 | bool antiAliasing(); | ||
42 | |||
41 | private slots: | 43 | private slots: |
@@ -76,2 +78,4 @@ private: | |||
76 | 78 | ||
79 | QAction* m_pAntiAliasingAction; | ||
80 | |||
77 | QAction* m_pUndoAction; | 81 | QAction* m_pUndoAction; |
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 | |||
@@ -34,3 +34,5 @@ void EllipseTool::drawFinalShape(QPainter& p) | |||
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 | ||
37 | if (m_pDrawPad->antiAliasing()) { | ||
36 | QRect r = m_polyline.boundingRect(); | 38 | QRect r = m_polyline.boundingRect(); |
@@ -66,4 +68,7 @@ void EllipseTool::drawFinalShape(QPainter& p) | |||
66 | 68 | ||
67 | p.setRasterOp(Qt::CopyROP); | ||
68 | p.drawPixmap(r.x(), r.y(), areaPixmap); | 69 | 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 | } |
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 | |||
@@ -34,3 +34,5 @@ void FilledEllipseTool::drawFinalShape(QPainter& p) | |||
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 | ||
37 | if (m_pDrawPad->antiAliasing()) { | ||
36 | QRect r = m_polyline.boundingRect(); | 38 | QRect r = m_polyline.boundingRect(); |
@@ -67,4 +69,8 @@ void FilledEllipseTool::drawFinalShape(QPainter& p) | |||
67 | 69 | ||
68 | p.setRasterOp(Qt::CopyROP); | ||
69 | p.drawPixmap(r.x(), r.y(), areaPixmap); | 70 | 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 | } |
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 | |||
@@ -34,3 +34,5 @@ void LineTool::drawFinalShape(QPainter& p) | |||
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 | ||
37 | if (m_pDrawPad->antiAliasing()) { | ||
36 | QRect r = m_polyline.boundingRect(); | 38 | QRect r = m_polyline.boundingRect(); |
@@ -67,4 +69,7 @@ void LineTool::drawFinalShape(QPainter& p) | |||
67 | 69 | ||
68 | p.setRasterOp(Qt::CopyROP); | ||
69 | p.drawPixmap(r.x(), r.y(), areaPixmap); | 70 | 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 | } |
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 | |||
@@ -55,5 +55,2 @@ void PointTool::mouseMoveEvent(QMouseEvent* e) | |||
55 | 55 | ||
56 | QPainter painter; | ||
57 | painter.begin(m_pDrawPadCanvas->currentPage()); | ||
58 | |||
59 | QRect r = m_polyline.boundingRect(); | 56 | QRect r = m_polyline.boundingRect(); |
@@ -65,2 +62,6 @@ void PointTool::mouseMoveEvent(QMouseEvent* e) | |||
65 | 62 | ||
63 | QPainter painter; | ||
64 | painter.begin(m_pDrawPadCanvas->currentPage()); | ||
65 | |||
66 | if (m_pDrawPad->antiAliasing()) { | ||
66 | QPixmap areaPixmap(r.width(), r.height()); | 67 | QPixmap areaPixmap(r.width(), r.height()); |
@@ -94,2 +95,7 @@ void PointTool::mouseMoveEvent(QMouseEvent* e) | |||
94 | painter.drawPixmap(r.x(), r.y(), areaPixmap); | 95 | painter.drawPixmap(r.x(), r.y(), areaPixmap); |
96 | } else { | ||
97 | painter.setPen(m_pDrawPad->pen()); | ||
98 | painter.drawPolyline(m_polyline); | ||
99 | } | ||
100 | |||
95 | painter.end(); | 101 | painter.end(); |