diff --git a/Filters/General/Testing/Data/Baseline/TestDiscreteMarchingCubes.png.sha512 b/Filters/General/Testing/Data/Baseline/TestDiscreteMarchingCubes.png.sha512 index a3a43fdcfaf557b607b10aecf48252ac7f2b0996..fc93771e54f6df410ea6918789df68ebcd4ed60f 100644 --- a/Filters/General/Testing/Data/Baseline/TestDiscreteMarchingCubes.png.sha512 +++ b/Filters/General/Testing/Data/Baseline/TestDiscreteMarchingCubes.png.sha512 @@ -1 +1 @@ -a91672e8647abac2f800f3817df97de2b40b28d2a16d2831fef3a4ad26802e970dc06cd9d05d0198ed48c941e0edcca6e6dede5071ce5ed3a7ce52fabae18c4c +79a8682a5f9541014662bb7cca944b1e44b0e2312d203522eaa5399651727d23121aad785f441894ac52382d224603c9f198e49250d0eecfec794d754ded2116 diff --git a/Filters/General/Testing/Python/TestDiscreteMarchingCubes.py b/Filters/General/Testing/Python/TestDiscreteMarchingCubes.py index d6f5c36ab543228fe662eee9d3a0bfe2bbcbc711..d3241e3806713a5a8f43ab451814316edff51ef3 100755 --- a/Filters/General/Testing/Python/TestDiscreteMarchingCubes.py +++ b/Filters/General/Testing/Python/TestDiscreteMarchingCubes.py @@ -1,5 +1,6 @@ #!/usr/bin/env python import vtk +from math import cos, sin, pi from vtk.util.misc import vtkGetDataRoot VTK_DATA_ROOT = vtkGetDataRoot() @@ -72,6 +73,14 @@ while i < n: i += 1 +angle = pi/6 +orientation = [ + -cos(angle), 0, sin(angle), + 0, 1, 0, + sin(angle), 0, cos(angle), +] +blobImage.SetDirectionMatrix(orientation) + discrete = vtk.vtkDiscreteMarchingCubes() discrete.SetInputData(blobImage) discrete.GenerateValues(n, 1, n) diff --git a/Filters/General/Testing/Python/TestMarchingCubes.py b/Filters/General/Testing/Python/TestMarchingCubes.py index 064eb3c590a0e0b437ae63a78d5fe48dd00fb6dc..4d1cd32aae1c622a29baed17de4ec1978f81c13d 100755 --- a/Filters/General/Testing/Python/TestMarchingCubes.py +++ b/Filters/General/Testing/Python/TestMarchingCubes.py @@ -1,5 +1,6 @@ #!/usr/bin/env python import vtk +from math import cos, sin, pi from vtk.util.misc import vtkGetDataRoot VTK_DATA_ROOT = vtkGetDataRoot() @@ -13,12 +14,20 @@ iren.SetRenderWindow(renWin) # create pipeline # +angle = pi/2 +orientation = [ + -1, 0, 0, + 0, cos(angle), -sin(angle), + 0, -sin(angle), -cos(angle) +] v16 = vtk.vtkVolume16Reader() v16.SetDataDimensions(64, 64) v16.SetDataByteOrderToLittleEndian() v16.SetFilePrefix(VTK_DATA_ROOT + "/Data/headsq/quarter") v16.SetImageRange(1, 93) v16.SetDataSpacing(3.2, 3.2, 1.5) +v16.SetDataOrigin(0.1, 10, 1000) +v16.GetOutput().SetDirectionMatrix(orientation) v16.Update() iso = vtk.vtkMarchingCubes() @@ -39,13 +48,7 @@ ren1.AddActor(isoActor) ren1.SetBackground(0.2, 0.3, 0.4) renWin.SetSize(200, 200) - ren1.ResetCamera() -ren1.GetActiveCamera().Elevation(90) -ren1.GetActiveCamera().SetViewUp(0, 0, -1) -ren1.GetActiveCamera().Azimuth(180) -ren1.ResetCameraClippingRange() - renWin.Render() # render the image diff --git a/Filters/Modeling/Testing/Python/TestImageMarchingCubes.py b/Filters/Modeling/Testing/Python/TestImageMarchingCubes.py index 9547e0e9f4496be5c347f240e4b213b728856969..bca1c357b8e3515ad77d0e243a92732618a8dffc 100755 --- a/Filters/Modeling/Testing/Python/TestImageMarchingCubes.py +++ b/Filters/Modeling/Testing/Python/TestImageMarchingCubes.py @@ -1,5 +1,6 @@ #!/usr/bin/env python import vtk +from math import cos, sin, pi from vtk.util.misc import vtkGetDataRoot VTK_DATA_ROOT = vtkGetDataRoot() @@ -22,12 +23,19 @@ iren.SetRenderWindow(renWin) # create pipeline # +angle = pi/2 +orientation = [ + -1, 0, 0, + 0, cos(angle), -sin(angle), + 0, -sin(angle), -cos(angle) +] reader = vtk.vtkImageReader2() reader.SetDataScalarTypeToUnsignedShort() reader.SetFilePrefix(VTK_DATA_ROOT + "/Data/headsq/quarter") reader.SetDataExtent(0, 63, 0, 63, 1, 93) reader.SetDataSpacing(3.2, 3.2, 1.5) reader.SetDataOrigin(0.0, 0.0, 0.0) +reader.GetOutput().SetDirectionMatrix(orientation) iso = vtk.vtkImageMarchingCubes() iso.SetInputConnection(reader.GetOutputPort()) @@ -59,13 +67,7 @@ ren1.AddActor(isoActor) ren1.SetBackground(0.2, 0.3, 0.4) renWin.SetSize(200, 200) - ren1.ResetCamera() -ren1.GetActiveCamera().Elevation(90) -ren1.GetActiveCamera().SetViewUp(0, 0, -1) -ren1.GetActiveCamera().Azimuth(180) -ren1.ResetCameraClippingRange() - renWin.Render() # render the image