From 032ac712fdd9c18b2125f558e96a517cf6c72851 Mon Sep 17 00:00:00 2001
From: Fabien Castan <fabcastan@gmail.com>
Date: Wed, 3 Aug 2022 19:12:09 +0200
Subject: [PATCH 1/2] [nodes] CameraInit: all intrinsics parameters should
 invalidate

---
 meshroom/nodes/aliceVision/CameraInit.py | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/meshroom/nodes/aliceVision/CameraInit.py b/meshroom/nodes/aliceVision/CameraInit.py
index dcc8182b6c..148aa401e8 100644
--- a/meshroom/nodes/aliceVision/CameraInit.py
+++ b/meshroom/nodes/aliceVision/CameraInit.py
@@ -34,8 +34,8 @@
                     "So this value is used to limit the range of possible values in the optimization. \n"
                     "If you put -1, this value will not be used and the focal length will not be bounded.",
                     value=-1.0, uid=[0], range=None),
-    desc.FloatParam(name="focalLength", label="Focal Length", description="Known/Calibrated Focal Length (in mm)", value=1000, uid=[], range=(0, 10000, 1)),
-    desc.FloatParam(name="pixelRatio", label="pixel Ratio", description="ratio between pixel width and pixel height", value=1, uid=[], range=(0, 10, 0.1)),
+    desc.FloatParam(name="focalLength", label="Focal Length", description="Known/Calibrated Focal Length (in mm)", value=1000, uid=[0], range=(0, 10000, 1)),
+    desc.FloatParam(name="pixelRatio", label="pixel Ratio", description="ratio between pixel width and pixel height", value=1, uid=[0], range=(0, 10, 0.1)),
     desc.BoolParam(name='pixelRatioLocked', label='Pixel ratio Locked',
                    description='the pixelRatio value is locked for estimation',
                    value=True, uid=[0]),
@@ -51,14 +51,14 @@
                      " * 3declassicld: Pinhole camera with a 10 anamorphic distortion coefficients\n"
                      " * 3deradial4: Pinhole camera with 3DE radial4 model\n",
                      value="", values=['', 'pinhole', 'radial1', 'radial3', 'brown', 'fisheye4', 'equidistant_r3', '3deanamorphic4', '3declassicld', '3deradial4'], exclusive=True, uid=[0]),
-    desc.IntParam(name="width", label="Width", description="Image Width", value=0, uid=[], range=(0, 10000, 1)),
-    desc.IntParam(name="height", label="Height", description="Image Height", value=0, uid=[], range=(0, 10000, 1)),
-    desc.FloatParam(name="sensorWidth", label="Sensor Width", description="Sensor Width (mm)", value=36, uid=[], range=(0, 1000, 1)),
-    desc.FloatParam(name="sensorHeight", label="Sensor Height", description="Sensor Height (mm)", value=24, uid=[], range=(0, 1000, 1)),
-    desc.StringParam(name="serialNumber", label="Serial Number", description="Device Serial Number (Camera UID and Lens UID combined)", value="", uid=[]),
+    desc.IntParam(name="width", label="Width", description="Image Width", value=0, uid=[0], range=(0, 10000, 1)),
+    desc.IntParam(name="height", label="Height", description="Image Height", value=0, uid=[0], range=(0, 10000, 1)),
+    desc.FloatParam(name="sensorWidth", label="Sensor Width", description="Sensor Width (mm)", value=36, uid=[0], range=(0, 1000, 1)),
+    desc.FloatParam(name="sensorHeight", label="Sensor Height", description="Sensor Height (mm)", value=24, uid=[0], range=(0, 1000, 1)),
+    desc.StringParam(name="serialNumber", label="Serial Number", description="Device Serial Number (Camera UID and Lens UID combined)", value="", uid=[0]),
     desc.GroupAttribute(name="principalPoint", label="Principal Point", description="Position of the Optical Center in the Image (i.e. the sensor surface).", groupDesc=[
-        desc.FloatParam(name="x", label="x", description="", value=0, uid=[], range=(0, 10000, 1)),
-        desc.FloatParam(name="y", label="y", description="", value=0, uid=[], range=(0, 10000, 1)),
+        desc.FloatParam(name="x", label="x", description="", value=0, uid=[0], range=(0, 10000, 1)),
+        desc.FloatParam(name="y", label="y", description="", value=0, uid=[0], range=(0, 10000, 1)),
         ]),
 
     desc.ChoiceParam(name="initializationMode", label="Initialization Mode",
@@ -70,7 +70,7 @@
                      values=("calibrated", "estimated", "unknown", "none"),
                      value="none",
                      exclusive=True,
-                     uid=[],
+                     uid=[0],
                      advanced=True
                      ),
 

From 95bb93b4bf7fdd54906ecf5f00279de4e78a62c4 Mon Sep 17 00:00:00 2001
From: Fabien Castan <fabcastan@gmail.com>
Date: Wed, 3 Aug 2022 20:49:44 +0200
Subject: [PATCH 2/2] [nodes] CameraInit: upgrade node version

Change in uid should modify the node version and thus require a manual upgrade of the node when loading previous scenes.
---
 meshroom/nodes/aliceVision/CameraInit.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meshroom/nodes/aliceVision/CameraInit.py b/meshroom/nodes/aliceVision/CameraInit.py
index 148aa401e8..7e7bd38c45 100644
--- a/meshroom/nodes/aliceVision/CameraInit.py
+++ b/meshroom/nodes/aliceVision/CameraInit.py
@@ -1,4 +1,4 @@
-__version__ = "7.0"
+__version__ = "8.0"
 
 import os
 import json