From 3d6c7d6b7d65c039066b4b6db838fbece90eba44 Mon Sep 17 00:00:00 2001 From: apo Date: Thu, 1 Dec 2005 15:02:48 +0000 Subject: [PATCH] Apply more strict checking before update outside/inside settings --- src/OBJECT/VISU_GaussPtsAct.cxx | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/src/OBJECT/VISU_GaussPtsAct.cxx b/src/OBJECT/VISU_GaussPtsAct.cxx index 2d213822..393fb46b 100644 --- a/src/OBJECT/VISU_GaussPtsAct.cxx +++ b/src/OBJECT/VISU_GaussPtsAct.cxx @@ -894,6 +894,12 @@ void VISU_GaussPtsAct ::UpdateInsideCursorSettings( PDeviceActor theActor ) { + if(!myInsideCursorSettings || myInsideCursorSettings->GetInitial()) + return; + + if(!myWidgetCtrl->GetEnabled()) + return; + VISU_GaussPointsPL* aPipeline = theActor->GetPipeLine(); SALOME_ExtractGeometry* anExtractGeometry = aPipeline->GetExtractGeometryFilter(); @@ -903,12 +909,6 @@ 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() ); @@ -1118,6 +1118,12 @@ void VISU_GaussPtsAct1 ::UpdateOutsideCursorSettings() { + if(!myOutsideCursorSettings || myOutsideCursorSettings->GetInitial()) + return; + + if(!myWidgetCtrl->GetEnabled()) + return; + VISU_GaussPointsPL* aPipeline = myOutsideDeviceActor->GetPipeLine(); SALOME_ExtractGeometry* anExtractGeometry = aPipeline->GetExtractGeometryFilter(); @@ -1129,12 +1135,6 @@ 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() ); -- 2.39.2