Skip to content
Snippets Groups Projects

Compare revisions

Changes are shown as if the source revision was being merged into the target revision. Learn more about comparing revisions.

Source

Select target project
No results found

Target

Select target project
  • roboct-public/roboct-schemas
1 result
Show changes
Commits on Source (2)
......@@ -134,6 +134,7 @@ def get_projection_dict(
image_dimensions_px: np.ndarray,
pixel_pitch_mm: np.ndarray,
header: JsonHeader | None = None,
focal_spot_orientation_quat: np.ndarray | None = None,
):
if header is None:
header = generate_header()
......@@ -144,10 +145,11 @@ def get_projection_dict(
detector_center_position_mm,
detector_center_orientation_quat,
header,
focal_spot_orientation_quat,
)
projection["detector"] = get_detector_dict(image_dimensions_px, pixel_pitch_mm)
projection["image"] = {"image_path", str(image_path)}
projection["image"] = {"image_path": str(image_path)}
return projection
......
[project]
name = "thd-json"
version = "0.1.9"
version = "0.1.10"
description = "THD JSON schema and validation tools."
authors = [
{ name = "swittl", email = "simon.wittl@th-deg.de" }
......
......@@ -3,15 +3,10 @@ from thd_json.header import JsonHeader, generate_header
from thd_json.projection_geometry import get_projection_geometry_dict
from thd_json.detector import get_detector_dict
from thd_json.header import JsonHeader, generate_header
from thd_json.projection_geometry import get_projection_geometry_dict
from thd_json.detector import get_detector_dict
from pathlib import Path
import argparse
import numpy as np
import numpy as np
def get_projection_validator(json_suffix: str = "*.json") -> Validator:
......@@ -49,7 +44,7 @@ def get_projection_dict(
image_dimensions_px: np.ndarray,
pixel_pitch_mm: np.ndarray,
header: JsonHeader | None = None,
focal_spot_orientation_quat: np.ndarray | None = None
focal_spot_orientation_quat: np.ndarray | None = None,
):
if header is None:
header = generate_header()
......@@ -60,13 +55,14 @@ def get_projection_dict(
detector_center_position_mm,
detector_center_orientation_quat,
header,
focal_spot_orientation_quat
focal_spot_orientation_quat,
)
projection['detector'] = get_detector_dict(image_dimensions_px, pixel_pitch_mm)
projection['image'] = {'image_path': str(image_path)}
projection["detector"] = get_detector_dict(image_dimensions_px, pixel_pitch_mm)
projection["image"] = {"image_path": str(image_path)}
return projection
if __name__ == "__main__":
projection_cli()
......@@ -11,7 +11,8 @@
"projection_geometry": {
"$ref": "./projection_geometry/projection_geometry.json"
},
"projection_geometry_nominal": {
"projection_geometry_nominal":
{
"$ref": "./projection_geometry/projection_geometry.json"
},
"detector": {
......
......@@ -45,7 +45,7 @@ def get_projection_geometry_dict(
detector_center_position_mm: np.ndarray,
detector_center_orientation_quat: np.ndarray,
header: JsonHeader | None = None,
focal_spot_orientation_quat: np.ndarray | None = None
focal_spot_orientation_quat: np.ndarray | None = None,
):
if header is None:
header = generate_header()
......
......@@ -170,6 +170,7 @@
"required": [
"header",
"focal_spot_position_mm",
"focal_spot_orientation_quat",
"detector_center_position_mm",
"detector_center_orientation_quat"
],
......