imagebaker 0.0.51__py3-none-any.whl → 0.0.53__py3-none-any.whl

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/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/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/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()

imagebaker/list_views/annotation_list.py

@@ -201,5 +201,6 @@ class AnnotationList(QDockWidget):
             self.layer.paste_annotation()
         elif event.key() == Qt.Key_Delete:
             self.delete_annotation(self.layer.selected_annotation_index)
-        else:
-            self.parentWidget().keyPressEvent(event)
+        elif event.key() == Qt.Key_H:
+            self.layer.toggle_annotation_visibility()
+        # self.parentWidget().keyPressEvent(event)

imagebaker/list_views/image_list.py

@@ -144,6 +144,11 @@ class ImageListPanel(QDockWidget):
             active_image_entries.append(image_entry)
 
         self.activeImageEntries.emit(active_image_entries)
+        # also set first item as selected if there are any items
+        if self.list_widget.count() > 0:
+            self.list_widget.setCurrentRow(0)
+            self.list_widget.setFocus()
+
         self.update()
 
     def handle_item_clicked(self, item: QListWidgetItem):

imagebaker/list_views/layer_settings.py

@@ -8,6 +8,7 @@ from PySide6.QtWidgets import (
     QSizePolicy,
     QDockWidget,
     QSlider,
+    QLineEdit,
 )
 
 from imagebaker.core.defs import LayerState
@@ -82,6 +83,32 @@ class LayerSettings(QDockWidget):
         )
         self.main_layout.addWidget(self.edge_width_slider["widget"])
 
+        # Caption input
+        caption_layout = QHBoxLayout()
+        caption_label = QLabel("Caption:")
+        caption_label.setSizePolicy(QSizePolicy.Fixed, QSizePolicy.Fixed)
+        self.caption_input = QLineEdit()
+        self.caption_input.setPlaceholderText("Enter caption...")
+        self.caption_input.setSizePolicy(QSizePolicy.Expanding, QSizePolicy.Fixed)
+        caption_layout.addWidget(caption_label)
+        caption_layout.addWidget(self.caption_input)
+        self.main_layout.addLayout(caption_layout)
+
+        # Set initial value if layer is selected
+        if self.selected_layer:
+            self.caption_input.setText(self.selected_layer.caption)
+
+        # Update layer caption on editing finished
+        def update_caption():
+            if self.selected_layer:
+                logger.info(
+                    f"Updating caption for layer {self.selected_layer.layer_name} to {self.caption_input.text()}"
+                )
+                self.selected_layer.caption = self.caption_input.text()
+                self.selected_layer.update()
+
+        self.caption_input.editingFinished.connect(update_caption)
+
         # Add stretch to push content to the top
         self.main_layout.addStretch()
 
@@ -177,6 +204,7 @@ class LayerSettings(QDockWidget):
             edge_opacity=self.selected_layer.edge_opacity,
             edge_width=self.selected_layer.edge_width,
             visible=self.selected_layer.visible,
+            caption=self.selected_layer.caption,
         )
         logger.info(f"Storing state {bake_settings}")
         self.messageSignal.emit(f"Stored state for {bake_settings.layer_name}")
@@ -240,6 +268,7 @@ class LayerSettings(QDockWidget):
                 self.edge_width_slider["slider"].setValue(
                     int(self.selected_layer.edge_width)
                 )
+                self.caption_input.setText(self.selected_layer.caption)
             else:
                 self.widget.setEnabled(False)
                 self.layer_name_label.setText("No BaseLayer")

imagebaker/tabs/baker_tab.py

@@ -18,7 +18,6 @@ from PySide6.QtWidgets import (
     QSlider,
     QLabel,
     QSpinBox,
-    QComboBox,
 )
 from collections import deque
 
@@ -485,5 +484,54 @@ class BakerTab(QWidget):
             self.layer_list.update_list()
             self.messageSignal.emit(f"Added new layer: {new_layer.layer_name}")
 
+        if event.key() == Qt.Key_H:
+            # if pressed h key, then toggle visibility of layer
+            selected_layer = self.current_canvas._get_selected_layer()
+            if selected_layer:
+                selected_layer.visible = not selected_layer.visible
+                selected_layer.update()
+                self.current_canvas.update()
+                self.layer_settings.update_sliders()
+                self.messageSignal.emit(
+                    f"Toggled visibility of annotations in layer: {selected_layer.layer_name}"
+                )
+        # if pressed W key, move the order of the selected layer up
+        # make it circular, if the first layer is selected, then move it to the last
+        if event.key() == Qt.Key_W:
+            selected_layer = self.current_canvas._get_selected_layer()
+            if selected_layer:
+                index = self.current_canvas.layers.index(selected_layer)
+                if index > 0:
+                    # Move the layer up
+                    self.current_canvas.layers.insert(index - 1, selected_layer)
+                    del self.current_canvas.layers[index + 1]
+                else:
+                    # Move the first layer to the end
+                    self.current_canvas.layers.append(selected_layer)
+                    del self.current_canvas.layers[0]
+                self.current_canvas.update()
+                self.layer_list.update_list()
+                self.messageSignal.emit(
+                    f"Moved layer {selected_layer.layer_name} up in order."
+                )
+        # if pressed S key, move the order of the selected layer down
+        # make it circular, if the last layer is selected, then move it to the first
+        if event.key() == Qt.Key_S:
+            selected_layer = self.current_canvas._get_selected_layer()
+            if selected_layer:
+                index = self.current_canvas.layers.index(selected_layer)
+                if index < len(self.current_canvas.layers) - 1:
+                    # Move the layer down
+                    self.current_canvas.layers.insert(index + 2, selected_layer)
+                    del self.current_canvas.layers[index]
+                else:
+                    # Move the last layer to the beginning
+                    self.current_canvas.layers.insert(0, selected_layer)
+                    del self.current_canvas.layers[-1]
+                self.current_canvas.update()
+                self.layer_list.update_list()
+                self.messageSignal.emit(
+                    f"Moved layer {selected_layer.layer_name} down in order."
+                )
         self.update()
         return super().keyPressEvent(event)

imagebaker/tabs/layerify_tab.py

@@ -169,6 +169,8 @@ 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
@@ -194,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()
 
@@ -222,6 +227,10 @@ class LayerifyTab(QWidget):
                     )  # Only the first layer is visible by default
                     if i == 0:
                         self.layer = layer  # Set the first layer as the current layer
+                        # Select the first item in the image list panel's list widget
+                        if self.image_list_panel.list_widget.count() > 0:
+                            self.image_list_panel.list_widget.setCurrentRow(0)
+
                 else:
                     layer.setVisible(False)
 
@@ -235,21 +244,30 @@ class LayerifyTab(QWidget):
         self.image_list_panel.update_image_list(self.image_entries)
         self.update()
 
-    def save_layer_annotations(self, layer: AnnotableLayer):
+    def save_layer_annotations(
+        self, layer: AnnotableLayer, save_dir: Path | None = None
+    ):
         """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"
+            if save_dir is None:
+                # Save to the cache directory
+                save_dir = self.config.cache_dir
+            save_dir = save_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):
+    def load_layer_annotations(
+        self, layer: AnnotableLayer, load_dir: Path | None = None
+    ):
         """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 is None:
+                load_dir = self.config.cache_dir
+            load_dir = load_dir / f"{file_name}.json"
             if load_dir.exists():
                 layer.annotations = Annotation.load_from_json(load_dir)
                 logger.info(
@@ -280,6 +298,9 @@ class LayerifyTab(QWidget):
                 layer.setVisible(i == 0)
                 if i == 0:
                     self.layer = layer
+                    # update annotation list to the first layer
+                    self.annotation_list.layer = self.layer
+                    self.annotation_list.update_list()
             else:
                 layer.setVisible(False)
         logger.info("Updated active entries in image list panel.")
@@ -319,7 +340,6 @@ class LayerifyTab(QWidget):
         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()
 
@@ -564,6 +584,34 @@ class LayerifyTab(QWidget):
             QMessageBox.warning(self, "Warning", "No annotations to save!")
             return
 
+        # an option to save all annotations (i.e. from all layers) or just the current layer
+        options = QMessageBox.StandardButton.Yes | QMessageBox.StandardButton.No
+        # Change the "No" button text to "Just This Layer"
+        msg_box = QMessageBox(self)
+        msg_box.setWindowTitle("Save Annotations")
+        msg_box.setText("Do you want to save annotations from all layers?")
+        yes_button = msg_box.addButton("All Layers", QMessageBox.YesRole)
+        just_this_button = msg_box.addButton("Just This Layer", QMessageBox.NoRole)
+        msg_box.setDefaultButton(yes_button)
+        msg_box.exec()
+        save_all = msg_box.clickedButton() == yes_button
+
+        if save_all:
+            # folder select dialog
+            save_dir = QFileDialog.getExistingDirectory(
+                self, "Select Save Directory", str(self.config.cache_dir)
+            )
+            if not save_dir:
+                QMessageBox.warning(self, "Warning", "No directory selected!")
+                return
+            for layer in self.annotable_layers:
+                if layer.annotations:
+                    self.save_layer_annotations(layer, Path(save_dir))
+            QMessageBox.information(
+                self, "Success", "All annotations saved successfully!"
+            )
+            return
+
         options = QFileDialog.Options()
         file_name, _ = QFileDialog.getSaveFileName(
             self, "Save Annotations", "", "JSON Files (*.json)", options=options
@@ -586,6 +634,34 @@ class LayerifyTab(QWidget):
         """
         Load annotations from a JSON file.
         """
+        # dialog box to load all annotations or just the current layer
+        options = QMessageBox.StandardButton.Yes | QMessageBox.StandardButton.No
+        # Change the "No" button text to "Just This Layer"
+        msg_box = QMessageBox(self)
+        msg_box.setWindowTitle("Load Annotations")
+        msg_box.setText("Do you want to load annotations from all layers?")
+        yes_button = msg_box.addButton("All Layers", QMessageBox.YesRole)
+        just_this_button = msg_box.addButton("Just This Layer", QMessageBox.NoRole)
+        msg_box.setDefaultButton(yes_button)
+        msg_box.exec()
+        load_all = msg_box.clickedButton() == yes_button
+        if load_all:
+            # folder select dialog
+            load_dir = QFileDialog.getExistingDirectory(
+                self, "Select Load Directory", str(self.config.cache_dir)
+            )
+            if not load_dir:
+                QMessageBox.warning(self, "Warning", "No directory selected!")
+                return
+            for layer in self.annotable_layers:
+                layer.annotations = []
+                layer.update()
+                self.load_layer_annotations(layer, Path(load_dir))
+            self.update_annotation_list()
+            QMessageBox.information(
+                self, "Success", "All annotations loaded successfully!"
+            )
+            return
         options = QFileDialog.Options()
         file_name, _ = QFileDialog.getOpenFileName(
             self, "Load Annotations", "", "JSON Files (*.json)", options=options
@@ -947,6 +1023,39 @@ class LayerifyTab(QWidget):
         elif key == Qt.Key_E:
             self.layer.set_mode(MouseMode.RECTANGLE)
             logger.info("Mouse mode set to RECTANGLE.")
+            # if pressed h key, then toggle visibility of annotations
+        elif event.key() == Qt.Key_H:
+            self.layer.toggle_annotation_visibility()
+
+        # if selected l, then run layerify the selected annotations
+        elif event.key() == Qt.Key_L:
+            if self.layer and self.layer.annotations:
+                selected_annotations = [
+                    ann for ann in self.layer.annotations if ann.selected
+                ]
+                if selected_annotations:
+                    logger.info(
+                        f"Layerifying {len(selected_annotations)} selected annotations."
+                    )
+                    self.layer.layerify_annotation(selected_annotations)
+                else:
+                    # layerify all annotations in the current layer
+                    self.layer.layerify_annotation(self.layer.annotations)
+                logger.info("Layerified all annotations in the current layer.")
+            else:
+                logger.warning("No annotations to layerify.")
+        elif event.key() == Qt.Key_C:
+            # if an annotation is selected, open a dialog box
+            # in that dialog box, ask for a caption
+            self.layer.selected_annotation = self.layer._get_selected_annotation()
+            if self.layer.selected_annotation:
+                current_caption = getattr(self.layer.selected_annotation, "caption", "")
+                text, ok = QInputDialog.getMultiLineText(
+                    self, "Edit Caption", "Enter caption:", current_caption
+                )
+                if ok:
+                    self.layer.selected_annotation.caption = text
+                    self.layer.update()
 
         # Pass the event to the annotation list if it needs to handle it
         if self.annotation_list.hasFocus():

imagebaker/utils/state_utils.py

@@ -66,6 +66,7 @@ def calculate_intermediate_states(
             + (current_state.edge_opacity - previous_state.edge_opacity) * (i / steps),
             edge_width=previous_state.edge_width
             + (current_state.edge_width - previous_state.edge_width) * (i / steps),
+            caption=previous_state.caption,  # Assuming caption is the same in both states
         )
 
         # Deep copy the drawing_states from the previous_state

imagebaker/window/main_window.py

@@ -187,3 +187,68 @@ class MainWindow(QMainWindow):
                 logger.info(
                     f"Deleted cache directory: {self.layerify_config.cache_dir}"
                 )
+
+    def keyPressEvent(self, event):
+        # if pressed escape key, close the application
+        if event.key() == Qt.Key_Escape:
+            logger.info("Escape key pressed, closing the application.")
+            self.close()
+
+        # if ctrl+h, show help dialog
+        elif event.key() == Qt.Key_H and event.modifiers() == Qt.ControlModifier:
+            logger.info("Ctrl+H pressed, showing help dialog.")
+            current_tab = self.tab_widget.currentIndex()
+            if current_tab == 0:
+                info = (
+                    "<b>Layerify Tab Shortcuts:</b><br>"
+                    "<ul>"
+                    "<li><b>Ctrl + C</b>: Copy selected annotation.</li>"
+                    "<li><b>Ctrl + V</b>: Paste copied annotation in its parent image if it is currently open.</li>"
+                    "<li><b>Delete</b>: Delete selected annotation.</li>"
+                    "<li><b>Left Click</b>: Select an annotation on mouse position.</li>"
+                    "<li><b>Left Click + Drag</b>: Drag a selected annotation.</li>"
+                    "<li><b>Double Left Click</b>: When using polygon annotation, completes the polygon.</li>"
+                    "<li><b>Right Click</b>: Unselect an annotation. While annotating the polygon, undo the last point.</li>"
+                    "<li><b>Ctrl + Mouse Wheel</b>: Zoom In/Out on the mouse position, i.e., resize the viewport.</li>"
+                    "<li><b>Ctrl + Drag</b>: If done on the background, the viewport is panned.</li>"
+                    "<li><b>Q</b>: Point mode on annotation.</li>"
+                    "<li><b>W</b>: Polygon mode on annotation.</li>"
+                    "<li><b>E</b>: Rectangle mode on annotation.</li>"
+                    "<li><b>H</b>: Hides/un-hides selected annotation.</li>"
+                    "<li><b>L</b>: Creates layer from an annotation. If any annotation selected, creates only its, else creates layers from all visible annotations.</li>"
+                    "<li><b>C</b>: If any annotation is selected, a input box for Caption is created.</li>"
+                    "<li><b>Numerics</b>: Selecting number 1, 2, till 9 selects label. If not available, asks for a new label.</li>"
+                    "<li><b>Escape</b>: Closes the application.</li>"
+                    "</ul>"
+                )
+            elif current_tab == 1:
+                info = (
+                    "<b>Baker Tab Shortcuts:</b><br>"
+                    "<ul>"
+                    "<li><b>Ctrl + C</b>: Copy selected layer.</li>"
+                    "<li><b>Ctrl + V</b>: Paste copied layer in its parent if it is currently open.</li>"
+                    "<li><b>Delete</b>: Delete selected layer.</li>"
+                    "<li><b>Left Click</b>: Select a layer on mouse position.</li>"
+                    "<li><b>Left Click + Drag</b>: Drag a selected layer.</li>"
+                    "<li><b>Ctrl + S</b>: Save State on Baker Tab.</li>"
+                    "<li><b>Ctrl + D</b>: Draw Mode on Baker Tab. Drawing can happen on a selected or main layer.</li>"
+                    "<li><b>Ctrl + E</b>: Erase Mode on Baker Tab.</li>"
+                    "<li><b>Wheel</b>: Change the size of the drawing pointer.</li>"
+                    "<li><b>W</b>: Moves selected layer one step up in layer list in baker.</li>"
+                    "<li><b>S</b>: Moves selected layer one step down in layer list in baker.</li>"
+                    "<li><b>H</b>: Hides/un-hides selected layer.</li>"
+                    "<li><b>C</b>: Edit Caption for selected layer.</li>"
+                    "<li><b>Escape</b>: Closes the application.</li>"
+                    "</ul>"
+                )
+            else:
+                info = "No shortcuts available for this tab."
+
+            QMessageBox.information(
+                self,
+                "Help",
+                info,
+            )
+
+        # pass event to other widgets
+        return super().keyPressEvent(event)

imagebaker/workers/baker_worker.py

@@ -39,6 +39,8 @@ class BakerWorker(QObject):
         self.layers = layers
         self.filename = filename
 
+        # logger.info(f"Received States: {self.states}")
+
     def process(self):
         results = []
         try:
@@ -128,6 +130,9 @@ class BakerWorker(QObject):
                                 painter.restore()
 
                             # Draw the drawing states
+                            logger.debug(
+                                f"Drawing states for layer {layer.layer_name}: {state.drawing_states}"
+                            )
                             if state.drawing_states:
                                 painter.save()
                                 try:
@@ -147,6 +152,10 @@ class BakerWorker(QObject):
                                         painter.drawPoint(
                                             drawing_state.position - top_left
                                         )
+                                except Exception as e:
+                                    logger.error(
+                                        f"Error drawing state for layer {layer.layer_name}: {e}"
+                                    )
                                 finally:
                                     painter.restore()
 
@@ -201,6 +210,7 @@ class BakerWorker(QObject):
                                 new_annotation = self._generate_annotation(
                                     ann, alpha_channel
                                 )
+                                new_annotation.caption = layer.caption
                                 new_annotations.append(new_annotation)
                 finally:
                     painter.end()
@@ -244,6 +254,8 @@ class BakerWorker(QObject):
             annotation_id=ann.annotation_id,
             is_complete=True,
             visible=True,
+            caption=ann.caption,
+            is_model_generated=ann.is_model_generated,
         )
 
         if ann.points:

{imagebaker-0.0.51.dist-info → imagebaker-0.0.53.dist-info}/METADATA

@@ -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
@@ -38,7 +38,7 @@ Requires-Dist: mkdocs-awesome-pages-plugin; extra == "docs"
 [![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>
 
 
@@ -76,27 +76,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.
@@ -105,37 +106,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
 
@@ -154,3 +162,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.dist-info → imagebaker-0.0.53.dist-info}/RECORD

@@ -3,41 +3,41 @@ imagebaker/core/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 imagebaker/core/configs/__init__.py,sha256=iyR_GOVMFw3XJSm7293YfyTnaLZa7pLQMfn5tGxVofI,31
 imagebaker/core/configs/configs.py,sha256=hm0CHfMVTD9353wB61Df9bVUb898zQVIFjdoXELdJcc,5694
 imagebaker/core/defs/__init__.py,sha256=NqV7gYIlRkaS7nx_UTNPSNZbdPrx4w-VurKOKyRLbKY,28
-imagebaker/core/defs/defs.py,sha256=oZCkgqHgvE_yupUzD5IB_ZMoRhyTh0EdCR8Gmh6TMsI,8505
+imagebaker/core/defs/defs.py,sha256=67L65v8zTKwcrgEgJUVXn3n4xhVuylO23GLvJ-qD1ZU,8710
 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=xkV6KTXN8-N6Wu3QAj5nQDMPZ4bRr673_fu5QuRKBj8,37128
-imagebaker/layers/base_layer.py,sha256=1K7Nt6OPITrILj-p4I6Jf0eaesCpdeecOXGj_8oAQb8,30650
-imagebaker/layers/canvas_layer.py,sha256=6quVe_Ieyz14zPL92xTfrinAT7X4yb9iyEl-f9SnQZU,42116
+imagebaker/layers/annotable_layer.py,sha256=v8sE73ewESh6sMzFZGrcYTWI-FY-J5-noiIr4YN_rXc,40696
+imagebaker/layers/base_layer.py,sha256=Tbu1D6M2jzK_pIns3ghbHa3NK-htV-klxGo13lR5hNk,30841
+imagebaker/layers/canvas_layer.py,sha256=9nwRzEo1Bp5KrtVYPFKXUVMCqkSW2qflgKBpI0V9FzI,43132
 imagebaker/list_views/__init__.py,sha256=Aa9slE6do8eYgZp77wrofpd_mlBDwxgF3adMyHYFanE,144
-imagebaker/list_views/annotation_list.py,sha256=w6jNMyo3nxhQKZx8MyusNvxs_R6Pj-b-YBI5e0APZVM,7528
+imagebaker/list_views/annotation_list.py,sha256=3AN9uv-RcKFrJidfdC8R2m_tIbvf4IPRYcea4fCB5j4,7604
 imagebaker/list_views/canvas_list.py,sha256=JYSYR0peGyJFJ6amL1894KsUHETPUkR3qAWdGL50Lbc,6717
-imagebaker/list_views/image_list.py,sha256=EX2YmoTRffBXTbbVnuflbdsxZQD8fgM2StSxg1a9ANA,5389
+imagebaker/list_views/image_list.py,sha256=kS6IMPhsyYXHZvx9lrUgPLmbZgNoiLlbFJW6wS6icjU,5582
 imagebaker/list_views/layer_list.py,sha256=fLx3Ry72fas1W5y_V84hSp41ARneogQN3qjfYTOcpxY,14476
-imagebaker/list_views/layer_settings.py,sha256=0WVSCm_RSBKo4pCkYU5c2OYjb_sW8x0UUfFC4So26jQ,9752
+imagebaker/list_views/layer_settings.py,sha256=KT0B4yIjR9DQmekIDh_TS0gBB6OkjdNBIZ1HnCFdUto,11025
 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=F3BK5XsVCteB-2zyFBKqeWyHgIif5cU3TBEMbuDH3QM,37415
+imagebaker/tabs/baker_tab.py,sha256=8V1t-cDCSotz6ZDv6o-6HA8H9eli5_0vVBPkkUP9_x4,23091
+imagebaker/tabs/layerify_tab.py,sha256=4kbWOgDszuYEFI6VOrzqFpwvBAxe_ihFayubul30lz8,42703
 imagebaker/utils/__init__.py,sha256=I1z5VVEf6QPOMvVkgVHDauQ9ew7tcTVguV4Kdi3Lk4Y,130
 imagebaker/utils/image.py,sha256=2-wbwD3PMwefgswge0drFM1XfXE7yQ64lqZZ5PwyCWs,3165
-imagebaker/utils/state_utils.py,sha256=Y2JVRGVfsoffwfA2lsCcqHwIxH_jOrEJAdH-oWfe2XE,3841
+imagebaker/utils/state_utils.py,sha256=6ivXVvamuYHQ6LjfoRIAuiTiZ4-LxUad22fvCH0CBcE,3932
 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=-CP7q6xzkhv9Cl5RwUft1Rv8nIAuj_SLOiZDS2x6QJ4,7374
+imagebaker/window/main_window.py,sha256=lpfTffUOKZx6rN_9uP1OQ3A2GRdRKzQYcDn-GZxAuLg,11342
 imagebaker/workers/__init__.py,sha256=XfXENwAYyNg9q_zR-gOsYJGjzwg_iIb_gING8ydnp9c,154
-imagebaker/workers/baker_worker.py,sha256=_jWeyYAGoO2mfxXDn7fBm9tIA69OITewDVN0hSAt3Jc,11532
+imagebaker/workers/baker_worker.py,sha256=Bg5gcO91Ip1Egvs_hy9reQrsGNssbS7_nn_oYsmX5mE,12164
 imagebaker/workers/layerify_worker.py,sha256=EOqKvhdACtf3y5Ljy6M7MvddAjlZW5DNfBFMtNPD-us,3223
 imagebaker/workers/model_worker.py,sha256=Tlg6_D977iK-kuGCNdQY4OnGiP8QqWY7adpRNXZw4rA,1636
-imagebaker-0.0.51.dist-info/LICENSE,sha256=1vkysFPOnT7y4LsoFTv9YsopIrQvBc2l6vUOfv4KKLc,1082
-imagebaker-0.0.51.dist-info/METADATA,sha256=1DumEPL4LyKVeuV_tDwyepZ9PsreraeKSTEJBernVmw,6940
-imagebaker-0.0.51.dist-info/WHEEL,sha256=tZoeGjtWxWRfdplE7E3d45VPlLNQnvbKiYnx7gwAy8A,92
-imagebaker-0.0.51.dist-info/entry_points.txt,sha256=IDjZHJCiiHpH5IUTByT2en0nMbnnnlrJZ5FPFehUvQM,61
-imagebaker-0.0.51.dist-info/top_level.txt,sha256=Gg-eILTlqJXwVQr0saSwsx3-H4SPdZ2agBZaufe194s,11
-imagebaker-0.0.51.dist-info/RECORD,,
+imagebaker-0.0.53.dist-info/LICENSE,sha256=1vkysFPOnT7y4LsoFTv9YsopIrQvBc2l6vUOfv4KKLc,1082
+imagebaker-0.0.53.dist-info/METADATA,sha256=_PgfaiQ55tSgQ-kZyPA-qc35RlpfFFf_n1aB3WXLLgw,8382
+imagebaker-0.0.53.dist-info/WHEEL,sha256=tZoeGjtWxWRfdplE7E3d45VPlLNQnvbKiYnx7gwAy8A,92
+imagebaker-0.0.53.dist-info/entry_points.txt,sha256=IDjZHJCiiHpH5IUTByT2en0nMbnnnlrJZ5FPFehUvQM,61
+imagebaker-0.0.53.dist-info/top_level.txt,sha256=Gg-eILTlqJXwVQr0saSwsx3-H4SPdZ2agBZaufe194s,11
+imagebaker-0.0.53.dist-info/RECORD,,