Commit cff62a10 authored by Berk Geveci's avatar Berk Geveci
Browse files

Preparation to deprecate vtkStreamer and subclasses.

vtkStreamer, vtkStreamLine, vtkStreamPoints, vtkDashedStreamLine
will be deprecated. In preparation, change tests to use vtkStreamTracer.
Also removed some references to these classes in comments.
parent ae30efa5
......@@ -28,15 +28,13 @@ lineWidget.GetPolyData(seeds)
lineWidget.ClampToBoundsOn()
rk4 = vtk.vtkRungeKutta4()
streamer = vtk.vtkStreamLine()
streamer = vtk.vtkStreamTracer()
streamer.SetInputData(pl3d_output)
streamer.SetSourceData(seeds)
streamer.SetMaximumPropagationTime(100)
streamer.SetIntegrationStepLength(.2)
streamer.SetStepLength(.001)
streamer.SetNumberOfThreads(1)
streamer.SetMaximumPropagation(100)
streamer.SetInitialIntegrationStep(.2)
streamer.SetIntegrationDirectionToForward()
streamer.VorticityOn()
streamer.SetComputeVorticity(1)
streamer.SetIntegrator(rk4)
rf = vtk.vtkRibbonFilter()
rf.SetInputConnection(streamer.GetOutputPort())
......@@ -57,15 +55,13 @@ lineWidget2.PlaceWidget()
lineWidget2.GetPolyData(seeds2)
lineWidget2.SetKeyPressActivationValue('L')
streamer2 = vtk.vtkStreamLine()
streamer2 = vtk.vtkStreamTracer()
streamer2.SetInputData(pl3d_output)
streamer2.SetSourceData(seeds2)
streamer2.SetMaximumPropagationTime(100)
streamer2.SetIntegrationStepLength(.2)
streamer2.SetStepLength(.001)
streamer2.SetNumberOfThreads(1)
streamer2.SetMaximumPropagation(100)
streamer2.SetInitialIntegrationStep(.2)
streamer2.SetIntegrationDirectionToForward()
streamer2.VorticityOn()
streamer2.SetComputeVorticity(1)
streamer2.SetIntegrator(rk4)
rf2 = vtk.vtkRibbonFilter()
rf2.SetInputConnection(streamer2.GetOutputPort())
......
......@@ -1370,14 +1370,6 @@
<class id="vtkTemporalStreamTracer" library="Parallel">
</class>
</class>
<class id="vtkStreamer" library="Graphics">
<class id="vtkStreamLine" library="Graphics">
<class id="vtkDashedStreamLine" library="Graphics">
</class>
</class>
<class id="vtkStreamPoints" library="Graphics">
</class>
</class>
<class id="vtkStripper" library="Graphics">
</class>
<class id="vtkStructuredGridGeometryFilter" library="Graphics">
......
......@@ -1928,14 +1928,6 @@
</node>
<node id="vtkStreamTracer">
</node>
<node id="vtkStreamer">
</node>
<node id="vtkStreamLine">
</node>
<node id="vtkDashedStreamLine">
</node>
<node id="vtkStreamPoints">
</node>
<node id="vtkStripper">
</node>
<node id="vtkStructuredGridGeometryFilter">
......
......@@ -29,15 +29,13 @@ lineWidget GetPolyData seeds
lineWidget ClampToBoundsOn
vtkRungeKutta4 rk4
vtkStreamLine streamer
vtkStreamTracer streamer
streamer SetInputData $pl3dOutput
streamer SetSourceData seeds
streamer SetMaximumPropagationTime 100
streamer SetIntegrationStepLength .2
streamer SetStepLength .001
streamer SetNumberOfThreads 1
streamer SetMaximumPropagation 100
streamer SetInitialIntegrationStep .2
streamer SetIntegrationDirectionToForward
streamer VorticityOn
streamer SetComputeVorticity 1
streamer SetIntegrator rk4
vtkRibbonFilter rf
rf SetInputConnection [streamer GetOutputPort]
......@@ -59,15 +57,13 @@ lineWidget2 PlaceWidget
lineWidget2 GetPolyData seeds2
lineWidget2 SetKeyPressActivationValue L
vtkStreamLine streamer2
vtkStreamTracer streamer2
streamer2 SetInputData $pl3dOutput
streamer2 SetSourceData seeds2
streamer2 SetMaximumPropagationTime 100
streamer2 SetIntegrationStepLength .2
streamer2 SetStepLength .001
streamer2 SetNumberOfThreads 1
streamer2 SetMaximumPropagation 100
streamer2 SetInitialIntegrationStep .2
streamer2 SetIntegrationDirectionToForward
streamer2 VorticityOn
streamer2 SetComputeVorticity 1
streamer2 SetIntegrator rk4
vtkRibbonFilter rf2
rf2 SetInputConnection [streamer2 GetOutputPort]
......
......@@ -1370,14 +1370,6 @@
<class id="vtkTemporalStreamTracer" library="Parallel">
</class>
</class>
<class id="vtkStreamer" library="Graphics">
<class id="vtkStreamLine" library="Graphics">
<class id="vtkDashedStreamLine" library="Graphics">
</class>
</class>
<class id="vtkStreamPoints" library="Graphics">
</class>
</class>
<class id="vtkStripper" library="Graphics">
</class>
<class id="vtkStructuredGridGeometryFilter" library="Graphics">
......
......@@ -1928,14 +1928,6 @@
</node>
<node id="vtkStreamTracer">
</node>
<node id="vtkStreamer">
</node>
<node id="vtkStreamLine">
</node>
<node id="vtkDashedStreamLine">
</node>
<node id="vtkStreamPoints">
</node>
<node id="vtkStripper">
</node>
<node id="vtkStructuredGridGeometryFilter">
......
......@@ -31,13 +31,12 @@ maxTime = 35.0*length/maxVelocity
# IntegrationStepLength specifies the integration step length as a
# fraction of the cell size that the streamline is in.
integ = vtk.vtkRungeKutta4()
streamer = vtk.vtkStreamLine()
streamer = vtk.vtkStreamTracer()
streamer.SetInputConnection(reader.GetOutputPort())
streamer.SetStartPosition(0.1, 2.1, 0.5)
streamer.SetMaximumPropagationTime(500)
streamer.SetStepLength(0.5)
streamer.SetIntegrationStepLength(0.05)
streamer.SetIntegrationDirectionToIntegrateBothDirections()
streamer.SetMaximumPropagation(500)
streamer.SetInitialIntegrationStep(0.05)
streamer.SetIntegrationDirectionToBoth()
streamer.SetIntegrator(integ)
# The tube is wrapped around the generated streamline. By varying the
......@@ -45,6 +44,7 @@ streamer.SetIntegrator(integ)
# whose radius is proportional to mass flux (in incompressible flow).
streamTube = vtk.vtkTubeFilter()
streamTube.SetInputConnection(streamer.GetOutputPort())
streamTube.SetInputArrayToProcess(1, 0, 0, vtk.vtkDataObject.FIELD_ASSOCIATION_POINTS, "vectors")
streamTube.SetRadius(0.02)
streamTube.SetNumberOfSides(12)
streamTube.SetVaryRadiusToVaryRadiusByVector()
......
......@@ -39,13 +39,12 @@ seeds.SetCenter(0.1, 2.1, 0.5)
seeds.SetNumberOfPoints(6)
integ = vtk.vtkRungeKutta4()
streamer = vtk.vtkStreamLine()
streamer = vtk.vtkStreamTracer()
streamer.SetInputConnection(reader.GetOutputPort())
streamer.SetSourceConnection(seeds.GetOutputPort())
streamer.SetMaximumPropagationTime(500)
streamer.SetStepLength(0.5)
streamer.SetIntegrationStepLength(0.05)
streamer.SetIntegrationDirectionToIntegrateBothDirections()
streamer.SetMaximumPropagation(500)
streamer.SetInitialIntegrationStep(0.05)
streamer.SetIntegrationDirectionToBoth()
streamer.SetIntegrator(integ)
# The tube is wrapped around the generated streamline. By varying the
......@@ -53,6 +52,7 @@ streamer.SetIntegrator(integ)
# whose radius is proportional to mass flux (in incompressible flow).
streamTube = vtk.vtkTubeFilter()
streamTube.SetInputConnection(streamer.GetOutputPort())
streamTube.SetInputArrayToProcess(1, 0, 0, vtk.vtkDataObject.FIELD_ASSOCIATION_POINTS, "vectors")
streamTube.SetRadius(0.02)
streamTube.SetNumberOfSides(12)
streamTube.SetVaryRadiusToVaryRadiusByVector()
......
......@@ -29,14 +29,13 @@ rakeActor = vtk.vtkActor()
rakeActor.SetMapper(rakeMapper)
integ = vtk.vtkRungeKutta4()
sl = vtk.vtkStreamLine()
sl = vtk.vtkStreamTracer()
sl.SetInputData(pl3d_output)
sl.SetSourceConnection(rake.GetOutputPort())
sl.SetIntegrator(integ)
sl.SetMaximumPropagationTime(0.1)
sl.SetIntegrationStepLength(0.1)
sl.SetMaximumPropagation(100)
sl.SetInitialIntegrationStep(0.1)
sl.SetIntegrationDirectionToBackward()
sl.SetStepLength(0.001)
# The ruled surface stiches together lines with triangle strips.
# Note the SetOnRatio method. It turns on every other strip that
......
......@@ -35,14 +35,13 @@ vtkActor rakeActor
rakeActor SetMapper rakeMapper
vtkRungeKutta4 integ
vtkStreamLine sl
vtkStreamTracer sl
sl SetInputData $pl3dOutput
sl SetSourceConnection [rake GetOutputPort]
sl SetIntegrator integ
sl SetMaximumPropagationTime 0.1
sl SetIntegrationStepLength 0.1
sl SetMaximumPropagation 100
sl SetInitialIntegrationStep 0.1
sl SetIntegrationDirectionToBackward
sl SetStepLength 0.001
#
# The ruled surface stiches together lines with triangle strips.
......
......@@ -36,7 +36,6 @@ vtk_add_test_python(
capSphere.py
clipArt.py
combStreamers.py
combStreamers2.py
constrainedDelaunay.py
contourCells.py
contourQuadraticCells.py
......
......@@ -32,18 +32,17 @@ psActor = vtk.vtkActor()
psActor.SetMapper(psMapper)
psActor.GetProperty().SetRepresentationToWireframe()
rk4 = vtk.vtkRungeKutta4()
streamer = vtk.vtkStreamLine()
streamer = vtk.vtkStreamTracer()
streamer.SetInputData(output)
streamer.SetSourceData(ps.GetOutput())
streamer.SetMaximumPropagationTime(100)
streamer.SetIntegrationStepLength(.2)
streamer.SetStepLength(.001)
streamer.SetNumberOfThreads(1)
streamer.SetMaximumPropagation(100)
streamer.SetInitialIntegrationStep(.2)
streamer.SetIntegrationDirectionToForward()
streamer.VorticityOn()
streamer.SetComputeVorticity(1)
streamer.SetIntegrator(rk4)
rf = vtk.vtkRibbonFilter()
rf.SetInputConnection(streamer.GetOutputPort())
rf.SetInputArrayToProcess(1, 0, 0, vtk.vtkDataObject.FIELD_ASSOCIATION_POINTS, "Normals")
rf.SetWidth(0.1)
rf.SetWidthFactor(5)
streamMapper = vtk.vtkPolyDataMapper()
......
#!/usr/bin/env python
import vtk
from vtk.test import Testing
from vtk.util.misc import vtkGetDataRoot
VTK_DATA_ROOT = vtkGetDataRoot()
# Create the RenderWindow, Renderer and both Actors
#
ren1 = vtk.vtkRenderer()
renWin = vtk.vtkRenderWindow()
renWin.AddRenderer(ren1)
iren = vtk.vtkRenderWindowInteractor()
iren.SetRenderWindow(renWin)
# create pipeline
#
pl3d = vtk.vtkMultiBlockPLOT3DReader()
pl3d.SetXYZFileName("" + str(VTK_DATA_ROOT) + "/Data/combxyz.bin")
pl3d.SetQFileName("" + str(VTK_DATA_ROOT) + "/Data/combq.bin")
pl3d.SetScalarFunctionNumber(100)
pl3d.SetVectorFunctionNumber(202)
pl3d.Update()
output = pl3d.GetOutput().GetBlock(0)
ps = vtk.vtkPlaneSource()
ps.SetXResolution(4)
ps.SetYResolution(4)
ps.SetOrigin(2,-2,26)
ps.SetPoint1(2,2,26)
ps.SetPoint2(2,-2,32)
psMapper = vtk.vtkPolyDataMapper()
psMapper.SetInputConnection(ps.GetOutputPort())
psActor = vtk.vtkActor()
psActor.SetMapper(psMapper)
psActor.GetProperty().SetRepresentationToWireframe()
streamer = vtk.vtkDashedStreamLine()
streamer.SetInputData(output)
streamer.SetSourceData(ps.GetOutput())
streamer.SetMaximumPropagationTime(100)
streamer.SetIntegrationStepLength(.2)
streamer.SetStepLength(.001)
streamer.SetNumberOfThreads(1)
streamer.SetIntegrationDirectionToForward()
streamMapper = vtk.vtkPolyDataMapper()
streamMapper.SetInputConnection(streamer.GetOutputPort())
streamMapper.SetScalarRange(output.GetScalarRange())
streamline = vtk.vtkActor()
streamline.SetMapper(streamMapper)
outline = vtk.vtkStructuredGridOutlineFilter()
outline.SetInputData(output)
outlineMapper = vtk.vtkPolyDataMapper()
outlineMapper.SetInputConnection(outline.GetOutputPort())
outlineActor = vtk.vtkActor()
outlineActor.SetMapper(outlineMapper)
# Add the actors to the renderer, set the background and size
#
ren1.AddActor(psActor)
ren1.AddActor(outlineActor)
ren1.AddActor(streamline)
ren1.SetBackground(1,1,1)
renWin.SetSize(300,300)
ren1.SetBackground(0.1,0.2,0.4)
cam1 = ren1.GetActiveCamera()
cam1.SetClippingRange(3.95297,50)
cam1.SetFocalPoint(9.71821,0.458166,29.3999)
cam1.SetPosition(2.7439,-37.3196,38.7167)
cam1.SetViewUp(-0.16123,0.264271,0.950876)
# render the image
#
renWin.Render()
# prevent the tk window from showing up then start the event loop
# --- end of script --
......@@ -108,13 +108,12 @@ try:
isoActor.GetProperty().SetColor(GetRGBColor('bisque'))
isoActor.GetProperty().SetRepresentationToWireframe()
streamer = vtk.vtkStreamLine()
streamer = vtk.vtkStreamTracer()
streamer.SetInputConnection(fd2ad.GetOutputPort())
streamer.SetStartPosition(-1.2, -0.1, 1.3)
streamer.SetMaximumPropagationTime(500)
streamer.SetStepLength(0.05)
streamer.SetIntegrationStepLength(0.05)
streamer.SetIntegrationDirectionToIntegrateBothDirections()
streamer.SetMaximumPropagation(500)
streamer.SetInitialIntegrationStep(0.05)
streamer.SetIntegrationDirectionToBoth()
streamTube = vtk.vtkTubeFilter()
streamTube.SetInputConnection(streamer.GetOutputPort())
......
......@@ -37,13 +37,12 @@ seeds.SetPoint1(15, -5, 32)
seeds.SetPoint2(15, 5, 32)
seeds.SetResolution(10)
sl = vtk.vtkStreamLine()
sl = vtk.vtkStreamTracer()
sl.SetInputData(pl3d_output)
sl.SetSourceConnection(seeds.GetOutputPort())
sl.SetMaximumPropagationTime(0.1)
sl.SetIntegrationStepLength(0.1)
sl.SetIntegrationDirectionToIntegrateBothDirections()
sl.SetStepLength(0.001)
sl.SetMaximumPropagation(100)
sl.SetInitialIntegrationStep(0.1)
sl.SetIntegrationDirectionToBoth()
mapper = vtk.vtkPolyDataMapper()
mapper.SetInputConnection(sl.GetOutputPort())
......
......@@ -39,14 +39,13 @@ seeds.SetResolution(10)
integ = vtk.vtkRungeKutta4()
sl = vtk.vtkStreamLine()
sl = vtk.vtkStreamTracer()
sl.SetIntegrator(integ)
sl.SetInputData(pl3d_output)
sl.SetSourceConnection(seeds.GetOutputPort())
sl.SetMaximumPropagationTime(0.1)
sl.SetIntegrationStepLength(0.1)
sl.SetMaximumPropagation(100)
sl.SetInitialIntegrationStep(0.1)
sl.SetIntegrationDirectionToBackward()
sl.SetStepLength(0.001)
scalarSurface = vtk.vtkRuledSurfaceFilter ()
scalarSurface.SetInputConnection(sl.GetOutputPort())
......
......@@ -39,14 +39,13 @@ seeds.SetResolution(10)
integ = vtk.vtkRungeKutta4()
sl = vtk.vtkStreamLine()
sl = vtk.vtkStreamTracer()
sl.SetIntegrator(integ)
sl.SetInputData(pl3d_output)
sl.SetSourceConnection(seeds.GetOutputPort())
sl.SetMaximumPropagationTime(0.1)
sl.SetIntegrationStepLength(0.1)
sl.SetMaximumPropagation(100)
sl.SetInitialIntegrationStep(0.1)
sl.SetIntegrationDirectionToBackward()
sl.SetStepLength(0.001)
scalarSurface = vtk.vtkRuledSurfaceFilter ()
scalarSurface.SetInputConnection(sl.GetOutputPort())
......
......@@ -39,14 +39,13 @@ seeds.SetResolution(10)
integ = vtk.vtkRungeKutta4()
sl = vtk.vtkStreamLine()
sl = vtk.vtkStreamTracer()
sl.SetIntegrator(integ)
sl.SetInputData(pl3d_output)
sl.SetSourceConnection(seeds.GetOutputPort())
sl.SetMaximumPropagationTime(0.1)
sl.SetIntegrationStepLength(0.1)
sl.SetMaximumPropagation(100)
sl.SetInitialIntegrationStep(0.1)
sl.SetIntegrationDirectionToBackward()
sl.SetStepLength(0.001)
tube = vtk.vtkTubeFilter()
tube.SetInputConnection(sl.GetOutputPort())
......
......@@ -8,7 +8,6 @@ vtk_add_test_tcl(
capCow.tcl
clipArt.tcl
combStreamers.tcl
combStreamers2.tcl
createBFont.tcl
deciFranFace.tcl
dispPlot.tcl
......
......@@ -35,18 +35,17 @@ vtkActor psActor
vtkRungeKutta4 rk4
vtkStreamLine streamer
vtkStreamTracer streamer
streamer SetInputData $output
streamer SetSourceData [ps GetOutput]
streamer SetMaximumPropagationTime 100
streamer SetIntegrationStepLength .2
streamer SetStepLength .001
streamer SetNumberOfThreads 1
streamer SetMaximumPropagation 100
streamer SetInitialIntegrationStep .2
streamer SetIntegrationDirectionToForward
streamer VorticityOn
streamer SetComputeVorticity 1
streamer SetIntegrator rk4
vtkRibbonFilter rf
rf SetInputConnection [streamer GetOutputPort]
rf SetInputArrayToProcess 1 0 0 0 "Normals"
rf SetWidth 0.1
rf SetWidthFactor 5
vtkPolyDataMapper streamMapper
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment