imagebaker 0.0.50__py3-none-any.whl → 0.52__py3-none-any.whl

imagebaker/core/configs/configs.py

@@ -74,6 +74,22 @@ class BaseConfig(BaseModel):
             logger.info(f"Created assets folder at {asset_dir}")
         return asset_dir
 
+    @property
+    def cache_dir(self):
+        cache_dir = self.project_dir / ".imagebaker" / "cache"
+        if not cache_dir.exists():
+            cache_dir.mkdir(parents=True)
+            logger.info(f"Created cache folder at {cache_dir}")
+        return cache_dir
+
+    @property
+    def bake_dir(self):
+        bake_dir = self.project_dir / ".imagebaker" / "bake"
+        if not bake_dir.exists():
+            bake_dir.mkdir(parents=True)
+            logger.info(f"Created bake folder at {bake_dir}")
+        return bake_dir
+
     class Config:
         arbitrary_types_allowed = True
 
@@ -96,6 +112,7 @@ class LayerConfig(BaseConfig):
     )
     # whether to search image in subfolders as well
     full_search: bool = False
+    cleanup_on_exit: bool = False
 
     def get_label_color(self, label):
         for lbl in self.predefined_labels:

imagebaker/core/defs/defs.py

@@ -210,6 +210,10 @@ class Annotation:
     def load_from_json(path: str):
         import json
 
+        # if path does not exist, return empty list
+        if not Path(path).exists():
+            return []
+
         with open(path, "r") as f:
             data = json.load(f)
 

imagebaker/layers/annotable_layer.py

@@ -42,6 +42,7 @@ class AnnotableLayer(BaseLayer):
     annotationCleared = Signal()
     annotationMoved = Signal()
     layersChanged = Signal()
+    labelUpdated = Signal(tuple)
 
     def __init__(self, parent, config: LayerConfig, canvas_config: CanvasConfig):
         super().__init__(parent, config)
@@ -534,13 +535,11 @@ class AnnotableLayer(BaseLayer):
                     self.current_annotation.polygon = QPolygonF(
                         [p for p in self.current_annotation.polygon][:-1]
                     )
-                    self.update()
 
                 # If the polygon is now empty, reset to idle mode
                 if len(self.current_annotation.polygon) == 0:
                     self.current_annotation = None
                     self.mouse_mode = MouseMode.IDLE
-                    self.update()
 
             # If not drawing a polygon, go to idle mode
             if not self.current_annotation:
@@ -548,7 +547,7 @@ class AnnotableLayer(BaseLayer):
                 for ann in self.annotations:
                     ann.selected = False
                     self.annotationUpdated.emit(ann)
-                self.update()
+            self.update()
 
         # If left-clicked
         if event.button() == Qt.LeftButton:
@@ -603,6 +602,15 @@ 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),
@@ -751,8 +759,8 @@ class AnnotableLayer(BaseLayer):
                 and len(self.current_annotation.polygon) >= 3
             ):
                 self.current_annotation.is_complete = True
+
                 self.finalize_annotation()
-                self.annotationAdded.emit(self.current_annotation)
                 self.current_annotation = None
 
                 return
@@ -794,6 +802,7 @@ class AnnotableLayer(BaseLayer):
             self, "Edit Label", "Enter new label:", text=annotation.label
         )
         if ok and new_label:
+            self.labelUpdated.emit((annotation.label, new_label))
             annotation.label = new_label
             self.annotationUpdated.emit(annotation)  # Emit signal
             self.update()
@@ -811,8 +820,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 +834,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
 

imagebaker/layers/canvas_layer.py

@@ -1030,7 +1030,7 @@ class CanvasLayer(BaseLayer):
                     logger.info(f"Saved baked image to {filename}")
                     if self.config.write_annotations:
                         image = qpixmap_to_numpy(image.copy())
-                        image = cv2.cvtColor(image, cv2.COLOR_RGBA2BGR)
+                        image = cv2.cvtColor(image, cv2.COLOR_RGBA2BGRA)
                         drawn = draw_annotations(image, annotations)
                         write_to = filename.parent / f"annotated_{filename.name}"
 

imagebaker/list_views/annotation_list.py

@@ -52,6 +52,7 @@ class AnnotationList(QDockWidget):
         if self.layer is None:
             return
         for idx, ann in enumerate(self.layer.annotations):
+
             item = QListWidgetItem(self.list_widget)
 
             # Create container widget

imagebaker/list_views/image_list.py

@@ -19,6 +19,7 @@ from pathlib import Path
 
 class ImageListPanel(QDockWidget):
     imageSelected = Signal(Path)
+    activeImageEntries = Signal(list)
 
     def __init__(
         self,
@@ -26,6 +27,7 @@ class ImageListPanel(QDockWidget):
         processed_images: set[Path],
         parent=None,
         max_name_length=15,
+        images_per_page=10,
     ):
         """
         :param image_entries: List of image paths to display.
@@ -35,7 +37,7 @@ class ImageListPanel(QDockWidget):
         self.image_entries: list["ImageEntry"] = image_entries
         self.processed_images = processed_images
         self.current_page = 0
-        self.images_per_page = 10
+        self.images_per_page = images_per_page
         self.max_name_length = max_name_length
         self.init_ui()
 
@@ -90,7 +92,20 @@ class ImageListPanel(QDockWidget):
         """Update the image list with image paths and baked results."""
         self.list_widget.clear()
 
-        for idx, image_entry in enumerate(image_entries):
+        # Calculate the range of images to display for the current page
+        start_index = self.current_page * self.images_per_page
+        end_index = min(start_index + self.images_per_page, len(image_entries))
+
+        # Update the pagination label
+        self.pagination_label.setText(
+            f"Showing {start_index + 1} to {end_index} of {len(image_entries)}"
+        )
+
+        # Display only the images for the current page
+        active_image_entries = []
+        for idx, image_entry in enumerate(
+            image_entries[start_index:end_index], start=start_index + 1
+        ):
             item_widget = QWidget()
             item_layout = QHBoxLayout(item_widget)
             item_layout.setContentsMargins(5, 5, 5, 5)
@@ -101,7 +116,7 @@ class ImageListPanel(QDockWidget):
                 thumbnail_pixmap = (
                     image_entry.data.get_thumbnail()
                 )  # Baked result thumbnail
-                name_label_text = f"Baked Result {idx + 1}"
+                name_label_text = f"Baked Result {idx}"
             else:
                 thumbnail_pixmap = QPixmap(str(image_entry.data)).scaled(
                     50, 50, Qt.KeepAspectRatio, Qt.SmoothTransformation
@@ -126,11 +141,9 @@ class ImageListPanel(QDockWidget):
 
             # Store metadata for the image
             list_item.setData(Qt.UserRole, image_entry)
-        self.pagination_label.setText(
-            f"Showing {self.current_page * self.images_per_page + 1} to "
-            f"{min((self.current_page + 1) * self.images_per_page, len(image_entries))} "
-            f"of {len(image_entries)}"
-        )
+            active_image_entries.append(image_entry)
+
+        self.activeImageEntries.emit(active_image_entries)
         self.update()
 
     def handle_item_clicked(self, item: QListWidgetItem):

imagebaker/tabs/layerify_tab.py

@@ -40,6 +40,7 @@ from imagebaker.core.defs import (
 from collections import deque
 from typing import Deque
 from dataclasses import dataclass
+import os
 
 
 @dataclass
@@ -103,13 +104,17 @@ class LayerifyTab(QWidget):
         """Connect all necessary signals"""
         # Connect all layers in the deque to annotation list
         for layer in self.annotable_layers:
-            layer.annotationAdded.connect(self.annotation_list.update_list)
-            layer.annotationUpdated.connect(self.annotation_list.update_list)
+            # layer.annotationAdded.connect(self.annotation_list.update_list)
+            layer.annotationAdded.connect(self.on_annotation_added)
+            # layer.annotationUpdated.connect(self.annotation_list.update_list)
+            layer.annotationUpdated.connect(self.on_annotation_updated)
             layer.messageSignal.connect(self.messageSignal)
             layer.layerSignal.connect(self.add_layer)
+            layer.labelUpdated.connect(self.on_label_update)
 
         # Connect image list panel signals
         self.image_list_panel.imageSelected.connect(self.on_image_selected)
+        self.image_list_panel.activeImageEntries.connect(self.update_active_entries)
 
     def init_ui(self):
         """Initialize the UI components"""
@@ -118,7 +123,9 @@ class LayerifyTab(QWidget):
             None, parent=self.main_window, max_name_length=self.config.max_name_length
         )
         self.image_list_panel = ImageListPanel(
-            self.image_entries, self.processed_images
+            self.image_entries,
+            self.processed_images,
+            images_per_page=self.config.deque_maxlen,
         )
 
         self.main_window.addDockWidget(Qt.LeftDockWidgetArea, self.image_list_panel)
@@ -162,10 +169,14 @@ class LayerifyTab(QWidget):
         for idx, layer in enumerate(self.annotable_layers):
             layer.setVisible(False)
             # logger.info(f"Layer {idx} hidden.")
-
+        current_label = self.layer.current_label
+        current_color = self.layer.current_color
+        
         if not image_entry.is_baked_result:  # Regular image
             image_path = image_entry.data
             self.curr_image_idx = self.image_entries.index(image_entry)
+            # convert curr_image_idx to correct index
+            self.curr_image_idx = self.curr_image_idx % len(self.annotable_layers)
 
             # Make the corresponding layer visible and set the image
             selected_layer = self.annotable_layers[self.curr_image_idx]
@@ -185,6 +196,9 @@ class LayerifyTab(QWidget):
             # logger.info(f"Layer {self.curr_image_idx} made visible for baked result.")
             self.layer = baked_result_layer  # Set the baked result as the current layer
 
+        # Set the current label and color
+        self.layer.current_label = current_label
+        self.layer.current_color = current_color
         self.annotation_list.layer = self.layer
         self.annotation_list.update_list()
 
@@ -206,6 +220,8 @@ class LayerifyTab(QWidget):
             for i, layer in enumerate(self.annotable_layers):
                 if i < len(self.image_entries):
                     layer.set_image(self.image_entries[i].data)
+                    self.load_layer_annotations(layer)
+                    layer.layer_name = f"Layer_{i + 1}"
                     layer.setVisible(
                         i == 0
                     )  # Only the first layer is visible by default
@@ -224,12 +240,68 @@ class LayerifyTab(QWidget):
         self.image_list_panel.update_image_list(self.image_entries)
         self.update()
 
+    def save_layer_annotations(self, layer: AnnotableLayer):
+        """Save annotations for a specific layer"""
+        if len(layer.annotations) > 0:
+            file_path = layer.file_path
+            file_name = file_path.name
+            save_dir = self.config.cache_dir / f"{file_name}.json"
+            Annotation.save_as_json(layer.annotations, save_dir)
+            logger.info(f"Saved annotations for {layer.layer_name} to {save_dir}")
+
+    def load_layer_annotations(self, layer: AnnotableLayer):
+        """Load annotations for a specific layer"""
+        if layer.file_path:
+            file_path = layer.file_path
+            file_name = file_path.name
+            load_dir = self.config.cache_dir / f"{file_name}.json"
+            if load_dir.exists():
+                layer.annotations = Annotation.load_from_json(load_dir)
+                logger.info(
+                    f"Loaded annotations for {layer.layer_name} from {load_dir}"
+                )
+            else:
+                logger.warning(f"No annotations found for {layer.layer_name}")
+
+    def update_active_entries(self, image_entries: list[ImageEntry]):
+        """Update the active entries in the image list panel."""
+        self.curr_image_idx = 0
+        for i, layer in enumerate(self.annotable_layers):
+            self.save_layer_annotations(layer)
+            layer.annotations = []
+
+            if i < len(image_entries):
+                # get index on the self.image_entries
+                idx = self.image_entries.index(image_entries[i])
+                if self.image_entries[idx].is_baked_result:
+                    # if the image is a baked result, set the layer to the baked result
+                    layer = self.image_entries[idx].data
+                    layer.file_path = layer.file_path
+                else:
+                    layer.set_image(self.image_entries[idx].data)
+                self.load_layer_annotations(layer)
+
+                layer.layer_name = f"Layer_{idx + 1}"
+                layer.setVisible(i == 0)
+                if i == 0:
+                    self.layer = layer
+            else:
+                layer.setVisible(False)
+        logger.info("Updated active entries in image list panel.")
+
     def clear_annotations(self):
         """Safely clear all annotations"""
         try:
             # Clear layer annotations
             self.clearAnnotations.emit()
             self.messageSignal.emit("Annotations cleared")
+            # clear cache annotation of layer
+            annotation_path = (
+                self.config.cache_dir / f"{self.layer.file_path.name}.json"
+            )
+            if annotation_path.exists():
+                os.remove(annotation_path)
+                logger.info(f"Cleared annotations from {annotation_path}")
 
         except Exception as e:
             logger.error(f"Clear error: {str(e)}")
@@ -241,13 +313,17 @@ class LayerifyTab(QWidget):
         Args:
             annotation (Annotation): The annotation that was added.
         """
-        if annotation.label not in self.config.predefined_labels:
+
+        # if annotation.label is not in the predefined labels, add it
+        if annotation.label not in [lbl.name for lbl in self.config.predefined_labels]:
+            logger.info(f"Label {annotation.label} created.")
             self.config.predefined_labels.append(
                 Label(annotation.label, annotation.color)
             )
             self.update_label_combo()
         logger.info(f"Added annotation: {annotation.label}")
         self.messageSignal.emit(f"Added annotation: {annotation.label}")
+        self.save_layer_annotations(self.layer)
 
         # Refresh the annotation list
         self.annotation_list.update_list()
@@ -259,11 +335,12 @@ class LayerifyTab(QWidget):
         Args:
             annotation (Annotation): The updated annotation.
         """
-        logger.info(f"Updated annotation: {annotation.label}")
+        # logger.info(f"Updated annotation: {annotation}")
         self.messageSignal.emit(f"Updated annotation: {annotation.label}")
 
         # Refresh the annotation list
         self.annotation_list.update_list()
+        self.save_layer_annotations(self.layer)
 
     def update_label_combo(self):
         """
@@ -276,6 +353,27 @@ class LayerifyTab(QWidget):
             pixmap = QPixmap(16, 16)
             pixmap.fill(label.color)
             self.label_combo.addItem(QIcon(pixmap), label.name)
+        logger.info("Updated label combo box with predefined labels.")
+        self.label_combo.setCurrentText(self.current_label)
+
+    def on_label_update(self, old_new_label: tuple[str, str]):
+        new_labels = []
+        index = 0
+        for i, label in enumerate(self.config.predefined_labels):
+            if label.name == old_new_label[0]:
+                label.name = old_new_label[1]
+                index = i
+            new_labels.append(label)
+
+        self.config.predefined_labels = new_labels
+        logger.info(f"Updated label from {old_new_label[0]} to {old_new_label[1]}")
+        self.messageSignal.emit(
+            f"Updated label from {old_new_label[0]} to {old_new_label[1]}."
+        )
+
+        self.update_label_combo()
+        self.handle_label_change(index=index)
+        self.label_combo.update()
 
     def load_default_image(self):
         """
@@ -589,6 +687,24 @@ class LayerifyTab(QWidget):
         )
         msg = f"Label changed to {self.current_label}"
         self.messageSignal.emit(msg)
+        self.layer.selected_annotation = self.layer._get_selected_annotation()
+        if self.layer.selected_annotation:
+            annotations = []
+            for ann in self.layer.annotations:
+                if ann == self.layer.selected_annotation:
+                    ann.label = label_info.name
+                    ann.color = label_info.color
+                annotations.append(ann)
+
+            self.layer.annotations = annotations
+            self.on_annotation_updated(self.layer.selected_annotation)
+            # disable label change callback
+            self.label_combo.currentIndexChanged.disconnect()
+            self.label_combo.currentIndexChanged.connect(lambda: None)
+            self.update_label_combo()
+            # set it back
+            self.label_combo.currentIndexChanged.connect(self.handle_label_change)
+
         self.layer.update()
         self.update()
 
@@ -628,7 +744,7 @@ class LayerifyTab(QWidget):
             ("🎨", "Color", self.choose_color),
             ("🧅", "Layerify All", self.layerify_all),
             ("🏷️", "Add Label", self.add_new_label),
-            ("🗑️", "Clear", lambda x: self.clearAnnotations.emit()),
+            ("🗑️", "Clear", self.clear_annotations),
         ]
 
         # Folder navigation buttons
@@ -636,18 +752,6 @@ class LayerifyTab(QWidget):
         self.select_folder_btn.clicked.connect(self.select_folder)
         toolbar_layout.addWidget(self.select_folder_btn)
 
-        self.next_image_btn = QPushButton("Next")
-        self.next_image_btn.clicked.connect(self.show_next_image)
-        toolbar_layout.addWidget(self.next_image_btn)
-
-        self.prev_image_btn = QPushButton("Prev")
-        self.prev_image_btn.clicked.connect(self.show_prev_image)
-        toolbar_layout.addWidget(self.prev_image_btn)
-
-        # Initially hide next/prev buttons
-        self.next_image_btn.setVisible(False)
-        self.prev_image_btn.setVisible(False)
-
         # Add mode buttons
         for icon, text, mode in modes:
             btn_txt = icon + text
@@ -703,11 +807,25 @@ class LayerifyTab(QWidget):
                     ImageEntry(is_baked_result=False, data=img_path)
                 )
 
+        # load from bake folder if it exists
+        bake_folder = self.config.bake_dir
+        if bake_folder.exists() and bake_folder.is_dir():
+            for img_path in bake_folder.glob("*.*"):
+                if img_path.suffix.lower() in [
+                    ".jpg",
+                    ".jpeg",
+                    ".png",
+                    ".bmp",
+                    ".tiff",
+                ]:
+                    self.image_entries.append(
+                        ImageEntry(is_baked_result=False, data=img_path)
+                    )
+
     def select_folder(self):
         """Allow the user to select a folder and load images from it."""
         folder_path = QFileDialog.getExistingDirectory(self, "Select Folder")
         if folder_path:
-            self.image_entries = []  # Clear the existing image paths
             folder_path = Path(folder_path)
 
             self._load_images_from_folder(folder_path)
@@ -726,9 +844,6 @@ class LayerifyTab(QWidget):
                 # Load the first set of images into the layers
                 self.load_default_images()
 
-                # Unhide the next/prev buttons if there are multiple images
-                self.next_image_btn.setVisible(len(self.image_entries) > 1)
-                self.prev_image_btn.setVisible(len(self.image_entries) > 1)
             else:
                 QMessageBox.warning(
                     self,
@@ -736,28 +851,6 @@ class LayerifyTab(QWidget):
                     "No valid image files found in the selected folder.",
                 )
 
-    def show_next_image(self):
-        """Show next image in the list. If at the end, show first image."""
-        if self.curr_image_idx < len(self.image_entries) - 1:
-            self.curr_image_idx += 1
-        else:
-            self.curr_image_idx = 0
-        self.layer.set_image(self.image_entries[self.curr_image_idx]["data"])
-        self.messageSignal.emit(
-            f"Showing image {self.curr_image_idx + 1}/{len(self.image_entries)}"
-        )
-
-    def show_prev_image(self):
-        """Show previous image in the list. If at the start, show last image."""
-        if self.curr_image_idx > 0:
-            self.curr_image_idx -= 1
-        else:
-            self.curr_image_idx = len(self.image_entries) - 1
-        self.layer.set_image(self.image_entries[self.curr_image_idx]["data"])
-        self.messageSignal.emit(
-            f"Showing image {self.curr_image_idx + 1}/{len(self.image_entries)}"
-        )
-
     def __del__(self):
         logger.warning(f"Tab {id(self)} deleted")
 
@@ -770,10 +863,20 @@ class LayerifyTab(QWidget):
             config=self.config,
             canvas_config=self.canvas_config,
         )
-        layer.annotations = baking_result.annotations
+        # save it in cache
+        filename = baking_result.filename
+        filepath = self.config.bake_dir / filename.name
+        baking_result.image.save(str(filepath))
+        #
+        Annotation.save_as_json(
+            baking_result.annotations, self.config.cache_dir / f"{filename.name}.json"
+        )
 
-        layer.annotationAdded.connect(self.annotation_list.update_list)
-        layer.annotationUpdated.connect(self.annotation_list.update_list)
+        layer.set_image(filepath)
+
+        layer.annotationAdded.connect(self.on_annotation_added)
+        layer.annotationUpdated.connect(self.on_annotation_updated)
+        layer.labelUpdated.connect(self.on_label_update)
         layer.messageSignal.connect(self.messageSignal)
         layer.layerSignal.connect(self.add_layer)
 
@@ -785,7 +888,7 @@ class LayerifyTab(QWidget):
         self.annotable_layers.append(layer)
 
         # Add baked result to image_entries
-        baked_result_entry = ImageEntry(is_baked_result=True, data=layer)
+        baked_result_entry = ImageEntry(is_baked_result=False, data=filepath)
         self.image_entries.append(baked_result_entry)
         # baking_result.image.save(str(baking_result.filename))
         layer.update()
@@ -793,6 +896,12 @@ class LayerifyTab(QWidget):
         logger.info("A baked result has arrived, adding it to the image list.")
 
         # Update the image list panel
+        # find the page index where this layer is
+        page_index = (
+            self.image_entries.index(baked_result_entry) // self.config.deque_maxlen
+        )
+        # set the current page to the page index
+        self.image_list_panel.current_page = page_index
         self.image_list_panel.update_image_list(self.image_entries)
         self.image_list_panel.imageSelected.emit(baked_result_entry)
 
@@ -831,6 +940,19 @@ class LayerifyTab(QWidget):
                 self.annotation_list.update_list()
                 logger.info("Selected annotation deleted.")
 
+        # if clicked q, set the mode to point
+        elif key == Qt.Key_Q:
+            self.layer.set_mode(MouseMode.POINT)
+            logger.info("Mouse mode set to POINT.")
+        # if clicked w, set the mode to polygon
+        elif key == Qt.Key_W:
+            self.layer.set_mode(MouseMode.POLYGON)
+            logger.info("Mouse mode set to POLYGON.")
+        # if clicked e, set the mode to rectangle
+        elif key == Qt.Key_E:
+            self.layer.set_mode(MouseMode.RECTANGLE)
+            logger.info("Mouse mode set to RECTANGLE.")
+
         # Pass the event to the annotation list if it needs to handle it
         if self.annotation_list.hasFocus():
             self.annotation_list.keyPressEvent(event)

imagebaker/utils/image.py

@@ -49,8 +49,11 @@ def draw_annotations(image: np.ndarray, annotations: list[Annotation]) -> np.nda
     Returns:
         np.ndarray: Image with annotations drawn.
     """
+    color = (0, 255, 0, 255) if image.shape[2] == 4 else (0, 255, 0)
+
     for i, ann in enumerate(annotations):
         if ann.rectangle:
+            # if image has alpha channel, make color full alpha
             cv2.rectangle(
                 image,
                 (int(ann.rectangle.x()), int(ann.rectangle.y())),
@@ -58,7 +61,7 @@ def draw_annotations(image: np.ndarray, annotations: list[Annotation]) -> np.nda
                     int(ann.rectangle.x() + ann.rectangle.width()),
                     int(ann.rectangle.y() + ann.rectangle.height()),
                 ),
-                (0, 255, 0),
+                color,
                 2,
             )
             rect_center = ann.rectangle.center()
@@ -69,7 +72,7 @@ def draw_annotations(image: np.ndarray, annotations: list[Annotation]) -> np.nda
                 (int(rect_center.x()), int(rect_center.y())),
                 cv2.FONT_HERSHEY_SIMPLEX,
                 1,
-                (0, 255, 0),
+                color,
                 2,
             )
         elif ann.polygon:
@@ -77,7 +80,7 @@ def draw_annotations(image: np.ndarray, annotations: list[Annotation]) -> np.nda
                 image,
                 [np.array([[int(p.x()), int(p.y())] for p in ann.polygon])],
                 True,
-                (0, 255, 0),
+                color,
                 2,
             )
             polygon_center = ann.polygon.boundingRect().center()
@@ -87,19 +90,19 @@ def draw_annotations(image: np.ndarray, annotations: list[Annotation]) -> np.nda
                 (int(polygon_center.x()), int(polygon_center.y())),
                 cv2.FONT_HERSHEY_SIMPLEX,
                 1,
-                (0, 255, 0),
+                color,
                 2,
             )
         elif ann.points:
             for p in ann.points:
-                cv2.circle(image, (int(p.x()), int(p.y())), 5, (0, 255, 0), -1)
+                cv2.circle(image, (int(p.x()), int(p.y())), 5, color, -1)
             cv2.putText(
                 image,
                 ann.label,
                 (int(ann.points[0].x()), int(ann.points[0].y())),
                 cv2.FONT_HERSHEY_SIMPLEX,
                 1,
-                (0, 255, 0),
+                color,
                 2,
             )
     return image

imagebaker/window/main_window.py

@@ -175,9 +175,15 @@ class MainWindow(QMainWindow):
         self.status_bar.showMessage(status_text)
 
     def closeEvent(self, event):
-        # Clean up tabs first
-        if hasattr(self, "layerify_tab"):
-            self.layerify_tab.deleteLater()
-        if hasattr(self, "baker_tab"):
-            self.baker_tab.deleteLater()
-        super().closeEvent(event)
+        logger.info("Closing the application.")
+        if self.layerify_config.cleanup_on_exit:
+            import shutil
+
+            if self.layerify_config.bake_dir.exists():
+                shutil.rmtree(self.layerify_config.bake_dir)
+                logger.info(f"Deleted bake directory: {self.layerify_config.bake_dir}")
+            if self.layerify_config.cache_dir.exists():
+                shutil.rmtree(self.layerify_config.cache_dir)
+                logger.info(
+                    f"Deleted cache directory: {self.layerify_config.cache_dir}"
+                )

imagebaker/workers/baker_worker.py

@@ -224,6 +224,8 @@ class BakerWorker(QObject):
             self.finished.emit(results)
 
         except Exception as e:
+            import traceback
+
             logger.error(f"Error in BakerWorker: {e}")
             self.error.emit(str(e))
             traceback.print_exc()
@@ -248,9 +250,14 @@ class BakerWorker(QObject):
             new_annotation.points = ann.points
         elif ann.rectangle:
             xywhs = mask_to_rectangles(alpha_channel, merge_rectangles=True)
-            new_annotation.rectangle = QRectF(
-                xywhs[0][0], xywhs[0][1], xywhs[0][2], xywhs[0][3]
-            )
+            if len(xywhs) == 0:
+                logger.info("No rectangles found")
+                # return None
+            else:
+                logger.info(f"Found {len(xywhs)} rectangles")
+                new_annotation.rectangle = QRectF(
+                    xywhs[0][0], xywhs[0][1], xywhs[0][2], xywhs[0][3]
+                )
         elif ann.polygon:
             polygon = mask_to_polygons(alpha_channel, merge_polygons=True)
             poly = QPolygonF([QPointF(p[0], p[1]) for p in polygon[0]])

{imagebaker-0.0.50.dist-info → imagebaker-0.52.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: imagebaker
-Version: 0.0.50
+Version: 0.52
 Summary: A package for baking images.
 Home-page: https://github.com/q-viper/Image-Baker
 Author: Ramkrishna Acharya
@@ -112,6 +112,9 @@ After cloning and going to the project directory, the following code should work
 * **Ctrl + D**: Draw Mode on Baker Tab. Drawing can happen on a selected or main layer.
 * **Ctrl + E**: Erase Mode on Baker Tab.
 * **Wheel**: Change the size of the drawing pointer.
+* **Q**: Point mode on annotation.
+* **W**: Polygon mode on annotation.
+* **E**: Rectangle mode on annotation.
 
 ## Demo
 ### Annotation Page
@@ -151,3 +154,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.50.dist-info → imagebaker-0.52.dist-info}/RECORD

@@ -1,43 +1,43 @@
 imagebaker/__init__.py,sha256=zrrxwyzuqVNeIu3rVPrOGYf6SCd5kWsoGcdqqUfsYX4,258
 imagebaker/core/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 imagebaker/core/configs/__init__.py,sha256=iyR_GOVMFw3XJSm7293YfyTnaLZa7pLQMfn5tGxVofI,31
-imagebaker/core/configs/configs.py,sha256=-qy7vmYaaUk3bh49pwsBig8de_3Y2JWjTDeyWcGQods,5130
+imagebaker/core/configs/configs.py,sha256=hm0CHfMVTD9353wB61Df9bVUb898zQVIFjdoXELdJcc,5694
 imagebaker/core/defs/__init__.py,sha256=NqV7gYIlRkaS7nx_UTNPSNZbdPrx4w-VurKOKyRLbKY,28
-imagebaker/core/defs/defs.py,sha256=-ZItfJdWaK9yFSuFn2LmQ4ncqukAZ_hvYFgE44HUdIo,8394
+imagebaker/core/defs/defs.py,sha256=oZCkgqHgvE_yupUzD5IB_ZMoRhyTh0EdCR8Gmh6TMsI,8505
 imagebaker/core/plugins/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 imagebaker/core/plugins/base_plugin.py,sha256=ROa1HTwV5LgGL-40CHKk_5MZYI5QAT1MzpYO7Fx-9P0,1084
 imagebaker/core/plugins/cosine_plugin.py,sha256=IXBfvaoxrvf-hytg_dT1zFmOfDbcWXBZ7NvIFPJ2tWQ,1251
 imagebaker/layers/__init__.py,sha256=q1kUDHhUXEGBOdu6CHDfqCnE2mraLHRqh0DFHYTbnRY,158
-imagebaker/layers/annotable_layer.py,sha256=ejBp6nooLtHs8c_G6lOsTJmSwBT404F_dmPsSkjvdEQ,37167
+imagebaker/layers/annotable_layer.py,sha256=_jR6SX14A4BB-kzH0vnx8phgJwq7pJj_fwdpbsq7rVo,37542
 imagebaker/layers/base_layer.py,sha256=1K7Nt6OPITrILj-p4I6Jf0eaesCpdeecOXGj_8oAQb8,30650
-imagebaker/layers/canvas_layer.py,sha256=7eDo0UHXRRZ5BX3BciPX88JsumzmwVemtS6cBjU9qwM,42115
+imagebaker/layers/canvas_layer.py,sha256=6quVe_Ieyz14zPL92xTfrinAT7X4yb9iyEl-f9SnQZU,42116
 imagebaker/list_views/__init__.py,sha256=Aa9slE6do8eYgZp77wrofpd_mlBDwxgF3adMyHYFanE,144
-imagebaker/list_views/annotation_list.py,sha256=HGV6lGlkFjvJvvGnCcLuX1kkfXA0GL8wKo8jOXSBXec,7527
+imagebaker/list_views/annotation_list.py,sha256=w6jNMyo3nxhQKZx8MyusNvxs_R6Pj-b-YBI5e0APZVM,7528
 imagebaker/list_views/canvas_list.py,sha256=JYSYR0peGyJFJ6amL1894KsUHETPUkR3qAWdGL50Lbc,6717
-imagebaker/list_views/image_list.py,sha256=NInkc893FGU7L6oSxy8KrWql-i6RB0BqvkroPAASjVw,4912
+imagebaker/list_views/image_list.py,sha256=EX2YmoTRffBXTbbVnuflbdsxZQD8fgM2StSxg1a9ANA,5389
 imagebaker/list_views/layer_list.py,sha256=fLx3Ry72fas1W5y_V84hSp41ARneogQN3qjfYTOcpxY,14476
 imagebaker/list_views/layer_settings.py,sha256=0WVSCm_RSBKo4pCkYU5c2OYjb_sW8x0UUfFC4So26jQ,9752
 imagebaker/models/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 imagebaker/models/base_model.py,sha256=4RyS4vShqWFHhdQDwYluwTPnRPEXjpZl9UjYY_w8NL0,4203
 imagebaker/tabs/__init__.py,sha256=ijg7MA17RvcHA2AuZE4OgRJXWxjecaUAlfASKAoCQ6Q,86
 imagebaker/tabs/baker_tab.py,sha256=yFQRiNmLIua5BvgW7Ysj5FrNbTLhGxqGRTRCABxeTtw,20493
-imagebaker/tabs/layerify_tab.py,sha256=Qsf9w81-43sB0LZy_vIB4wCzUhHHhoIiarZJvKRxeZ0,32340
+imagebaker/tabs/layerify_tab.py,sha256=UEEPxC-_TK01nk-pqJ96JEnSN5h3gpK1YVxIA9lsFu4,37661
 imagebaker/utils/__init__.py,sha256=I1z5VVEf6QPOMvVkgVHDauQ9ew7tcTVguV4Kdi3Lk4Y,130
-imagebaker/utils/image.py,sha256=fq7g3DqSdjF9okxZ3fe5kF4Hxn32rqhvVqxy8yI5bnI,3067
+imagebaker/utils/image.py,sha256=2-wbwD3PMwefgswge0drFM1XfXE7yQ64lqZZ5PwyCWs,3165
 imagebaker/utils/state_utils.py,sha256=Y2JVRGVfsoffwfA2lsCcqHwIxH_jOrEJAdH-oWfe2XE,3841
 imagebaker/utils/transform_mask.py,sha256=k8MfTgM5-_U2TvDHQHRelz-leGFX6OcsllV6-J4BKfw,3651
 imagebaker/utils/utils.py,sha256=MnJ4flxxwZbjROWJ5iKHnJxPSSMbfWRbF9GKfVcKutA,840
 imagebaker/utils/vis.py,sha256=f7c44gm6g9ja5hgVeXKfOhHzxHdzXcIUwKiA1RZU_F8,4736
 imagebaker/window/__init__.py,sha256=FIxtUR1qnbQMYzppQv7tEfv1-ueHhpu0Z7xuWZR794w,44
 imagebaker/window/app.py,sha256=e6FGO_BnvkiQC9JN3AmqkgbF72zzZS0hc7PFc43QiVc,4725
-imagebaker/window/main_window.py,sha256=gpJ7DDuPmxhHh_6Rv3YH2J_1AqG7-NM8R3tKNYhFT3E,7030
+imagebaker/window/main_window.py,sha256=-CP7q6xzkhv9Cl5RwUft1Rv8nIAuj_SLOiZDS2x6QJ4,7374
 imagebaker/workers/__init__.py,sha256=XfXENwAYyNg9q_zR-gOsYJGjzwg_iIb_gING8ydnp9c,154
-imagebaker/workers/baker_worker.py,sha256=EJTL4ln09NuntFpu0o-Hfk0vCtDxpKqJxJcmtgTnMwo,11297
+imagebaker/workers/baker_worker.py,sha256=_jWeyYAGoO2mfxXDn7fBm9tIA69OITewDVN0hSAt3Jc,11532
 imagebaker/workers/layerify_worker.py,sha256=EOqKvhdACtf3y5Ljy6M7MvddAjlZW5DNfBFMtNPD-us,3223
 imagebaker/workers/model_worker.py,sha256=Tlg6_D977iK-kuGCNdQY4OnGiP8QqWY7adpRNXZw4rA,1636
-imagebaker-0.0.50.dist-info/LICENSE,sha256=1vkysFPOnT7y4LsoFTv9YsopIrQvBc2l6vUOfv4KKLc,1082
-imagebaker-0.0.50.dist-info/METADATA,sha256=Zsl37tIGiV9wrQ2zfiaubhmPbhOMucos2V_fF5mtbXU,6829
-imagebaker-0.0.50.dist-info/WHEEL,sha256=tZoeGjtWxWRfdplE7E3d45VPlLNQnvbKiYnx7gwAy8A,92
-imagebaker-0.0.50.dist-info/entry_points.txt,sha256=IDjZHJCiiHpH5IUTByT2en0nMbnnnlrJZ5FPFehUvQM,61
-imagebaker-0.0.50.dist-info/top_level.txt,sha256=Gg-eILTlqJXwVQr0saSwsx3-H4SPdZ2agBZaufe194s,11
-imagebaker-0.0.50.dist-info/RECORD,,
+imagebaker-0.52.dist-info/LICENSE,sha256=1vkysFPOnT7y4LsoFTv9YsopIrQvBc2l6vUOfv4KKLc,1082
+imagebaker-0.52.dist-info/METADATA,sha256=TvkbuBIRmuwTIOHHcMAR6fmgB3TQs5GJ5c738antwpg,6991
+imagebaker-0.52.dist-info/WHEEL,sha256=tZoeGjtWxWRfdplE7E3d45VPlLNQnvbKiYnx7gwAy8A,92
+imagebaker-0.52.dist-info/entry_points.txt,sha256=IDjZHJCiiHpH5IUTByT2en0nMbnnnlrJZ5FPFehUvQM,61
+imagebaker-0.52.dist-info/top_level.txt,sha256=Gg-eILTlqJXwVQr0saSwsx3-H4SPdZ2agBZaufe194s,11
+imagebaker-0.52.dist-info/RECORD,,