[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [Calligra] 395a8be: KisToolFreehand: use KisCanvasResourceProvider's l
From:       Geoffry Song <goffrie () gmail ! com>
Date:       2010-12-31 23:27:35
Message-ID: 20101231232735.3D391A60B9 () git ! kde ! org
[Download RAW message or body]

commit 395a8be23508e4dbfeddeef521a20af1e67fb802
branch master
Author: Geoffry Song <goffrie@gmail.com>
Date:   Fri Dec 31 12:28:38 2010 -0500

    KisToolFreehand: use KisCanvasResourceProvider's list of perspective grids

diff --git a/krita/ui/tool/kis_tool_freehand.cc b/krita/ui/tool/kis_tool_freehand.cc
index 2359aea..a41e40e 100644
--- a/krita/ui/tool/kis_tool_freehand.cc
+++ b/krita/ui/tool/kis_tool_freehand.cc
@@ -144,12 +144,11 @@ void KisToolFreehand::mousePressEvent(KoPointerEvent *e)
      */
     QPointF pos = adjustPosition(e->point, e->point);
     qreal perspective = 1.0;
-    foreach (const KisPaintingAssistant* assistant, \
static_cast<KisCanvas2*>(canvas())->view()->paintingAssistantManager()->assistants()) \
                {
-        const KisAbstractPerspectiveGrid* perspectiveGrid = dynamic_cast<const \
                KisAbstractPerspectiveGrid*>(assistant);
-        if (!perspectiveGrid) continue;
-        if (!perspectiveGrid->contains(pos)) continue;
-        perspective = perspectiveGrid->distance(pos);
-        break;
+    foreach (const KisAbstractPerspectiveGrid* grid, \
static_cast<KisCanvas2*>(canvas())->view()->resourceProvider()->perspectiveGrids()) { \
+        if (grid->contains(pos)) { +            perspective = grid->distance(pos);
+            break;
+        }
     }
     bool ignoreEvent = \
currentPaintOpPreset()->settings()->mousePressEvent(KisPaintInformation(convertToPixelCoord(e->point),
                
                                                          \
pressureToCurve(e->pressure()), e->xTilt(), e->yTilt(), @@ -227,12 +226,11 @@ void \
KisToolFreehand::mouseMoveEvent(KoPointerEvent *e)  QPointF dragVec = pos - \
m_previousPaintInformation.pos();  
     qreal perspective = 1.0;
-    foreach (const KisPaintingAssistant* assistant, \
static_cast<KisCanvas2*>(canvas())->view()->paintingAssistantManager()->assistants()) \
                {
-        const KisAbstractPerspectiveGrid* perspectiveGrid = dynamic_cast<const \
                KisAbstractPerspectiveGrid*>(assistant);
-        if (!perspectiveGrid) continue;
-        if (!perspectiveGrid->contains(adjusted)) continue;
-        perspective = perspectiveGrid->distance(adjusted);
-        break;
+    foreach (const KisAbstractPerspectiveGrid* grid, \
static_cast<KisCanvas2*>(canvas())->view()->resourceProvider()->perspectiveGrids()) { \
+        if (grid->contains(adjusted)) { +            perspective = \
grid->distance(adjusted); +            break;
+        }
     }
 
     KisPaintInformation info =


[prev in list] [next in list] [prev in thread] [next in thread]