add 3de undistortion models

This commit is contained in:
Fabien Servant 2024-06-21 15:58:36 +02:00
parent 9d78536e2a
commit dfa1f7fb79
3 changed files with 6 additions and 24 deletions

View file

@ -1,4 +1,4 @@
__version__ = "10.0"
__version__ = "11.0"
import os
import json
@ -138,12 +138,9 @@ Intrinsic = [
" - radialk3pt: radial distortion with three parameters and normalized with the sum of parameters (Best for equidistant cameras).\n"
" - brown: distortion with 3 radial and 2 tangential parameters.\n"
" - fisheye1: distortion with 1 parameter suited for fisheye optics (like 120deg FoV).\n"
" - fisheye4: distortion with 4 parameters suited for fisheye optics (like 120deg FoV).\n"
" - 3deanamorphic4: Pinhole camera with 4 anamorphic distortion coefficients.\n"
" - 3declassicld: Pinhole camera with 10 anamorphic distortion coefficients.\n"
" - 3deradial4: Pinhole camera with 3DE radial4 model.\n",
" - fisheye4: distortion with 4 parameters suited for fisheye optics (like 120deg FoV).\n",
value="radialk3",
values=["none", "radialk1", "radialk3", "radialk3pt", "brown", "fisheye4", "fisheye1", "3deanamorphic4", "3declassicld", "3deradial4"],
values=["none", "radialk1", "radialk3", "radialk3pt", "brown", "fisheye4", "fisheye1"],
exclusive=True,
uid=[0],
),
@ -551,11 +548,6 @@ The needed metadata are:
intrinsic['distortionType'] = "radialk3"
intrinsic['undistortionType'] = "none"
elif itype == "3deradial4":
intrinsic['type'] = "pinhole"
intrinsic['distortionType'] = "3deradial4"
intrinsic['undistortionType'] = "none"
elif itype == "brown":
intrinsic['type'] = "pinhole"
intrinsic['distortionType'] = "brown"
@ -571,16 +563,6 @@ The needed metadata are:
intrinsic['distortionType'] = "fisheye1"
intrinsic['undistortionType'] = "none"
elif itype == "3deanamorphic4":
intrinsic['type'] = "pinhole"
intrinsic['distortionType'] = "none"
intrinsic['undistortionType'] = "3deanamorphic4"
elif itype == "3declassicld":
intrinsic['type'] = "pinhole"
intrinsic['distortionType'] = "3declassicld"
intrinsic['undistortionType'] = "none"
elif itype == "equidistant":
intrinsic['type'] = "equidistant"
intrinsic['distortionType'] = "none"

View file

@ -1,4 +1,4 @@
__version__ = '4.0'
__version__ = '5.0'
from meshroom.core import desc
from meshroom.core.utils import VERBOSE_LEVEL
@ -33,7 +33,7 @@ Calibration of a camera/lens couple distortion using a full screen checkerboard.
label="Undistortion Model",
description="model used to estimate undistortion.",
value="3deanamorphic4",
values=["3deanamorphic4"],
values=["3deanamorphic4", "3declassicld", "3deradial4"],
exclusive=True,
uid=[0],
),

View file

@ -24,7 +24,7 @@ It also allows to export an undistorted image of the lens grids for validation.
name="exportNukeNode",
label="Export Nuke Node",
description="Export Nuke LensDistortion node as nuke file.\n"
"Only supports 3DEqualizer/3DE4 Anamorphic lens model.",
"Only supports 3DEqualizer lens models.",
value=True,
uid=[0],
),