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

List:       kde-commits
Subject:    [calligra/krita-chili-kazakov] krita: Fix hangups in the transform mask when using Perspective Trans
From:       Dmitry Kazakov <dimula73 () gmail ! com>
Date:       2014-10-28 12:51:45
Message-ID: E1Xj6FV-0004di-MY () scm ! kde ! org
[Download RAW message or body]

Git commit 544d6558b43f094d3c97135297607a15a2963cea by Dmitry Kazakov.
Committed on 28/10/2014 at 11:51.
Pushed by dkazakov into branch 'krita-chili-kazakov'.

Fix hangups in the transform mask when using Perspective Transform

M  +50   -5    krita/image/kis_transform_mask.cpp
M  +3    -0    krita/image/kis_transform_mask.h
M  +14   -2    krita/plugins/tools/tool_transform2/strokes/transform_stroke_strategy.cpp


http://commits.kde.org/calligra/544d6558b43f094d3c97135297607a15a2963cea

diff --git a/krita/image/kis_transform_mask.cpp b/krita/image/kis_transform_mask.cpp
index f15bd51..22132fb 100644
--- a/krita/image/kis_transform_mask.cpp
+++ b/krita/image/kis_transform_mask.cpp
@@ -154,7 +154,13 @@ void KisTransformMask::recaclulateStaticImage()
     }
 
     m_d->recalculatingStaticImage = true;
-    parentLayer->updateProjection(parentLayer->exactBounds(), N_FILTHY_PROJECTION);
+    /**
+     * updateProjection() is assuming that the requestedRect takes
+     * into account all the change rects of all the masks. Usually,
+     * this work is done by the walkers.
+     */
+    QRect requestedRect = parentLayer->changeRect(parentLayer->exactBounds());
+    parentLayer->updateProjection(requestedRect, N_FILTHY_PROJECTION);
     m_d->recalculatingStaticImage = false;
 
     m_d->staticCacheValid = true;
@@ -203,6 +209,14 @@ void KisTransformMask::accept(KisProcessingVisitor &visitor, \
KisUndoAdapter *und  return visitor.visit(this, undoAdapter);
 }
 
+QRect calculateLimitingRect(const QRect &bounds, qreal coeff)
+{
+    int w = bounds.width() * coeff;
+    int h = bounds.height() * coeff;
+
+    return bounds.adjusted(-w, -h, w, h);
+}
+
 QRect KisTransformMask::changeRect(const QRect &rect, PositionToFilthy pos) const
 {
     Q_UNUSED(pos);
@@ -223,14 +237,22 @@ QRect KisTransformMask::changeRect(const QRect &rect, \
PositionToFilthy pos) cons  if ((parentNode = parent()) &&
         (parentOriginal = parentNode->original())) {
 
-        QRect backwardRect = m_d->worker.backwardTransform().mapRect(rect);
-        QRegion backwardRegion(backwardRect);
-        backwardRegion -= parentOriginal->defaultBounds()->bounds();
+        const QRect bounds = parentOriginal->defaultBounds()->bounds();
+        const QRect limitingRect = calculateLimitingRect(bounds, 2);
+
+        changeRect &= limitingRect;
+        QRect backwardRect = limitingRect & \
m_d->worker.backwardTransform().mapRect(rect);  
+        QRegion backwardRegion(backwardRect);
+        backwardRegion -= bounds;
         backwardRegion = m_d->worker.forwardTransform().map(backwardRegion);
 
         // FIXME: d-oh... please fix me and use region instead :(
         changeRect |= backwardRegion.boundingRect();
+    } else {
+        qWarning() << "WARNING: a transform mask has no parent, don't know how to \
limit it"; +        const QRect limitingRect(-1000, -1000, 10000, 10000);
+        changeRect &= limitingRect;
     }
 
     return changeRect;
@@ -247,7 +269,30 @@ QRect KisTransformMask::needRect(const QRect& rect, \
PositionToFilthy pos) const  if (rect.isEmpty()) return rect;
     if (!m_d->params->isAffine()) return rect;
 
-    return kisGrowRect(m_d->worker.backwardTransform().mapRect(rect), 2);
+    QRect needRect = kisGrowRect(m_d->worker.backwardTransform().mapRect(rect), 2);
+
+    KisNodeSP parentNode;
+
+    if ((parentNode = parent())) {
+        needRect &= parentNode->exactBounds();
+    } else if (needRect.width() > 1e6 || needRect.height() > 1e6) {
+        qWarning() << "WARNING: transform mask returns infinite need rect! \
Dropping..." << needRect; +        needRect = rect;
+    }
+
+    return needRect;
+}
+
+QRect KisTransformMask::extent() const
+{
+    QRect rc = KisMask::extent();
+    return rc | changeRect(rc);
+}
+
+QRect KisTransformMask::exactBounds() const
+{
+    QRect rc = KisMask::exactBounds();
+    return rc | changeRect(rc);
 }
 
 #include "kis_transform_mask.moc"
diff --git a/krita/image/kis_transform_mask.h b/krita/image/kis_transform_mask.h
index 8a61cfa..9930c90 100644
--- a/krita/image/kis_transform_mask.h
+++ b/krita/image/kis_transform_mask.h
@@ -61,6 +61,9 @@ public:
     QRect changeRect(const QRect &rect, PositionToFilthy pos = N_FILTHY) const;
     QRect needRect(const QRect &rect, PositionToFilthy pos = N_FILTHY) const;
 
+    QRect extent() const;
+    QRect exactBounds() const;
+
     void setTransformParams(KisTransformMaskParamsInterfaceSP params);
     KisTransformMaskParamsInterfaceSP transformParams() const;
 
diff --git a/krita/plugins/tools/tool_transform2/strokes/transform_stroke_strategy.cpp \
b/krita/plugins/tools/tool_transform2/strokes/transform_stroke_strategy.cpp index \
                28391a5..b72d6f7 100644
--- a/krita/plugins/tools/tool_transform2/strokes/transform_stroke_strategy.cpp
+++ b/krita/plugins/tools/tool_transform2/strokes/transform_stroke_strategy.cpp
@@ -55,14 +55,26 @@ public:
          */
 
         m_mask->recaclulateStaticImage();
-        m_mask->setDirty();
+        updateMask();
     }
 
     void undo() {
         m_mask->setTransformParams(m_oldParams);
 
         m_mask->recaclulateStaticImage();
-        m_mask->setDirty();
+        updateMask();
+    }
+
+private:
+    void updateMask() {
+        QRect updateRect = m_mask->extent();
+
+        KisNodeSP parent = m_mask->parent();
+        if (parent && parent->original()) {
+            updateRect |= parent->original()->defaultBounds()->bounds();
+        }
+
+        m_mask->setDirty(updateRect);
     }
 
 private:


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