Skip to content

Commit 9c74845

Browse files
committed
fix(viz): optimize updates for negatoscopes when only pixels change
The 2D and 2D negatoscopes code was also widely refactored to share as much code as possible; this will make future maintenance easier.
1 parent 29c5c5b commit 9c74845

File tree

18 files changed

+736
-997
lines changed

18 files changed

+736
-997
lines changed

activities/io/dicom/rc/configurations/2d_local_preview_config.xml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,13 +39,12 @@
3939

4040
<service uid="pNegatoAdp" type="sight::module::viz::scene3d::adaptor::negato2d" auto_connect="true">
4141
<in key="image" uid="image" />
42-
<in key="tf" uid="tf" />
42+
<inout key="tf" uid="tf" />
4343
<config sliceIndex="axial" filtering="anisotropic" />
4444
</service>
4545

4646
<service uid="pNegatoCameraAdp" type="sight::module::viz::scene3d::adaptor::negato2d_camera" auto_connect="true">
4747
<inout key="image" uid="image" />
48-
<inout key="tf" uid="tf" />
4948
<config priority="0" orientation="axial" />
5049
</service>
5150

activities/io/dicom/rc/configurations/2d_pacs_preview_config.xml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,13 +39,12 @@
3939

4040
<service uid="pNegatoAdp" type="sight::module::viz::scene3d::adaptor::negato2d" auto_connect="true">
4141
<in key="image" uid="image" />
42-
<in key="tf" uid="tf" />
42+
<inout key="tf" uid="tf" />
4343
<config sliceIndex="axial" filtering="anisotropic" />
4444
</service>
4545

4646
<service uid="pNegatoCameraAdp" type="sight::module::viz::scene3d::adaptor::negato2d_camera" auto_connect="true">
4747
<inout key="image" uid="image" />
48-
<inout key="tf" uid="tf" />
4948
<config priority="0" orientation="axial" />
5049
</service>
5150

activities/io/dicomweb/rc/configurations/2d_preview_config.xml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,13 +38,12 @@
3838

3939
<service uid="pNegatoAdp" type="sight::module::viz::scene3d::adaptor::negato2d" auto_connect="true">
4040
<in key="image" uid="image" />
41-
<in key="tf" uid="tf" />
41+
<inout key="tf" uid="tf" />
4242
<config sliceIndex="axial" filtering="anisotropic" />
4343
</service>
4444

4545
<service uid="pNegatoCameraAdp" type="sight::module::viz::scene3d::adaptor::negato2d_camera" auto_connect="true">
4646
<inout key="image" uid="image" />
47-
<inout key="tf" uid="tf" />
4847
<config priority="0" orientation="axial" />
4948
</service>
5049

activities/viz/negato/rc/configurations/2d_negato.xml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,6 @@
105105

106106
<service uid="negatoCameraAdp" type="sight::module::viz::scene3d::adaptor::negato2d_camera">
107107
<inout key="image" uid="${image}" />
108-
<inout key="tf" uid="tf" />
109108
<config priority="0" orientation="${orientation}" />
110109
</service>
111110

@@ -115,7 +114,7 @@
115114

116115
<service uid="negatoAdp" type="sight::module::viz::scene3d::adaptor::negato2d" auto_connect="true">
117116
<in key="image" uid="${image}" />
118-
<in key="tf" uid="tf" />
117+
<inout key="tf" uid="tf" />
119118
<config sliceIndex="${orientation}" filtering="none" />
120119
</service>
121120

activities/viz/negato/rc/configurations/2d_negato_with_tf.xml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,6 @@
8383

8484
<service uid="negatoCameraAdp" type="sight::module::viz::scene3d::adaptor::negato2d_camera" auto_connect="true">
8585
<inout key="image" uid="${image}" />
86-
<inout key="tf" uid="${transferFunctionDeferred}" />
8786
<config priority="0" orientation="${orientation}" />
8887
</service>
8988

@@ -93,7 +92,7 @@
9392

9493
<service uid="negatoAdp" type="sight::module::viz::scene3d::adaptor::negato2d" auto_connect="true">
9594
<in key="image" uid="${image}" />
96-
<in key="tf" uid="${transferFunctionDeferred}" />
95+
<inout key="tf" uid="${transferFunctionDeferred}" />
9796
<config sliceIndex="${orientation}" filtering="none" />
9897
</service>
9998

activities/viz/negato/rc/configurations/2d_simple_config.xml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,13 +39,12 @@
3939

4040
<service uid="interactor4Negato" type="sight::module::viz::scene3d::adaptor::negato2d_camera" auto_connect="true">
4141
<inout key="image" uid="${objectID}" />
42-
<inout key="tf" uid="tf" />
4342
<config priority="0" orientation="${orientation}" />
4443
</service>
4544

4645
<service uid="seriesAdaptor" type="sight::module::viz::scene3d::adaptor::negato2d" auto_connect="true">
4746
<in key="image" uid="${objectID}" />
48-
<in key="tf" uid="tf" />
47+
<inout key="tf" uid="tf" />
4948
<config autoresetcamera="true" sliceIndex="${orientation}" />
5049
</service>
5150

configs/io/dicom/rc/configurations/pacs_selector_widget.xml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -257,13 +257,12 @@
257257

258258
<service uid="p_negato_adp" type="sight::module::viz::scene3d::adaptor::negato2d" auto_connect="true">
259259
<in key="image" uid="previewImage" />
260-
<in key="tf" uid="tf" />
260+
<inout key="tf" uid="tf" />
261261
<config sliceIndex="axial" filtering="anisotropic" />
262262
</service>
263263

264264
<service uid="p_negato_camera_adp" type="sight::module::viz::scene3d::adaptor::negato2d_camera" auto_connect="true">
265265
<inout key="image" uid="previewImage" />
266-
<inout key="tf" uid="tf" />
267266
<config priority="0" orientation="axial" />
268267
</service>
269268

configs/viz/scene3d/rc/configurations/negato2d.xml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@
102102

103103
<service uid="negatoAdp" type="sight::module::viz::scene3d::adaptor::negato2d">
104104
<in key="image" uid="${image}" />
105-
<in key="tf" uid="${transferFunction}" />
105+
<inout key="tf" uid="${transferFunction}" />
106106
<config sliceIndex="${sliceIndex}" filtering="${filtering}" />
107107
<properties classification="${classification}" />
108108
</service>
@@ -114,7 +114,6 @@
114114

115115
<service uid="negatoCameraAdp" type="sight::module::viz::scene3d::adaptor::negato2d_camera">
116116
<inout key="image" uid="${image}" />
117-
<inout key="tf" uid="${transferFunction}" />
118117
<config priority="0" orientation="${sliceIndex}" />
119118
</service>
120119

examples/filter/ex_image_reslice/rc/plugin.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -215,7 +215,7 @@
215215

216216
<service uid="reslice_axial_negato_adp" type="sight::module::viz::scene3d::adaptor::negato2d">
217217
<in key="image" uid="axial_slice" />
218-
<in key="tf" uid="tf" />
218+
<inout key="tf" uid="tf" />
219219
<config sliceIndex="axial" filtering="linear" border="false" interactive="false" slicesCross="false" />
220220
</service>
221221

@@ -226,7 +226,7 @@
226226

227227
<service uid="reslice_frontal_negato_adp" type="sight::module::viz::scene3d::adaptor::negato2d">
228228
<in key="image" uid="frontal_slice" />
229-
<in key="tf" uid="tf" />
229+
<inout key="tf" uid="tf" />
230230
<config sliceIndex="axial" filtering="linear" border="false" interactive="false" slicesCross="false" />
231231
</service>
232232

examples/filter/ex_image_reslice/rc/reslice_view.xml

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -75,25 +75,23 @@
7575

7676
<service uid="negato_camera_adp" type="sight::module::viz::scene3d::adaptor::negato2d_camera">
7777
<inout key="image" uid="${slice}" />
78-
<inout key="tf" uid="${tf}" />
7978
<config orientation="axial" margin="0.01" />
8079
</service>
8180

8281
<service uid="negato_adp" type="sight::module::viz::scene3d::adaptor::negato2d">
8382
<in key="image" uid="${slice}" />
84-
<in key="tf" uid="${tf}" />
83+
<inout key="tf" uid="${tf}" />
8584
<config filtering="linear" border="false" interactive="false" slicesCross="false" />
8685
</service>
8786

8887
<service uid="mask_negato_camera_adp" type="sight::module::viz::scene3d::adaptor::negato2d_camera">
8988
<inout key="image" uid="${slice}" />
90-
<inout key="tf" uid="${tf}" />
9189
<config orientation="axial" margin="0.01" />
9290
</service>
9391

9492
<service uid="mask_negato_adp" type="sight::module::viz::scene3d::adaptor::negato2d">
9593
<in key="image" uid="${mask_slice}" />
96-
<in key="tf" uid="${mask_tf}" />
94+
<inout key="tf" uid="${mask_tf}" />
9795
<config sliceIndex="axial" filtering="linear" border="false" interactive="false" slicesCross="false" tf_alpha="true" />
9896
<properties classification="pre" />
9997
</service>

0 commit comments

Comments
 (0)