Add canvas modifier for changing canvas size #92

Author: DamirPorobic

CHANGELOG.md

@@ -5,6 +5,7 @@
 * New: Add a new tool for creating resizable movable duplicates of regions. ([#131](https://github.com/ksnip/kImageAnnotator/issues/131))
 * New: Add support for hiding annotation settings panel. ([#182](https://github.com/ksnip/kImageAnnotator/issues/182))
 * New: Add config option for numbering tool to only set next number. ([#42](https://github.com/ksnip/kImageAnnotator/issues/42))
+* New: Allow manually changing canvas size. ([#92](https://github.com/ksnip/kImageAnnotator/issues/92))
 
 ## Release 0.4.1
 * Fixed: Brazilian Portuguese translation not loaded. ([#176](https://github.com/ksnip/kImageAnnotator/issues/176))

example/main.cpp

@@ -43,12 +43,15 @@ int main(int argc, char **argv)
 	auto annotationAction = new QAction(QLatin1Literal("Annotation"), &mainWindow);
 	auto cropAction = new QAction(QLatin1Literal("Crop"), &mainWindow);
 	auto scaleAction = new QAction(QLatin1Literal("Scale"), &mainWindow);
+	auto modifyCanvasAction = new QAction(QLatin1Literal("Modify Canvas"), &mainWindow);
 	mainWindow.connect(annotationAction, &QAction::triggered, kImageAnnotator, &KImageAnnotator::showAnnotator);
 	mainWindow.connect(cropAction, &QAction::triggered, kImageAnnotator, &KImageAnnotator::showCropper);
 	mainWindow.connect(scaleAction, &QAction::triggered, kImageAnnotator, &KImageAnnotator::showScaler);
+	mainWindow.connect(modifyCanvasAction, &QAction::triggered, kImageAnnotator, &KImageAnnotator::showCanvasModifier);
 	menu->addAction(annotationAction);
 	menu->addAction(cropAction);
 	menu->addAction(scaleAction);
+	menu->addAction(modifyCanvasAction);
 	menuBar->addMenu(menu);
 	mainWindow.show();
 	mainWindow.setMinimumSize(kImageAnnotator->sizeHint());

include/kImageAnnotator/KImageAnnotator.h

@@ -47,6 +47,7 @@ Q_OBJECT
 	void showAnnotator();
 	void showCropper();
 	void showScaler();
+	void showCanvasModifier();
 	void setSettingsCollapsed(bool isCollapsed);
 
 public Q_SLOTS:

src/CMakeLists.txt

@@ -10,12 +10,16 @@ set(KIMAGEANNOTATOR_SRCS
 	${CMAKE_CURRENT_SOURCE_DIR}/gui/annotator/tabs/AnnotationTabWidget.cpp
 	${CMAKE_CURRENT_SOURCE_DIR}/gui/annotator/tabs/AnnotationTabContextMenu.cpp
 	${CMAKE_CURRENT_SOURCE_DIR}/gui/annotator/tabs/AnnotationTabCloser.cpp
+	${CMAKE_CURRENT_SOURCE_DIR}/gui/canvasModifier/ModifyCanvasView.cpp
+	${CMAKE_CURRENT_SOURCE_DIR}/gui/canvasModifier/ModifyCanvasWidget.cpp
+	${CMAKE_CURRENT_SOURCE_DIR}/gui/canvasModifier/ModifyCanvasSelectionRestrictor.cpp
 	${CMAKE_CURRENT_SOURCE_DIR}/gui/cropper/CropWidget.cpp
 	${CMAKE_CURRENT_SOURCE_DIR}/gui/cropper/CropView.cpp
-	${CMAKE_CURRENT_SOURCE_DIR}/gui/cropper/CropSelectionHandler.cpp
 	${CMAKE_CURRENT_SOURCE_DIR}/gui/cropper/CropSelectionRestrictor.cpp
-	${CMAKE_CURRENT_SOURCE_DIR}/gui/cropper/CropHandles.cpp
-	${CMAKE_CURRENT_SOURCE_DIR}/gui/cropper/CropSelectionMoveHelper.cpp
+	${CMAKE_CURRENT_SOURCE_DIR}/gui/selection/SelectionHandler.cpp
+	${CMAKE_CURRENT_SOURCE_DIR}/gui/selection/SelectionMoveHelper.cpp
+	${CMAKE_CURRENT_SOURCE_DIR}/gui/selection/SelectionHandles.cpp
+	${CMAKE_CURRENT_SOURCE_DIR}/gui/selection/BaseSelectionView.cpp
 	${CMAKE_CURRENT_SOURCE_DIR}/gui/scaler/ScaleDialog.cpp
 	${CMAKE_CURRENT_SOURCE_DIR}/gui/scaler/ScaleWidget.cpp
 	${CMAKE_CURRENT_SOURCE_DIR}/gui/scaler/ScaleSizeHandler.cpp
@@ -88,6 +92,7 @@ set(KIMAGEANNOTATOR_SRCS
 	${CMAKE_CURRENT_SOURCE_DIR}/annotations/undo/ScaleCommand.cpp
 	${CMAKE_CURRENT_SOURCE_DIR}/annotations/undo/PasteCommand.cpp
 	${CMAKE_CURRENT_SOURCE_DIR}/annotations/undo/ChangePropertiesCommand.cpp
+	${CMAKE_CURRENT_SOURCE_DIR}/annotations/undo/ModifyCanvasCommand.cpp
 	${CMAKE_CURRENT_SOURCE_DIR}/annotations/misc/ShadowEffect.cpp
 	${CMAKE_CURRENT_SOURCE_DIR}/annotations/misc/ImageBlurrer.cpp
 	${CMAKE_CURRENT_SOURCE_DIR}/annotations/misc/AnnotationItemClipboard.cpp

src/annotations/core/AnnotationArea.cpp

@@ -99,10 +99,7 @@ QImage AnnotationArea::image()
 	}
 
 	mItemModifier->clear();
-
-	auto graphicsEffectRect = mImage->graphicsEffect()->boundingRect();
-	setSceneRect(itemsBoundingRect().united(graphicsEffectRect)); // Cover all items
-
+	setSceneRect(canvasRect());
 	auto scaleFactor = mDevicePixelRatioScaler->scaleFactor();
 	QImage image(sceneRect().size().toSize() * scaleFactor, QImage::Format_ARGB32_Premultiplied);
 	image.fill(Qt::white);
@@ -192,6 +189,26 @@ void AnnotationArea::imageEffectChanged(ImageEffects effect)
 	mImage->setGraphicsEffect(graphicsEffect);
 }
 
+void AnnotationArea::setCanvasRect(const QRectF &rect)
+{
+	mCanvasRect = rect;
+}
+
+QRectF AnnotationArea::canvasRect() const
+{
+	if(mCanvasRect.isNull()) {
+		auto graphicsEffectRect = mImage->graphicsEffect()->boundingRect();
+		return itemsBoundingRect().united(graphicsEffectRect);
+	} else {
+		return mCanvasRect;
+	}
+}
+
+void AnnotationArea::modifyCanvas(const QRectF &canvasRect)
+{
+	mUndoStack->push(new ModifyCanvasCommand(canvasRect, this));
+}
+
 void AnnotationArea::update()
 {
 	mItemModifier->updateSelection();

src/annotations/core/AnnotationArea.h

@@ -45,6 +45,7 @@
 #include "src/annotations/undo/ScaleCommand.h"
 #include "src/annotations/undo/PasteCommand.h"
 #include "src/annotations/undo/ChangePropertiesCommand.h"
+#include "src/annotations/undo/ModifyCanvasCommand.h"
 #include "src/annotations/core/ZoomValueProvider.h"
 #include "src/annotations/core/imageEffects/ImageEffectFactory.h"
 
@@ -71,6 +72,9 @@ class AnnotationArea : public QGraphicsScene, public ISettingsListener
 	void numberToolSeedChanged(int numberToolSeed) override;
 	int numberToolSeed() const override;
 	void imageEffectChanged(ImageEffects effect) override;
+	void setCanvasRect(const QRectF &rect);
+	QRectF canvasRect() const;
+	void modifyCanvas(const QRectF &canvasRect);
 
 public slots:
     virtual void update();
@@ -102,6 +106,7 @@ public slots:
 	QAction *mRedoAction;
 	IDevicePixelRatioScaler *mDevicePixelRatioScaler;
 	KeyEventListener mKeyListener;
+	QRectF mCanvasRect;
 
     void addItemAtPosition(const QPointF& position);
     void addPointToCurrentItem(const QPointF& position);

src/annotations/undo/AddCommand.cpp

@@ -27,10 +27,6 @@ AddCommand::AddCommand(AbstractAnnotationItem *item, AnnotationArea *annotationA
     mAnnotationArea = annotationArea;
 }
 
-AddCommand::~AddCommand()
-{
-}
-
 void AddCommand::undo()
 {
     mAnnotationArea->removeAnnotationItem(mItem);

src/annotations/undo/AddCommand.h

@@ -33,7 +33,7 @@ class AddCommand : public QUndoCommand
 {
 public:
     AddCommand(AbstractAnnotationItem *item, AnnotationArea *annotationArea);
-    ~AddCommand();
+    ~AddCommand() = default;
     virtual void undo() override;
     virtual void redo() override;
 

src/annotations/undo/ModifyCanvasCommand.cpp

@@ -0,0 +1,43 @@
+/*
+ * Copyright (C) 2020 Damir Porobic <[email protected]>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#include "ModifyCanvasCommand.h"
+
+namespace kImageAnnotator {
+
+
+ModifyCanvasCommand::ModifyCanvasCommand(const QRectF &canvasRect, AnnotationArea *annotationArea) :
+	mAnnotationArea(annotationArea),
+	mNewCanvasRect(canvasRect),
+	mOriginalCanvasRect(annotationArea->canvasRect())
+{
+
+}
+
+void ModifyCanvasCommand::undo()
+{
+	mAnnotationArea->setCanvasRect(mOriginalCanvasRect);
+}
+
+void ModifyCanvasCommand::redo()
+{
+	mAnnotationArea->setCanvasRect(mNewCanvasRect);
+}
+
+} // namespace kImageAnnotator

src/annotations/undo/ModifyCanvasCommand.h

@@ -0,0 +1,45 @@
+/*
+ * Copyright (C) 2020 Damir Porobic <[email protected]>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#ifndef KIMAGEANNOTATOR_MODIFYCANVASCOMMAND_H
+#define KIMAGEANNOTATOR_MODIFYCANVASCOMMAND_H
+
+#include <QUndoCommand>
+
+#include "src/annotations/core/AnnotationArea.h"
+
+namespace kImageAnnotator {
+
+class ModifyCanvasCommand : public QUndoCommand
+{
+public:
+	explicit ModifyCanvasCommand(const QRectF &canvasRect, AnnotationArea *annotationArea);
+	~ModifyCanvasCommand() override = default;
+	void undo() override;
+	void redo() override;
+
+private:
+	AnnotationArea *mAnnotationArea;
+	QRectF mNewCanvasRect;
+	QRectF mOriginalCanvasRect;
+};
+
+} // namespace kImageAnnotator
+
+#endif //KIMAGEANNOTATOR_MODIFYCANVASCOMMAND_H