diff --git a/aslam_cv/aslam_cv_backend_python/python/aslam_cv_backend/__init__.py b/aslam_cv/aslam_cv_backend_python/python/aslam_cv_backend/__init__.py index a144e1fc8..940d66abd 100644 --- a/aslam_cv/aslam_cv_backend_python/python/aslam_cv_backend/__init__.py +++ b/aslam_cv/aslam_cv_backend_python/python/aslam_cv_backend/__init__.py @@ -97,6 +97,16 @@ class FovPinhole(CameraModel): shutterType = aslam_cv.GlobalShutter frameType = aslam_cv.FovDistortedPinholeFrame +class NonePinhole(CameraModel): + geometry = aslam_cv.PinholeCameraGeometry + reprojectionError = PinholeReprojectionError + reprojectionErrorSimple = PinholeReprojectionErrorSimple + designVariable = PinholeCameraGeometryDesignVariable + projectionType = aslam_cv.PinholeProjection + distortionType = aslam_cv.NoDistortion + shutterType = aslam_cv.GlobalShutter + frameType = aslam_cv.PinholeFrame + class ExtendedUnified(CameraModel): geometry = aslam_cv.ExtendedUnifiedCameraGeometry reprojectionError = ExtendedUnifiedReprojectionError diff --git a/aslam_offline_calibration/kalibr/python/kalibr_calibrate_cameras b/aslam_offline_calibration/kalibr/python/kalibr_calibrate_cameras index dc6a9091b..c6d5ee307 100755 --- a/aslam_offline_calibration/kalibr/python/kalibr_calibrate_cameras +++ b/aslam_offline_calibration/kalibr/python/kalibr_calibrate_cameras @@ -34,6 +34,7 @@ def initBagDataset(bagfile, topic, from_to, freq): cameraModels = { 'pinhole-radtan': acvb.DistortedPinhole, 'pinhole-equi': acvb.EquidistantPinhole, 'pinhole-fov': acvb.FovPinhole, + 'pinhole-none': acvb.NonePinhole, 'omni-none': acvb.Omni, 'omni-radtan': acvb.DistortedOmni, 'eucm-none': acvb.ExtendedUnified, diff --git a/aslam_offline_calibration/kalibr/python/kalibr_camera_calibration/CameraUtils.py b/aslam_offline_calibration/kalibr/python/kalibr_camera_calibration/CameraUtils.py index 67b14362b..4bea44569 100644 --- a/aslam_offline_calibration/kalibr/python/kalibr_camera_calibration/CameraUtils.py +++ b/aslam_offline_calibration/kalibr/python/kalibr_camera_calibration/CameraUtils.py @@ -328,6 +328,7 @@ def saveChainParametersYaml(cself, resultFile, graph): cameraModels = {acvb.DistortedPinhole: 'pinhole', acvb.EquidistantPinhole: 'pinhole', acvb.FovPinhole: 'pinhole', + acvb.NonePinhole: 'pinhole', acvb.Omni: 'omni', acvb.DistortedOmni: 'omni', acvb.ExtendedUnified: 'eucm', @@ -335,6 +336,7 @@ def saveChainParametersYaml(cself, resultFile, graph): distortionModels = {acvb.DistortedPinhole: 'radtan', acvb.EquidistantPinhole: 'equidistant', acvb.FovPinhole: 'fov', + acvb.NonePinhole: 'none', acvb.Omni: 'none', acvb.DistortedOmni: 'radtan', acvb.ExtendedUnified: 'none',