GameSentenceMiner 2.15.0__tar.gz → 2.15.2__tar.gz

{gamesentenceminer-2.15.0 → gamesentenceminer-2.15.2}/GameSentenceMiner/config_gui.py

@@ -2193,7 +2193,7 @@ class ConfigApp:
         self.overlay_monitor = ttk.Combobox(overlay_frame, values=self.monitors, state="readonly")
         self.overlay_monitor.grid(row=self.current_row, column=1, sticky='EW', pady=2)
         # disable selection for now, default to value 1
-        self.overlay_monitor.current(1)
+        self.overlay_monitor.current(0)
         self.overlay_monitor.config(state="disabled")
         self.current_row += 1
         

{gamesentenceminer-2.15.0 → gamesentenceminer-2.15.2}/GameSentenceMiner/obs.py

@@ -506,6 +506,39 @@ def set_fit_to_screen_for_scene_items(scene_name: str):
             
             source_width = scene_item_transform.get('sourceWidth', None)
             source_height = scene_item_transform.get('sourceHeight', None)
+
+            aspect_ratio_different = False
+            already_cropped = any([
+                scene_item_transform.get('cropLeft', 0) != 0,
+                scene_item_transform.get('cropRight', 0) != 0,
+                scene_item_transform.get('cropTop', 0) != 0,
+                scene_item_transform.get('cropBottom', 0) != 0,
+            ])
+            
+            if source_width and source_height and not already_cropped:
+                source_aspect_ratio = source_width / source_height
+                canvas_aspect_ratio = canvas_width / canvas_height
+                # Check if aspect ratio is different and if it's a standard aspect ratio
+                aspect_ratio_different = abs(source_aspect_ratio - canvas_aspect_ratio) > 0.01
+
+                # List of standard aspect ratios
+                standard_ratios = [
+                    4 / 3,
+                    16 / 9,
+                    16 / 10,
+                    21 / 9,
+                    32 / 9,
+                    5 / 4,
+                    3 / 2,
+                ]
+
+                def is_standard_ratio(ratio):
+                    return any(abs(ratio - std) < 0.02 for std in standard_ratios)
+
+                # Only crop if both source and canvas are standard aspect ratios
+                if aspect_ratio_different:
+                    if not (is_standard_ratio(source_aspect_ratio) and is_standard_ratio(canvas_aspect_ratio)):
+                        aspect_ratio_different = False
             
             # This transform object is the equivalent of "Fit to Screen"
             fit_to_screen_transform = {
@@ -515,11 +548,15 @@ def set_fit_to_screen_for_scene_items(scene_name: str):
                 'boundsHeight': canvas_height,
                 'positionX': 0,
                 'positionY': 0,
-                'cropLeft': 0 if canvas_width >= source_width else (source_width - canvas_width) // 2,
-                'cropRight': 0 if canvas_width >= source_width else (source_width - canvas_width) // 2,
-                'cropTop': 0 if canvas_height >= source_height else (source_height - canvas_height) // 2,
-                'cropBottom': 0 if canvas_height >= source_height else (source_height - canvas_height) // 2,
             }
+            
+            if not already_cropped:
+                fit_to_screen_transform.update({
+                    'cropLeft': 0 if not aspect_ratio_different or canvas_width > source_width else (source_width - canvas_width) // 2,
+                    'cropRight': 0 if not aspect_ratio_different or canvas_width > source_width else (source_width - canvas_width) // 2,
+                    'cropTop': 0 if not aspect_ratio_different or canvas_height > source_height else (source_height - canvas_height) // 2,
+                    'cropBottom': 0 if not aspect_ratio_different or canvas_height > source_height else (source_height - canvas_height) // 2,
+                })
 
             try:
                 client.set_scene_item_transform(

{gamesentenceminer-2.15.0 → gamesentenceminer-2.15.2}/GameSentenceMiner.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: GameSentenceMiner
-Version: 2.15.0
+Version: 2.15.2
 Summary: A tool for mining sentences from games. Update: Overlay?
 Author-email: Beangate <bpwhelan95@gmail.com>
 License: MIT License

{gamesentenceminer-2.15.0 → gamesentenceminer-2.15.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: GameSentenceMiner
-Version: 2.15.0
+Version: 2.15.2
 Summary: A tool for mining sentences from games. Update: Overlay?
 Author-email: Beangate <bpwhelan95@gmail.com>
 License: MIT License

{gamesentenceminer-2.15.0 → gamesentenceminer-2.15.2}/pyproject.toml

@@ -7,7 +7,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "GameSentenceMiner"
-version = "2.15.0"
+version = "2.15.2"
 description = "A tool for mining sentences from games. Update: Overlay?"
 readme = "README.md"
 requires-python = ">=3.10"