Add number pointer tool #79

Author: DamirPorobic

CHANGELOG.md

@@ -6,6 +6,7 @@
 * New: Saved image expand to include annotations out of border. ([#90](https://github.com/ksnip/kImageAnnotator/issues/90))
 * New: Add support for stickers. ([#74](https://github.com/ksnip/kImageAnnotator/issues/74))
 * New: Add tab context menu for close all tabs and close other tabs. ([#93](https://github.com/ksnip/kImageAnnotator/issues/93))
+* New: Add Number with Arrow/pointer tool. ([#79](https://github.com/ksnip/kImageAnnotator/issues/79))
 * Changed: Make dropdown buttons show popup on click. ([#89](https://github.com/ksnip/kImageAnnotator/issues/89))
 * Changed: Hide unavailable setting widgets. ([#101](https://github.com/ksnip/kImageAnnotator/issues/101))
 * Changed: Make arrow size decrease with stroke size. ([#84](https://github.com/ksnip/kImageAnnotator/issues/84))

resources/.directory

@@ -4,6 +4,7 @@
         <file alias="arrow.svg" >icons/dark/arrow.svg</file>
         <file alias="doubleArrow.svg" >icons/dark/doubleArrow.svg</file>
         <file alias="number.svg" >icons/dark/number.svg</file>
+        <file alias="numberPointer.svg" >icons/dark/numberPointer.svg</file>
         <file alias="markerPen.svg" >icons/dark/markerPen.svg</file>
         <file alias="markerRect.svg" >icons/dark/markerRect.svg</file>
         <file alias="markerEllipse.svg" >icons/dark/markerEllipse.svg</file>
@@ -29,6 +30,7 @@
         <file alias="arrow.svg" >icons/light/arrow.svg</file>
         <file alias="doubleArrow.svg" >icons/light/doubleArrow.svg</file>
         <file alias="number.svg" >icons/light/number.svg</file>
+        <file alias="numberPointer.svg" >icons/light/numberPointer.svg</file>
         <file alias="markerPen.svg" >icons/light/markerPen.svg</file>
         <file alias="markerRect.svg" >icons/light/markerRect.svg</file>
         <file alias="markerEllipse.svg" >icons/light/markerEllipse.svg</file>

resources/icons/dark/.directory

@@ -50,14 +50,18 @@ set(KIMAGEANNOTATOR_SRCS
 	${CMAKE_CURRENT_SOURCE_DIR}/annotations/items/AnnotationRect.cpp
 	${CMAKE_CURRENT_SOURCE_DIR}/annotations/items/AnnotationEllipse.cpp
 	${CMAKE_CURRENT_SOURCE_DIR}/annotations/items/AnnotationNumber.cpp
+	${CMAKE_CURRENT_SOURCE_DIR}/annotations/items/AnnotationNumberPointer.cpp
 	${CMAKE_CURRENT_SOURCE_DIR}/annotations/items/AnnotationPen.cpp
 	${CMAKE_CURRENT_SOURCE_DIR}/annotations/items/AnnotationText.cpp
 	${CMAKE_CURRENT_SOURCE_DIR}/annotations/items/AnnotationBlur.cpp
 	${CMAKE_CURRENT_SOURCE_DIR}/annotations/items/AnnotationImage.cpp
 	${CMAKE_CURRENT_SOURCE_DIR}/annotations/items/AnnotationSticker.cpp
+	${CMAKE_CURRENT_SOURCE_DIR}/annotations/items/BaseAnnotationNumber.cpp
 	${CMAKE_CURRENT_SOURCE_DIR}/annotations/items/helper/KeyInputHelper.cpp
 	${CMAKE_CURRENT_SOURCE_DIR}/annotations/items/helper/TextCursor.cpp
 	${CMAKE_CURRENT_SOURCE_DIR}/annotations/items/helper/CapsLockStatusChecker.cpp
+	${CMAKE_CURRENT_SOURCE_DIR}/annotations/items/helper/NumberRectHelper.cpp
+	${CMAKE_CURRENT_SOURCE_DIR}/annotations/items/helper/ShapeHelper.cpp
 	${CMAKE_CURRENT_SOURCE_DIR}/annotations/undo/AddCommand.cpp
 	${CMAKE_CURRENT_SOURCE_DIR}/annotations/undo/DeleteCommand.cpp
 	${CMAKE_CURRENT_SOURCE_DIR}/annotations/undo/MoveCommand.cpp

resources/icons/dark/numberPointer.svg

@@ -108,6 +108,10 @@ AbstractAnnotationItem *AnnotationItemFactory::createItem(const QPointF &initPos
 			newItem = new AnnotationNumber(initPosition, properties.staticCast<AnnotationTextProperties>());
 			mNumberManager->addItem(dynamic_cast<AnnotationNumber *>(newItem));
 			break;
+		case ToolTypes::NumberPointer:
+			newItem = new AnnotationNumberPointer(initPosition, properties.staticCast<AnnotationTextProperties>());
+			mNumberManager->addItem(dynamic_cast<AnnotationNumberPointer *>(newItem));
+			break;
 		case ToolTypes::Text:
 			newItem = new AnnotationText(initPosition, properties.staticCast<AnnotationTextProperties>());
 			break;
@@ -126,6 +130,7 @@ AbstractAnnotationItem *AnnotationItemFactory::createItem(const QPointF &initPos
 AbstractAnnotationItem *AnnotationItemFactory::cloneItem(const AbstractAnnotationItem *item)
 {
 	Q_ASSERT(item != nullptr);
+
 	AbstractAnnotationItem *newItem = nullptr;
 
 	switch (item->toolType()) {
@@ -160,6 +165,10 @@ AbstractAnnotationItem *AnnotationItemFactory::cloneItem(const AbstractAnnotatio
 			newItem = new AnnotationNumber(*(dynamic_cast<const AnnotationNumber *>(item)));
 			mNumberManager->addItem(dynamic_cast<AnnotationNumber *>(newItem));
 			break;
+		case ToolTypes::NumberPointer:
+			newItem = new AnnotationNumberPointer(*(dynamic_cast<const AnnotationNumberPointer *>(item)));
+			mNumberManager->addItem(dynamic_cast<AnnotationNumberPointer *>(newItem));
+			break;
 		case ToolTypes::Text:
 			newItem = new AnnotationText(*(dynamic_cast<const AnnotationText *>(item)));
 			break;

resources/icons/light/.directory

@@ -30,6 +30,7 @@
 #include "src/annotations/items/AnnotationRect.h"
 #include "src/annotations/items/AnnotationEllipse.h"
 #include "src/annotations/items/AnnotationNumber.h"
+#include "src/annotations/items/AnnotationNumberPointer.h"
 #include "src/annotations/items/AnnotationText.h"
 #include "src/annotations/items/AnnotationBlur.h"
 #include "src/annotations/items/AnnotationImage.h"