Commit 8b3d93bf authored by Dave DeMarle's avatar Dave DeMarle
Browse files

Merge branch 'fix-python-vtk-inputs-r-rel' into release

Change-Id: I31e5f285ab373253bc3558ae29a76a4d57cf2b6f
parents 68b73f89 1ece67f0
...@@ -521,7 +521,7 @@ def main(): ...@@ -521,7 +521,7 @@ def main():
cone = vtk.vtkConeSource() cone = vtk.vtkConeSource()
cone.SetResolution(80) cone.SetResolution(80)
coneMapper = vtk.vtkPolyDataMapper() coneMapper = vtk.vtkPolyDataMapper()
coneMapper.SetInput(cone.GetOutput()) coneMapper.SetInputConnection(cone.GetOutputPort())
#coneActor = vtk.vtkLODActor() #coneActor = vtk.vtkLODActor()
coneActor = vtk.vtkActor() coneActor = vtk.vtkActor()
coneActor.SetMapper(coneMapper) coneActor.SetMapper(coneMapper)
......
...@@ -280,7 +280,7 @@ def main(): ...@@ -280,7 +280,7 @@ def main():
cone = vtk.vtkConeSource() cone = vtk.vtkConeSource()
cone.SetResolution(80) cone.SetResolution(80)
coneMapper = vtk.vtkPolyDataMapper() coneMapper = vtk.vtkPolyDataMapper()
coneMapper.SetInput(cone.GetOutput()) coneMapper.SetInputConnection(cone.GetOutputPort())
#coneActor = vtk.vtkLODActor() #coneActor = vtk.vtkLODActor()
coneActor = vtk.vtkActor() coneActor = vtk.vtkActor()
coneActor.SetMapper(coneMapper) coneActor.SetMapper(coneMapper)
......
...@@ -505,7 +505,7 @@ def main(): ...@@ -505,7 +505,7 @@ def main():
cone = vtk.vtkConeSource() cone = vtk.vtkConeSource()
cone.SetResolution(80) cone.SetResolution(80)
coneMapper = vtk.vtkPolyDataMapper() coneMapper = vtk.vtkPolyDataMapper()
coneMapper.SetInput(cone.GetOutput()) coneMapper.SetInputConnection(cone.GetOutputPort())
#coneActor = vtk.vtkLODActor() #coneActor = vtk.vtkLODActor()
coneActor = vtk.vtkActor() coneActor = vtk.vtkActor()
coneActor.SetMapper(coneMapper) coneActor.SetMapper(coneMapper)
......
...@@ -273,7 +273,7 @@ def main(): ...@@ -273,7 +273,7 @@ def main():
cone = vtk.vtkConeSource() cone = vtk.vtkConeSource()
cone.SetResolution(80) cone.SetResolution(80)
coneMapper = vtk.vtkPolyDataMapper() coneMapper = vtk.vtkPolyDataMapper()
coneMapper.SetInput(cone.GetOutput()) coneMapper.SetInputConnection(cone.GetOutputPort())
#coneActor = vtk.vtkLODActor() #coneActor = vtk.vtkLODActor()
coneActor = vtk.vtkActor() coneActor = vtk.vtkActor()
coneActor.SetMapper(coneMapper) coneActor.SetMapper(coneMapper)
......
...@@ -457,7 +457,7 @@ def QVTKRenderWidgetConeExample(): ...@@ -457,7 +457,7 @@ def QVTKRenderWidgetConeExample():
cone.SetResolution(8) cone.SetResolution(8)
coneMapper = vtk.vtkPolyDataMapper() coneMapper = vtk.vtkPolyDataMapper()
coneMapper.SetInput(cone.GetOutput()) coneMapper.SetInputConnection(cone.GetOutputPort())
coneActor = vtk.vtkActor() coneActor = vtk.vtkActor()
coneActor.SetMapper(coneMapper) coneActor.SetMapper(coneMapper)
......
...@@ -330,7 +330,7 @@ def QVTKRenderWidgetConeExample(): ...@@ -330,7 +330,7 @@ def QVTKRenderWidgetConeExample():
cone.SetResolution(8) cone.SetResolution(8)
coneMapper = vtk.vtkPolyDataMapper() coneMapper = vtk.vtkPolyDataMapper()
coneMapper.SetInput(cone.GetOutput()) coneMapper.SetInputConnection(cone.GetOutputPort())
coneActor = vtk.vtkActor() coneActor = vtk.vtkActor()
coneActor.SetMapper(coneMapper) coneActor.SetMapper(coneMapper)
......
...@@ -368,7 +368,7 @@ def QVTKRenderWidgetConeExample(): ...@@ -368,7 +368,7 @@ def QVTKRenderWidgetConeExample():
cone.SetResolution(8) cone.SetResolution(8)
coneMapper = vtk.vtkPolyDataMapper() coneMapper = vtk.vtkPolyDataMapper()
coneMapper.SetInput(cone.GetOutput()) coneMapper.SetInputConnection(cone.GetOutputPort())
coneActor = vtk.vtkActor() coneActor = vtk.vtkActor()
coneActor.SetMapper(coneMapper) coneActor.SetMapper(coneMapper)
......
...@@ -450,7 +450,7 @@ def vtkRenderWidgetConeExample(): ...@@ -450,7 +450,7 @@ def vtkRenderWidgetConeExample():
cone.SetResolution(8) cone.SetResolution(8)
coneMapper = vtk.vtkPolyDataMapper() coneMapper = vtk.vtkPolyDataMapper()
coneMapper.SetInput(cone.GetOutput()) coneMapper.SetInputConnection(cone.GetOutputPort())
coneActor = vtk.vtkActor() coneActor = vtk.vtkActor()
coneActor.SetMapper(coneMapper) coneActor.SetMapper(coneMapper)
......
...@@ -377,7 +377,7 @@ def vtkRenderWindowInteractorConeExample(): ...@@ -377,7 +377,7 @@ def vtkRenderWindowInteractorConeExample():
cone.SetResolution(8) cone.SetResolution(8)
coneMapper = vtk.vtkPolyDataMapper() coneMapper = vtk.vtkPolyDataMapper()
coneMapper.SetInput(cone.GetOutput()) coneMapper.SetInputConnection(cone.GetOutputPort())
coneActor = vtk.vtkActor() coneActor = vtk.vtkActor()
coneActor.SetMapper(coneMapper) coneActor.SetMapper(coneMapper)
......
...@@ -748,7 +748,7 @@ def wxVTKRenderWindowConeExample(): ...@@ -748,7 +748,7 @@ def wxVTKRenderWindowConeExample():
cone.SetResolution(8) cone.SetResolution(8)
coneMapper = vtk.vtkPolyDataMapper() coneMapper = vtk.vtkPolyDataMapper()
coneMapper.SetInput(cone.GetOutput()) coneMapper.SetInputConnection(cone.GetOutputPort())
coneActor = vtk.vtkActor() coneActor = vtk.vtkActor()
coneActor.SetMapper(coneMapper) coneActor.SetMapper(coneMapper)
......
...@@ -695,7 +695,7 @@ def wxVTKRenderWindowInteractorConeExample(): ...@@ -695,7 +695,7 @@ def wxVTKRenderWindowInteractorConeExample():
cone.SetResolution(8) cone.SetResolution(8)
coneMapper = vtk.vtkPolyDataMapper() coneMapper = vtk.vtkPolyDataMapper()
coneMapper.SetInput(cone.GetOutput()) coneMapper.SetInputConnection(cone.GetOutputPort())
coneActor = vtk.vtkActor() coneActor = vtk.vtkActor()
coneActor.SetMapper(coneMapper) coneActor.SetMapper(coneMapper)
......
Markdown is supported
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