From 89e407ac4ac715cf006380e69deb4f4961b7e29e Mon Sep 17 00:00:00 2001 From: ouv Date: Fri, 27 May 2011 09:23:53 +0000 Subject: [PATCH] Using native vtkStreamLine class instead of out-of-date VISU_StreamLine. --- src/PIPELINE/Makefile.am | 4 ---- src/PIPELINE/VISU_StreamLinesPL.cxx | 4 ++-- src/PIPELINE/VISU_StreamLinesPL.hxx | 4 ++-- src/PIPELINE/VISU_Streamer.cxx | 2 +- 4 files changed, 5 insertions(+), 9 deletions(-) diff --git a/src/PIPELINE/Makefile.am b/src/PIPELINE/Makefile.am index 5cae7e29..977176a1 100644 --- a/src/PIPELINE/Makefile.am +++ b/src/PIPELINE/Makefile.am @@ -44,8 +44,6 @@ salomeinclude_HEADERS= \ VISU_IsoSurfacesPL.hxx \ VISU_DeformedShapePL.hxx \ VISU_VectorsPL.hxx \ - VISU_Streamer.hxx \ - VISU_StreamLine.hxx \ VISU_StreamLinesPL.hxx \ VISU_LookupTable.hxx \ VISU_ScalarBarActor.hxx \ @@ -93,8 +91,6 @@ dist_libVisuPipeLine_la_SOURCES= \ VISU_IsoSurfacesPL.cxx \ VISU_DeformedShapePL.cxx \ VISU_VectorsPL.cxx \ - VISU_Streamer.cxx \ - VISU_StreamLine.cxx \ VISU_StreamLinesPL.cxx \ VISU_LookupTable.cxx \ VISU_ScalarBarActor.cxx \ diff --git a/src/PIPELINE/VISU_StreamLinesPL.cxx b/src/PIPELINE/VISU_StreamLinesPL.cxx index 63b58caf..5c363ffa 100644 --- a/src/PIPELINE/VISU_StreamLinesPL.cxx +++ b/src/PIPELINE/VISU_StreamLinesPL.cxx @@ -32,7 +32,6 @@ //#include "VISU_UsedPointsFilter.hxx" #include "VISU_MaskPointsFilter.hxx" #include "VISU_PipeLineUtils.hxx" -#include "VISU_StreamLine.hxx" #include "VTKViewer_CellCenters.h" #include "VTKViewer_GeometryFilter.h" @@ -44,6 +43,7 @@ #include #include +#include #ifdef _DEBUG_ static int MYDEBUG = 0; @@ -68,7 +68,7 @@ VISU_StreamLinesPL SetIsShrinkable(false); SetIsFeatureEdgesAllowed(false); - myStream = VISU_StreamLine::New(); + myStream = vtkStreamLine::New(); myCenters = VTKViewer_CellCenters::New(); myGeomFilter = VTKViewer_GeometryFilter::New(); myPointsFilter = VISU_MaskPointsFilter::New(); diff --git a/src/PIPELINE/VISU_StreamLinesPL.hxx b/src/PIPELINE/VISU_StreamLinesPL.hxx index 73a604c1..a6395fc4 100644 --- a/src/PIPELINE/VISU_StreamLinesPL.hxx +++ b/src/PIPELINE/VISU_StreamLinesPL.hxx @@ -38,7 +38,7 @@ class vtkPointSet; class VTKViewer_CellCenters; class VTKViewer_GeometryFilter; class VISU_MaskPointsFilter; -class VISU_StreamLine; +class vtkStreamLine; //---------------------------------------------------------------------------- @@ -247,7 +247,7 @@ protected: vtkFloatingPointType GetUsedPointsDefault(); - VISU_StreamLine* myStream; + vtkStreamLine* myStream; vtkPointSet* mySource; VTKViewer_CellCenters* myCenters; VTKViewer_GeometryFilter *myGeomFilter; diff --git a/src/PIPELINE/VISU_Streamer.cxx b/src/PIPELINE/VISU_Streamer.cxx index 167ed70d..b89e9263 100644 --- a/src/PIPELINE/VISU_Streamer.cxx +++ b/src/PIPELINE/VISU_Streamer.cxx @@ -91,7 +91,7 @@ VISU_Streamer::~VISU_Streamer() { } -static const double VTK_EPSILON=1E-7; +static const double VTK_EPSILON=1E-12; VTK_THREAD_RETURN_TYPE VISU_Streamer::ThreadedIntegrate( void *arg ) { -- 2.39.2