-// Copyright (C) 2007-2022 CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2024 CEA, EDF, OPEN CASCADE
//
// Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
myControlActor = my3DActor;
break;
}
+ case eScaledJacobian:
+ {
+ SMESH::Controls::ScaledJacobian* aControl = new SMESH::Controls::ScaledJacobian();
+ aControl->SetPrecision( myControlsPrecision );
+ myFunctor.reset( aControl );
+ myControlActor = my3DActor;
+ break;
+ }
case eMaxElementLength2D:
{
SMESH::Controls::MaxElementLength2D* aControl = new SMESH::Controls::MaxElementLength2D();
myControlActor = my2DActor;
break;
}
+ case eWarping3D:
+ {
+ SMESH::Controls::Warping3D* aControl = new SMESH::Controls::Warping3D();
+ aControl->SetPrecision(myControlsPrecision);
+ myFunctor.reset(aControl);
+ myControlActor = my3DActor;
+ break;
+ }
case eSkew:
{
SMESH::Controls::Skew* aControl = new SMESH::Controls::Skew();
my1DExtActor->SetExtControlMode(myFunctor,myScalarBarActor,myLookupTable);
UpdateDistribution();
break;
+ case eWarping3D:
+ my2DExtActor->SetExtControlMode(myFunctor, myScalarBarActor, myLookupTable);
+ UpdateDistribution();
+ break;
default:
myControlActor->SetControlMode(myFunctor,myScalarBarActor,myLookupTable);
UpdateDistribution();
QString aTitle = QString(myScalarBarActor->GetTitle());
aTitle.replace(QRegExp("(:\\s).*"),"\\1"+ QString::number(GetNumberControlEntities()));
myScalarBarActor->SetTitle(aTitle.toUtf8().constData());
-
}
else {
if(theCheckEntityMode){
case eBareBorderFace:
case eOverConstrainedFace:
case eCoincidentElems2D:
+ case eWarping3D:
my2DExtActor->VisibilityOn();
break;
case eBareBorderVolume:
if ( GetPickable( ))
myPickableActor->VisibilityOn();
- if ( GetRepresentation() != ePoint )
+ if ( GetRepresentation() != ePoint &&
+ !(IsClipThresholdOn() && GetActorForThreshold() != myControlActor)) // Avoid calling VisibilityOn if for display result of Threshold Criteria need only ExtActor
{
if(myEntityMode & e0DElements ){
my0DActor->VisibilityOn();
}
+// Get Actor for Threshold criteria compute
+SMESH_DeviceActor* SMESH_ActorDef::GetActorForThreshold()
+{
+ switch (myControlMode) {
+ case eLength2D:
+ return my1DExtActor;
+ case eWarping3D:
+ return my2DExtActor;
+ default:;
+ return myControlActor;
+ }
+}
+
// Hides the cells beyond threshold if isThresholdOn == true.
-void SMESH_ActorDef::ClipThreshold(bool isThresholdOn, double min /*= 0.0*/, double max /*= 0.0*/)
+void SMESH_ActorDef::ClipThreshold(bool isThresholdOn,double min /*= 0.0*/, double max /*= 0.0*/)
{
+ SMESH_DeviceActor* anActor = GetActorForThreshold();
+ if (anActor != myControlActor)
+ myControlActor->VisibilityOff();
+
myIsClipThresholdOn = isThresholdOn;
-
if (isThresholdOn)
{
// Initialize the filter
// We have set scalar data with SMESH_DeviceActor::SetControlMode() call as vtkDataSetAttributes::SCALARS.
// So, we don't need to pass an array name in SetInputArrayToProcess().
- threshold->SetInputConnection(myControlActor->myMergeFilter->GetOutputPort());
+ threshold->SetInputConnection(anActor->myMergeFilter->GetOutputPort());
threshold->SetInputArrayToProcess(0, 0, 0, vtkDataObject::FIELD_ASSOCIATION_CELLS, vtkDataSetAttributes::SCALARS);
// Set range
// Add to the filters' chain
vtkAlgorithmOutput* port = threshold->GetOutputPort();
- myControlActor->myPassFilter[0]->SetInputConnection(port);
+ anActor->myPassFilter[0]->SetInputConnection(port);
}
else
{
// Restore the filters' chain
- myControlActor->SetImplicitFunctionUsed(myControlActor->myIsImplicitFunctionUsed);
+ anActor->SetImplicitFunctionUsed(anActor->myIsImplicitFunctionUsed);
+ // Restore Actor filters when after Controls, which not use ExtACtor was called Controls, which use ExtActor
+ // For avoid artifact's
+ if (anActor != myControlActor)
+ myControlActor->SetImplicitFunctionUsed(myControlActor->myIsImplicitFunctionUsed);
+
+ myControlActor->VisibilityOn();
}
}