imagebaker 0.0.46__py3-none-any.whl → 0.0.49__py3-none-any.whl

imagebaker/__init__.py

@@ -2,4 +2,4 @@ from loguru import logger  # noqa
 
 logger.info("imagebaker package loaded with loguru logger.")
 
-__version__ = "0.0.4"  # noqa
+# __version__ = "0.0.49"  # noqa

imagebaker/core/configs/configs.py

@@ -8,6 +8,11 @@ from pydantic import BaseModel, Field
 from imagebaker.core.defs import Label, ModelType
 from imagebaker import logger
 
+try:
+    from imagebaker import __version__
+except ImportError:
+    __version__ = "unknown"
+
 
 class DrawConfig(BaseModel):
     color: QColor = Field(default_factory=lambda: QColor(255, 255, 255))
@@ -37,11 +42,13 @@ class DrawConfig(BaseModel):
 
 class BaseConfig(BaseModel):
     project_name: str = "ImageBaker"
-    version: str = "0.1.0"
+    version: str = __version__
     project_dir: Path = Path(".")
 
     is_debug: bool = True
     deque_maxlen: int = 10
+    # max num_characters to show in name
+    max_name_length: int = 15
 
     # drawing configs #
     # ON SELECTION
@@ -87,6 +94,8 @@ class LayerConfig(BaseConfig):
             Label("Custom", QColor(128, 128, 128)),
         ]
     )
+    # whether to search image in subfolders as well
+    full_search: bool = False
 
     def get_label_color(self, label):
         for lbl in self.predefined_labels:

imagebaker/layers/annotable_layer.py

@@ -472,10 +472,13 @@ class AnnotableLayer(BaseLayer):
                     self.selected_annotation.polygon[self.active_point_index] = (
                         clamped_pos
                     )
+                elif self.selected_annotation.points:
+                    self.selected_annotation.points[0] = clamped_pos
                 self.annotationMoved.emit()
                 self.annotationUpdated.emit(self.selected_annotation)
                 self.update()
                 return
+
             if self.mouse_mode == MouseMode.PAN and event.buttons() & Qt.LeftButton:
                 if self.pan_start:
                     delta = event.position() - self.pan_start
@@ -534,6 +537,7 @@ class AnnotableLayer(BaseLayer):
                 self.mouse_mode = MouseMode.IDLE
                 for ann in self.annotations:
                     ann.selected = False
+                    self.annotationUpdated.emit(ann)
                 self.update()
 
         # If left-clicked
@@ -559,7 +563,9 @@ class AnnotableLayer(BaseLayer):
                 elif self.selected_annotation.polygon:
                     self.initial_polygon = QPolygonF(self.selected_annotation.polygon)
                     if "point_" in self.active_handle:
-                        self.active_point = int(self.active_handle.split("_")[1])
+                        self.active_point_index = int(self.active_handle.split("_")[1])
+                elif self.selected_annotation.points:
+                    self.active_point_index = 0
 
             # If pan mode
             if self.mouse_mode == MouseMode.PAN:
@@ -646,6 +652,11 @@ class AnnotableLayer(BaseLayer):
                 if annotation.polygon.containsPoint(pos, Qt.OddEvenFill):
                     return annotation, "move"
 
+            # Check points
+            elif annotation.points:
+                if (annotation.points[0] - pos).manhattanLength() < margin:
+                    return annotation, "point_0"
+
         return None, None
 
     def handle_mouse_double_click(self, event: QMouseEvent, pos: QPoint):
@@ -656,6 +667,73 @@ class AnnotableLayer(BaseLayer):
                 break
         # if left double click
         if event.button() == Qt.LeftButton:
+            img_pos = self.widget_to_image_pos(event.position())
+
+            self.selected_annotation, self.active_handle = (
+                self.find_annotation_and_handle_at(img_pos)
+            )
+
+            if self.selected_annotation:
+                if self.selected_annotation.polygon and self.active_handle:
+                    if "point_" in self.active_handle:
+                        index = int(self.active_handle.split("_")[1])
+                        # Remove the point at the clicked index
+                        polygon = self.selected_annotation.polygon
+                        polygon = QPolygonF(
+                            [p for i, p in enumerate(polygon) if i != index]
+                        )
+
+                        self.selected_annotation.polygon = polygon
+                        self.annotationUpdated.emit(self.selected_annotation)
+                        self.update()
+                        logger.info(f"Removed point at index {index}")
+                        return
+
+                # Check if an edge was double-clicked
+                polygon = self.selected_annotation.polygon
+                if polygon:
+                    for i in range(len(polygon)):
+                        start_point = polygon[i]
+                        end_point = polygon[
+                            (i + 1) % len(polygon)
+                        ]  # Wrap around to the first point
+
+                        # Calculate the vector along the edge and the vector from the start point to the clicked position
+                        line_vector = end_point - start_point
+                        point_vector = img_pos - start_point
+
+                        # Calculate the length of the edge
+                        line_length_squared = (
+                            line_vector.x() ** 2 + line_vector.y() ** 2
+                        )
+                        if line_length_squared == 0:
+                            continue  # Avoid division by zero for degenerate edges
+
+                        # Project the point onto the line (normalized)
+                        projection = (
+                            point_vector.x() * line_vector.x()
+                            + point_vector.y() * line_vector.y()
+                        ) / line_length_squared
+
+                        # Clamp the projection to the range [0, 1] to ensure it lies on the segment
+                        projection = max(0, min(1, projection))
+
+                        # Calculate the projection point on the edge
+                        projection_point = start_point + projection * line_vector
+
+                        # Calculate the perpendicular distance from the clicked position to the edge
+                        perpendicular_distance = (
+                            img_pos - projection_point
+                        ).manhattanLength()
+
+                        # Check if the perpendicular distance is within the margin
+                        if perpendicular_distance < 10:  # Margin of 10
+                            # Insert a new point at the projection point
+                            polygon.insert(i + 1, projection_point)
+                            self.annotationUpdated.emit(self.selected_annotation)
+                            self.update()
+                            return
+
             # if drawing a polygon, close the polygon
             if (
                 self.current_annotation
@@ -670,20 +748,20 @@ class AnnotableLayer(BaseLayer):
                 return
 
             # did we click on an annotation?
-            annotation = self.find_annotation_at(self.widget_to_image_pos(pos))
-            if annotation:
-                # toggle selection
-                annotation.selected = not annotation.selected
-
-                # make all other annotations unselected
-                for ann in self.annotations:
-                    if ann != annotation:
-                        ann.selected = False
-            else:
-                # we clicked on the background
-                # make all annotations unselected
-                for ann in self.annotations:
-                    ann.selected = False
+            # annotation = self.find_annotation_at(self.widget_to_image_pos(pos))
+            # if annotation:
+            #     # toggle selection
+            #     annotation.selected = not annotation.selected
+
+            #     # make all other annotations unselected
+            #     for ann in self.annotations:
+            #         if ann != annotation:
+            #             ann.selected = False
+            # else:
+            #     # we clicked on the background
+            #     # make all annotations unselected
+            #     for ann in self.annotations:
+            #         ann.selected = False
             # update the view
             for ann in self.annotations:
                 self.annotationUpdated.emit(ann)

imagebaker/list_views/annotation_list.py

@@ -23,9 +23,10 @@ from imagebaker import logger
 class AnnotationList(QDockWidget):
     messageSignal = Signal(str)
 
-    def __init__(self, layer: AnnotableLayer, parent=None):
+    def __init__(self, layer: AnnotableLayer, parent=None, max_name_length=15):
         super().__init__("Annotations", parent)
         self.layer = layer
+        self.max_name_length = max_name_length
         self.init_ui()
 
     def init_ui(self):
@@ -100,7 +101,7 @@ class AnnotationList(QDockWidget):
                 else ann.annotator
             )
             secondary_text.append(score_text)
-            short_path = ann.file_path.stem
+            short_path = ann.file_path.stem[: self.max_name_length]
             secondary_text.append(f"<span style='color:#666;'>{short_path}</span>")
 
             if secondary_text:

imagebaker/list_views/image_list.py

@@ -25,6 +25,7 @@ class ImageListPanel(QDockWidget):
         image_entries: list["ImageEntry"],
         processed_images: set[Path],
         parent=None,
+        max_name_length=15,
     ):
         """
         :param image_entries: List of image paths to display.
@@ -35,6 +36,7 @@ class ImageListPanel(QDockWidget):
         self.processed_images = processed_images
         self.current_page = 0
         self.images_per_page = 10
+        self.max_name_length = max_name_length
         self.init_ui()
 
     def init_ui(self):
@@ -104,7 +106,7 @@ class ImageListPanel(QDockWidget):
                 thumbnail_pixmap = QPixmap(str(image_entry.data)).scaled(
                     50, 50, Qt.KeepAspectRatio, Qt.SmoothTransformation
                 )
-                name_label_text = Path(image_entry.data).name
+                name_label_text = Path(image_entry.data).name[: self.max_name_length]
 
             thumbnail_label.setPixmap(thumbnail_pixmap)
             item_layout.addWidget(thumbnail_label)

imagebaker/tabs/layerify_tab.py

@@ -114,7 +114,9 @@ class LayerifyTab(QWidget):
     def init_ui(self):
         """Initialize the UI components"""
         # Create annotation list and image list panel
-        self.annotation_list = AnnotationList(None, parent=self.main_window)
+        self.annotation_list = AnnotationList(
+            None, parent=self.main_window, max_name_length=self.config.max_name_length
+        )
         self.image_list_panel = ImageListPanel(
             self.image_entries, self.processed_images
         )
@@ -197,18 +199,7 @@ class LayerifyTab(QWidget):
         if not self.image_entries:
             assets_folder = self.config.assets_folder
             if assets_folder.exists() and assets_folder.is_dir():
-                for img_path in assets_folder.rglob("*.*"):
-                    if img_path.suffix.lower() in [
-                        ".jpg",
-                        ".jpeg",
-                        ".png",
-                        ".bmp",
-                        ".tiff",
-                    ]:
-                        # Add regular images as dictionaries with type and data
-                        self.image_entries.append(
-                            ImageEntry(is_baked_result=False, data=img_path)
-                        )
+                self._load_images_from_folder(assets_folder)
 
         # Load images into layers if any are found
         if self.image_entries:
@@ -690,6 +681,27 @@ class LayerifyTab(QWidget):
         self.model_combo.currentIndexChanged.connect(self.handle_model_change)
         toolbar_layout.addWidget(self.model_combo)
 
+    def _load_images_from_folder(self, folder_path: Path):
+        """Load images from a folder and update the image list."""
+        self.image_entries = []  # Clear the existing image paths
+
+        if self.config.full_search:
+            image_paths = list(folder_path.rglob("*.*"))
+        else:
+            image_paths = list(folder_path.glob("*.*"))
+
+        for img_path in image_paths:
+            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")
@@ -697,18 +709,7 @@ class LayerifyTab(QWidget):
             self.image_entries = []  # Clear the existing image paths
             folder_path = Path(folder_path)
 
-            # Use rglob to get all image files in the folder and subfolders
-            for img_path in folder_path.rglob("*.*"):
-                if img_path.suffix.lower() in [
-                    ".jpg",
-                    ".jpeg",
-                    ".png",
-                    ".bmp",
-                    ".tiff",
-                ]:
-                    self.image_entries.append(
-                        ImageEntry(is_baked_result=False, data=img_path)
-                    )
+            self._load_images_from_folder(folder_path)
 
             self.curr_image_idx = 0  # Reset the current image index
 

imagebaker/window/main_window.py

@@ -1,6 +1,8 @@
 from imagebaker.core.configs import LayerConfig, CanvasConfig
 from imagebaker import logger
 from imagebaker.tabs import LayerifyTab, BakerTab
+from imagebaker import __version__
+
 
 from PySide6.QtCore import Qt, QTimer
 from PySide6.QtWidgets import (
@@ -37,7 +39,7 @@ class MainWindow(QMainWindow):
     def init_ui(self):
         """Initialize the main window and set up tabs."""
         try:
-            self.setWindowTitle("Image Baker")
+            self.setWindowTitle(f"Image Baker v{__version__}")
             self.setGeometry(100, 100, 1200, 800)
 
             self.status_bar = self.statusBar()

{imagebaker-0.0.46.dist-info → imagebaker-0.0.49.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: imagebaker
-Version: 0.0.46
+Version: 0.0.49
 Summary: A package for baking images.
 Home-page: https://github.com/q-viper/Image-Baker
 Author: Ramkrishna Acharya
@@ -16,7 +16,7 @@ Requires-Dist: numpy>=1.21
 Requires-Dist: matplotlib>=3.4
 Requires-Dist: opencv-python>=4.5
 Requires-Dist: black>=23.1
-Requires-Dist: pydantic>=2.0
+Requires-Dist: pydantic>=2.11.1
 Requires-Dist: flake8>=6.0
 Requires-Dist: typer>=0.9
 Requires-Dist: PySide6==6.8.3

{imagebaker-0.0.46.dist-info → imagebaker-0.0.49.dist-info}/RECORD

@@ -1,41 +1,41 @@
-imagebaker/__init__.py,sha256=UeXmuH87AJb0MVzWgT4HXNtl99XxS7HGenLyI9K93go,127
+imagebaker/__init__.py,sha256=ep22Ki-KljDvYzGvAfrDe9UU77GWgfoAsLd7t0S273c,130
 imagebaker/core/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 imagebaker/core/configs/__init__.py,sha256=iyR_GOVMFw3XJSm7293YfyTnaLZa7pLQMfn5tGxVofI,31
-imagebaker/core/configs/configs.py,sha256=5KRZfLShu4JqV459n5dX4AlbIlkySyAmJr8OzYG4X7Q,4850
+imagebaker/core/configs/configs.py,sha256=uyUhoHA9-Ult-vVtnLX-JNmeUght4mUUV80yKWzUO_o,5100
 imagebaker/core/defs/__init__.py,sha256=NqV7gYIlRkaS7nx_UTNPSNZbdPrx4w-VurKOKyRLbKY,28
 imagebaker/core/defs/defs.py,sha256=nIg2ZQADbpcyC0ZOl54L14yLZ38-SUnfMkklCDfhN3E,8257
 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=8Y35JvgSQMBTkvjG8VlD1xQgTsskyMwjU6ETU_xalAw,32819
+imagebaker/layers/annotable_layer.py,sha256=ZjDqNMEqB78iEAThotfksv8-xIK6NCr52fI26Rv6CXA,36627
 imagebaker/layers/base_layer.py,sha256=uncseSxTbLKnV84hAPbJLDbBMV0nu1gQ4N-SLHoGB6s,25486
 imagebaker/layers/canvas_layer.py,sha256=47R-g3NAzAQ720tWrIZUYIAupxImdORVYK5BFIRopqo,40414
 imagebaker/list_views/__init__.py,sha256=Aa9slE6do8eYgZp77wrofpd_mlBDwxgF3adMyHYFanE,144
-imagebaker/list_views/annotation_list.py,sha256=Wx2MbDGxcGeqss9TccFWVVYvlDo9hsefBMQBi4s72is,7436
+imagebaker/list_views/annotation_list.py,sha256=HGV6lGlkFjvJvvGnCcLuX1kkfXA0GL8wKo8jOXSBXec,7527
 imagebaker/list_views/canvas_list.py,sha256=JYSYR0peGyJFJ6amL1894KsUHETPUkR3qAWdGL50Lbc,6717
-imagebaker/list_views/image_list.py,sha256=o4yGNXRffPJOZxd_c9JIK9MVzJkeWtXbZUF7pAVmfzw,4813
+imagebaker/list_views/image_list.py,sha256=NInkc893FGU7L6oSxy8KrWql-i6RB0BqvkroPAASjVw,4912
 imagebaker/list_views/layer_list.py,sha256=fLx3Ry72fas1W5y_V84hSp41ARneogQN3qjfYTOcpxY,14476
 imagebaker/list_views/layer_settings.py,sha256=38E39z-rEdl0YSe2C_k4wd5CgHPETQeJE5VvJLfFQ-k,8454
 imagebaker/models/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 imagebaker/models/base_model.py,sha256=ZfZ_VgP-jzfmEAdOycVtOYkr03m8EyXWdmK0-50MxIk,4197
 imagebaker/tabs/__init__.py,sha256=ijg7MA17RvcHA2AuZE4OgRJXWxjecaUAlfASKAoCQ6Q,86
 imagebaker/tabs/baker_tab.py,sha256=kIVoF4w_Ch1YNdHtHsNZKfr46tZWBDSj5xrrEkF1piM,20752
-imagebaker/tabs/layerify_tab.py,sha256=L8FqZf5JHHYc8BCRKwLWIRdgUSq2YvS7XiJ5Zd5kkTo,32427
+imagebaker/tabs/layerify_tab.py,sha256=2IEdRyYHhNdY2696YiLcnWWKYN6gYwcKH6jsffYiL5M,32304
 imagebaker/utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 imagebaker/utils/image.py,sha256=fq7g3DqSdjF9okxZ3fe5kF4Hxn32rqhvVqxy8yI5bnI,3067
 imagebaker/utils/state_utils.py,sha256=sI0R3ht4W_kQGwOpzUdBjy6M4PaKaAQlj-_MM6pidfM,3584
 imagebaker/utils/transform_mask.py,sha256=k8MfTgM5-_U2TvDHQHRelz-leGFX6OcsllV6-J4BKfw,3651
 imagebaker/window/__init__.py,sha256=FIxtUR1qnbQMYzppQv7tEfv1-ueHhpu0Z7xuWZR794w,44
 imagebaker/window/app.py,sha256=e6FGO_BnvkiQC9JN3AmqkgbF72zzZS0hc7PFc43QiVc,4725
-imagebaker/window/main_window.py,sha256=GM5Pf7wpR8u99FarL7eqyc09Khwi6TWEgka6MvrjP6Y,6978
+imagebaker/window/main_window.py,sha256=gpJ7DDuPmxhHh_6Rv3YH2J_1AqG7-NM8R3tKNYhFT3E,7030
 imagebaker/workers/__init__.py,sha256=XfXENwAYyNg9q_zR-gOsYJGjzwg_iIb_gING8ydnp9c,154
 imagebaker/workers/baker_worker.py,sha256=JyV1Hu4mzbYhmogc7K3U24adklmT3x3V0ZNMxe7iT-w,10697
 imagebaker/workers/layerify_worker.py,sha256=EOqKvhdACtf3y5Ljy6M7MvddAjlZW5DNfBFMtNPD-us,3223
 imagebaker/workers/model_worker.py,sha256=Tlg6_D977iK-kuGCNdQY4OnGiP8QqWY7adpRNXZw4rA,1636
-imagebaker-0.0.46.dist-info/LICENSE,sha256=1vkysFPOnT7y4LsoFTv9YsopIrQvBc2l6vUOfv4KKLc,1082
-imagebaker-0.0.46.dist-info/METADATA,sha256=eQ78w8cbBe1zk2PCQlStYW5BzoMj1hO3yxlHnm7xVfA,6733
-imagebaker-0.0.46.dist-info/WHEEL,sha256=tZoeGjtWxWRfdplE7E3d45VPlLNQnvbKiYnx7gwAy8A,92
-imagebaker-0.0.46.dist-info/entry_points.txt,sha256=IDjZHJCiiHpH5IUTByT2en0nMbnnnlrJZ5FPFehUvQM,61
-imagebaker-0.0.46.dist-info/top_level.txt,sha256=Gg-eILTlqJXwVQr0saSwsx3-H4SPdZ2agBZaufe194s,11
-imagebaker-0.0.46.dist-info/RECORD,,
+imagebaker-0.0.49.dist-info/LICENSE,sha256=1vkysFPOnT7y4LsoFTv9YsopIrQvBc2l6vUOfv4KKLc,1082
+imagebaker-0.0.49.dist-info/METADATA,sha256=BldoEWej9PUXnJVw_rpJEYFnjXosJIXWKJB2oY9ZLyI,6736
+imagebaker-0.0.49.dist-info/WHEEL,sha256=tZoeGjtWxWRfdplE7E3d45VPlLNQnvbKiYnx7gwAy8A,92
+imagebaker-0.0.49.dist-info/entry_points.txt,sha256=IDjZHJCiiHpH5IUTByT2en0nMbnnnlrJZ5FPFehUvQM,61
+imagebaker-0.0.49.dist-info/top_level.txt,sha256=Gg-eILTlqJXwVQr0saSwsx3-H4SPdZ2agBZaufe194s,11
+imagebaker-0.0.49.dist-info/RECORD,,