Add a flag which allows us to expose aces2.0 support by a flag in the cli

Author: davisadam10

packages/open_vp_cal/src/open_vp_cal/core/constants.py

@@ -55,6 +55,8 @@
 DEFAULT_RESOLUTION_HEIGHT = 1080
 
 DEFAULT_OCIO_CONFIG = "studio-config-v2.1.0_aces-v1.3_ocio-v2.3"
+DEFAULT_ACES_2_OCIO_CONFIG = "studio-config-v4.0.0_aces-v2.0_ocio-v2.5"
+
 ARC_CONFIG = "arc_config.xml"
 
 

packages/open_vp_cal/src/open_vp_cal/core/resource_loader.py

@@ -32,6 +32,17 @@ class ResourceLoader:
      folder within the installed package.
 
     """
+    _enable_aces_2: bool = False
+
+    @classmethod
+    def set_enable_aces_2(cls, enable: bool) -> None:
+        """Set whether to use ACES 2.0 OCIO config globally.
+
+        Args:
+            enable: If True, use the ACES 2.0 OCIO config instead of the default
+        """
+        cls._enable_aces_2 = enable
+
     @staticmethod
     def _get_resource(filename: str) -> str:
         """ For the given filename, we return the absolute file path from within the installed package.
@@ -48,13 +59,15 @@ def _get_resource(filename: str) -> str:
     def ocio_config_path(cls) -> str:
         """
 
-        Returns: The absolute path to the ocio config file
+        Returns: The absolute path to the ocio config file. Uses ACES 2.0 config if
+                 set_enable_aces_2(True) was called, otherwise uses the default ACES 1.3 config.
 
         """
+        config_name = constants.DEFAULT_ACES_2_OCIO_CONFIG if cls._enable_aces_2 else constants.DEFAULT_OCIO_CONFIG
         ocio_config_path = os.path.join(
-            cls.prefs_dir(), f"{constants.DEFAULT_OCIO_CONFIG}{ocio.OCIO_CONFIG_DEFAULT_FILE_EXT}")
+            cls.prefs_dir(), f"{config_name}{ocio.OCIO_CONFIG_DEFAULT_FILE_EXT}")
         if not os.path.exists(ocio_config_path):
-            ocio.Config().CreateFromBuiltinConfig(constants.DEFAULT_OCIO_CONFIG).serialize(ocio_config_path)
+            ocio.Config().CreateFromBuiltinConfig(config_name).serialize(ocio_config_path)
         return ocio_config_path
 
     @classmethod

packages/open_vp_cal/src/open_vp_cal/main.py

@@ -34,9 +34,13 @@
 from open_vp_cal.project_settings import ProjectSettings
 
 
-def open_ui() -> None:
+def open_ui(enable_aces_2: bool = False) -> None:
     """ Opens the MainWindow as QApplication after the splash screen loads
+
+    Args:
+        enable_aces_2: Whether to use the ACES 2.0 OCIO config instead of the default
     """
+    ResourceLoader.set_enable_aces_2(enable_aces_2)
     from PySide6.QtWidgets import QMessageBox
     from PySide6 import QtWidgets
     from PySide6.QtGui import QPixmap
@@ -211,7 +215,8 @@ def add_error_to_log(error_log: str, error: str) -> None:
 def run_cli(
         project_settings_file_path: str,
         output_folder: str,
-        ocio_config_path: str = None, force=False, error_log: str = None, export_analysis_swatches: bool = False ) -> dict[str, LedWallSettings]:
+        ocio_config_path: str = None, force=False, error_log: str = None, export_analysis_swatches: bool = False,
+        enable_aces_2: bool = False) -> dict[str, LedWallSettings]:
     """ Runs the application in CLI mode to process the given project settings file.
 
     Args:
@@ -222,10 +227,13 @@ def run_cli(
             primarily for testing purposes
         error_log: The error log file path to store errors in as a json file
         export_analysis_swatches: For debugging we can force the swatches to be exported after the analysis
+        enable_aces_2: Whether to use the ACES 2.0 OCIO config instead of the default
 
     Returns: The list of ProcessingResults
 
     """
+    ResourceLoader.set_enable_aces_2(enable_aces_2)
+
     project_settings = ProjectSettings.from_json(project_settings_file_path)
     project_settings.output_folder = output_folder
     open_vp_cal_base = OpenVPCalBase()
@@ -314,7 +322,7 @@ def run_args(args: argparse.Namespace) -> None:
         args: The command line arguments
     """
     if args.ui:
-        open_ui()
+        open_ui(enable_aces_2=args.enable_aces_2)
     else:
 
         if args.generate_patterns:
@@ -328,7 +336,8 @@ def run_args(args: argparse.Namespace) -> None:
                 args.output_folder,
                 args.ocio_config_path,
                 force=args.ignore_errors,
-                error_log=args.error_log
+                error_log=args.error_log,
+                enable_aces_2=args.enable_aces_2
             )
 
 
@@ -372,6 +381,8 @@ def parse_args() -> argparse.Namespace:
     parser.add_argument('--ignore_errors', type=str2bool, default=False,
                         help='CLI flag to ignore any errors produced during the calibration process and logging them in the provided error log file')
     parser.add_argument('--error_log', required=False, help='A file path to store any errors in a json file, the file is created if it does not already exist')
+    parser.add_argument('--enable_aces_2', type=str2bool, default=False,
+                        help='CLI flag to use the ACES 2.0 OCIO config instead of the default ACES 1.3 config')
     args = parser.parse_args(sys.argv[1:])
 
     if not args.ui: