Skip to content

Commit 000a9db

Browse files
committed
Make style changes and complexity to example transducer tracking result (OpenwaterHealth#182)
1 parent 2742f16 commit 000a9db

2 files changed

Lines changed: 14 additions & 9 deletions

File tree

src/openlifu/db/session.py

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ class Session:
103103
only. None of the other transforms in the list are considered to be approved.
104104
"""
105105

106-
transducer_tracking_results: Optional[List[TransducerTrackingResult]] = field(default_factory=list)
106+
transducer_tracking_results: List[TransducerTrackingResult] = field(default_factory=list)
107107
"""List of any transducer tracking results"""
108108

109109
def __post_init__(self):
@@ -150,10 +150,15 @@ def from_dict(d:Dict):
150150
if 'array_transform' in d:
151151
d['array_transform'] = ArrayTransform(np.array(d['array_transform']['matrix']), d['array_transform']['units'])
152152
if 'transducer_tracking_results' in d:
153-
d['transducer_tracking_results'] = [TransducerTrackingResult(t['photoscan_id'],
154-
ArrayTransform(np.array(t['transducer_to_photoscan_transform']['matrix']),t['transducer_to_photoscan_transform']['units']),
155-
ArrayTransform(np.array(t['photoscan_to_volume_transform']['matrix']), t['photoscan_to_volume_transform']['units']),
156-
t['transducer_tracking_approved']) for t in d['transducer_tracking_results']]
153+
d['transducer_tracking_results'] = [
154+
TransducerTrackingResult(
155+
t['photoscan_id'],
156+
ArrayTransform(np.array(t['transducer_to_photoscan_transform']['matrix']),t['transducer_to_photoscan_transform']['units']),
157+
ArrayTransform(np.array(t['photoscan_to_volume_transform']['matrix']), t['photoscan_to_volume_transform']['units']),
158+
t['transducer_tracking_approved']
159+
)
160+
for t in d['transducer_tracking_results']
161+
]
157162
if isinstance(d['targets'], list):
158163
if len(d['targets'])>0 and isinstance(d['targets'][0], dict):
159164
d['targets'] = [Point.from_dict(p) for p in d['targets']]

tests/resources/example_db/subjects/example_subject/sessions/example_session/example_session.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -48,17 +48,17 @@
4848
"photoscan_id": "example_photoscan",
4949
"transducer_to_photoscan_transform": {
5050
"matrix": [
51-
[1.0, 0.0, 0.0, 0.0],
52-
[0.0, 1.0, 0.0, 0.0],
51+
[2.0, 0.5, 0.0, 0.0],
52+
[-0.5, 2.0, 0.0, 0.0],
5353
[0.0, 0.0, 1.0, 0.0],
5454
[0.0, 0.0, 0.0, 1.0]
5555
],
5656
"units": "mm"
5757
},
5858
"photoscan_to_volume_transform": {
5959
"matrix": [
60-
[1.0, 0.0, 0.0, 0.0],
61-
[0.0, 1.0, 0.0, 0.0],
60+
[1.0, 0.0, 3.0, 0.0],
61+
[0.0, 1.0, 2.0, 0.0],
6262
[0.0, 0.0, 1.0, 0.0],
6363
[0.0, 0.0, 0.0, 1.0]
6464
],

0 commit comments

Comments
 (0)