diff --git a/app/lang/de.toml b/app/lang/de.toml index 43f5ecf..d4eaf1f 100644 --- a/app/lang/de.toml +++ b/app/lang/de.toml @@ -3,8 +3,8 @@ "toolbar.open_image" = "Bild laden" "toolbar.open_folder" = "Ordner laden" "toolbar.choose_color" = "Farbe wählen" -"toolbar.pick_from_image" = "Farbe aus Bild klicken" -"toolbar.save_overlay" = "Overlay speichern" +"toolbar.pick_from_image" = "Farbe aus Bild auswählen" +"toolbar.save_overlay" = "Bild speichern" "toolbar.clear_excludes" = "Ausschlüsse löschen" "toolbar.toggle_free_draw" = "Freihandmodus umschalten" "toolbar.undo_exclude" = "Letzten Ausschluss entfernen" @@ -25,6 +25,7 @@ "status.pick_mode_ended" = "Pick-Modus beendet." "status.pick_mode_from_image" = "Farbe vom Bild gewählt: Hue {hue:.1f}°, S {saturation:.0f}%, V {value:.0f}%" "palette.current" = "Farbe:" +"palette.overlay_color" = "Overlay:" "palette.more" = "Weitere Farben:" "palette.swatch.red" = "Rot" "palette.swatch.orange" = "Orange" @@ -55,7 +56,7 @@ "dialog.saved_title" = "Gespeichert" "dialog.open_image_title" = "Bild wählen" "dialog.open_folder_title" = "Ordner mit Bildern wählen" -"dialog.save_overlay_title" = "Overlay speichern als" +"dialog.save_overlay_title" = "Bild speichern als" "dialog.choose_color_title" = "Farbe wählen" "dialog.images_filter" = "Bilder" "dialog.folder_not_found" = "Der Ordner wurde nicht gefunden." @@ -81,7 +82,9 @@ "toolbar.export_folder" = "Ordner-Statistik" "menu.file" = "Datei" "menu.edit" = "Bearbeiten" +"menu.exclusions" = "Ausschlüsse" "menu.view" = "Ansicht" +"menu.view_log" = "Protokoll anzeigen" "menu.tools" = "Werkzeuge" "toolbar.pull_patterns" = "Muster-Bilder laden" @@ -99,4 +102,23 @@ "dialog.weight_brightness" = "Helligkeit/Dunkelheit %" "dialog.weight_grouping" = "Gruppierung %" "dialog.total_weight" = "Gesamt:" -"dialog.weight_error" = "Die Summe muss genau 100% sein (aktuell {total}%)." +"dialog.weight_error" = "Gewichtungen müssen exakt 100% ergeben (aktuell {total}%)." + +[tooltip] +"tooltip.open_image" = "Öffnet ein einzelnes Bild zur Analyse" +"tooltip.open_folder" = "Öffnet einen Ordner mit Bildern für die Stapelverarbeitung" +"tooltip.export_folder" = "Exportiert die Ergebnisse für den aktuellen Ordner als CSV" +"tooltip.export_settings" = "Speichert die aktuellen Schieberegler- und Farbeinstellungen in einer JSON-Datei" +"tooltip.import_settings" = "Lädt gespeicherte Einstellungen aus einer JSON-Datei" +"tooltip.save_overlay" = "Speichert das aktuell sichtbare zusammengesetzte Overlay-Bild" +"tooltip.open_app_folder" = "Öffnet das Installationsverzeichnis der Anwendung" +"tooltip.reset_sliders" = "Setzt alle Schieberegler auf ihre Standardwerte zurück" +"tooltip.pick_from_image" = "Klicken Sie auf das Bild, um eine Zielfarbe auszuwählen" +"tooltip.prefer_dark" = "Priorisiert dunklere Farben gegenüber helleren bei der Gesamtbewertung" +"tooltip.undo_exclude" = "Macht die zuletzt gezeichnete Ausschlussform rückgängig" +"tooltip.clear_excludes" = "Entfernt alle Ausschlussformen aus dem Bild" +"tooltip.toggle_free_draw" = "Wechselt zwischen dem Zeichnen von Rechtecken und Freiform-Polygonen" +"tooltip.exclude_bg" = "Ignoriert basierend auf den Einstellungen automatisch Hintergrundfarben" +"tooltip.pull_patterns" = "Lädt Musterbilder von einer Remote-Quelle herunter" +"tooltip.toggle_theme" = "Wechselt zwischen hellem und dunklem UI-Design" +"tooltip.view_log" = "Zeigt aktuelle Anwendungsstatusmeldungen und Protokolle an" diff --git a/app/lang/en.toml b/app/lang/en.toml index 25496f0..3bed397 100644 --- a/app/lang/en.toml +++ b/app/lang/en.toml @@ -3,8 +3,8 @@ "toolbar.open_image" = "Open image" "toolbar.open_folder" = "Open folder" "toolbar.choose_color" = "Choose color" -"toolbar.pick_from_image" = "Pick from image" -"toolbar.save_overlay" = "Save overlay" +"toolbar.pick_from_image" = "Select color from image" +"toolbar.save_overlay" = "Save Image" "toolbar.clear_excludes" = "Clear exclusions" "toolbar.toggle_free_draw" = "Toggle free-draw" "toolbar.undo_exclude" = "Undo last exclusion" @@ -25,6 +25,7 @@ "status.pick_mode_ended" = "Pick mode ended." "status.pick_mode_from_image" = "Color picked from image: Hue {hue:.1f}°, S {saturation:.0f}%, V {value:.0f}%" "palette.current" = "Color:" +"palette.overlay_color" = "Overlay:" "palette.more" = "More colors:" "palette.swatch.red" = "Red" "palette.swatch.orange" = "Orange" @@ -55,7 +56,7 @@ "dialog.saved_title" = "Saved" "dialog.open_image_title" = "Select image" "dialog.open_folder_title" = "Select folder" -"dialog.save_overlay_title" = "Save overlay as" +"dialog.save_overlay_title" = "Save Image as" "dialog.choose_color_title" = "Choose color" "dialog.images_filter" = "Images" "dialog.folder_not_found" = "The folder could not be found." @@ -81,7 +82,9 @@ "toolbar.export_folder" = "Export Folder Stats" "menu.file" = "File" "menu.edit" = "Edit" +"menu.exclusions" = "Exclusions" "menu.view" = "View" +"menu.view_log" = "View Log" "menu.tools" = "Tools" "toolbar.pull_patterns" = "Pull Pattern Images" @@ -100,3 +103,22 @@ "dialog.weight_grouping" = "Grouping %" "dialog.total_weight" = "Total:" "dialog.weight_error" = "Weights must sum exactly to 100% (currently {total}%)." + +[tooltip] +"tooltip.open_image" = "Open a single image for analysis" +"tooltip.open_folder" = "Open a folder of images to process in batch" +"tooltip.export_folder" = "Export CSV results for the current folder" +"tooltip.export_settings" = "Save current slider and color settings to a JSON file" +"tooltip.import_settings" = "Load saved settings from a JSON file" +"tooltip.save_overlay" = "Save the currently visible composite overlay image" +"tooltip.open_app_folder" = "Open the application installation directory" +"tooltip.reset_sliders" = "Reset all sliders to their default values" +"tooltip.pick_from_image" = "Click on the image to select a target color" +"tooltip.prefer_dark" = "Prioritize darker colors over brighter ones in the composite score" +"tooltip.undo_exclude" = "Undo the last exclusion shape drawn" +"tooltip.clear_excludes" = "Remove all exclusion shapes from the image" +"tooltip.toggle_free_draw" = "Toggle between drawing rectangles and free-form polygons" +"tooltip.exclude_bg" = "Automatically ignore background colors based on settings" +"tooltip.pull_patterns" = "Download pattern images from a remote source" +"tooltip.toggle_theme" = "Switch between light and dark UI themes" +"tooltip.view_log" = "View recent application status messages and logs" diff --git a/app/qt/image_processor.py b/app/qt/image_processor.py index c502a91..b94752f 100644 --- a/app/qt/image_processor.py +++ b/app/qt/image_processor.py @@ -98,6 +98,132 @@ def _rgb_to_hsv_numpy(arr: np.ndarray) -> np.ndarray: return np.stack([h, s * 100.0, v * 100.0], axis=-1) +def _export_worker(args: tuple) -> tuple: + """Standalone worker for ProcessPoolExecutor batch export. + + Receives ``(image_path, params)`` where *params* is the dict produced by + ``QtImageProcessor.get_export_params()``. Opens the image, runs the + full stats pipeline, and returns a plain results tuple. No processor + instance is needed so nothing has to be pickled. + """ + image_path, params = args + from pathlib import Path + + try: + img_path = Path(image_path) + hue_min = params["hue_min"] + hue_max = params["hue_max"] + sat_min = params["sat_min"] + sat_max = params["sat_max"] + val_min = params["val_min"] + val_max = params["val_max"] + exclude_bg = params["exclude_bg"] + exclude_bg_rgb = tuple(params["exclude_bg_rgb"]) + exclude_bg_tolerance = params["exclude_bg_tolerance"] + prefer_dark = params["prefer_dark"] + exclude_shapes = params["exclude_shapes"] + exclude_ref_size = params["exclude_ref_size"] + + img = Image.open(img_path).convert("RGBA") + arr = np.asarray(img, dtype=np.float32) + + rgb = arr[..., :3] / 255.0 + alpha_ch = arr[..., 3].copy() + + if exclude_bg: + r_bg, g_bg, b_bg = exclude_bg_rgb + tol = exclude_bg_tolerance + bg_mask = ( + (np.abs(arr[..., 0] - r_bg) <= tol) & + (np.abs(arr[..., 1] - g_bg) <= tol) & + (np.abs(arr[..., 2] - b_bg) <= tol) + ) + alpha_ch[bg_mask] = 0 + + hsv = _rgb_to_hsv_numpy(rgb) + hue = hsv[..., 0] + sat = hsv[..., 1] + val = hsv[..., 2] + + if hue_min <= hue_max: + hue_ok = (hue >= hue_min) & (hue <= hue_max) + else: + hue_ok = (hue >= hue_min) | (hue <= hue_max) + + match_mask = ( + hue_ok + & (sat >= sat_min) + & (sat <= sat_max) + & (val >= val_min) + & (val <= val_max) + & (alpha_ch >= 128) + ) + + # Build exclusion mask + w, h = img.size + if not exclude_shapes: + excl_mask = np.zeros((h, w), dtype=bool) + else: + target_w, target_h = w, h + ref_w, ref_h = exclude_ref_size or (w, h) + sx = target_w / ref_w if ref_w > 0 else 1.0 + sy = target_h / ref_h if ref_h > 0 else 1.0 + mask_img = Image.new("L", (w, h), 0) + draw = ImageDraw.Draw(mask_img) + for shape in exclude_shapes: + kind = shape.get("kind") + if kind == "rect": + x0, y0, x1, y1 = shape["coords"] + draw.rectangle([x0 * sx, y0 * sy, x1 * sx, y1 * sy], fill=255) + elif kind == "polygon": + points = shape.get("points", []) + if len(points) >= 3: + scaled_pts = [(int(px * sx), int(py * sy)) for px, py in points] + draw.polygon(scaled_pts, fill=255) + excl_mask = np.asarray(mask_img, dtype=bool) + + keep_match = match_mask & ~excl_mask + visible = alpha_ch >= 128 + keep_visible = visible & ~excl_mask + brightness = float(val[keep_visible].mean()) if keep_visible.any() else 0.0 + + # Grouping score (inline for worker isolation) + if not keep_match.any(): + grouping = 0.0 + else: + mh, mw = keep_match.shape + padded = np.pad(keep_match, 5, mode='constant', constant_values=0) + cumsum = padded.astype(np.int32).cumsum(axis=0).cumsum(axis=1) + y2, x2 = np.arange(9, 9 + mh)[:, None], np.arange(9, 9 + mw) + y1_1, x1_1 = np.arange(0, mh)[:, None], np.arange(0, mw) + window_sums = cumsum[y2, x2] - cumsum[y1_1, x2] - cumsum[y2, x1_1] + cumsum[y1_1, x1_1] + neighbors = (window_sums - keep_match.astype(np.int32)).clip(min=0) + match_neighbors = neighbors[keep_match] + grouping = float(((match_neighbors / 80.0) ** 2).mean() * 100.0) + + matches_all = int(match_mask[visible].sum()) + total_all = int(visible.sum()) + matches_keep = int(keep_match[visible].sum()) + total_keep = int(keep_visible.sum()) + + eff_brightness = (100.0 - brightness) if prefer_dark else brightness + + pct_all = (matches_all / total_all * 100) if total_all else 0.0 + pct_keep = (matches_keep / total_keep * 100) if total_keep else 0.0 + + weights = params["weights"] + w_all = weights.get("match_all", 30) / 100.0 + w_keep = weights.get("match_keep", 50) / 100.0 + w_bright = weights.get("brightness", 10) / 100.0 + w_group = weights.get("grouping", 10) / 100.0 + composite = w_all * pct_all + w_keep * pct_keep + w_bright * eff_brightness + w_group * grouping + + img.close() + return (img_path.name, pct_all, pct_keep, eff_brightness, grouping, composite) + except Exception: + return (img_path.name, None, None, None, None, None) + + class QtImageProcessor: """Process images and build overlays for the Qt UI.""" @@ -546,7 +672,33 @@ class QtImageProcessor: except ValueError: pass + def get_export_params(self) -> dict: + """Extract all parameters needed for headless batch processing. + + Called once before a batch export so that each worker receives + a plain dict instead of re-reading instance attributes. + """ + return { + "hue_min": float(self.hue_min), + "hue_max": float(self.hue_max), + "sat_min": float(self.sat_min), + "sat_max": float(self.sat_max), + "val_min": float(self.val_min), + "val_max": float(self.val_max), + "exclude_bg": self.exclude_bg, + "exclude_bg_rgb": self.exclude_bg_rgb, + "exclude_bg_tolerance": self.exclude_bg_tolerance, + "prefer_dark": self.prefer_dark, + "exclude_shapes": self.exclude_shapes, + "exclude_ref_size": self.exclude_ref_size, + "weights": self.weights, + } + @property def exclude_bg_color_hex(self) -> str: r, g, b = self.exclude_bg_rgb return f"#{r:02x}{g:02x}{b:02x}" + + @property + def overlay_color_hex(self) -> str: + return f"#{self.overlay_r:02x}{self.overlay_g:02x}{self.overlay_b:02x}" diff --git a/app/qt/main_window.py b/app/qt/main_window.py index 3dece99..987550d 100644 --- a/app/qt/main_window.py +++ b/app/qt/main_window.py @@ -153,6 +153,20 @@ class SliderControl(QtWidgets.QWidget): self.slider.valueChanged.connect(self._sync_value) layout.addWidget(self.slider) + # Allow slider to receive focus for keyboard control + self.setFocusPolicy(QtCore.Qt.StrongFocus) + self.slider.setFocusPolicy(QtCore.Qt.NoFocus) + + def keyPressEvent(self, event: QtGui.QKeyEvent) -> None: + if event.key() == QtCore.Qt.Key_Left: + self.slider.setValue(self.slider.value() - 1) + event.accept() + elif event.key() == QtCore.Qt.Key_Right: + self.slider.setValue(self.slider.value() + 1) + event.accept() + else: + super().keyPressEvent(event) + def _sync_value(self, value: int) -> None: self.value_edit.setText(str(value)) self.value_changed.emit(self.key, value) @@ -434,11 +448,11 @@ class TitleBar(QtWidgets.QWidget): layout.addWidget(self.title_label) layout.addStretch(1) - self.min_btn = self._create_button("–", "Minimise") + self.min_btn = self._create_button("–", "Minimize") self.min_btn.clicked.connect(window.showMinimized) layout.addWidget(self.min_btn) - self.max_btn = self._create_button("❐", "Maximise / Restore") + self.max_btn = self._create_button("❐", "Maximize / Restore") self.max_btn.clicked.connect(window.toggle_maximise) layout.addWidget(self.max_btn) @@ -639,6 +653,14 @@ class MainWindow(QtWidgets.QMainWindow, I18nMixin): self._current_image_path: Path | None = None self._current_color = DEFAULT_COLOR self._toolbar_actions: Dict[str, Callable[[], None]] = {} + + # Debounced log history + self._log_history: List[Tuple[str, str]] = [] + self._pending_log_msg: str | None = None + self._log_timer = QtCore.QTimer() + self._log_timer.setSingleShot(True) + self._log_timer.timeout.connect(self._commit_log) + self._register_default_actions() self.exclude_mode = "rect" @@ -696,54 +718,66 @@ class MainWindow(QtWidgets.QMainWindow, I18nMixin): def _build_menu_bar(self) -> QtWidgets.QMenuBar: self.menu_bar = QtWidgets.QMenuBar(self) + def add_item(menu: QtWidgets.QMenu, icon: str, text_key: str, slot, tooltip_key: str): + action = menu.addAction(f"{icon} {self._t(text_key)}", slot) + action.setToolTip(self._t(tooltip_key)) + return action + # File Menu file_menu = self.menu_bar.addMenu(self._t("menu.file")) - file_menu.addAction("🖼 " + self._t("toolbar.open_image"), lambda: self._invoke_action("open_image"), "Ctrl+O") + add_item(file_menu, "🖼", "toolbar.open_image", lambda: self._invoke_action("open_image"), "tooltip.open_image") file_menu.addSeparator() - file_menu.addAction("📂 " + self._t("toolbar.open_folder"), lambda: self._invoke_action("open_folder"), "Ctrl+Shift+O") - file_menu.addAction("📊 " + self._t("toolbar.export_folder"), lambda: self._invoke_action("export_folder")) + add_item(file_menu, "📂", "toolbar.open_folder", lambda: self._invoke_action("open_folder"), "tooltip.open_folder") + add_item(file_menu, "📊", "toolbar.export_folder", lambda: self._invoke_action("export_folder"), "tooltip.export_folder") file_menu.addSeparator() - file_menu.addAction("📤 " + self._t("toolbar.export_settings"), lambda: self._invoke_action("export_settings"), "Ctrl+E") - file_menu.addAction("📥 " + self._t("toolbar.import_settings"), lambda: self._invoke_action("import_settings"), "Ctrl+I") + add_item(file_menu, "📤", "toolbar.export_settings", lambda: self._invoke_action("export_settings"), "tooltip.export_settings") + add_item(file_menu, "📥", "toolbar.import_settings", lambda: self._invoke_action("import_settings"), "tooltip.import_settings") file_menu.addSeparator() - file_menu.addAction("💾 " + self._t("toolbar.save_overlay"), lambda: self._invoke_action("save_overlay"), "Ctrl+S") + add_item(file_menu, "💾", "toolbar.save_overlay", lambda: self._invoke_action("save_overlay"), "tooltip.save_overlay") + file_menu.addSeparator() + add_item(file_menu, "📁", "toolbar.open_app_folder", lambda: self._invoke_action("open_app_folder"), "tooltip.open_app_folder") # Edit Menu edit_menu = self.menu_bar.addMenu(self._t("menu.edit")) - edit_menu.addAction("↩ " + self._t("toolbar.undo_exclude"), lambda: self._invoke_action("undo_exclude"), "Ctrl+Z") - edit_menu.addAction("🧹 " + self._t("toolbar.clear_excludes"), lambda: self._invoke_action("clear_excludes")) + add_item(edit_menu, "🔄", "toolbar.reset_sliders", lambda: self._invoke_action("reset_sliders"), "tooltip.reset_sliders") + add_item(edit_menu, "🖱", "toolbar.pick_from_image", lambda: self._invoke_action("pick_from_image"), "tooltip.pick_from_image") edit_menu.addSeparator() - edit_menu.addAction("🔄 " + self._t("toolbar.reset_sliders"), lambda: self._invoke_action("reset_sliders"), "Ctrl+R") - - # Tools Menu - tools_menu = self.menu_bar.addMenu(self._t("menu.tools")) - tools_menu.addAction("🎨 " + self._t("toolbar.choose_color"), lambda: self._invoke_action("choose_color")) - tools_menu.addAction("🖱 " + self._t("toolbar.pick_from_image"), lambda: self._invoke_action("pick_from_image")) - self.free_draw_action = QtGui.QAction("△ " + self._t("toolbar.toggle_free_draw"), self) - self.free_draw_action.setCheckable(True) - self.free_draw_action.setChecked(False) - self.free_draw_action.triggered.connect(lambda: self._invoke_action("toggle_free_draw")) - tools_menu.addAction(self.free_draw_action) - tools_menu.addSeparator() - tools_menu.addAction("📥 " + self._t("toolbar.pull_patterns"), lambda: self._invoke_action("pull_patterns")) - - # View Menu - view_menu = self.menu_bar.addMenu(self._t("menu.view")) - view_menu.addAction("🌓 " + self._t("toolbar.toggle_theme"), lambda: self._invoke_action("toggle_theme")) + self.prefer_dark_action = QtGui.QAction("🌑 " + self._t("toolbar.prefer_dark"), self) self.prefer_dark_action.setCheckable(True) self.prefer_dark_action.setChecked(False) + self.prefer_dark_action.setToolTip(self._t("tooltip.prefer_dark")) self.prefer_dark_action.triggered.connect(lambda: self._invoke_action("toggle_prefer_dark")) - view_menu.addAction(self.prefer_dark_action) + edit_menu.addAction(self.prefer_dark_action) + + # Exclusions Menu + exclusions_menu = self.menu_bar.addMenu(self._t("menu.exclusions")) + add_item(exclusions_menu, "🔙", "toolbar.undo_exclude", lambda: self._invoke_action("undo_exclude"), "tooltip.undo_exclude") + add_item(exclusions_menu, "🧹", "toolbar.clear_excludes", lambda: self._invoke_action("clear_excludes"), "tooltip.clear_excludes") + exclusions_menu.addSeparator() + self.free_draw_action = QtGui.QAction("🖌 " + self._t("toolbar.toggle_free_draw"), self) + self.free_draw_action.setCheckable(True) + self.free_draw_action.setChecked(False) + self.free_draw_action.setToolTip(self._t("tooltip.toggle_free_draw")) + self.free_draw_action.triggered.connect(lambda: self._invoke_action("toggle_free_draw")) + exclusions_menu.addAction(self.free_draw_action) + + # Tools Menu + tools_menu = self.menu_bar.addMenu(self._t("menu.tools")) self.exclude_bg_action = QtGui.QAction("🖼 " + self._t("toolbar.exclude_bg", color=self.processor.exclude_bg_color_hex), self) self.exclude_bg_action.setCheckable(True) self.exclude_bg_action.setChecked(True) + self.exclude_bg_action.setToolTip(self._t("tooltip.exclude_bg")) self.exclude_bg_action.triggered.connect(lambda: self._invoke_action("toggle_exclude_bg")) - view_menu.addAction(self.exclude_bg_action) - - view_menu.addSeparator() - view_menu.addAction("📁 " + self._t("toolbar.open_app_folder"), lambda: self._invoke_action("open_app_folder")) + tools_menu.addAction(self.exclude_bg_action) + tools_menu.addSeparator() + add_item(tools_menu, "📥", "toolbar.pull_patterns", lambda: self._invoke_action("pull_patterns"), "tooltip.pull_patterns") + + # View Menu + view_menu = self.menu_bar.addMenu(self._t("menu.view")) + add_item(view_menu, "🌓", "toolbar.toggle_theme", lambda: self._invoke_action("toggle_theme"), "tooltip.toggle_theme") + add_item(view_menu, "📋", "menu.view_log", self.show_log_dialog, "tooltip.view_log") # Status label logic remains but moved to palette layout or kept minimal # We will add it to the palette layout so that it stays on top @@ -757,16 +791,27 @@ class MainWindow(QtWidgets.QMainWindow, I18nMixin): current_group = QtWidgets.QHBoxLayout() current_group.setSpacing(8) + self.current_label = QtWidgets.QLabel(self._t("palette.current")) current_group.addWidget(self.current_label) - self.current_color_swatch = QtWidgets.QLabel() - self.current_color_swatch.setFixedSize(28, 28) - self.current_color_swatch.setStyleSheet(f"background-color: {DEFAULT_COLOR}; border-radius: 6px;") + # Make current color swatch clickable using ColorSwatch matching style + self.current_color_swatch = ColorSwatch("palette.current", DEFAULT_COLOR, lambda h, l: self._invoke_action("choose_color")) current_group.addWidget(self.current_color_swatch) self.current_color_label = QtWidgets.QLabel(f"({DEFAULT_COLOR})") current_group.addWidget(self.current_color_label) + + # Add overlay color group + current_group.addSpacing(16) + self.overlay_label = QtWidgets.QLabel(self._t("palette.overlay_color")) + current_group.addWidget(self.overlay_label) + + from app.logic import OVERLAY_COLOR + overlay_default = OVERLAY_COLOR if OVERLAY_COLOR else DEFAULT_OVERLAY_HEX + self.overlay_color_swatch = ColorSwatch("palette.overlay_color", overlay_default, lambda h, l: self._choose_overlay_color()) + current_group.addWidget(self.overlay_color_swatch) + layout.addLayout(current_group) self.more_label = QtWidgets.QLabel(self._t("palette.more")) @@ -966,6 +1011,11 @@ class MainWindow(QtWidgets.QMainWindow, I18nMixin): if not directory: return folder = Path(directory) + + # Check if there is an 'images' subfolder when the selected folder isn't named 'images' + if folder.name.lower() != "images" and (folder / "images").is_dir(): + folder = folder / "images" + paths = sorted( (p for p in folder.iterdir() if p.suffix.lower() in SUPPORTED_IMAGE_EXTENSIONS and p.is_file()), key=lambda p: p.name.lower(), @@ -1021,6 +1071,7 @@ class MainWindow(QtWidgets.QMainWindow, I18nMixin): "prefer_dark": self.processor.prefer_dark, "weights": self.processor.weights, "current_color": self._current_color, + "overlay_color": self.processor.overlay_color_hex, "exclude_ref_size": self.processor.exclude_ref_size, "shapes": self.image_view.shapes } @@ -1028,7 +1079,7 @@ class MainWindow(QtWidgets.QMainWindow, I18nMixin): try: with open(path_str, "w", encoding="utf-8") as f: json.dump(settings, f, indent=4) - self.status_label.setText(self._t("status.settings_exported", path=Path(path_str).name)) + self.set_status(self._t("status.settings_exported", path=Path(path_str).name)) except Exception as e: QtWidgets.QMessageBox.warning(self, self._t("dialog.error_title"), str(e)) @@ -1061,11 +1112,15 @@ class MainWindow(QtWidgets.QMainWindow, I18nMixin): with open(path_str, "r", encoding="utf-8") as f: settings = json.load(f) - # 1. Apply color (UI ONLY) + # 1. Apply colors if "current_color" in settings: self._current_color = settings["current_color"] - # Specifically NOT setting processor color to keep it RED self._update_color_display(self._current_color, self._t("palette.current")) + + if "overlay_color" in settings: + overlay_hex = settings["overlay_color"] + self.processor.set_overlay_color(overlay_hex) + self.overlay_color_swatch.setStyleSheet(f"background-color: {overlay_hex}; border-radius: 6px;") # 2. Apply slider values keys = ["hue_min", "hue_max", "sat_min", "sat_max", "val_min", "val_max", "alpha"] @@ -1097,7 +1152,7 @@ class MainWindow(QtWidgets.QMainWindow, I18nMixin): self._sync_sliders_from_processor() self._refresh_views() - self.status_label.setText(self._t("status.settings_imported")) + self.set_status(self._t("status.settings_imported")) except Exception as e: QtWidgets.QMessageBox.warning(self, self._t("dialog.error_title"), str(e)) @@ -1147,61 +1202,63 @@ class MainWindow(QtWidgets.QMainWindow, I18nMixin): delimiter = ";" decimal = "," + # Weights mapping + w_all = self.processor.weights.get("match_all", 30) + w_keep = self.processor.weights.get("match_keep", 50) + w_bright = self.processor.weights.get("brightness", 10) + w_group = self.processor.weights.get("grouping", 10) + brightness_col = self._t("stats.darkness_label") if self.processor.prefer_dark else self._t("stats.brightness_label") headers = [ "Filename", - "Color", - "Matching Pixels", - "Matching Pixels w/ Exclusions", - "Excluded Pixels", - brightness_col, - self._t("stats.grouping_label"), + f"Matching Pixels ({w_all}%)", # Was the non-exclusion match percentage + f"Matching Pixels w/ Exclusions ({w_keep}%)", + f"{brightness_col} ({w_bright}%)", + f"{self._t('stats.grouping_label')} ({w_group}%)", "Composite Score" ] + + # Color and Excluded pixels removed from headers rows = [headers] - def process_image(img_path): - try: - img = Image.open(img_path) - s = self.processor.get_stats_headless(img) - - pct_all = (s.matches_all / s.total_all * 100) if s.total_all else 0.0 - pct_keep = (s.matches_keep / s.total_keep * 100) if s.total_keep else 0.0 - pct_excl = (s.total_excl / s.total_all * 100) if s.total_all else 0.0 - - pct_all_str = f"{pct_all:.2f}".replace(".", decimal) - pct_keep_str = f"{pct_keep:.2f}".replace(".", decimal) - pct_excl_str = f"{pct_excl:.2f}".replace(".", decimal) - brightness_str = f"{s.effective_brightness:.2f}".replace(".", decimal) - grouping_str = f"{s.grouping_score:.2f}".replace(".", decimal) - composite_str = f"{s.composite_score(self.processor.weights):.2f}".replace(".", decimal) - - img.close() - return [ - img_path.name, - self._current_color, - pct_all_str, - pct_keep_str, - pct_excl_str, - brightness_str, - grouping_str, - composite_str - ] - except Exception: - return [img_path.name, self._current_color, "Error", "Error", "Error", "Error", "Error", "Error"] + params = self.processor.get_export_params() + tasks = [(str(p), params) for p in self.processor.preview_paths] results = [None] * total - with concurrent.futures.ThreadPoolExecutor() as executor: - future_to_idx = {executor.submit(process_image, p): i for i, p in enumerate(self.processor.preview_paths)} + + from app.qt.image_processor import _export_worker + with concurrent.futures.ProcessPoolExecutor() as executor: + future_to_idx = {executor.submit(_export_worker, t): i for i, t in enumerate(tasks)} done_count = 0 for future in concurrent.futures.as_completed(future_to_idx): idx = future_to_idx[future] - results[idx] = future.result() + res = future.result() + name, pct_all, pct_keep, eff_brightness, grouping, composite_score = res + + if pct_keep is None: + # Error parsing image + results[idx] = [name, "Error", "Error", "Error", "Error", "Error"] + else: + pct_all_str = f"{pct_all:.2f}".replace(".", decimal) + pct_keep_str = f"{pct_keep:.2f}".replace(".", decimal) + brightness_str = f"{eff_brightness:.2f}".replace(".", decimal) + grouping_str = f"{grouping:.2f}".replace(".", decimal) + composite_str = f"{composite_score:.2f}".replace(".", decimal) + + results[idx] = [ + name, + pct_all_str, + pct_keep_str, + brightness_str, + grouping_str, + composite_str + ] + done_count += 1 if done_count % 10 == 0 or done_count == total: - self.status_label.setText(self._t("status.exporting", current=str(done_count), total=str(total))) + self.set_status(self._t("status.exporting", current=str(done_count), total=str(total))) QtWidgets.QApplication.processEvents() - + rows.extend(results) # Compute max width per column for alignment, plus extra space so it's not cramped @@ -1217,7 +1274,7 @@ class MainWindow(QtWidgets.QMainWindow, I18nMixin): # Restore overlay state for currently viewed image self.processor._rebuild_overlay() - self.status_label.setText(self._t("status.export_done", path=csv_path)) + self.set_status(self._t("status.export_done", path=Path(csv_path).name)) def show_previous_image(self) -> None: if not self.processor.preview_paths: @@ -1245,6 +1302,18 @@ class MainWindow(QtWidgets.QMainWindow, I18nMixin): self.processor.set_exclusions([]) self._refresh_views() + def _try_show_previous_image(self) -> None: + focused = QtWidgets.QApplication.focusWidget() + if isinstance(focused, (QtWidgets.QSlider, QtWidgets.QLineEdit)): + return + self.show_previous_image() + + def _try_show_next_image(self) -> None: + focused = QtWidgets.QApplication.focusWidget() + if isinstance(focused, (QtWidgets.QSlider, QtWidgets.QLineEdit)): + return + self.show_next_image() + # Helpers ---------------------------------------------------------------- def _update_color_display(self, hex_code: str, label: str, update_range: bool = False) -> None: @@ -1252,7 +1321,7 @@ class MainWindow(QtWidgets.QMainWindow, I18nMixin): self.current_color_swatch.setStyleSheet(f"background-color: {hex_code}; border-radius: 6px;") self.current_color_label.setText(f"({hex_code})") if label: - self.status_label.setText(f"{label}: {hex_code}") + self.set_status(f"{label}: {hex_code}") if update_range: # Convert hex to HSV and update sliders/thresholds @@ -1286,7 +1355,7 @@ class MainWindow(QtWidgets.QMainWindow, I18nMixin): def _on_slider_change(self, key: str, value: int) -> None: self.processor.set_threshold(key, value) label = self._slider_title(key) - self.status_label.setText(f"{label}: {value}") + self.set_status(f"{label}: {value}") self._slider_timer.start() def _reset_sliders(self) -> None: @@ -1296,7 +1365,7 @@ class MainWindow(QtWidgets.QMainWindow, I18nMixin): default_value = int(self.processor.defaults.get(attr, getattr(self.processor, attr))) control.set_value(default_value) self.processor.set_threshold(attr, default_value) - self.status_label.setText(self._t("status.defaults_restored")) + self.set_status(self._t("status.defaults_restored")) self._refresh_overlay_only() # Shortcuts -------------------------------------------------------------- @@ -1308,8 +1377,8 @@ class MainWindow(QtWidgets.QMainWindow, I18nMixin): (QtGui.QKeySequence.Save, self.save_overlay), (QtGui.QKeySequence.Undo, self.undo_exclusion), (QtGui.QKeySequence("Ctrl+R"), self._reset_sliders), - (QtGui.QKeySequence(QtCore.Qt.Key_Left), self.show_previous_image), - (QtGui.QKeySequence(QtCore.Qt.Key_Right), self.show_next_image), + (QtGui.QKeySequence(QtCore.Qt.Key_Left), self._try_show_previous_image), + (QtGui.QKeySequence(QtCore.Qt.Key_Right), self._try_show_next_image), (QtGui.QKeySequence(QtCore.Qt.Key_Escape), self._exit_pick_mode), ] for seq, slot in shortcuts: @@ -1327,13 +1396,13 @@ class MainWindow(QtWidgets.QMainWindow, I18nMixin): self._pick_mode = True self.image_view.pick_mode = True self.image_view.setCursor(QtCore.Qt.CrossCursor) - self.status_label.setText(self._t("status.pick_mode_ready")) + self.set_status(self._t("status.pick_mode_ready")) def _exit_pick_mode(self) -> None: self._pick_mode = False self.image_view.pick_mode = False self.image_view.setCursor(QtCore.Qt.ArrowCursor) - self.status_label.setText(self._t("status.pick_mode_ended")) + self.set_status(self._t("status.pick_mode_ended")) def _on_pixel_picked(self, x: int, y: int) -> None: result = self.processor.pick_color(x, y) @@ -1362,19 +1431,68 @@ class MainWindow(QtWidgets.QMainWindow, I18nMixin): self.processor.set_threshold(attr, value) # Update color swatch to the picked pixel color - h_norm = hue / 360.0 - s_norm = sat / 100.0 - v_norm = val / 100.0 - import colorsys - r, g, b = colorsys.hsv_to_rgb(h_norm, s_norm, v_norm) - hex_code = "#{:02x}{:02x}{:02x}".format(int(r * 255), int(g * 255), int(b * 255)) - self._update_color_display(hex_code, "") - - self.status_label.setText( - self._t("status.pick_mode_from_image", hue=hue, saturation=sat, value=val) - ) + if not self._current_image_path: + return + try: + from PIL import Image + img = Image.open(self._current_image_path).convert("RGB") + r, g, b = img.getpixel((x, y)) # type: ignore[misc] + img.close() + hex_code = f"#{r:02x}{g:02x}{b:02x}" + hue, sat, val = self.processor.rgb_to_hsv(r, g, b) + msg = self._t("status.pick_mode_from_image", hue=hue, saturation=sat, value=val) + self._update_color_display(hex_code, "Picked Color") + self.set_status(msg) + # Auto-exit pick mode after selection + self._invoke_action("pick_from_image") + except Exception as e: + self.set_status(self._t("dialog.image_open_failed", error=str(e))) self._refresh_overlay_only() + def set_status(self, msg: str) -> None: + self.status_label.setText(msg) + self._pending_log_msg = msg + self._log_timer.start(250) + + def _commit_log(self) -> None: + if not self._pending_log_msg: + return + import datetime + timestamp = datetime.datetime.now().strftime("%H:%M:%S") + self._log_history.append((timestamp, self._pending_log_msg)) + if len(self._log_history) > 10: + self._log_history.pop(0) + self._pending_log_msg = None + + def show_log_dialog(self) -> None: + dialog = QtWidgets.QDialog(self) + dialog.setWindowTitle(self._t("menu.view_log")) + + screen = self.screen() + if screen: + rect = screen.availableGeometry() + dialog.resize(max(400, int(rect.width() * 0.5)), max(300, int(rect.height() * 0.5))) + else: + dialog.setMinimumSize(400, 300) + + layout = QtWidgets.QVBoxLayout(dialog) + + text_edit = QtWidgets.QTextEdit() + text_edit.setReadOnly(True) + + log_text = "" + for ts, msg in self._log_history: + log_text += f"[{ts}] {msg}\n" + + text_edit.setPlainText(log_text if log_text else "No logs yet.") + layout.addWidget(text_edit) + + btn_box = QtWidgets.QDialogButtonBox(QtWidgets.QDialogButtonBox.Ok) + btn_box.accepted.connect(dialog.accept) + layout.addWidget(btn_box) + + dialog.exec() + def open_pattern_puller(self) -> None: dialog = PatternPullerDialog(self.language, parent=self) dialog.exec() @@ -1432,15 +1550,41 @@ class MainWindow(QtWidgets.QMainWindow, I18nMixin): hex_code = color.name() self._update_color_display(hex_code, self._t("dialog.choose_color_title"), update_range=True) + def _choose_overlay_color(self) -> None: + color = QtWidgets.QColorDialog.getColor(parent=self, title=self._t("dialog.choose_color_title")) + if not color.isValid(): + return + hex_code = color.name() + self.processor.set_overlay_color(hex_code) + self.overlay_color_swatch.setStyleSheet( + f"QPushButton {{ background-color: {hex_code}; border: 2px solid {THEMES[self.current_theme]['border']}; border-radius: 6px; }}" + f"QPushButton:hover {{ border-color: {THEMES[self.current_theme]['accent']}; }}" + ) + self.overlay_color_swatch.hex_code = hex_code + self._refresh_overlay_only() + def save_overlay(self) -> None: pixmap = self.processor.overlay_pixmap() if pixmap.isNull(): QtWidgets.QMessageBox.information(self, self._t("dialog.info_title"), self._t("dialog.no_preview_available")) return + + skin_name = "image" + if self._current_image_path: + # Similar logic to export_settings to get the skin name + if self._current_image_path.parent.name == "images": + skin_name = self._current_image_path.parent.parent.name + elif self._current_image_path.parent.name and self._current_image_path.parent.name != "images": + skin_name = self._current_image_path.parent.name + else: + skin_name = self._current_image_path.stem + + default_name = f"{skin_name}.png" + filename, _ = QtWidgets.QFileDialog.getSaveFileName( self, self._t("dialog.save_overlay_title"), - "overlay.png", + default_name, "PNG (*.png)", ) if not filename: @@ -1448,14 +1592,14 @@ class MainWindow(QtWidgets.QMainWindow, I18nMixin): if not pixmap.save(filename, "PNG"): QtWidgets.QMessageBox.warning(self, self._t("dialog.error_title"), self._t("dialog.image_open_failed", error="Unable to save file")) return - self.status_label.setText(self._t("dialog.overlay_saved", path=filename)) + self.set_status(self._t("dialog.overlay_saved", path=filename)) def toggle_free_draw(self) -> None: self.exclude_mode = "free" if self.exclude_mode == "rect" else "rect" self.image_view.set_mode(self.exclude_mode) self.free_draw_action.setChecked(self.exclude_mode == "free") message_key = "status.free_draw_enabled" if self.exclude_mode == "free" else "status.free_draw_disabled" - self.status_label.setText(self._t(message_key)) + self.set_status(self._t(message_key)) def toggle_prefer_dark(self) -> None: self.processor.prefer_dark = not self.processor.prefer_dark @@ -1476,12 +1620,12 @@ class MainWindow(QtWidgets.QMainWindow, I18nMixin): def clear_exclusions(self) -> None: self.image_view.clear_shapes() self.processor.set_exclusions([]) - self.status_label.setText(self._t("toolbar.clear_excludes")) + self.set_status(self._t("toolbar.clear_excludes")) self._refresh_overlay_only() def undo_exclusion(self) -> None: self.image_view.undo_last() - self.status_label.setText(self._t("toolbar.undo_exclude")) + self.set_status(self._t("toolbar.undo_exclude")) def toggle_theme(self) -> None: self.current_theme = "light" if self.current_theme == "dark" else "dark" @@ -1504,6 +1648,7 @@ class MainWindow(QtWidgets.QMainWindow, I18nMixin): self.status_label.setStyleSheet(f"color: {colors['text_muted']}; font-weight: 500;") self.current_label.setStyleSheet(f"color: {colors['text_muted']}; font-weight: 500;") + self.overlay_label.setStyleSheet(f"color: {colors['text_muted']}; font-weight: 500;") self.current_color_label.setStyleSheet(f"color: {colors['text_dim']};") self.more_label.setStyleSheet(f"color: {colors['text_muted']}; font-weight: 500;") self.filename_prefix_label.setStyleSheet(f"color: {colors['text_muted']}; font-weight: 500;") @@ -1611,7 +1756,7 @@ class MainWindow(QtWidgets.QMainWindow, I18nMixin): dimensions = f"{width}×{height}" # Status label for top right layout - self.status_label.setText( + self.set_status( self._t("status.loaded", name=self._current_image_path.name, dimensions=dimensions, position=position) ) diff --git a/tests/test_image_processor.py b/tests/test_image_processor.py index 6fa0fce..061fe91 100644 --- a/tests/test_image_processor.py +++ b/tests/test_image_processor.py @@ -155,3 +155,20 @@ def test_calculate_grouping_score(): # 1 center pixel = 80/80 = 1.0. # Overall it should be a healthy percentage. assert res_9x9 > 10.0 # significant grouping + +def test_export_worker_error(): + from app.qt.image_processor import _export_worker + + # 1. Provide a missing file to trigger an exception during Image.open() + res1 = _export_worker(("missing_file.png", { + "hue_min": 0, "hue_max": 360, "sat_min": 0, "sat_max": 100, + "val_min": 0, "val_max": 100, "exclude_bg": False, + "exclude_bg_rgb": (0, 0, 0), "exclude_bg_tolerance": 5, + "prefer_dark": False, "exclude_shapes": [], "exclude_ref_size": None, + "weights": {} + })) + assert res1 == ("missing_file.png", None, None, None, None, None) + + # 2. Provide an empty params dict to trigger KeyError before opening image + res2 = _export_worker(("dummy.png", {})) + assert res2 == ("dummy.png", None, None, None, None, None)