Merge with branch V2_2_0_VISU_improvement

[modules/visu.git] / src / PIPELINE / VISU_IsoSurfacesPL.cxx

diff --git a/src/PIPELINE/VISU_IsoSurfacesPL.cxx b/src/PIPELINE/VISU_IsoSurfacesPL.cxx
index b6bbb6433a3d70ece89a5f7db1ef39a60b7808bd..7462ff51024f04e81bda3dc35be7ae4dbf4a932d 100644 (file)
--- a/src/PIPELINE/VISU_IsoSurfacesPL.cxx
+++ b/src/PIPELINE/VISU_IsoSurfacesPL.cxx
@@ -1,23 +1,23 @@
 //  VISU OBJECT : interactive object for VISU entities implementation
 //
 //  Copyright (C) 2003  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS 
-// 
-//  This library is free software; you can redistribute it and/or 
-//  modify it under the terms of the GNU Lesser General Public 
-//  License as published by the Free Software Foundation; either 
-//  version 2.1 of the License. 
-// 
-//  This library is distributed in the hope that it will be useful, 
-//  but WITHOUT ANY WARRANTY; without even the implied warranty of 
-//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU 
-//  Lesser General Public License for more details. 
-// 
-//  You should have received a copy of the GNU Lesser General Public 
-//  License along with this library; if not, write to the Free Software 
-//  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA 
-// 
-//  See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org 
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//
+//  This library is free software; you can redistribute it and/or
+//  modify it under the terms of the GNU Lesser General Public
+//  License as published by the Free Software Foundation; either
+//  version 2.1 of the License.
+//
+//  This library is distributed in the hope that it will be useful,
+//  but WITHOUT ANY WARRANTY; without even the implied warranty of
+//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+//  Lesser General Public License for more details.
+//
+//  You should have received a copy of the GNU Lesser General Public
+//  License along with this library; if not, write to the Free Software
+//  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//
+//  See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org
 //
 //
 //
@@ -36,6 +36,7 @@ vtkStandardNewMacro(VISU_IsoSurfacesPL);
 VISU_IsoSurfacesPL::VISU_IsoSurfacesPL(){
   myContourFilter = vtkContourFilter::New();
   myCellDataToPointData = vtkCellDataToPointData::New();
+  myIsShrinkable = false;
 }
 
 VISU_IsoSurfacesPL::~VISU_IsoSurfacesPL(){
@@ -55,10 +56,10 @@ void VISU_IsoSurfacesPL::ShallowCopy(VISU_PipeLine *thePipeLine){
   }
 }
 
-int VISU_IsoSurfacesPL::GetNbParts() { 
+int VISU_IsoSurfacesPL::GetNbParts() {
   return myContourFilter->GetNumberOfContours();
 }
-void VISU_IsoSurfacesPL::SetNbParts(int theNb) { 
+void VISU_IsoSurfacesPL::SetNbParts(int theNb) {
   myContourFilter->SetNumberOfContours(theNb);
   Modified();
 }
@@ -68,7 +69,7 @@ void VISU_IsoSurfacesPL::SetScaling(int theScaling) {
   VISU_ScalarMapPL::SetScaling(theScaling);
   SetRange(myRange);
 }
-void VISU_IsoSurfacesPL::SetRange(float theRange[2]){ 
+void VISU_IsoSurfacesPL::SetRange(float theRange[2]){
   if(theRange[0] <= theRange[1]){
     myRange[0] = theRange[0];  myRange[1] = theRange[1];
     float aRange[2] = {myRange[0], myRange[1]};
@@ -84,7 +85,7 @@ float VISU_IsoSurfacesPL::GetMin() {
 float VISU_IsoSurfacesPL::GetMax() {
   return myRange[1];
 }
-  
+
 
 void VISU_IsoSurfacesPL::Init(){
   VISU_ScalarMapPL::Init();
@@ -101,7 +102,7 @@ VISU_ScalarMapPL::THook* VISU_IsoSurfacesPL::DoHook(){
 
 
 void VISU_IsoSurfacesPL::Update(){
-  VISU::CellDataToPoint(myContourFilter,myCellDataToPointData,myInput,myFieldTransform);
+  VISU::CellDataToPoint(myContourFilter,myCellDataToPointData,GetInput2(),myFieldTransform);
   SetMapScale();
 
   VISU_ScalarMapPL::Update();