Fix for the IPAL22822: Changes of plots in hexa8

diff --git a/src/PIPELINE/Makefile.am b/src/PIPELINE/Makefile.am
index ab75c0602cf362898e2e905cb575a7b42860de47..e01a27fa65fed4c029fc1994d186a3e29a9d3eae 100644 (file)
--- a/src/PIPELINE/Makefile.am
+++ b/src/PIPELINE/Makefile.am
@@ -130,7 +130,7 @@ libVisuPipeLine_la_CPPFLAGS= \
 libVisuPipeLine_la_LDFLAGS= \
        $(VTK_LIBS) -lVTKViewer \
        $(KERNEL_LDFLAGS) -lSALOMELocalTrace \
-       $(GUI_LDFLAGS) -lqtx -lsuit \
+       $(GUI_LDFLAGS) -lqtx -lsuit -lvtkEDFOverloads \
        $(MED_LDFLAGS) \
        ../CONVERTOR/libVisuConvertor.la \
        $(MED2_LIBS) \

diff --git a/src/PIPELINE/VISUPipeLine.cxx b/src/PIPELINE/VISUPipeLine.cxx
index 1a05f3fa17705d404ca3700651495cafe600de54..c09963e7136a99eaf9b9e43719bcc7bfad3b359a 100644 (file)
--- a/src/PIPELINE/VISUPipeLine.cxx
+++ b/src/PIPELINE/VISUPipeLine.cxx
@@ -56,7 +56,7 @@ typedef VISU_CutLinesPL TPresent;
 // VTK includes
 #include <vtkShrinkFilter.h>
 #include <vtkPointLocator.h>
-#include <vtkCutter.h>
+#include <vtkEDFCutter.h>
 #include <vtkPlane.h>
 #include <vtkWarpVector.h>
 #include <vtkScalarBarActor.h>

diff --git a/src/PIPELINE/VISU_CutPlanesPL.cxx b/src/PIPELINE/VISU_CutPlanesPL.cxx
index e48517fdf0becfb5769c8467e8583349759091f3..f6b7d7aa935b959e46bc6cdbaf7959560515e52f 100644 (file)
--- a/src/PIPELINE/VISU_CutPlanesPL.cxx
+++ b/src/PIPELINE/VISU_CutPlanesPL.cxx
@@ -33,7 +33,7 @@
 #include "VISU_DeformationPL.hxx"
 
 #include <vtkAppendPolyData.h>
-#include <vtkCutter.h>
+#include <vtkEDFCutter.h>
 #include <vtkPlane.h>
 
 //#include <vtkUnstructuredGrid.h>
@@ -559,7 +559,7 @@ VISU_CutPlanesPL
                vtkFloatingPointType theDir[3], 
                vtkFloatingPointType theOrig[3])
 {
-  vtkCutter *aCutPlane = vtkCutter::New();
+  vtkEDFCutter *aCutPlane = vtkEDFCutter::New();
   aCutPlane->SetInput(theDataSet);
   vtkPlane *aPlane = vtkPlane::New();
   aPlane->SetOrigin(theOrig);

diff --git a/src/PIPELINE/VISU_PlanesWidget.cxx b/src/PIPELINE/VISU_PlanesWidget.cxx
index 5732f27b6a36f47f883858fa8cefbd5a9e1c602b..a873cf20f954ac026372f1ede7b79e0abd54ec52 100644 (file)
--- a/src/PIPELINE/VISU_PlanesWidget.cxx
+++ b/src/PIPELINE/VISU_PlanesWidget.cxx
@@ -36,7 +36,7 @@
 #include <vtkCamera.h>
 #include <vtkCellPicker.h>
 #include <vtkConeSource.h>
-#include <vtkCutter.h>
+#include <vtkEDFCutter.h>
 #include <vtkFeatureEdges.h>
 #include <vtkImageData.h>
 #include <vtkLineSource.h>
@@ -123,7 +123,7 @@ VISU_PlanesWidget::VISU_PlanesWidget()
   this->myOutlineActor->PickableOff();
   this->OutlineTranslation = 0;
   
-  this->myCutter1 = vtkCutter::New();
+  this->myCutter1 = vtkEDFCutter::New();
   this->myCutter1->SetInput(myBox);
   this->myCutter1->SetCutFunction(myPlane1);
   this->myCutMapper1 = vtkPolyDataMapper::New();
@@ -142,7 +142,7 @@ VISU_PlanesWidget::VISU_PlanesWidget()
   myEdgesActor1->GetProperty()->SetLineWidth(4.); 
   myEdgesActor1->GetProperty()->SetColor(0., .5, .7); 
 
-  this->myCutter2 = vtkCutter::New();
+  this->myCutter2 = vtkEDFCutter::New();
   this->myCutter2->SetInput(myBox);
   this->myCutter2->SetCutFunction(this->myPlane2);
   this->myCutMapper2 = vtkPolyDataMapper::New();

diff --git a/src/PIPELINE/VISU_PlanesWidget.hxx b/src/PIPELINE/VISU_PlanesWidget.hxx
index d7df19044c8be1d41c71253c716cc243ee6ba346..8e5031afb84912e1ba7fb10ccad1b9fc4705ef6d 100644 (file)
--- a/src/PIPELINE/VISU_PlanesWidget.hxx
+++ b/src/PIPELINE/VISU_PlanesWidget.hxx
@@ -38,7 +38,7 @@ class vtkConeSource;
 class vtkLineSource;
 class vtkSphereSource;
 class vtkPlane;
-class vtkCutter;
+class vtkEDFCutter;
 class vtkProperty;
 class vtkImageData;
 class vtkOutlineFilter;
@@ -295,12 +295,12 @@ protected:
   
   int OutlineTranslation; //whether the outline can be moved
   
-  // The cut plane is produced with a vtkCutter
-  vtkCutter         *myCutter1;
+  // The cut plane is produced with a vtkEDFCutter
+  vtkEDFCutter         *myCutter1;
   vtkPolyDataMapper *myCutMapper1;
   vtkActor          *myCutActor1;
 
-  vtkCutter         *myCutter2;
+  vtkEDFCutter         *myCutter2;
   vtkPolyDataMapper *myCutMapper2;
   vtkActor          *myCutActor2;
   

diff --git a/src/PIPELINE/VISU_Plot3DPL.cxx b/src/PIPELINE/VISU_Plot3DPL.cxx
index e80418f8c982b37977c7e1815953b009a0065034..2ebbde70489bdb7e5cc129c1a2b2a6d06f05e502 100644 (file)
--- a/src/PIPELINE/VISU_Plot3DPL.cxx
+++ b/src/PIPELINE/VISU_Plot3DPL.cxx
@@ -30,7 +30,7 @@
 #include "VISU_PipeLineUtils.hxx"
 
 #include <vtkAppendPolyData.h>
-#include <vtkCutter.h>
+#include <vtkEDFCutter.h>
 #include <vtkPlane.h>
 
 #include <vtkGeometryFilter.h>
@@ -205,11 +205,11 @@ VISU_Plot3DPL
   GetBasePlane( anOrigin, aPlaneNormal );
 
   vtkPolyData* aPolyData = 0;
-  vtkCutter *aCutPlane = 0;
+  vtkEDFCutter *aCutPlane = 0;
 
   if ( !IsPlanarInput() )
   {
-    aCutPlane = vtkCutter::New();
+    aCutPlane = vtkEDFCutter::New();
     aCutPlane->SetInput(aMergedInput);
 
     vtkPlane *aPlane = vtkPlane::New();

diff --git a/src/VISUGUI/Makefile.am b/src/VISUGUI/Makefile.am
index dde34229a5e85314af700b6db4376f5fe390b4bd..c1024a0eed421eb2f182bf5459ace6d6a7b1b204 100644 (file)
--- a/src/VISUGUI/Makefile.am
+++ b/src/VISUGUI/Makefile.am
@@ -193,7 +193,7 @@ libVISU_la_LDFLAGS= \
        $(QWT_LIBS) \
        $(CAS_LDFLAGS) -lTKV3d \
        $(KERNEL_LDFLAGS) -lSalomeNS -lSalomeDSClient \
-       $(GUI_LDFLAGS) -lSVTK -lSPlot2d -lSalomePrs -lOCCViewer -lViewerTools \
+       $(GUI_LDFLAGS) -lSVTK -lSPlot2d -lSalomePrs -lOCCViewer -lViewerTools -lvtkEDFOverloads \
        ../OBJECT/libVisuObject.la ../VISU_I/libVISUEngineImpl.la \
        ../../idl/libSalomeIDLVISU.la
 

diff --git a/src/VISUGUI/VisuGUI_ClippingPanel.cxx b/src/VISUGUI/VisuGUI_ClippingPanel.cxx
index 882aba1dd6eee0d9bffb85af60beca0adcecbdb6..01e9687ebe7bb24334e690652674e5ab6b98c7fc 100644 (file)
--- a/src/VISUGUI/VisuGUI_ClippingPanel.cxx
+++ b/src/VISUGUI/VisuGUI_ClippingPanel.cxx
@@ -52,7 +52,7 @@
 #include <QCheckBox>
 
 #include <vtkImageData.h>
-#include <vtkCutter.h>
+#include <vtkEDFCutter.h>
 #include <vtkPolyDataMapper.h>
 
 #include <SALOMEDSClient_AttributeSequenceOfReal.hxx>
@@ -107,7 +107,7 @@ PreviewPlane::PreviewPlane(SVTK_ViewWindow* theWindow,
                     (aBound[3]-aBound[2]),
                     (aBound[5]-aBound[4]));
 
-  myCutter = vtkCutter::New();
+  myCutter = vtkEDFCutter::New();
   myCutter->SetInput(myBox);
   myCutter->SetCutFunction(myPlane);
 

diff --git a/src/VISUGUI/VisuGUI_ClippingPanel.h b/src/VISUGUI/VisuGUI_ClippingPanel.h
index 17d4820407cca3f9469761b06a82cc5e5816428d..712fd37459c19c9db642a9189478c8afe732e6db 100644 (file)
--- a/src/VISUGUI/VisuGUI_ClippingPanel.h
+++ b/src/VISUGUI/VisuGUI_ClippingPanel.h
@@ -30,7 +30,7 @@ class SVTK_ViewWindow;
 class SUIT_ViewWindow;
 class vtkPolyDataMapper;
 class vtkImageData;
-class vtkCutter;
+class vtkEDFCutter;
 
 #include "VISU_Prs3d_i.hh"
 #include "VisuGUI_Panel.h"
@@ -97,7 +97,7 @@ private:
   const double* myBounds;
   vtkPlane* myPlane;
   vtkImageData* myBox;
-  vtkCutter* myCutter;
+  vtkEDFCutter* myCutter;
 };