myIsPointsVisible = false;
myIsEntityModeCache = false;
+ myRepresentationCache = 0;
myHighlightActor = SMESH_SVTKActor::New();
myHighlightActor->Delete(); // vtkSmartPointer!
aFilter->RegisterCellsWithType(VTK_QUADRATIC_HEXAHEDRON);
aFilter->RegisterCellsWithType(VTK_TRIQUADRATIC_HEXAHEDRON);
aFilter->RegisterCellsWithType(VTK_QUADRATIC_WEDGE);
+ aFilter->RegisterCellsWithType(VTK_BIQUADRATIC_QUADRATIC_WEDGE);
aFilter->RegisterCellsWithType(VTK_QUADRATIC_PYRAMID);
aFilter->RegisterCellsWithType(VTK_CONVEX_POINT_SET);
aFilter->RegisterCellsWithType(VTK_POLYHEDRON);
aFilter->RegisterCellsWithType(VTK_QUADRATIC_HEXAHEDRON);
aFilter->RegisterCellsWithType(VTK_TRIQUADRATIC_HEXAHEDRON);
aFilter->RegisterCellsWithType(VTK_QUADRATIC_WEDGE);
+ aFilter->RegisterCellsWithType(VTK_BIQUADRATIC_QUADRATIC_WEDGE);
aFilter->RegisterCellsWithType(VTK_QUADRATIC_PYRAMID);
aFilter->RegisterCellsWithType(VTK_CONVEX_POINT_SET);
aFilter->RegisterCellsWithType(VTK_POLYHEDRON);
myEdgeProp->SetColor(anRGB[0],anRGB[1],anRGB[2]);
myEdgeProp->SetLineWidth(aLineWidth);
+ // my1DActor is used to
+ // - show numbers
+ // - show controls on all edges (eg Length)
+ // since edges are shown by myHighlitableActor
my1DActor = SMESH_CellLabelActor::New();
my1DActor->SetStoreClippingMapping(true);
my1DActor->SetUserMatrix(aMatrix);
my1DExtProp->SetLineWidth(aLineWidth + aLineWidthInc);
my1DExtProp->SetPointSize(aElem0DSize);
+ // my1DExtActor is used to show filtered edges or links between nodes
my1DExtActor = SMESH_DeviceActor::New();
my1DExtActor->SetUserMatrix(aMatrix);
my1DExtActor->PickableOff();
}
+void SMESH_ActorDef::SetControl(SMESH::Controls::FunctorPtr theFunctor)
+{
+ myFunctor = theFunctor;
+ if ( !theFunctor )
+ SetControlMode( eNone, true );
+ else
+ SetControlMode( eCustomControl, true );
+}
+
void SMESH_ActorDef::SetControlMode(eControl theMode)
{
SetControlMode(theMode,true);
}
-
void SMESH_ActorDef::SetControlMode( eControl theMode, bool theCheckEntityMode )
{
vtkLookupTable* lookupTable = static_cast<vtkLookupTable*>(myScalarBarActor->GetLookupTable());
if( !mgr )
return;
- myControlMode = eNone;
+ //myControlMode = eNone;
+ myControlMode = theMode;
theCheckEntityMode &= mgr->booleanValue( "SMESH", "display_entity", false );
my0DActor->GetMapper()->SetScalarVisibility(false);
break;
}
case eLength2D:
- {
myFunctor.reset(new SMESH::Controls::Length2D());
myControlActor = my2DActor;
break;
- }
case eFreeBorders:
myFunctor.reset(new SMESH::Controls::FreeBorders());
myControlActor = my1DActor;
myControlActor = my3DActor;
break;
}
+ case eDeflection2D:
+ {
+ SMESH::Controls::Deflection2D* aControl = new SMESH::Controls::Deflection2D();
+ aControl->SetPrecision( myControlsPrecision );
+ myFunctor.reset( aControl );
+ myControlActor = my2DActor;
+ break;
+ }
case eBareBorderVolume:
{
myFunctor.reset(new SMESH::Controls::BareBorderVolume());
myControlActor = myNodeActor;
break;
}
+ case eCustomControl:
+ {
+ if ( !myFunctor )
+ return;
+ switch ( myFunctor->GetType() ) {
+ case SMDSAbs_Node : myControlActor = myNodeActor; break;
+ case SMDSAbs_Edge : myControlActor = my1DActor; break;
+ case SMDSAbs_Face : myControlActor = my2DActor; break;
+ case SMDSAbs_Volume : myControlActor = my3DActor; break;
+ default : return;
+ }
+ break;
+ }
default:
return;
}
- vtkUnstructuredGrid* aGrid = myControlActor->GetUnstructuredGrid();
- vtkIdType aNbCells = aGrid->GetNumberOfCells();
+ int aNbCells = myFunctor ? myVisualObj->GetNbEntities( myFunctor->GetType() ) : 0;
bool aShowOnlyScalarBarTitle = false;
if(aNbCells) {
- myControlMode = theMode;
+ //myControlMode = theMode;
switch(myControlMode){
case eFreeNodes:
case eCoincidentNodes:
SetEntityMode(eEdges);
}
else if(myControlActor == my2DActor) {
- switch(myControlMode) {
- case eLength2D:
- case eFreeEdges:
- case eFreeFaces:
- case eMultiConnection2D:
- if (!myIsEntityModeCache){
- myEntityModeCache = GetEntityMode();
- myIsEntityModeCache=true;
- }
- SetEntityMode(eFaces);
- break;
- default:
- if (!myIsEntityModeCache){
- myEntityModeCache = GetEntityMode();
- myIsEntityModeCache=true;
- }
- SetEntityMode(eFaces);
+ if (!myIsEntityModeCache){
+ myEntityModeCache = GetEntityMode();
+ myIsEntityModeCache=true;
}
- }else if(myControlActor == my3DActor) {
+ SetEntityMode(eFaces);
+ }
+ else if(myControlActor == my3DActor) {
if (!myIsEntityModeCache){
myEntityModeCache = GetEntityMode();
myIsEntityModeCache=true;
if (isLogarithmic && range[0] > 1e-07 && range[1] > 1e-07)
lookupTable->SetScale(VTK_SCALE_LOG10);
- Update();
+ //Update();
}
int SMESH_ActorDef::GetNumberControlEntities()
if ( !mySelector || !mySelector->IsSelectionEnabled() )
{
myBaseActor->SetUnstructuredGrid( NULL );
- myHighlitableActor->SetUnstructuredGrid( NULL );
+ //myHighlitableActor->SetUnstructuredGrid( NULL );
}
theRenderer->AddActor(myBaseActor);
theRenderer->AddActor(myNodeExtActor);
return myPickableActor->GetNodeCoord(theObjID);
}
+int SMESH_ActorDef::GetNodeVtkId(int theObjID)
+{
+ return myPickableActor->GetNodeVtkId(theObjID);
+}
int SMESH_ActorDef::GetElemObjId(int theVtkID)
{
myScalarBarActor->VisibilityOff();
- if(GetVisibility()){
- if(theIsUpdateRepersentation)
+ if ( GetVisibility() ) {
+ if ( theIsUpdateRepersentation )
SetRepresentation(GetRepresentation());
if(myControlMode != eNone) {
case eCoincidentNodes:
myNodeExtActor->VisibilityOn();
break;
+ case eLength:
+ case eMultiConnection:
+ my1DActor->VisibilityOn();
+ break;
case eFreeEdges:
case eFreeBorders:
case eCoincidentElems1D:
+ case eLength2D:
+ case eMultiConnection2D:
my1DExtActor->VisibilityOn();
break;
case eFreeFaces:
case eCoincidentElems3D:
my3DExtActor->VisibilityOn();
break;
- case eLength2D:
- case eMultiConnection2D:
- my1DExtActor->VisibilityOn();
- break;
default:;
}
- if(myControlActor->GetUnstructuredGrid()->GetNumberOfCells())
+ if ( myFunctor && myVisualObj->GetNbEntities( myFunctor->GetType() ))
myScalarBarActor->VisibilityOn();
}
- if(myRepresentation != ePoint)
- myPickableActor->VisibilityOn();
- else {
- myNodeActor->VisibilityOn();
- }
-
- if(myEntityMode & e0DElements && GetRepresentation() != ePoint ){
- my0DActor->VisibilityOn();
- }
- if(myEntityMode & eBallElem && GetRepresentation() != ePoint ){
- myBallActor->VisibilityOn();
- }
-
- if(myEntityMode & eEdges && GetRepresentation() != ePoint){
- my1DActor->VisibilityOn();
- }
+ myPickableActor->VisibilityOn();
- if(myEntityMode & eFaces && GetRepresentation() != ePoint){
- my2DActor->VisibilityOn();
- }
-
- if(myEntityMode & eVolumes && GetRepresentation() != ePoint){
- my3DActor->VisibilityOn();
+ if ( GetRepresentation() != ePoint )
+ {
+ if(myEntityMode & e0DElements ){
+ my0DActor->VisibilityOn();
+ }
+ if(myEntityMode & eBallElem ){
+ myBallActor->VisibilityOn();
+ }
+ if(myEntityMode & eEdges && GetCellsLabeled() ){ // my1DActor shows labels only
+ my1DActor->VisibilityOn();
+ }
+ if(myEntityMode & eFaces ){
+ my2DActor->VisibilityOn();
+ }
+ if(myEntityMode & eVolumes ){
+ my3DActor->VisibilityOn();
+ }
}
- if(myNodeActor->GetPointsLabeled()){
+ if(myNodeActor->GetPointsLabeled()) {
+ myNodeActor->UpdateLabels();
myNodeActor->VisibilityOn();
}
-
if(my0DActor)
my0DActor->UpdateLabels();
void SMESH_ActorDef::SetEntityMode(unsigned int theMode)
{
- myEntityState = eAllEntity;
+ unsigned int anObjectEntities = eAllEntity; // entities present in my object
if(!myVisualObj->GetNbEntities(SMDSAbs_0DElement)) {
- myEntityState &= ~e0DElements;
+ anObjectEntities &= ~e0DElements;
theMode &= ~e0DElements;
}
if(!myVisualObj->GetNbEntities(SMDSAbs_Ball)) {
- myEntityState &= ~eBallElem;
+ anObjectEntities &= ~eBallElem;
theMode &= ~eBallElem;
}
if(!myVisualObj->GetNbEntities(SMDSAbs_Edge)) {
- myEntityState &= ~eEdges;
+ anObjectEntities &= ~eEdges;
theMode &= ~eEdges;
}
if(!myVisualObj->GetNbEntities(SMDSAbs_Face)) {
- myEntityState &= ~eFaces;
+ anObjectEntities &= ~eFaces;
theMode &= ~eFaces;
}
if(!myVisualObj->GetNbEntities(SMDSAbs_Volume)) {
- myEntityState &= ~eVolumes;
+ anObjectEntities &= ~eVolumes;
theMode &= ~eVolumes;
}
theMode |= eVolumes;
}
- myBaseActor->myGeomFilter->SetInside(myEntityMode != myEntityState);
-
- myEntityMode = theMode;
+ myBaseActor->myGeomFilter->SetInside(myEntityMode != anObjectEntities);
- VTKViewer_ExtractUnstructuredGrid* aFilter = myBaseActor->GetExtractUnstructuredGrid();
- aFilter->ClearRegisteredCellsWithType();
- VTKViewer_ExtractUnstructuredGrid* aHightFilter = myHighlitableActor->GetExtractUnstructuredGrid();
- aHightFilter->ClearRegisteredCellsWithType();
-
- bool isPassAll =
- (( myEntityMode & e0DElements || myVisualObj->GetNbEntities(SMDSAbs_0DElement) == 0 ) &&
- ( myEntityMode & eBallElem || myVisualObj->GetNbEntities(SMDSAbs_Ball) == 0 ) &&
- ( myEntityMode & eEdges || myVisualObj->GetNbEntities(SMDSAbs_Edge) == 0 ) &&
- ( myEntityMode & eFaces || myVisualObj->GetNbEntities(SMDSAbs_Face) == 0 ) &&
- ( myEntityMode & eVolumes || myVisualObj->GetNbEntities(SMDSAbs_Volume) == 0 ));
- if ( isPassAll && myEntityMode )
+ if ( anObjectEntities == 0 && myRepresentation != ePoint ) // no elements, show nodes
{
- aFilter->SetModeOfChanging(VTKViewer_ExtractUnstructuredGrid::ePassAll);
- aHightFilter->SetModeOfChanging(VTKViewer_ExtractUnstructuredGrid::ePassAll);
+ myRepresentationCache = GetRepresentation();
+ SetRepresentation( ePoint );
}
- else
+
+ if ( myEntityMode != theMode )
{
- aFilter->SetModeOfChanging(VTKViewer_ExtractUnstructuredGrid::eAdding);
- aHightFilter->SetModeOfChanging(VTKViewer_ExtractUnstructuredGrid::eAdding);
+ myEntityMode = theMode; // entities to show
- if (myEntityMode & e0DElements) {
- aFilter->RegisterCellsWithType(VTK_VERTEX);
- aHightFilter->RegisterCellsWithType(VTK_VERTEX);
- }
+ // Set cell types to extract
- if (myEntityMode & eBallElem) {
- aFilter->RegisterCellsWithType(VTK_POLY_VERTEX);
+ VTKViewer_ExtractUnstructuredGrid* aFilter = myBaseActor->GetExtractUnstructuredGrid();
+ VTKViewer_ExtractUnstructuredGrid* aHltFilter = myHighlitableActor->GetExtractUnstructuredGrid();
+ aFilter->ClearRegisteredCellsWithType();
+ aHltFilter->ClearRegisteredCellsWithType();
+
+ bool isPassAll = ( myEntityMode == anObjectEntities && myEntityMode );
+ if ( isPassAll )
+ {
+ aFilter->SetModeOfChanging(VTKViewer_ExtractUnstructuredGrid::ePassAll);
+ aHltFilter->SetModeOfChanging(VTKViewer_ExtractUnstructuredGrid::ePassAll);
}
+ else
+ {
+ aFilter->SetModeOfChanging(VTKViewer_ExtractUnstructuredGrid::eAdding);
+ aHltFilter->SetModeOfChanging(VTKViewer_ExtractUnstructuredGrid::eAdding);
- if (myEntityMode & eEdges) {
- aFilter->RegisterCellsWithType(VTK_LINE);
- aFilter->RegisterCellsWithType(VTK_QUADRATIC_EDGE);
+ if (myEntityMode & e0DElements) {
+ aFilter->RegisterCellsWithType(VTK_VERTEX);
+ aHltFilter->RegisterCellsWithType(VTK_VERTEX);
+ }
- aHightFilter->RegisterCellsWithType(VTK_LINE);
- aHightFilter->RegisterCellsWithType(VTK_QUADRATIC_EDGE);
- }
+ if (myEntityMode & eBallElem) {
+ aFilter->RegisterCellsWithType(VTK_POLY_VERTEX);
+ }
- if (myEntityMode & eFaces) {
- aFilter->RegisterCellsWithType(VTK_TRIANGLE);
- aFilter->RegisterCellsWithType(VTK_QUAD);
- aFilter->RegisterCellsWithType(VTK_POLYGON);
- aFilter->RegisterCellsWithType(VTK_QUADRATIC_TRIANGLE);
- aFilter->RegisterCellsWithType(VTK_QUADRATIC_QUAD);
- aFilter->RegisterCellsWithType(VTK_QUADRATIC_POLYGON);
- aFilter->RegisterCellsWithType(VTK_BIQUADRATIC_QUAD);
- aFilter->RegisterCellsWithType(VTK_BIQUADRATIC_TRIANGLE);
-
- aHightFilter->RegisterCellsWithType(VTK_TRIANGLE);
- aHightFilter->RegisterCellsWithType(VTK_QUAD);
- aHightFilter->RegisterCellsWithType(VTK_POLYGON);
- aHightFilter->RegisterCellsWithType(VTK_QUADRATIC_TRIANGLE);
- aHightFilter->RegisterCellsWithType(VTK_QUADRATIC_QUAD);
- aHightFilter->RegisterCellsWithType(VTK_QUADRATIC_POLYGON);
- aHightFilter->RegisterCellsWithType(VTK_BIQUADRATIC_QUAD);
- aHightFilter->RegisterCellsWithType(VTK_BIQUADRATIC_TRIANGLE);
- }
+ if (myEntityMode & eEdges) {
+ aFilter->RegisterCellsWithType(VTK_LINE);
+ aFilter->RegisterCellsWithType(VTK_QUADRATIC_EDGE);
+
+ aHltFilter->RegisterCellsWithType(VTK_LINE);
+ aHltFilter->RegisterCellsWithType(VTK_QUADRATIC_EDGE);
+ }
+
+ if (myEntityMode & eFaces) {
+ aFilter->RegisterCellsWithType(VTK_TRIANGLE);
+ aFilter->RegisterCellsWithType(VTK_QUAD);
+ aFilter->RegisterCellsWithType(VTK_POLYGON);
+ aFilter->RegisterCellsWithType(VTK_QUADRATIC_TRIANGLE);
+ aFilter->RegisterCellsWithType(VTK_QUADRATIC_QUAD);
+ aFilter->RegisterCellsWithType(VTK_QUADRATIC_POLYGON);
+ aFilter->RegisterCellsWithType(VTK_BIQUADRATIC_QUAD);
+ aFilter->RegisterCellsWithType(VTK_BIQUADRATIC_TRIANGLE);
+
+ aHltFilter->RegisterCellsWithType(VTK_TRIANGLE);
+ aHltFilter->RegisterCellsWithType(VTK_QUAD);
+ aHltFilter->RegisterCellsWithType(VTK_POLYGON);
+ aHltFilter->RegisterCellsWithType(VTK_QUADRATIC_TRIANGLE);
+ aHltFilter->RegisterCellsWithType(VTK_QUADRATIC_QUAD);
+ aHltFilter->RegisterCellsWithType(VTK_QUADRATIC_POLYGON);
+ aHltFilter->RegisterCellsWithType(VTK_BIQUADRATIC_QUAD);
+ aHltFilter->RegisterCellsWithType(VTK_BIQUADRATIC_TRIANGLE);
+ }
- if (myEntityMode & eVolumes) {
- aFilter->RegisterCellsWithType(VTK_TETRA);
- aFilter->RegisterCellsWithType(VTK_VOXEL);
- aFilter->RegisterCellsWithType(VTK_HEXAHEDRON);
- aFilter->RegisterCellsWithType(VTK_WEDGE);
- aFilter->RegisterCellsWithType(VTK_PYRAMID);
- aFilter->RegisterCellsWithType(VTK_HEXAGONAL_PRISM);
- aFilter->RegisterCellsWithType(VTK_QUADRATIC_TETRA);
- aFilter->RegisterCellsWithType(VTK_QUADRATIC_HEXAHEDRON);
- aFilter->RegisterCellsWithType(VTK_TRIQUADRATIC_HEXAHEDRON);
- aFilter->RegisterCellsWithType(VTK_QUADRATIC_PYRAMID);
- aFilter->RegisterCellsWithType(VTK_QUADRATIC_WEDGE);
- aFilter->RegisterCellsWithType(VTK_CONVEX_POINT_SET);
- aFilter->RegisterCellsWithType(VTK_POLYHEDRON);
-
- aHightFilter->RegisterCellsWithType(VTK_TETRA);
- aHightFilter->RegisterCellsWithType(VTK_VOXEL);
- aHightFilter->RegisterCellsWithType(VTK_HEXAHEDRON);
- aHightFilter->RegisterCellsWithType(VTK_WEDGE);
- aHightFilter->RegisterCellsWithType(VTK_PYRAMID);
- aHightFilter->RegisterCellsWithType(VTK_HEXAGONAL_PRISM);
- aHightFilter->RegisterCellsWithType(VTK_QUADRATIC_TETRA);
- aHightFilter->RegisterCellsWithType(VTK_QUADRATIC_HEXAHEDRON);
- aHightFilter->RegisterCellsWithType(VTK_TRIQUADRATIC_HEXAHEDRON);
- aHightFilter->RegisterCellsWithType(VTK_QUADRATIC_WEDGE);
- aHightFilter->RegisterCellsWithType(VTK_QUADRATIC_PYRAMID);
- aHightFilter->RegisterCellsWithType(VTK_CONVEX_POINT_SET);
- aHightFilter->RegisterCellsWithType(VTK_POLYHEDRON);
+ if (myEntityMode & eVolumes) {
+ aFilter->RegisterCellsWithType(VTK_TETRA);
+ aFilter->RegisterCellsWithType(VTK_VOXEL);
+ aFilter->RegisterCellsWithType(VTK_HEXAHEDRON);
+ aFilter->RegisterCellsWithType(VTK_WEDGE);
+ aFilter->RegisterCellsWithType(VTK_PYRAMID);
+ aFilter->RegisterCellsWithType(VTK_HEXAGONAL_PRISM);
+ aFilter->RegisterCellsWithType(VTK_QUADRATIC_TETRA);
+ aFilter->RegisterCellsWithType(VTK_QUADRATIC_HEXAHEDRON);
+ aFilter->RegisterCellsWithType(VTK_TRIQUADRATIC_HEXAHEDRON);
+ aFilter->RegisterCellsWithType(VTK_QUADRATIC_PYRAMID);
+ aFilter->RegisterCellsWithType(VTK_QUADRATIC_WEDGE);
+ aFilter->RegisterCellsWithType(VTK_BIQUADRATIC_QUADRATIC_WEDGE);
+ aFilter->RegisterCellsWithType(VTK_CONVEX_POINT_SET);
+ aFilter->RegisterCellsWithType(VTK_POLYHEDRON);
+
+ aHltFilter->RegisterCellsWithType(VTK_TETRA);
+ aHltFilter->RegisterCellsWithType(VTK_VOXEL);
+ aHltFilter->RegisterCellsWithType(VTK_HEXAHEDRON);
+ aHltFilter->RegisterCellsWithType(VTK_WEDGE);
+ aHltFilter->RegisterCellsWithType(VTK_PYRAMID);
+ aHltFilter->RegisterCellsWithType(VTK_HEXAGONAL_PRISM);
+ aHltFilter->RegisterCellsWithType(VTK_QUADRATIC_TETRA);
+ aHltFilter->RegisterCellsWithType(VTK_QUADRATIC_HEXAHEDRON);
+ aHltFilter->RegisterCellsWithType(VTK_TRIQUADRATIC_HEXAHEDRON);
+ aHltFilter->RegisterCellsWithType(VTK_QUADRATIC_WEDGE);
+ aHltFilter->RegisterCellsWithType(VTK_BIQUADRATIC_QUADRATIC_WEDGE);
+ aHltFilter->RegisterCellsWithType(VTK_QUADRATIC_PYRAMID);
+ aHltFilter->RegisterCellsWithType(VTK_CONVEX_POINT_SET);
+ aHltFilter->RegisterCellsWithType(VTK_POLYHEDRON);
+ }
}
+ if ( GetVisibility() )
+ aFilter->Update();
+ if (MYDEBUG) MESSAGE(aFilter->GetOutput()->GetNumberOfCells());
}
- if ( GetVisibility() )
- aFilter->Update();
- if (MYDEBUG) MESSAGE(aFilter->GetOutput()->GetNumberOfCells());
- SetVisibility(GetVisibility(),false);
+
+ SetVisibility( GetVisibility(), myRepresentationCache != 0 );
}
void SMESH_ActorDef::SetRepresentation (int theMode)
int aNb0Ds = myVisualObj->GetNbEntities(SMDSAbs_0DElement);
int aNbBalls = myVisualObj->GetNbEntities(SMDSAbs_Ball);
+ if ( myRepresentationCache && aNbEdges + aNbFaces + aNbVolumes + aNb0Ds + aNbBalls )
+ {
+ theMode = myRepresentationCache;
+ if ( theMode == eSurface && aNbFaces + aNbVolumes == 0 )
+ theMode = eEdge;
+ else
+ myRepresentationCache = 0;
+ }
+
if (theMode < 0) {
myRepresentation = eSurface;
if (!aNbFaces && !aNbVolumes && !aNbBalls && aNbEdges) {
}
myPickableActor = myBaseActor;
- myNodeActor->SetVisibility(false);
- myNodeExtActor->SetVisibility(false);
vtkProperty *aProp = NULL, *aBackProp = NULL;
vtkProperty *aPropVN = NULL, *aPropVR = NULL;
SMESH_DeviceActor::EReperesent aReperesent = SMESH_DeviceActor::EReperesent(-1);
switch (myRepresentation) {
case ePoint:
myPickableActor = myNodeActor;
- myNodeActor->SetVisibility(true);
aQuadraticMode = SMESH_Actor::eLines;
aProp = aBackProp = aPropVN = aPropVR = myNodeProp;
aReperesent = SMESH_DeviceActor::ePoint;
break;
}
- my2DActor->SetProperty(aProp);
- my2DActor->SetBackfaceProperty(aBackProp);
- my2DActor->SetRepresentation(aReperesent);
+ if ( myRepresentation != ePoint )
+ {
+ my2DActor->SetProperty(aProp);
+ my2DActor->SetBackfaceProperty(aBackProp);
+ my2DActor->SetRepresentation(aReperesent);
- if(aQuadraticMode == SMESH_Actor::eLines)
- my2DActor->SetQuadraticArcMode(false);
- else if(aQuadraticMode == SMESH_Actor::eArcs)
- my2DActor->SetQuadraticArcMode(true);
+ if(aQuadraticMode == SMESH_Actor::eLines)
+ my2DActor->SetQuadraticArcMode(false);
+ else if(aQuadraticMode == SMESH_Actor::eArcs)
+ my2DActor->SetQuadraticArcMode(true);
- my2DExtActor->SetRepresentation(aReperesent);
+ my2DExtActor->SetRepresentation(aReperesent);
- my3DActor->SetProperty(aPropVN);
- my3DActor->SetBackfaceProperty(aPropVR);
- my3DActor->SetRepresentation(aReperesent);
+ my3DActor->SetProperty(aPropVN);
+ my3DActor->SetBackfaceProperty(aPropVR);
+ my3DActor->SetRepresentation(aReperesent);
+ my0DActor->SetRepresentation(aReperesent);
+ myBallActor->SetRepresentation(aReperesent);
- my1DExtActor->SetVisibility(false);
- my2DExtActor->SetVisibility(false);
- my3DExtActor->SetVisibility(false);
-
- my0DActor->SetRepresentation(aReperesent);
- myBallActor->SetRepresentation(aReperesent);
-
- switch ( myControlMode ) {
- case eLength:
- case eMultiConnection:
- aProp = aBackProp = my1DProp;
- if(myRepresentation != ePoint)
- aReperesent = SMESH_DeviceActor::eInsideframe;
- break;
- default:;
- }
+ switch ( myControlMode ) {
+ case eLength:
+ case eMultiConnection:
+ aProp = aBackProp = my1DProp;
+ if ( myRepresentation != ePoint )
+ aReperesent = SMESH_DeviceActor::eInsideframe;
+ break;
+ default:;
+ }
- if(aQuadraticMode == SMESH_Actor::eLines)
- my1DActor->SetQuadraticArcMode(false);
- else if(aQuadraticMode == SMESH_Actor::eArcs)
- my1DActor->SetQuadraticArcMode(true);
+ if(aQuadraticMode == SMESH_Actor::eLines)
+ my1DActor->SetQuadraticArcMode(false);
+ else if(aQuadraticMode == SMESH_Actor::eArcs)
+ my1DActor->SetQuadraticArcMode(true);
- my1DActor->SetProperty(aProp);
- my1DActor->SetBackfaceProperty(aBackProp);
- my1DActor->SetRepresentation(aReperesent);
+ my1DActor->SetProperty(aProp);
+ my1DActor->SetBackfaceProperty(aBackProp);
+ my1DActor->SetRepresentation(aReperesent);
- my1DExtActor->SetRepresentation(aReperesent);
+ my1DExtActor->SetRepresentation(aReperesent);
+ }
if(myIsPointsVisible)
myPickableActor = myNodeActor;
- if(GetPointRepresentation())
- myNodeActor->SetVisibility(true);
SetMapper(myPickableActor->GetMapper());
case SMESH_DeviceActor::eSurface:
case SMESH_DeviceActor::eWireframe:
{
- // if ( !mySelector || !mySelector->IsSelectionEnabled() )
- // myHighlitableActor->SetUnstructuredGrid( NULL );
- // else if ( !myHighlitableActor->myExtractUnstructuredGrid->GetInput() )
- // myHighlitableActor->SetUnstructuredGrid(myVisualObj->GetUnstructuredGrid());
-
if(myIsHighlighted) {
myHighlitableActor->SetProperty(myHighlightProp);
}else if(myIsPreselected){
}
myNodeActor->SetRepresentation(SMESH_DeviceActor::ePoint);
myNodeActor->GetExtractUnstructuredGrid()->SetModeOfExtraction(VTKViewer_ExtractUnstructuredGrid::ePoints);
+ myNodeActor->GetProperty()->Modified();
break;
}
}
if ( enable && ! myBaseActor->myExtractUnstructuredGrid->GetInput() )
{
myBaseActor->SetUnstructuredGrid(myVisualObj->GetUnstructuredGrid());
- myHighlitableActor->SetUnstructuredGrid(myVisualObj->GetUnstructuredGrid());
+ //myHighlitableActor->SetUnstructuredGrid(myVisualObj->GetUnstructuredGrid());
myBaseActor->myExtractUnstructuredGrid->Update();
- myHighlitableActor->myExtractUnstructuredGrid->Update();
+ //myHighlitableActor->myExtractUnstructuredGrid->Update();
}
if ( !enable && myBaseActor->myExtractUnstructuredGrid->GetInput() )
{
myBaseActor->SetUnstructuredGrid( NULL );
- myHighlitableActor->SetUnstructuredGrid( NULL );
+ //myHighlitableActor->SetUnstructuredGrid( NULL );
myBaseActor->myExtractUnstructuredGrid->Update();
- myHighlitableActor->myExtractUnstructuredGrid->Update();
+ //myHighlitableActor->myExtractUnstructuredGrid->Update();
}
}
int SMESH_ActorDef::RenderOpaqueGeometry(vtkViewport *vp)
{
if (myPickableActor->GetIsOpaque())
- {
+ {
vtkRenderer *ren = static_cast<vtkRenderer *>(vp);
this->Render(ren);
return 1;
- }
+ }
return 0;
}
int SMESH_ActorDef::RenderTranslucentGeometry(vtkViewport *vp)
{
if (!myPickableActor->GetIsOpaque())
- {
+ {
vtkRenderer *ren = static_cast<vtkRenderer *>(vp);
this->Render(ren);
return 1;
- }
+ }
return 0;
}
void SMESH_ActorDef::Render(vtkRenderer *ren)
{
- unsigned long aTime = myTimeStamp->GetMTime();
- unsigned long anObjTime = myVisualObj->GetUnstructuredGrid()->GetMTime();
- unsigned long aClippingTime = myImplicitBoolean->GetMTime();
+ vtkMTimeType aTime = myTimeStamp->GetMTime();
+ vtkMTimeType anObjTime = myVisualObj->GetUnstructuredGrid()->GetMTime();
+ vtkMTimeType aClippingTime = myImplicitBoolean->GetMTime();
if(anObjTime > aTime || aClippingTime > aTime)
Update();
}
SetFacesOriented(myIsFacesOriented);
}
- if(myVisualObj->GetEntitiesFlag()) {
- myEntityMode |= myVisualObj->GetEntitiesState();
- }
+ // if(myVisualObj->GetEntitiesFlag()) { IPAL53915
+ // myEntityMode |= myVisualObj->GetEntitiesState();
+ // }
SetEntityMode(GetEntityMode());
SetVisibility(GetVisibility());
if ( !mySelector || !mySelector->IsSelectionEnabled() )
{
myBaseActor->SetUnstructuredGrid( NULL );
- myHighlitableActor->SetUnstructuredGrid( NULL );
+ //myHighlitableActor->SetUnstructuredGrid( NULL );
}
my1DActor->SetPlaneCollection( myPlaneCollection );
my1DActor->SetUnstructuredGrid(myVisualObj->GetUnstructuredGrid());
