From d4f7766364dc256ed8b35fd6dad3f21c0d05d360 Mon Sep 17 00:00:00 2001 From: ana Date: Fri, 30 Dec 2011 08:35:48 +0000 Subject: [PATCH] Fix for the IPAL22822: Changes of plots in hexa8 --- src/PIPELINE/Makefile.am | 2 +- src/PIPELINE/VISUPipeLine.cxx | 2 +- src/PIPELINE/VISU_CutPlanesPL.cxx | 4 ++-- src/PIPELINE/VISU_PlanesWidget.cxx | 6 +++--- src/PIPELINE/VISU_PlanesWidget.hxx | 8 ++++---- src/PIPELINE/VISU_Plot3DPL.cxx | 6 +++--- src/VISUGUI/Makefile.am | 2 +- src/VISUGUI/VisuGUI_ClippingPanel.cxx | 4 ++-- src/VISUGUI/VisuGUI_ClippingPanel.h | 4 ++-- 9 files changed, 19 insertions(+), 19 deletions(-) diff --git a/src/PIPELINE/Makefile.am b/src/PIPELINE/Makefile.am index ab75c060..e01a27fa 100644 --- 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 1a05f3fa..c09963e7 100644 --- a/src/PIPELINE/VISUPipeLine.cxx +++ b/src/PIPELINE/VISUPipeLine.cxx @@ -56,7 +56,7 @@ typedef VISU_CutLinesPL TPresent; // VTK includes #include #include -#include +#include #include #include #include diff --git a/src/PIPELINE/VISU_CutPlanesPL.cxx b/src/PIPELINE/VISU_CutPlanesPL.cxx index e48517fd..f6b7d7aa 100644 --- a/src/PIPELINE/VISU_CutPlanesPL.cxx +++ b/src/PIPELINE/VISU_CutPlanesPL.cxx @@ -33,7 +33,7 @@ #include "VISU_DeformationPL.hxx" #include -#include +#include #include //#include @@ -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 5732f27b..a873cf20 100644 --- a/src/PIPELINE/VISU_PlanesWidget.cxx +++ b/src/PIPELINE/VISU_PlanesWidget.cxx @@ -36,7 +36,7 @@ #include #include #include -#include +#include #include #include #include @@ -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 d7df1904..8e5031af 100644 --- 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 e80418f8..2ebbde70 100644 --- a/src/PIPELINE/VISU_Plot3DPL.cxx +++ b/src/PIPELINE/VISU_Plot3DPL.cxx @@ -30,7 +30,7 @@ #include "VISU_PipeLineUtils.hxx" #include -#include +#include #include #include @@ -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 dde34229..c1024a0e 100644 --- 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 882aba1d..01e9687e 100644 --- a/src/VISUGUI/VisuGUI_ClippingPanel.cxx +++ b/src/VISUGUI/VisuGUI_ClippingPanel.cxx @@ -52,7 +52,7 @@ #include #include -#include +#include #include #include @@ -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 17d48204..712fd374 100644 --- 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; }; -- 2.39.2