support serial number with leading zeros

annie-xd-wang · annie-xd-wang · commit cd3177518711 · 2024-02-28T11:18:34.000-08:00
diff --git a/src/navigate/model/device_startup_functions.py b/src/navigate/model/device_startup_functions.py
@@ -1234,9 +1234,13 @@ def load_devices(configuration, is_synthetic=False, plugin_devices={}) -> dict:
                     )
 
             if (not is_synthetic) and device["type"].startswith("Hamamatsu"):
+                camera_serial_number = str(camera._serial_number)
                 device_ref_name = build_ref_name(
-                    "_", device["type"], str(camera._serial_number)
+                    "_", device["type"], camera_serial_number
                 )
+                # if the serial number is with leading zeros, the yaml reader will convert it to a octal number
+                if camera_serial_number.startswith("0"):
+                    devices["camera"][build_ref_name("_", device["type"], int(camera_serial_number, 8))]
             else:
                 device_ref_name = build_ref_name(
                     "_", device["type"], device["serial_number"]

Original file line number	Diff line number	Diff line change
`@@ -1234,9 +1234,13 @@ def load_devices(configuration, is_synthetic=False, plugin_devices={}) -> dict:`
`1234`	`1234`	`)`
`1235`	`1235`
`1236`	`1236`	`if (not is_synthetic) and device["type"].startswith("Hamamatsu"):`
	`1237`	`+ camera_serial_number = str(camera._serial_number)`
`1237`	`1238`	`device_ref_name = build_ref_name(`
`1238`		`- "_", device["type"], str(camera._serial_number)`
	`1239`	`+ "_", device["type"], camera_serial_number`
`1239`	`1240`	`)`
	`1241`	`+ # if the serial number is with leading zeros, the yaml reader will convert it to a octal number`
	`1242`	`+ if camera_serial_number.startswith("0"):`
	`1243`	`+ devices["camera"][build_ref_name("_", device["type"], int(camera_serial_number, 8))]`
`1240`	`1244`	`else:`
`1241`	`1245`	`device_ref_name = build_ref_name(`
`1242`	`1246`	`"_", device["type"], device["serial_number"]`