From: apo Date: Thu, 1 Dec 2005 13:33:44 +0000 (+0000) Subject: To apply deformation to segementation and otherwise X-Git-Tag: TG-D5-38-2003_D2005-20-12~83 X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=10526f05c1189a0b5c672f2386ba18477b4921fe;p=modules%2Fvisu.git To apply deformation to segementation and otherwise --- diff --git a/src/OBJECT/VISU_GaussPtsAct.cxx b/src/OBJECT/VISU_GaussPtsAct.cxx index 6ea09ae3..2d213822 100644 --- a/src/OBJECT/VISU_GaussPtsAct.cxx +++ b/src/OBJECT/VISU_GaussPtsAct.cxx @@ -191,7 +191,7 @@ VISU_GaussPtsAct Superclass::ShallowCopyPL(thePipeLine); - VISU_GaussPointsPL* aPipeLine = dynamic_cast(thePipeLine); + UpdateInsideCursorSettings(); } @@ -903,6 +903,12 @@ VISU_GaussPtsAct aPipeline->SetImplicitFunction(anImplicitFunction); // To restore + if(!myInsideCursorSettings || myInsideCursorSettings->GetInitial()) + return; + + if(!myWidgetCtrl->GetEnabled()) + return; + aPipeline->SetPrimitiveType( myInsideCursorSettings->GetPrimitiveType() ); aPipeline->SetClamp( myInsideCursorSettings->GetClamp() ); aPipeline->SetImageData( myInsideCursorSettings->GetTexture() ); @@ -958,15 +964,7 @@ VISU_GaussPtsAct1 Superclass::ShallowCopyPL(thePipeLine); - VISU_GaussPointsPL* aPipeLine = dynamic_cast(thePipeLine); - - myDeviceActor->ShallowCopyPL(aPipeLine); - - // Restore implicit function - if(myWidgetCtrl){ - vtkImplicitFunction* aFunction = myWidgetCtrl->ImplicitFunction(); - myInsideDeviceActor->GetPipeLine()->SetImplicitFunction(aFunction); - } + UpdateOutsideCursorSettings(); } @@ -1131,6 +1129,12 @@ VISU_GaussPtsAct1 anExtractGeometry->SetExtractBoundaryCells(true); anExtractGeometry->SetExtractInside(true); + if(!myOutsideCursorSettings || myOutsideCursorSettings->GetInitial()) + return; + + if(!myWidgetCtrl->GetEnabled()) + return; + aPipeline->SetPrimitiveType( myOutsideCursorSettings->GetPrimitiveType() ); aPipeline->SetClamp( myOutsideCursorSettings->GetClamp() ); aPipeline->SetImageData( myOutsideCursorSettings->GetTexture() ); @@ -1221,11 +1225,6 @@ VISU_GaussPtsAct2 if(MYDEBUG2) MESSAGE("VISU_GaussPtsAct2::ShallowCopyPL - this = "<ImplicitFunction(); - myDeviceActor->GetPipeLine()->SetImplicitFunction(aFunction); - } }