From 1e4c97ecef63d3661c0149821dc475f9585a1b1d Mon Sep 17 00:00:00 2001 From: smh Date: Thu, 13 May 2004 08:05:47 +0000 Subject: [PATCH] Fix on Bug PAL5877 - V1_4_1a: PAL-POST-012_4-05-13 checkpoint 9.29 fails (regression) --- src/PIPELINE/VISU_IsoSurfacesPL.cxx | 24 ++---------------------- 1 file changed, 2 insertions(+), 22 deletions(-) diff --git a/src/PIPELINE/VISU_IsoSurfacesPL.cxx b/src/PIPELINE/VISU_IsoSurfacesPL.cxx index e47acd33..b6bbb643 100644 --- a/src/PIPELINE/VISU_IsoSurfacesPL.cxx +++ b/src/PIPELINE/VISU_IsoSurfacesPL.cxx @@ -107,33 +107,13 @@ void VISU_IsoSurfacesPL::Update(){ VISU_ScalarMapPL::Update(); } - -static void SearchRange(vtkContourFilter* theContourFilter, - int theNbParts, - float theDelta, - float theRange[2]) -{ - float aRange = theRange[0] - theDelta; - do{ - theContourFilter->GenerateValues(theNbParts,theRange); - theContourFilter->Update(); - static float EPS = 1.0E-3, INCREMENT = 3.0; - theRange[0] -= EPS*theDelta; - theDelta *= INCREMENT; - if(aRange > theRange[0]) break; - }while(!theContourFilter->GetOutput()->GetNumberOfPoints()); -} - - void VISU_IsoSurfacesPL::SetMapScale(float theMapScale){ VISU_ScalarMapPL::SetMapScale(theMapScale); - float aDelta = GetMax()-GetMin(); - float aRange[2] = {GetMax() - theMapScale*aDelta, GetMax()}; + float aRange[2] = {GetMax() - theMapScale*(GetMax()-GetMin()), GetMax()}; float aNewRange[2] = {aRange[0], aRange[1]}; - ::SearchRange(myContourFilter,GetNbParts(),aDelta,aNewRange); - //myContourFilter->GenerateValues(GetNbParts(),aNewRange); if(GetScaling() == VTK_SCALE_LOG10) VISU_LookupTable::ComputeLogRange(aRange,aNewRange); + myContourFilter->GenerateValues(GetNbParts(),aNewRange); Modified(); } -- 2.39.2