ForkMaster/smesh
1
0
Fork 0
mirror of https://git.salome-platform.org/gitpub/modules/smesh.git synced 2025-04-03 21:14:29 +05:00
Code Issues Packages Projects Releases Wiki Activity

Fix for the "0020314: EDF 993 SMESH : Display bug with Volumes created by GHS3D" issue (problem with displaying coincident 3D elements).

Browse Source
This commit is contained in:
rnv 2012-02-20 12:21:17 +00:00
parent 7c156331ce
commit cfddf61e77
3 changed files with 19 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/OBJECT/SMESH_Actor.cxx
View File

@ -203,6 +203,7 @@ SMESH_ActorDef::SMESH_ActorDef()
my3DActor->SetProperty(mySurfaceProp); my3DActor->SetProperty(mySurfaceProp);
my3DActor->SetBackfaceProperty(myBackSurfaceProp); my3DActor->SetBackfaceProperty(myBackSurfaceProp);
my3DActor->SetRepresentation(SMESH_DeviceActor::eSurface); my3DActor->SetRepresentation(SMESH_DeviceActor::eSurface);
my3DActor->SetCoincident3DAllowed(true);
aFilter = my3DActor->GetExtractUnstructuredGrid(); aFilter = my3DActor->GetExtractUnstructuredGrid();
aFilter->SetModeOfChanging(VTKViewer_ExtractUnstructuredGrid::eAdding); aFilter->SetModeOfChanging(VTKViewer_ExtractUnstructuredGrid::eAdding);
aFilter->RegisterCellsWithType(VTK_TETRA); aFilter->RegisterCellsWithType(VTK_TETRA);
@ -228,6 +229,7 @@ SMESH_ActorDef::SMESH_ActorDef()
my3DExtActor->SetProperty(my2DExtProp); my3DExtActor->SetProperty(my2DExtProp);
my3DExtActor->SetBackfaceProperty(my2DExtProp); my3DExtActor->SetBackfaceProperty(my2DExtProp);
my3DExtActor->SetRepresentation(SMESH_DeviceActor::eSurface); my3DExtActor->SetRepresentation(SMESH_DeviceActor::eSurface);
my3DExtActor->SetCoincident3DAllowed(true);
aFilter = my3DExtActor->GetExtractUnstructuredGrid(); aFilter = my3DExtActor->GetExtractUnstructuredGrid();
aFilter->SetModeOfChanging(VTKViewer_ExtractUnstructuredGrid::eAdding); aFilter->SetModeOfChanging(VTKViewer_ExtractUnstructuredGrid::eAdding);
aFilter->RegisterCellsWithType(VTK_TETRA); aFilter->RegisterCellsWithType(VTK_TETRA);
@ -411,6 +413,7 @@ SMESH_ActorDef::SMESH_ActorDef()
myHighlitableActor->SetUserMatrix(aMatrix); myHighlitableActor->SetUserMatrix(aMatrix);
myHighlitableActor->PickableOff(); myHighlitableActor->PickableOff();
myHighlitableActor->SetRepresentation(SMESH_DeviceActor::eWireframe); myHighlitableActor->SetRepresentation(SMESH_DeviceActor::eWireframe);
myHighlitableActor->SetCoincident3DAllowed(true);
aMatrix->Delete(); aMatrix->Delete();

8
src/OBJECT/SMESH_DeviceActor.cxx
View File

@ -972,3 +972,11 @@ int SMESH_DeviceActor::GetMarkerTexture()
{ {
return myMapper->GetMarkerTexture(); return myMapper->GetMarkerTexture();
} }
void SMESH_DeviceActor::SetCoincident3DAllowed(bool theFlag) {
myGeomFilter->SetAppendCoincident3D(theFlag);
}
bool SMESH_DeviceActor::IsCoincident3DAllowed() const {
return myGeomFilter->GetAppendCoincident3D();
}

8
src/OBJECT/SMESH_DeviceActor.h
View File

@ -130,6 +130,14 @@ class SMESHOBJECT_EXPORT SMESH_DeviceActor: public vtkLODActor{
bool IsHighlited() { return myIsHighlited;} bool IsHighlited() { return myIsHighlited;}
void SetHighlited(bool theIsHighlited); void SetHighlited(bool theIsHighlited);
virtual
void
SetCoincident3DAllowed(bool theIsFeatureEdgesAllowed);
virtual
bool
IsCoincident3DAllowed() const;
virtual void Render(vtkRenderer *, vtkMapper *); virtual void Render(vtkRenderer *, vtkMapper *);
void SetImplicitFunctionUsed(bool theIsImplicitFunctionUsed); void SetImplicitFunctionUsed(bool theIsImplicitFunctionUsed);