Merge branch 'pen-tool'

mitchcurtis · Nov 23, 2018 · d9e2481 · d9e2481
2 parents bce180e + 15cf014
commit d9e2481
Show file tree

Hide file tree

Showing 33 changed files with 786 additions and 108 deletions.
diff --git a/app/images/circle-tool-shape.png b/app/images/circle-tool-shape.png
diff --git a/app/images/circle-tool-shape.svg b/app/images/circle-tool-shape.svg
diff --git a/app/images/circle-tool-shape@2x.png b/app/images/circle-tool-shape@2x.png
diff --git a/app/images/circle-tool-shape@3x.png b/app/images/circle-tool-shape@3x.png
diff --git a/app/images/circle-tool-shape@4x.png b/app/images/circle-tool-shape@4x.png
diff --git a/app/images/images.qrc b/app/images/images.qrc
@@ -11,6 +11,11 @@
         <file>change-tool-size@3x.png</file>
         <file>change-tool-size@4x.png</file>
         <file>checker.png</file>
+        <file>circle-tool-shape.svg</file>
+        <file>circle-tool-shape@4x.png</file>
+        <file>circle-tool-shape@3x.png</file>
+        <file>circle-tool-shape@2x.png</file>
+        <file>circle-tool-shape.png</file>
         <file>fill.png</file>
         <file>fill@2x.png</file>
         <file>fill@3X.png</file>
@@ -63,6 +68,11 @@
         <file>splitscreen@2x.png</file>
         <file>splitscreen@3x.png</file>
         <file>splitscreen@4x.png</file>
+        <file>square-tool-shape.svg</file>
+        <file>square-tool-shape@4x.png</file>
+        <file>square-tool-shape@3x.png</file>
+        <file>square-tool-shape@2x.png</file>
+        <file>square-tool-shape.png</file>
         <file>textured-fill.png</file>
         <file>textured-fill@2x.png</file>
         <file>textured-fill@3x.png</file>

diff --git a/app/images/square-tool-shape.png b/app/images/square-tool-shape.png
diff --git a/app/images/square-tool-shape.svg b/app/images/square-tool-shape.svg
diff --git a/app/images/square-tool-shape@2x.png b/app/images/square-tool-shape@2x.png
diff --git a/app/images/square-tool-shape@3x.png b/app/images/square-tool-shape@3x.png
diff --git a/app/images/square-tool-shape@4x.png b/app/images/square-tool-shape@4x.png
diff --git a/app/qml/ui/ToolBar.qml b/app/qml/ui/ToolBar.qml
@@ -292,6 +292,54 @@ ToolBar {
             }
         }
 
+        ToolButton {
+            id: toolShapeButton
+            objectName: "toolShapeButton"
+            hoverEnabled: true
+            focusPolicy: Qt.NoFocus
+
+            readonly property bool squareShape: canvas && canvas.toolShape === ImageCanvas.SquareToolShape
+            icon.source: squareShape ? "qrc:/images/square-tool-shape.png" : "qrc:/images/circle-tool-shape.png"
+
+            ToolTip.text: qsTr("Choose brush shape")
+            ToolTip.visible: hovered
+
+            onClicked: toolShapeMenu.visible = !toolShapeMenu.visible
+
+            ToolButtonMenuIndicator {
+                color: toolShapeButton.icon.color
+                anchors.right: parent.contentItem.right
+                anchors.bottom: parent.contentItem.bottom
+                anchors.margins: 6
+            }
+
+            Menu {
+                id: toolShapeMenu
+                objectName: "toolShapeMenu"
+                y: toolShapeButton.height
+                width: 260
+
+                MenuItem {
+                    objectName: "squareToolShapeMenuItem"
+                    text: qsTr("Square")
+                    icon.source: "qrc:/images/square-tool-shape.png"
+                    autoExclusive: true
+                    checkable: true
+                    checked: canvas && canvas.toolShape === ImageCanvas.SquareToolShape
+                    onTriggered: canvas.toolShape = ImageCanvas.SquareToolShape
+                }
+                MenuItem {
+                    objectName: "circleToolShapeMenuItem"
+                    text: qsTr("Circle")
+                    icon.source: "qrc:/images/circle-tool-shape.png"
+                    autoExclusive: true
+                    checkable: true
+                    checked: canvas && canvas.toolShape === ImageCanvas.CircleToolShape
+                    onTriggered: canvas.toolShape = ImageCanvas.CircleToolShape
+                }
+            }
+        }
+
         ToolSeparator {
             id: toolSeparator
         }

diff --git a/lib/applypixellinecommand.cpp b/lib/applypixellinecommand.cpp
@@ -20,23 +20,49 @@
 #include "applypixellinecommand.h"
 
 #include <QLoggingCategory>
+#include <QPainter>
+#include <QImage>
 
 #include "commands.h"
 
 Q_LOGGING_CATEGORY(lcApplyPixelLineCommand, "app.undo.applyPixelLineCommand")
 
-ApplyPixelLineCommand::ApplyPixelLineCommand(ImageCanvas *canvas, int layerIndex, const QImage &imageWithLine,
-    const QImage &imageWithoutLine, const QRect &lineRect,
-    const QPoint &newLastPixelPenReleaseScenePos, const QPoint &oldLastPixelPenReleaseScenePos, QUndoCommand *parent) :
+// The undo command for lines needs the project image before and after
+// the line was drawn on it.
+ApplyPixelLineCommand::ApplyPixelLineCommand(ImageCanvas *canvas, int layerIndex, QImage &currentProjectImage, const QPointF point1, const QPointF point2,
+                                             const QPointF &newLastPixelPenReleaseScenePos, const QPointF &oldLastPixelPenReleaseScenePos,
+                                             const QPainter::CompositionMode mode, QUndoCommand *parent) :
     QUndoCommand(parent),
     mCanvas(canvas),
     mLayerIndex(layerIndex),
-    mImageWithLine(imageWithLine),
-    mImageWithoutLine(imageWithoutLine),
-    mLineRect(lineRect),
     mNewLastPixelPenReleaseScenePos(newLastPixelPenReleaseScenePos),
-    mOldLastPixelPenReleaseScenePos(oldLastPixelPenReleaseScenePos)
+    mOldLastPixelPenReleaseScenePos(oldLastPixelPenReleaseScenePos),
+    subImageDatas()
 {
+    const QRect lineRect = mCanvas->normalisedLineRect(point1, point2);
+    const QList<ImageCanvas::SubImage> subImages = canvas->subImagesInBounds(lineRect);
+    for (auto const &subImage : subImages) {
+        // subimage-space to scene-space offset
+        const QPoint offset = subImage.bounds.topLeft() - subImage.offset;
+        // line rect offset to scene space and clipped to subimage bounds
+        const QRect subImageLineRect = subImage.bounds.intersected(lineRect.translated(offset));
+
+        SubImageData subImageData;
+        subImageData.subImage = subImage;
+        subImageData.lineRect = subImageLineRect;
+        subImageData.imageWithoutLine = currentProjectImage.copy(subImageLineRect);
+
+        QPainter painter(&currentProjectImage);
+        // Clip drawing to subimage
+        painter.setClipRect(subImageLineRect);
+        // Draw line with offset to subimage
+        mCanvas->drawLine(&painter, point1 + offset, point2 + offset, mode);
+        painter.end();
+
+        subImageData.imageWithLine = currentProjectImage.copy(subImageLineRect);
+        subImageDatas.append(subImageData);
+    }
+
     qCDebug(lcApplyPixelLineCommand) << "constructed" << this;
 }
 
@@ -48,13 +74,17 @@ ApplyPixelLineCommand::~ApplyPixelLineCommand()
 void ApplyPixelLineCommand::undo()
 {
     qCDebug(lcApplyPixelLineCommand) << "undoing" << this;
-    mCanvas->applyPixelLineTool(mLayerIndex, mImageWithoutLine, mLineRect, mOldLastPixelPenReleaseScenePos);
+    for (auto const &subImageData : subImageDatas) {
+        mCanvas->applyPixelLineTool(mLayerIndex, subImageData.imageWithoutLine, subImageData.lineRect, mOldLastPixelPenReleaseScenePos);
+    }
 }
 
 void ApplyPixelLineCommand::redo()
 {
     qCDebug(lcApplyPixelLineCommand) << "redoing" << this;
-    mCanvas->applyPixelLineTool(mLayerIndex, mImageWithLine, mLineRect, mNewLastPixelPenReleaseScenePos);
+    for (auto const &subImageData : subImageDatas) {
+        mCanvas->applyPixelLineTool(mLayerIndex, subImageData.imageWithLine, subImageData.lineRect, mNewLastPixelPenReleaseScenePos);
+    }
 }
 
 int ApplyPixelLineCommand::id() const
@@ -71,7 +101,7 @@ QDebug operator<<(QDebug debug, const ApplyPixelLineCommand *command)
 {
     debug.nospace() << "(ApplyPixelLineCommand"
         << " layerIndex=" << command->mLayerIndex
-        << ", lineRect" << command->mLineRect
+//        << ", lineRect" << command->mLineRect
         << ", newLastPixelPenReleaseScenePos=" << command->mNewLastPixelPenReleaseScenePos
         << ", oldLastPixelPenReleaseScenePos=" << command->mOldLastPixelPenReleaseScenePos
         << ")";

diff --git a/lib/applypixellinecommand.h b/lib/applypixellinecommand.h
@@ -30,9 +30,9 @@
 class SLATE_EXPORT ApplyPixelLineCommand : public QUndoCommand
 {
 public:
-    ApplyPixelLineCommand(ImageCanvas *canvas, int layerIndex, const QImage &imageWithLine,
-        const QImage &imageWithoutLine, const QRect &lineRect, const QPoint &newLastPixelPenReleaseScenePos,
-        const QPoint &oldLastPixelPenReleaseScenePos, QUndoCommand *parent = nullptr);
+    ApplyPixelLineCommand(ImageCanvas *canvas, int layerIndex, QImage &currentProjectImage, const QPointF point1, const QPointF point2,
+                          const QPointF &newLastPixelPenReleaseScenePos, const QPointF &oldLastPixelPenReleaseScenePos,
+                          const QPainter::CompositionMode mode, QUndoCommand *parent = nullptr);
     ~ApplyPixelLineCommand();
 
     void undo() override;
@@ -46,11 +46,16 @@ class SLATE_EXPORT ApplyPixelLineCommand : public QUndoCommand
 
     ImageCanvas *mCanvas;
     int mLayerIndex;
-    QImage mImageWithLine;
-    QImage mImageWithoutLine;
-    QRect mLineRect;
-    QPoint mNewLastPixelPenReleaseScenePos;
-    QPoint mOldLastPixelPenReleaseScenePos;
+    QPointF mNewLastPixelPenReleaseScenePos;
+    QPointF mOldLastPixelPenReleaseScenePos;
+
+    struct SubImageData {
+        ImageCanvas::SubImage subImage;
+        QRect lineRect;
+        QImage imageWithoutLine;
+        QImage imageWithLine;
+    };
+    QList<SubImageData> subImageDatas;
 };
 
 

diff --git a/lib/canvaspane.cpp b/lib/canvaspane.cpp
@@ -154,7 +154,8 @@ void CanvasPane::reset()
 QDebug operator<<(QDebug debug, const CanvasPane *pane)
 {
     QDebugStateSaver stateSaver(debug);
-    debug.nospace() << "(CanvasPane offset=" << pane->integerOffset()
+    debug.nospace() << "(CanvasPane objectName=" << pane->objectName()
+        << "offset=" << pane->integerOffset()
         << " size=" << pane->size()
         << " zoomLevel=" << pane->zoomLevel()
         << ")";

diff --git a/lib/canvaspane.h b/lib/canvaspane.h
@@ -80,6 +80,6 @@ class SLATE_EXPORT CanvasPane : public QObject
     bool mSceneCentered;
 };
 
-QDebug operator<<(QDebug debug, const CanvasPane *pane);
+SLATE_EXPORT QDebug operator<<(QDebug debug, const CanvasPane *pane);
 
 #endif // CANVASPANE_H