Using native vtkStreamLine class instead of out-of-date VISU_StreamLine.

diff --git a/src/PIPELINE/Makefile.am b/src/PIPELINE/Makefile.am
index 5cae7e29ab77440018cc2dc5536bba210e0bb34c..977176a1dfb72d6c7880e1d21e90d1d7b50308be 100644 (file)
--- 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 63b58cafc0506c4562d3b7c502a9a7899bd53dc1..5c363ffa52f4af3288638c553f8ef31930f7c8d1 100644 (file)
--- 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 <vtkCell.h>
 #include <vtkDataSet.h>
+#include <vtkStreamLine.h>
 
 #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 73a604c13e6707041f6386be21eb4a88faf1c359..a6395fc4344afbcf3492941a598b90d4c5976f63 100644 (file)
--- 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 167ed70da882353ed2f9591a0bfef20c88279071..b89e926313120237c86ee2f017da92fbccebd7b3 100644 (file)
--- 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 )
 {