add source file to the set, zoomed 400% + correct file type

scripts/generate-icat-comparison-projects.py

@@ -71,15 +71,17 @@ def get_image_dimensions(file_path):
 script_dir = os.path.dirname(os.path.abspath(__file__))
 
 # Construct the full path to the target directory
-base_dir = os.path.join(script_dir, '..', 'result', 'flux-dev')
+base_dirs = [os.path.join(script_dir, '..', 'source'), os.path.join(script_dir, '..', 'result')]
 
 output_dir = os.path.join(script_dir, '..', 'output/icat_projects')
 
-if not os.path.exists(base_dir):
-    print(f"The path {base_dir} does not exist!")
-    sys.exit(1)  # Exit the program with a non-zero status to indicate an error
-else: 
-    print(f"Searching for images in {base_dir}.")
+for dir in base_dirs:
+    if not os.path.exists(dir):
+        print(f"The path {dir} does not exist!")
+        sys.exit(1)  # Exit the program with a non-zero status to indicate an error
+
+
+print(f"Searching for images in {base_dirs}.")
 
 os.makedirs(output_dir, exist_ok=True)
 
@@ -90,15 +92,16 @@ pattern = re.compile(r'\d{5}')
 file_groups = defaultdict(list)
 
 # Walk through all subdirectories and files
-for root, dirs, files in os.walk(base_dir):
-    for file in files:
-        # Search for the five-digit number in the file name
-        match = pattern.search(file)
-        if match:
-            # Get the five-digit number
-            number = match.group()
-            # Add the file (with its full path) to the corresponding group
-            file_groups[number].append(os.path.join(root, file))
+for dir in base_dirs:
+    for root, dirs, files in os.walk(dir):
+        for file in files:
+            # Search for the five-digit number in the file name
+            match = pattern.search(file)
+            if match:
+                # Get the five-digit number
+                number = match.group()
+                # Add the file (with its full path) to the corresponding group
+                file_groups[number].append(os.path.join(root, file))
 
 # Fill JSON structure with grouped files
 for number, group in file_groups.items():
@@ -143,12 +146,18 @@ for number, group in file_groups.items():
         hex_id = uuid.uuid4().hex  # Generate a unique hex ID for each file
         cleaned_path = os.path.abspath(file_path).replace('\\', '%5C').replace(':', '%3A')
         width, height = get_image_dimensions(file_path)
+        fileExt = file_name.split('.')[-1]
+
+        if "source" in file_path.lower():
+            zoomFactor = 400
+        else:
+            zoomFactor = 100
         
         # Example media entry
         media_entry = {
             "id": hex_id,
             "created": int(os.path.getctime(file_path) * 1000),
-            "codec": "PNG",
+            "codec": fileExt.upper(),
             "bitrate": 0,
             "width": width,
             "height": height,
@@ -163,11 +172,11 @@ for number, group in file_groups.items():
             "name": file_name,
             "base": base_name,
             "originalBase": base_name,
-            "extension": file_name.split('.')[-1],
-            "format": "PNG",
+            "extension": fileExt,
+            "format": fileExt.upper(),
             "x": 0,
             "y": 0,
-            "z": 100,
+            "z": zoomFactor,
             "startTime": 0,
             "thumbnails": [],
             "labelVisibility": {