Skip to content

Commit 46f6a28

Browse files
committed
Merge remote-tracking branch 'origin/feat/pydantic' into feat/pydantic
# Conflicts: # noxfile.py
2 parents 8e8f8f3 + 72bdfc5 commit 46f6a28

9 files changed

Lines changed: 1038 additions & 1223 deletions

File tree

ifdo/__init__.py

Lines changed: 53 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,54 @@
1-
from ifdo.models import iFDO
1+
from ifdo.models.ifdo import iFDO
2+
from ifdo.models.ifdo import ImageData, ImageSetHeader
3+
from ifdo.models.ifdo_capture import (
4+
ImageAcquisition,
5+
ImageCameraCalibrationModel,
6+
ImageCameraHousingViewport,
7+
ImageCameraPose,
8+
ImageCaptureMode,
9+
ImageDeployment,
10+
ImageDomeportParameters,
11+
ImageFaunaAttraction,
12+
ImageFlatportParameters,
13+
ImageIllumination,
14+
ImageMarineZone,
15+
ImageNavigation,
16+
ImagePhotometricCalibration,
17+
ImagePixelMagnitude,
18+
ImageQuality,
19+
ImageScaleReference,
20+
ImageSpectralResolution,
21+
)
22+
from ifdo.models.ifdo_content import ImageAnnotation, ImageAnnotationCreator, ImageAnnotationLabel, AnnotationLabel
23+
from ifdo.models.ifdo_core import ImageContext, ImageCreator, ImageLicense, ImagePI
224

3-
__all__ = ["iFDO"]
25+
__all__ = [
26+
"iFDO",
27+
"ImageData",
28+
"ImageSetHeader",
29+
"ImagePI",
30+
"ImageContext",
31+
"ImageCreator",
32+
"ImageLicense",
33+
"ImageDomeportParameters",
34+
"ImageFlatportParameters",
35+
"ImageQuality",
36+
"ImagePhotometricCalibration",
37+
"ImageCameraCalibrationModel",
38+
"ImageCameraPose",
39+
"ImageDeployment",
40+
"ImageNavigation",
41+
"ImageIllumination",
42+
"ImageAcquisition",
43+
"ImageCameraHousingViewport",
44+
"ImageMarineZone",
45+
"ImageCaptureMode",
46+
"ImagePixelMagnitude",
47+
"ImageScaleReference",
48+
"ImageFaunaAttraction",
49+
"ImageSpectralResolution",
50+
"ImageAnnotation",
51+
"ImageAnnotationLabel",
52+
"ImageAnnotationCreator",
53+
"AnnotationLabel",
54+
]

ifdo/model.py

Lines changed: 0 additions & 183 deletions
This file was deleted.

0 commit comments

Comments
 (0)