Merge pull request #49 from shaunhwq/feature_search

Feature search

Author: shaunhwq

visual_comparison/configurations.py

@@ -19,6 +19,8 @@
     "cv2.INTER_NEAREST",
     "cv2.INTER_CUBIC",
 ]
+DISPLAY_INTERPOLATION_TYPES = CV2_INTERPOLATION_TYPES + ["None"]
+ZOOM_INTERPOLATION_TYPES = CV2_INTERPOLATION_TYPES
 
 # Contains information on config.ini file, e.g. how to parse, default values for each. Possible options.
 config_info = dict(
@@ -27,12 +29,12 @@
         theme=dict(obj="options", type=str, values=["blue", "green", "dark-blue"], default="dark-blue"),
     ),
     Display=dict(
-        interpolation_type=dict(obj="options", type=eval, values=CV2_INTERPOLATION_TYPES, default="cv2.INTER_LINEAR"),
+        interpolation_type=dict(obj="options", type=eval, values=DISPLAY_INTERPOLATION_TYPES, default="cv2.INTER_LINEAR"),
         fast_loading_threshold_ms=dict(obj="entry", type=int, default=100),
         ctk_corner_radius=dict(obj="entry", type=int, default=3),
     ),
     Zoom=dict(
-        interpolation_type=dict(obj="options", type=eval, values=CV2_INTERPOLATION_TYPES, default="cv2.INTER_NEAREST"),
+        interpolation_type=dict(obj="options", type=eval, values=ZOOM_INTERPOLATION_TYPES, default="cv2.INTER_NEAREST"),
     ),
     Functionality=dict(
         max_fps=dict(obj="entry", type=int, default=60),

visual_comparison/utils/__init__.py

@@ -1,4 +1,5 @@
 from .image_utils import *
 from .file_utils import *
+from .trie import *
 from .utils import *
-from .widgets import *
+from .widgets import *

visual_comparison/utils/trie.py

@@ -0,0 +1,61 @@
+from typing import List
+
+
+__all__ = ["SearchTrie"]
+
+
+class TrieNode:
+    def __init__(self):
+        self.children = {}
+        self.indices = []
+
+
+class SearchTrie:
+    def __init__(self, strings: List[str]):
+        self.trie = TrieNode()
+        self.strings = []
+
+        for string in strings:
+            self.add(string)
+
+    def reset(self):
+        self.trie = TrieNode()
+
+    def add(self, string):
+        str_idx = len(self.strings)
+        self.strings.append(string)
+
+        current_node = self.trie
+        for character in string:
+            node = current_node.children.get(character, TrieNode())
+            node.indices.append(str_idx)
+            current_node.children[character] = node
+            current_node = node
+
+    def search(self, prefix):
+        current_node = self.trie
+        for character in prefix:
+            node = current_node.children.get(character, TrieNode())
+            if node is None:
+                return node
+            current_node = node
+        return current_node
+
+    def tab_completion(self, prefix):
+        """
+        Get common string for children nodes starting with prefix
+
+        e.g. abc_123_def, abc_123_ijk, abc_123_lmn
+        prefix = 'abc', returns '_123_'
+
+        :param prefix: Prefix to look for
+        :return: Common string for child nodes with prefix
+        """
+        current_node = self.search(prefix)
+
+        output_string = ""
+        while len(current_node.children) == 1:
+            character, node = list(current_node.children.items())[0]
+            output_string += character
+            current_node = node
+        return output_string

visual_comparison/utils/widgets.py

@@ -1,8 +1,15 @@
 import customtkinter
 import tkinter
+import tkinter.ttk as ttk
 
 
-__all__ = ["shift_widget_to_root_center", "set_appearance_mode_and_theme", "create_tool_tip", "is_window_in_background"]
+__all__ = [
+    "shift_widget_to_root_center",
+    "set_appearance_mode_and_theme",
+    "create_tool_tip",
+    "is_window_in_background",
+    "set_tkinter_widgets_appearance_mode",
+]
 
 
 def shift_widget_to_root_center(parent_widget, child_widget):
@@ -73,3 +80,24 @@ def is_window_in_background(window):
         return window.focus_displayof() is None
     except KeyError as e:
         return True
+
+
+def set_tkinter_widgets_appearance_mode(ctk_root) -> None:
+    """
+    Sets appearance mode of tkinter objects to match the color scheme of customtkinter objects
+    :param ctk_root: customtkinter.CTk() object
+    """
+    bg_color = ctk_root._apply_appearance_mode(customtkinter.ThemeManager.theme["CTkFrame"]["fg_color"])
+    text_color = ctk_root._apply_appearance_mode(customtkinter.ThemeManager.theme["CTkLabel"]["text_color"])
+    selected_color = ctk_root._apply_appearance_mode(customtkinter.ThemeManager.theme["CTkButton"]["fg_color"])
+
+    # bg color is light and selected color is either blue or dark-blue
+    if bg_color in ["gray86", "gray90"] and selected_color in ["#3a7ebf", "#3B8ED0"]:
+        selected_color = "royal blue"
+
+    tree_style = ttk.Style()
+    tree_style.theme_use('default')
+    tree_style.configure("Treeview", background=bg_color, foreground=text_color, fieldbackground=bg_color, borderwidth=0.5, font=('Calibri', 10, 'bold'))
+    tree_style.map('Treeview', background=[('selected', bg_color)], foreground=[('selected', selected_color)])
+    tree_style.configure("Treeview.Heading", background=bg_color, foreground=text_color, fieldbackground=bg_color, borderwidth=0.5)
+    tree_style.map('Treeview.Heading', background=[('selected', bg_color)], foreground=[('selected', selected_color)])

visual_comparison/visual_comparison_app.py

@@ -16,7 +16,7 @@
 from .widgets import DisplayWidget, ControlButtonsWidget, PreviewWidget, VideoControlsWidget
 from .widgets import MultiSelectPopUpWidget, DataSelectionPopup, MessageBoxPopup, GetNumberBetweenRangePopup, RootSelectionPopup, ExportVideoPopup, ExportSelectionPopup, ProgressBarPopup, SettingsPopupWidget
 from .enums import VCModes, VCState
-from .utils import image_utils, set_appearance_mode_and_theme, file_reader, is_window_in_background
+from .utils import image_utils, set_appearance_mode_and_theme, file_reader, is_window_in_background, set_tkinter_widgets_appearance_mode
 from .configurations import read_config, parse_config, config_info
 
 
@@ -43,6 +43,7 @@ def __init__(self, root=None, preview_folder=None, config_path="visual_compariso
         self.configurations = parse_config(read_config(config_path))
 
         set_appearance_mode_and_theme(self.configurations["Appearance"]["mode"], self.configurations["Appearance"]["theme"])
+        set_tkinter_widgets_appearance_mode(self)
 
         self.root = root
         self.preview_folder = preview_folder
@@ -163,6 +164,7 @@ def on_change_settings(self):
         self.configurations = new_config
         self.bind_keys_to_buttons(prev_config)
         set_appearance_mode_and_theme(new_config["Appearance"]["mode"], new_config["Appearance"]["theme"])
+        set_tkinter_widgets_appearance_mode(self)
 
     def on_change_dir(self):
         self.on_pause(paused=True)
@@ -276,11 +278,30 @@ def on_filter_files(self):
 
         # Get data from popup
         popup = DataSelectionPopup(self.content_handler.data, column_titles=titles, text_width=text_width, ctk_corner_radius=self.configurations["Display"]["ctk_corner_radius"])
-        is_cancelled, rows = popup.get_input()
+        is_cancelled, (action, data) = popup.get_input()
 
         if is_cancelled:
             return
 
+        if action not in ["search", "filter"]:
+            raise NotImplementedError(f"Unknown action: {action}")
+
+        if action == "search":
+            search_name = data
+
+            # Index returned by search index is for displayed items, so we need to find which items are displayed
+            try:
+                selected_index = self.content_handler.current_files.index(search_name)
+            except ValueError:
+                msg_popup = MessageBoxPopup(f"Unable to change to '{search_name}', item not in current view", self.configurations["Display"]["ctk_corner_radius"])
+                msg_popup.wait()
+                return
+
+            self.on_specify_index(selected_index)
+            return
+
+        # Filter action
+        rows = data
         if len(rows) == 0:
             msg_popup = MessageBoxPopup("No items selected. Ignoring selection", self.configurations["Display"]["ctk_corner_radius"])
             msg_popup.wait()

visual_comparison/widgets/__init__.py

@@ -1,6 +1,7 @@
+from .widget_control_buttons import *
 from .widget_display import *
 from .widget_pop_ups import *
-from .widget_control_buttons import *
 from .widget_preview import *
-from .widget_video_controls import *
 from .widget_settings import *
+from .widget_settings import *
+from .widget_video_controls import *

visual_comparison/widgets/widget_display.py

@@ -1,4 +1,5 @@
 import platform
+from typing import Optional
 
 import cv2
 import numpy as np
@@ -21,7 +22,7 @@ def __init__(self, *args, **kwargs):
         self.image_label.bind("<Motion>", self.on_mouse_move)
         self.scale = 1
 
-    def update_image(self, image: np.array, interpolation: int):
+    def update_image(self, image: np.array, interpolation: Optional[int]):
         """
         Update display widget with new image
         :param image: Image to display
@@ -30,15 +31,20 @@ def update_image(self, image: np.array, interpolation: int):
         """
         image = cv2.cvtColor(image, cv2.COLOR_BGR2RGB)
         h, w, _ = image.shape
+
         # Different systems have different borders which use part of the screen for their display (dock etc)
-        h_multiplier = 0.75 if platform.system() == "Darwin" else 0.8
-        screen_h, screen_w = self.master.winfo_screenheight() * h_multiplier, self.master.winfo_screenwidth()
-        if w > screen_w or h > screen_h:
-            self.scale = 1 / max(w / screen_w, h / screen_h)
-            image = image_utils.resize_scale(image, scale=self.scale, interpolation=interpolation)
-            h, w, _ = image.shape
-        else:
+        if interpolation is None:
             self.scale = 1
+        else:
+            h_multiplier = 0.75 if platform.system() == "Darwin" else 0.8
+            screen_h, screen_w = self.master.winfo_screenheight() * h_multiplier, self.master.winfo_screenwidth()
+            if w > screen_w or h > screen_h:
+                self.scale = 1 / max(w / screen_w, h / screen_h)
+                image = image_utils.resize_scale(image, scale=self.scale, interpolation=interpolation)
+                h, w, _ = image.shape
+            else:
+                self.scale = 1
+
         pil_image = Image.fromarray(image)
         ctk_image = customtkinter.CTkImage(light_image=pil_image, size=(w, h))
         self.image_label.configure(image=ctk_image, width=w, height=h)