imagebaker 0.0.51__tar.gz → 0.0.53__tar.gz

imagebaker-0.0.53/CONTRIBUTING

@@ -0,0 +1,5 @@
+## Contributing Guidelines
+
+* Please add a good description of what it does.
+* If relevent, also add how it was before and how it is now after the change. Either by screenshot or by logs.
+* If updated the codebase, please run tests.

{imagebaker-0.0.51 → imagebaker-0.0.53}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: imagebaker
-Version: 0.0.51
+Version: 0.0.53
 Summary: A package for baking images.
 Home-page: https://github.com/q-viper/Image-Baker
 Author: Ramkrishna Acharya
@@ -24,7 +24,7 @@ License-File: LICENSE
 [![PyPI version](https://img.shields.io/pypi/v/imagebaker.svg)](https://pypi.org/imagebaker/)
 
 <p align="center">
-    <img src="assets/demo.gif" alt="Centered Demo" />
+    <img src="https://github.com/q-viper/image-baker/blob/main/assets/demo.gif?raw=true" alt="Centered Demo" />
 </p>
 
 
@@ -62,27 +62,28 @@ Run the following command to launch the GUI:
 
 `imagebaker`
 
-By default, the above command will not run any models on the backend. So please take a look into the example of model definition at [examples/loaded_models.py](examples/loaded_models.py). Then we need to pass it as:
+By default, the above command will not run any models on the backend. So please take a look into the example of model definition at [examples/loaded_models.py](https://github.com/q-viper/image-baker/blob/main/examples/loaded_models.py). Then we need to pass it as:
 
 `imagebaker --models-file examples/loaded_models.py`
 
 For more options, please do: `imagebaker --help` It should give the following options.
 
-![](assets/demo/options.png)
+![](https://github.com/q-viper/image-baker/blob/main/assets/demo/options.png?raw=true)
 
 
-* **`--configs-file`** allows us to define custom configs. The custom configs have to inherit LayerConfig and CanvasConfig defined at [imagebaker/core/configs/configs.py](imagebaker/core/configs/configs.py). An example is available at [examples](examples/). 
+* **`--configs-file`** allows us to define custom configs. The custom configs have to inherit LayerConfig and CanvasConfig defined at [imagebaker/core/configs/configs.py](https://github.com/q-viper/image-baker/blob/main/imagebaker/core/configs/configs.py). An example is available at [examples](https://github.com/q-viper/image-baker/blob/main/examples/). 
 
 After cloning and going to the project directory, the following code should work.
 `imagebaker --models-file examples/loaded_models.py --configs-file examples/example_config.py`
 
 ## Features
 - **Annotating Images**: Load a folder of images and annotate them using bounding boxes or polygons.
-- **Model Testing**: Define models for detection, segmentation, and prompts (e.g., points or rectangles) by following the base model structure in [imagebaker/models/base_model.py](imagebaker/models/base_model.py). See [examples/loaded_models.py](examples/loaded_models.py) for a working example.
+- **Model Testing**: Define models for detection, segmentation, and prompts (e.g., points or rectangles) by following the base model structure in [imagebaker/models/base_model.py](https://github.com/q-viper/image-baker/blob/main/imagebaker/models/base_model.py). See [examples/loaded_models.py](https://github.com/q-viper/image-baker/blob/main/examples/loaded_models.py) for a working example.
 - **Layerifying**: Crop images based on annotations to create reusable layers. Each cropped image represents a single layer.
 - **Baking States**: Arrange layers to create image variations by dragging, rotating, adjusting opacity, and more. Save the state using the Save State button or Ctrl + S.
 - **Playing States**: Replay saved states, export them locally, or use them for further predictions.
 - **Exporting States**: Export the final annotated JSON and the baked multilayer image.
+- **Drawing On Layers**: First select a layer then draw upon it. Only selected layer will be drawn. And if no layers are selected, then the drawing will not be exported.
 
 ### Shortcuts
 * **Ctrl + C**: Copy selected annotation/layer.
@@ -91,37 +92,44 @@ After cloning and going to the project directory, the following code should work
 * **Left Click**: Select an annotation/layer on mouse position.
 * **Left Click + Drag**: Drag a selected annotation/layer.
 * **Double Left Click**: When using polygon annotation, completes the polygon.
-* **Right Click**: Deselect an annotation/layer. While annotating the polygon, undo the last point.
+* **Right Click**: Unselect an annotation/layer. While annotating the polygon, undo the last point.
 * **Ctrl + Mouse Wheel**: Zoom In/Out on the mouse position, i.e., resize the viewport.
 * **Ctrl + Drag**: If done on the background, the viewport is panned.
 * **Ctrl + S**: Save State on Baker Tab.
 * **Ctrl + D**: Draw Mode on Baker Tab. Drawing can happen on a selected or main layer.
 * **Ctrl + E**: Erase Mode on Baker Tab.
+* **Ctrl + H**: Opens a help window.
 * **Wheel**: Change the size of the drawing pointer.
 * **Q**: Point mode on annotation.
-* **W**: Polygon mode on annotation.
+* **W**: Polygon mode on annotation. Moves selected layer one step up in layer lists in baker.
+* **S**: Moves selected layer one step down in layer list in baker.
 * **E**: Rectangle mode on annotation.
+* **H**: Hides/un-hides selected annotation/layer.
+* **L**: Creates layer from an annotation. If any annotation selected, creates only its, else creates layers from all visible annotations.
+* **C**: If any annotation is selected, a input box for Caption is created. It can be edited on baker tab as well and is state aware.
+* **Numerics**: Selecting number 1, 2, till 9 selects label. If not available, asks for a new label.
+* **Escape**: Closes the application.
 
 ## Demo
 ### Annotation Page
 This is where the loading of the image folder and annotation, connection with the model running in the backend, and layerifying happen.
 
-![](assets/demo/annotation_page.png)
+![](https://github.com/q-viper/image-baker/blob/main/assets/demo/annotation_page.png?raw=True)
 
 ### Baker Page
 This is where the layer baking happens. And the extraction of the layers as well.
 
-![](assets/demo/baker_page.png)
+![](https://github.com/q-viper/image-baker/blob/main/assets/demo/baker_page.png?raw=True)
 
 An example of drawing:
 
-![](assets/demo/drawing.png)
+![](https://github.com/q-viper/image-baker/blob/main/assets/demo/drawing.png?raw=True)
 
 ### Annotated
 
 The JSON and the baked image will be exported to the local folder, and in debug mode, the annotations and the mask for each layer will be exported too.
 
-![](assets/demo/annotated_veg_smiley.png)
+![](https://github.com/q-viper/image-baker/blob/main/assets/demo/annotated_veg_smiley.png?raw=True)
 
 ### Demo Video
 
@@ -140,3 +148,5 @@ Click on the image above to play the video on YouTube.
 Contributions are welcome! 
 
 Do you find this project to be useful and are you looking for some features that are not implemented yet? Feel free to open issues or submit pull requests to improve the project.
+
+For more please visit [CONTRIBUTING](CONTRIBUTING).

{imagebaker-0.0.51 → imagebaker-0.0.53}/README.md

@@ -8,7 +8,7 @@
 [![PyPI version](https://img.shields.io/pypi/v/imagebaker.svg)](https://pypi.org/imagebaker/)
 
 <p align="center">
-    <img src="assets/demo.gif" alt="Centered Demo" />
+    <img src="https://github.com/q-viper/image-baker/blob/main/assets/demo.gif?raw=true" alt="Centered Demo" />
 </p>
 
 
@@ -46,27 +46,28 @@ Run the following command to launch the GUI:
 
 `imagebaker`
 
-By default, the above command will not run any models on the backend. So please take a look into the example of model definition at [examples/loaded_models.py](examples/loaded_models.py). Then we need to pass it as:
+By default, the above command will not run any models on the backend. So please take a look into the example of model definition at [examples/loaded_models.py](https://github.com/q-viper/image-baker/blob/main/examples/loaded_models.py). Then we need to pass it as:
 
 `imagebaker --models-file examples/loaded_models.py`
 
 For more options, please do: `imagebaker --help` It should give the following options.
 
-![](assets/demo/options.png)
+![](https://github.com/q-viper/image-baker/blob/main/assets/demo/options.png?raw=true)
 
 
-* **`--configs-file`** allows us to define custom configs. The custom configs have to inherit LayerConfig and CanvasConfig defined at [imagebaker/core/configs/configs.py](imagebaker/core/configs/configs.py). An example is available at [examples](examples/). 
+* **`--configs-file`** allows us to define custom configs. The custom configs have to inherit LayerConfig and CanvasConfig defined at [imagebaker/core/configs/configs.py](https://github.com/q-viper/image-baker/blob/main/imagebaker/core/configs/configs.py). An example is available at [examples](https://github.com/q-viper/image-baker/blob/main/examples/). 
 
 After cloning and going to the project directory, the following code should work.
 `imagebaker --models-file examples/loaded_models.py --configs-file examples/example_config.py`
 
 ## Features
 - **Annotating Images**: Load a folder of images and annotate them using bounding boxes or polygons.
-- **Model Testing**: Define models for detection, segmentation, and prompts (e.g., points or rectangles) by following the base model structure in [imagebaker/models/base_model.py](imagebaker/models/base_model.py). See [examples/loaded_models.py](examples/loaded_models.py) for a working example.
+- **Model Testing**: Define models for detection, segmentation, and prompts (e.g., points or rectangles) by following the base model structure in [imagebaker/models/base_model.py](https://github.com/q-viper/image-baker/blob/main/imagebaker/models/base_model.py). See [examples/loaded_models.py](https://github.com/q-viper/image-baker/blob/main/examples/loaded_models.py) for a working example.
 - **Layerifying**: Crop images based on annotations to create reusable layers. Each cropped image represents a single layer.
 - **Baking States**: Arrange layers to create image variations by dragging, rotating, adjusting opacity, and more. Save the state using the Save State button or Ctrl + S.
 - **Playing States**: Replay saved states, export them locally, or use them for further predictions.
 - **Exporting States**: Export the final annotated JSON and the baked multilayer image.
+- **Drawing On Layers**: First select a layer then draw upon it. Only selected layer will be drawn. And if no layers are selected, then the drawing will not be exported.
 
 ### Shortcuts
 * **Ctrl + C**: Copy selected annotation/layer.
@@ -75,37 +76,44 @@ After cloning and going to the project directory, the following code should work
 * **Left Click**: Select an annotation/layer on mouse position.
 * **Left Click + Drag**: Drag a selected annotation/layer.
 * **Double Left Click**: When using polygon annotation, completes the polygon.
-* **Right Click**: Deselect an annotation/layer. While annotating the polygon, undo the last point.
+* **Right Click**: Unselect an annotation/layer. While annotating the polygon, undo the last point.
 * **Ctrl + Mouse Wheel**: Zoom In/Out on the mouse position, i.e., resize the viewport.
 * **Ctrl + Drag**: If done on the background, the viewport is panned.
 * **Ctrl + S**: Save State on Baker Tab.
 * **Ctrl + D**: Draw Mode on Baker Tab. Drawing can happen on a selected or main layer.
 * **Ctrl + E**: Erase Mode on Baker Tab.
+* **Ctrl + H**: Opens a help window.
 * **Wheel**: Change the size of the drawing pointer.
 * **Q**: Point mode on annotation.
-* **W**: Polygon mode on annotation.
+* **W**: Polygon mode on annotation. Moves selected layer one step up in layer lists in baker.
+* **S**: Moves selected layer one step down in layer list in baker.
 * **E**: Rectangle mode on annotation.
+* **H**: Hides/un-hides selected annotation/layer.
+* **L**: Creates layer from an annotation. If any annotation selected, creates only its, else creates layers from all visible annotations.
+* **C**: If any annotation is selected, a input box for Caption is created. It can be edited on baker tab as well and is state aware.
+* **Numerics**: Selecting number 1, 2, till 9 selects label. If not available, asks for a new label.
+* **Escape**: Closes the application.
 
 ## Demo
 ### Annotation Page
 This is where the loading of the image folder and annotation, connection with the model running in the backend, and layerifying happen.
 
-![](assets/demo/annotation_page.png)
+![](https://github.com/q-viper/image-baker/blob/main/assets/demo/annotation_page.png?raw=True)
 
 ### Baker Page
 This is where the layer baking happens. And the extraction of the layers as well.
 
-![](assets/demo/baker_page.png)
+![](https://github.com/q-viper/image-baker/blob/main/assets/demo/baker_page.png?raw=True)
 
 An example of drawing:
 
-![](assets/demo/drawing.png)
+![](https://github.com/q-viper/image-baker/blob/main/assets/demo/drawing.png?raw=True)
 
 ### Annotated
 
 The JSON and the baked image will be exported to the local folder, and in debug mode, the annotations and the mask for each layer will be exported too.
 
-![](assets/demo/annotated_veg_smiley.png)
+![](https://github.com/q-viper/image-baker/blob/main/assets/demo/annotated_veg_smiley.png?raw=True)
 
 ### Demo Video
 
@@ -123,4 +131,6 @@ Click on the image above to play the video on YouTube.
 
 Contributions are welcome! 
 
-Do you find this project to be useful and are you looking for some features that are not implemented yet? Feel free to open issues or submit pull requests to improve the project.
+Do you find this project to be useful and are you looking for some features that are not implemented yet? Feel free to open issues or submit pull requests to improve the project.
+
+For more please visit [CONTRIBUTING](CONTRIBUTING).

imagebaker-0.0.53/docs/index.md

@@ -0,0 +1,136 @@
+# Image-Baker
+![Dependabot Status](https://img.shields.io/badge/dependabot-active-brightgreen)
+![GitHub License](https://img.shields.io/github/license/q-viper/image-baker)
+![commit activity](https://img.shields.io/github/commit-activity/w/q-viper/SmokeSim/master)
+![code size in bytes](https://img.shields.io/github/languages/code-size/q-viper/image-baker)
+<!-- ![Tests](https://github.com/q-viper/SmokeSim/actions/workflows/test-on-push.yml/badge.svg) -->
+![Code Formatting](https://github.com/q-viper/image-baker/actions/workflows/black-formatter.yml/badge.svg)
+[![PyPI version](https://img.shields.io/pypi/v/imagebaker.svg)](https://pypi.org/imagebaker/)
+
+<p align="center">
+    <img src="https://github.com/q-viper/image-baker/blob/main/assets/demo.gif?raw=true" alt="Centered Demo" />
+</p>
+
+
+*An example of baked images. (Each object is a layer and an annotation will also be extracted for all layers.)*
+
+Let's bake an image.
+
+## Why is it relevant?
+
+When training computer vision models (especially for detection and segmentation), labeling large amounts of data is crucial for better model performance. Often, the process involves multiple cycles of labeling, training, and evaluation. By generating multiple realistic labeled datasets from a single image, the time spent on labeling can be significantly reduced.
+
+## What's up with the name?
+The concept involves extracting portions of an image (e.g., objects of interest) using tools like polygons or models such as Segment Anything. These extractions are treated as layers, which can then be copied, pasted, and manipulated to create multiple instances of the desired object. By combining these layers step by step, a new labeled image with annotations in JSON format is created. The term "baking" refers to the process of merging these layers into a single cohesive image.
+
+## Getting Started
+### Installation
+#### Using PIP
+This project is also available on the PyPI server.
+
+```bash
+pip install imagebaker
+```
+
+#### Developing
+Please, clone this repository and install it locally:
+
+```bash
+git clone https://github.com/q-viper/image-baker.git 
+cd image-baker
+pip install -e .
+```
+
+### First Run
+Run the following command to launch the GUI:
+
+`imagebaker`
+
+By default, the above command will not run any models on the backend. So please take a look into the example of model definition at [examples/loaded_models.py](https://github.com/q-viper/image-baker/blob/main/examples/loaded_models.py). Then we need to pass it as:
+
+`imagebaker --models-file examples/loaded_models.py`
+
+For more options, please do: `imagebaker --help` It should give the following options.
+
+![](https://github.com/q-viper/image-baker/blob/main/assets/demo/options.png?raw=true)
+
+
+* **`--configs-file`** allows us to define custom configs. The custom configs have to inherit LayerConfig and CanvasConfig defined at [imagebaker/core/configs/configs.py](https://github.com/q-viper/image-baker/blob/main/imagebaker/core/configs/configs.py). An example is available at [examples](https://github.com/q-viper/image-baker/blob/main/examples/). 
+
+After cloning and going to the project directory, the following code should work.
+`imagebaker --models-file examples/loaded_models.py --configs-file examples/example_config.py`
+
+## Features
+- **Annotating Images**: Load a folder of images and annotate them using bounding boxes or polygons.
+- **Model Testing**: Define models for detection, segmentation, and prompts (e.g., points or rectangles) by following the base model structure in [imagebaker/models/base_model.py](https://github.com/q-viper/image-baker/blob/main/imagebaker/models/base_model.py). See [examples/loaded_models.py](https://github.com/q-viper/image-baker/blob/main/examples/loaded_models.py) for a working example.
+- **Layerifying**: Crop images based on annotations to create reusable layers. Each cropped image represents a single layer.
+- **Baking States**: Arrange layers to create image variations by dragging, rotating, adjusting opacity, and more. Save the state using the Save State button or Ctrl + S.
+- **Playing States**: Replay saved states, export them locally, or use them for further predictions.
+- **Exporting States**: Export the final annotated JSON and the baked multilayer image.
+- **Drawing On Layers**: First select a layer then draw upon it. Only selected layer will be drawn. And if no layers are selected, then the drawing will not be exported.
+
+### Shortcuts
+* **Ctrl + C**: Copy selected annotation/layer.
+* **Ctrl + V**: Paste copied annotation/layer in its parent image/layer if it is currently open.
+* **Delete**: Delete selected annotation/layer.
+* **Left Click**: Select an annotation/layer on mouse position.
+* **Left Click + Drag**: Drag a selected annotation/layer.
+* **Double Left Click**: When using polygon annotation, completes the polygon.
+* **Right Click**: Unselect an annotation/layer. While annotating the polygon, undo the last point.
+* **Ctrl + Mouse Wheel**: Zoom In/Out on the mouse position, i.e., resize the viewport.
+* **Ctrl + Drag**: If done on the background, the viewport is panned.
+* **Ctrl + S**: Save State on Baker Tab.
+* **Ctrl + D**: Draw Mode on Baker Tab. Drawing can happen on a selected or main layer.
+* **Ctrl + E**: Erase Mode on Baker Tab.
+* **Ctrl + H**: Opens a help window.
+* **Wheel**: Change the size of the drawing pointer.
+* **Q**: Point mode on annotation.
+* **W**: Polygon mode on annotation. Moves selected layer one step up in layer lists in baker.
+* **S**: Moves selected layer one step down in layer list in baker.
+* **E**: Rectangle mode on annotation.
+* **H**: Hides/un-hides selected annotation/layer.
+* **L**: Creates layer from an annotation. If any annotation selected, creates only its, else creates layers from all visible annotations.
+* **C**: If any annotation is selected, a input box for Caption is created. It can be edited on baker tab as well and is state aware.
+* **Numerics**: Selecting number 1, 2, till 9 selects label. If not available, asks for a new label.
+* **Escape**: Closes the application.
+
+## Demo
+### Annotation Page
+This is where the loading of the image folder and annotation, connection with the model running in the backend, and layerifying happen.
+
+![](https://github.com/q-viper/image-baker/blob/main/assets/demo/annotation_page.png?raw=True)
+
+### Baker Page
+This is where the layer baking happens. And the extraction of the layers as well.
+
+![](https://github.com/q-viper/image-baker/blob/main/assets/demo/baker_page.png?raw=True)
+
+An example of drawing:
+
+![](https://github.com/q-viper/image-baker/blob/main/assets/demo/drawing.png?raw=True)
+
+### Annotated
+
+The JSON and the baked image will be exported to the local folder, and in debug mode, the annotations and the mask for each layer will be exported too.
+
+![](https://github.com/q-viper/image-baker/blob/main/assets/demo/annotated_veg_smiley.png?raw=True)
+
+### Demo Video
+
+To see the tool in action, check out the demo video below:
+
+
+[![Demo Video](https://img.youtube.com/vi/WckMT0r-2Lc/0.jpg)](https://youtu.be/WckMT0r-2Lc)
+
+
+Click on the image above to play the video on YouTube.
+
+
+## Contributions
+
+
+Contributions are welcome! 
+
+Do you find this project to be useful and are you looking for some features that are not implemented yet? Feel free to open issues or submit pull requests to improve the project.
+
+For more please visit [CONTRIBUTING](CONTRIBUTING).

{imagebaker-0.0.51 → imagebaker-0.0.53}/imagebaker/core/defs/defs.py

@@ -78,6 +78,7 @@ class LayerState:
     drawing_states: list[DrawingState] = field(default_factory=list)
     edge_opacity: int = 100
     edge_width: int = 10
+    caption: str = ""
 
     def copy(self):
         return LayerState(
@@ -109,6 +110,7 @@ class LayerState:
             ],
             edge_opacity=self.edge_opacity,
             edge_width=self.edge_width,
+            caption=self.caption,
         )
 
 
@@ -138,6 +140,7 @@ class Annotation:
     file_path: Path = field(default_factory=lambda: Path("Runtime"))
     is_model_generated: bool = False
     model_name: str = None
+    caption: str = ""
 
     def copy(self):
         ann = Annotation(
@@ -156,6 +159,7 @@ class Annotation:
             file_path=self.file_path,
             is_model_generated=self.is_model_generated,
             model_name=self.model_name,
+            caption=self.caption,
         )
         ann.is_selected = False
         return ann
@@ -200,6 +204,7 @@ class Annotation:
                 "file_path": str(annotation.file_path),
                 "is_model_generated": annotation.is_model_generated,
                 "model_name": annotation.model_name,
+                "caption": annotation.caption,
             }
             annotations_dict.append(data)
 
@@ -234,6 +239,7 @@ class Annotation:
                 file_path=Path(d.get("file_path", "Runtime")),
                 is_model_generated=d.get("is_model_generated", False),
                 model_name=d.get("model_name", None),
+                caption=d.get("caption", ""),
             )
 
             # Handle points safely

{imagebaker-0.0.51 → imagebaker-0.0.53}/imagebaker/layers/annotable_layer.py

@@ -24,6 +24,7 @@ from PySide6.QtGui import (
     QWheelEvent,
     QMouseEvent,
     QKeyEvent,
+    QFont,
 )
 from PySide6.QtWidgets import (
     QApplication,
@@ -68,14 +69,23 @@ class AnnotableLayer(BaseLayer):
         self.annotationCleared.emit()
         self.update()
 
+    def toggle_annotation_visibility(self):
+        """Toggle visibility of all annotations."""
+        selected_annotation = self._get_selected_annotation()
+        if selected_annotation is not None:
+            selected_annotation.visible = not selected_annotation.visible
+            self.annotationUpdated.emit(selected_annotation)
+            self.update()
+
     def handle_key_press(self, event: QKeyEvent):
         # Handle Ctrl key for panning
         if event.key() == Qt.Key_Control:
-            if (
-                self.mouse_mode != MouseMode.POLYGON
-            ):  # Only activate pan mode when not drawing polygons
+            # disable this for now to allow pannings
+            # if (
+            #     self.mouse_mode != MouseMode.POLYGON
+            # ):  # Only activate pan mode when not drawing polygons
 
-                self.mouse_mode = MouseMode.PAN
+            self.mouse_mode = MouseMode.PAN
 
         # Handle Ctrl+C for copy
         if event.modifiers() & Qt.ControlModifier and event.key() == Qt.Key_C:
@@ -258,7 +268,7 @@ class AnnotableLayer(BaseLayer):
 
         # Draw labels
         if annotation.is_complete and annotation.label:
-            painter.save()
+            # painter.save()
             label_pos = self.get_label_position(annotation)
             text = annotation.label
 
@@ -298,8 +308,58 @@ class AnnotableLayer(BaseLayer):
             # Draw text
             painter.setPen(Qt.white)
             painter.drawText(bg_rect, Qt.AlignCenter, text)
-            painter.restore()
-            self.label_rects.append((bg_rect, annotation))
+
+            # now if the annotations has caption,
+            # draw the caption below the label in itallic
+            # just below the label, in a font lighter than a label
+
+            if annotation.caption:
+                caption_font = painter.font()
+                # Draw a background rectangle for the caption to ensure visibility
+                caption_text = annotation.caption
+                caption_font.setItalic(True)
+                caption_font.setPixelSize(
+                    self.config.selected_draw_config.label_font_size * self.scale + 2
+                )
+                caption_font.setWeight(QFont.Light)
+                painter.setFont(caption_font)
+                metrics = painter.fontMetrics()
+                text_width = metrics.horizontalAdvance(caption_text)
+                text_height = metrics.height()
+                # Draw background rectangle for caption
+                caption_rect = QRectF(
+                    widget_pos.x() - text_width / 2 - 2,
+                    widget_pos.y() + text_height / 2 - 2,
+                    text_width + 4,
+                    text_height + 4,
+                )
+                painter.setPen(Qt.NoPen)
+                painter.setBrush(
+                    self.config.normal_draw_config.label_font_background_color
+                )
+                painter.drawRect(caption_rect)
+                # Draw caption text
+                painter.setPen(Qt.white)
+                painter.drawText(caption_rect, Qt.AlignCenter, caption_text)
+                caption_font.setItalic(True)
+                caption_font.setPixelSize(
+                    self.config.selected_draw_config.label_font_size * self.scale + 2
+                )
+                caption_font.setWeight(QFont.Light)
+                painter.setFont(caption_font)
+                metrics = painter.fontMetrics()
+                text_width = metrics.horizontalAdvance(annotation.caption)
+                text_height = metrics.height()
+                painter.setPen(Qt.white)
+                painter.setBrush(Qt.gray)
+
+                caption_rect = QRectF(
+                    widget_pos.x() - text_width / 2 - 2,
+                    widget_pos.y() + text_height / 2 - 2,
+                    text_width + 4,
+                    text_height + 4,
+                )
+                painter.drawText(caption_rect, Qt.AlignCenter, annotation.caption)
 
         painter.restore()
 
@@ -398,7 +458,14 @@ class AnnotableLayer(BaseLayer):
                 MouseMode.ZOOM_IN,
                 MouseMode.ZOOM_OUT,
             ]:
-                self.mouse_mode = MouseMode.IDLE
+                if self.current_annotation:
+                    if (
+                        self.current_annotation.polygon
+                        and not self.current_annotation.is_complete
+                    ):
+                        self.mouse_mode = MouseMode.POLYGON
+                else:
+                    self.mouse_mode = MouseMode.IDLE
 
         # Clean up transformation state
         if hasattr(self, "selected_annotation"):
@@ -602,6 +669,17 @@ class AnnotableLayer(BaseLayer):
             elif self.mouse_mode == MouseMode.POLYGON:
                 # If not double-click
                 if not self.current_annotation:
+                    # if this point is equal to the last point of the previous polygon, then ignore it
+                    if len(self.annotations) > 0:
+                        last_polygon = self.annotations[-1].polygon
+                        if last_polygon:
+                            last_point = last_polygon[-1]
+                            if last_point == clamped_pos:
+                                logger.info(
+                                    "Ignoring point, same as last polygon point"
+                                )
+                                return
+
                     self.current_annotation = Annotation(
                         file_path=self.file_path,
                         annotation_id=len(self.annotations),
@@ -811,8 +889,6 @@ class AnnotableLayer(BaseLayer):
                 self.current_annotation
             )
             self.annotationAdded.emit(self.current_annotation)
-            self.current_annotation = None
-            self.update()
         else:
             # Show custom label dialog
             label, ok = QInputDialog.getText(self, "Label", "Enter label name:")
@@ -827,8 +903,8 @@ class AnnotableLayer(BaseLayer):
                     )
                     self.annotationAdded.emit(self.current_annotation)
                     self.current_annotation.annotation_id = len(self.annotations)
-                    self.current_annotation = None
-                    self.update()
+        self.current_annotation = None
+        self.update()
 
     # in update, update cursor
 
@@ -915,6 +991,7 @@ class AnnotableLayer(BaseLayer):
         new_layer.layer_name = (
             f"{annotation.label} {annotation.annotation_id} {annotation.annotator}"
         )
+        new_layer.caption = annotation.caption
 
         new_layer._apply_edge_opacity()
         new_layer.update()

{imagebaker-0.0.51 → imagebaker-0.0.53}/imagebaker/layers/base_layer.py

@@ -240,7 +240,7 @@ class BaseLayer(QWidget):
             for step, state in enumerate(intermediate_states):
                 step += self.current_step
 
-                logger.info(f"Saving state {step} for layer {layer.layer_id}")
+                logger.info(f"Saving state {step} for layer {layer.layer_id}: {state}")
                 state.selected = False
                 if step not in curr_states:
                     curr_states[step] = []
@@ -853,3 +853,11 @@ class BaseLayer(QWidget):
     @edge_width.setter
     def edge_width(self, value: int):
         self.layer_state.edge_width = value
+
+    @property
+    def caption(self) -> str:
+        return self.layer_state.caption
+
+    @caption.setter
+    def caption(self, value: str):
+        self.layer_state.caption = value

{imagebaker-0.0.51 → imagebaker-0.0.53}/imagebaker/layers/canvas_layer.py

@@ -27,7 +27,6 @@ from PySide6.QtGui import (
     QMouseEvent,
     QKeyEvent,
     QTransform,
-    QImage,
 )
 from PySide6.QtWidgets import (
     QApplication,
@@ -127,7 +126,6 @@ class CanvasLayer(BaseLayer):
 
     ## Helper functions ##
     def handle_key_press(self, event: QKeyEvent):
-
         # Handle Delete key
         if event.key() == Qt.Key_Delete:
             self._delete_layer()
@@ -149,6 +147,15 @@ class CanvasLayer(BaseLayer):
         if event.modifiers() & Qt.ControlModifier and event.key() == Qt.Key_V:
             self._paste_layer()
             return  # Important: return after handling
+        # if event.key() == Qt.Key_H:
+        #     if self.selected_layer:
+        #         # Toggle visibility of the selected layer
+        #         logger.info(
+        #             f"Toggling visibility of layer: {self.selected_layer.layer_name}"
+        #         )
+        #         self.selected_layer.visible = not self.selected_layer.visible
+        #         self.selected_layer.update()
+        #     return  # Important: return after handling
 
     def paint_layer(self, painter: QPainter):
         """
@@ -362,7 +369,16 @@ class CanvasLayer(BaseLayer):
         """
         """Add a new drawing state."""
         self.selected_layer = self._get_selected_layer()
-        layer = self.selected_layer if self.selected_layer else self
+        layer = self.selected_layer
+        if not layer:
+            logger.debug("No layer selected for drawing.")
+            # show popup message window that closes in 2 seconds
+            QMessageBox.information(
+                self.parent(),
+                "No Layer Selected",
+                "Please select a layer to draw on.",
+            )
+            return
 
         # Convert the position to be relative to the layer
         relative_pos = pos - layer.position
@@ -384,8 +400,14 @@ class CanvasLayer(BaseLayer):
             )
             layer.layer_state.drawing_states.append(drawing_state)
             self._last_draw_point = relative_pos  # Update the last draw point
-            # logger.debug(f"Added drawing state at position: {relative_pos}")
-
+            logger.debug(
+                f"Added drawing state at position: {relative_pos} to layer {layer.layer_name}"
+            )
+        else:
+            logger.debug(
+                f"Mouse mode {self.mouse_mode} does not support drawing states."
+            )
+            return
         self.update()  # Refresh the canvas to show the new drawing
 
     def handle_wheel(self, event: QWheelEvent):
@@ -822,6 +844,7 @@ class CanvasLayer(BaseLayer):
         filename = self.config.export_folder / f"{filename}.png"
         logger.info(f"Exporting baked image to {filename}")
         self.states = {0: [layer.layer_state for layer in self.layers]}
+        logger.debug(f"Exporting states: {self.states}")
 
         self.loading_dialog = QProgressDialog(
             "Baking Please wait...", "Cancel", 0, 0, self.parentWidget()