Skip to content

Free Motion Capture for Everyone πŸ’€βœ¨

TypeScript

playing numpydantic types

jonmatthis55058bcc74a8
diff --git a/freemocap/pipelines/calibration_pipeline/positional_6dof.py b/freemocap/pipelines/calibration_pipeline/positional_6dof.py
index 4a1e0401..d75062d6 100644
--- a/freemocap/pipelines/calibration_pipeline/positional_6dof.py
+++ b/freemocap/pipelines/calibration_pipeline/positional_6dof.py
@@ -3,12 +3,12 @@ from numpydantic import NDArray, Shape
from pydantic import BaseModel
from freemocap.pipelines.calibration_pipeline.multi_camera_calibration.calibration_numpy_types import \
- TransformationMatrix
+ TransformationMatrix, TranslationVector, RotationVector
import cv2
class Positional6DoF(BaseModel):
- translation: NDArray[Shape["3 xyz"], float] = np.zeros((3))
- rotation: NDArray[Shape["3 xyz"], float] = np.zeros((3))
+ translation: TranslationVector= np.zeros((3))
+ rotation: RotationVector = np.zeros((3))
@property
def transformation_matrix(self) -> TransformationMatrix:
diff --git a/freemocap/pipelines/calibration_pipeline/single_camera_calibration_estimate.py b/freemocap/pipelines/calibration_pipeline/single_camera_calibration_estimate.py
index 11567fb2..301b8d0d 100644
--- a/freemocap/pipelines/calibration_pipeline/single_camera_calibration_estimate.py
+++ b/freemocap/pipelines/calibration_pipeline/single_camera_calibration_estimate.py
@@ -5,15 +5,15 @@ from pydantic import BaseModel
from pydantic import Field
from freemocap.pipelines.calibration_pipeline.multi_camera_calibration.calibration_numpy_types import \
- TransformationMatrix
+ TransformationMatrix, CameraMatrix, CameraDistortionCoefficients
from freemocap.pipelines.calibration_pipeline.positional_6dof import Positional6DoF
from skellycam import CameraId
class SingleCameraCalibrationEstimate(BaseModel):
camera_id: CameraId
- camera_matrix: NDArray[Shape["3, 3"], np.float64]
- distortion_coefficients: NDArray[Shape["5"], np.float64]
+ camera_matrix: CameraMatrix
+ distortion_coefficients: CameraDistortionCoefficients
positional_6dof: Positional6DoF = Field(default_factory=Positional6DoF)