ForkMaster/smesh
1
0
Fork 0
mirror of https://git.salome-platform.org/gitpub/modules/smesh.git synced 2025-01-13 02:00:34 +05:00
Code Issues Packages Projects Releases Wiki Activity

0021348: EDF 1944 SMESH: Problem to assign a3D algorithm on a mixt 2D/3D shape

Browse Source 
fix defining shape dimension
This commit is contained in:
eap 2011-08-25 09:25:27 +00:00
parent 48da63cb03
commit dad3caa028
1 changed files with 22 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
src/SMESHGUI/SMESHGUI_MeshOp.cxx
View File

@ -537,13 +537,13 @@ void SMESHGUI_MeshOp::selectionDone()
switch ( aGeomVar->GetShapeType() ) { switch ( aGeomVar->GetShapeType() ) {
case GEOM::SOLID: shapeDim = 3; break; case GEOM::SOLID: shapeDim = 3; break;
case GEOM::SHELL: case GEOM::SHELL:
{ // Bug 0016155: EDF PAL 447: If the shape is a Shell, disable 3D tab
//shapeDim = 3; // Bug 0016155: EDF PAL 447: If the shape is a Shell, disable 3D tab // {
TopoDS_Shape aShape; // TopoDS_Shape aShape;
bool isClosed = GEOMBase::GetShape(aGeomVar, aShape) && /*aShape.Closed()*/BRep_Tool::IsClosed(aShape); // bool isClosed = GEOMBase::GetShape(aGeomVar, aShape) && /*aShape.Closed()*/BRep_Tool::IsClosed(aShape);
shapeDim = qMax(isClosed ? 3 : 2, shapeDim); // shapeDim = qMax(isClosed ? 3 : 2, shapeDim);
} // }
break; // break;
case GEOM::FACE: shapeDim = qMax(2, shapeDim); break; case GEOM::FACE: shapeDim = qMax(2, shapeDim); break;
case GEOM::WIRE: case GEOM::WIRE:
case GEOM::EDGE: shapeDim = qMax(1, shapeDim); break; case GEOM::EDGE: shapeDim = qMax(1, shapeDim); break;
@ -551,16 +551,21 @@ void SMESHGUI_MeshOp::selectionDone()
default: default:
{ {
TopoDS_Shape aShape; TopoDS_Shape aShape;
if (GEOMBase::GetShape(aGeomVar, aShape)) { if (GEOMBase::GetShape(aGeomVar, aShape))
TopExp_Explorer exp (aShape, TopAbs_SHELL); {
TopExp_Explorer exp (aShape, TopAbs_SOLID);
if (exp.More()) { if (exp.More()) {
//shapeDim = 3; // Bug 0016155: EDF PAL 447: If the shape is a Shell, disable 3D tab shapeDim = 3;
shapeDim = qMax(2, shapeDim);
for (; exp.More() && shapeDim == 2; exp.Next()) {
if (/*exp.Current().Closed()*/BRep_Tool::IsClosed(exp.Current()))
shapeDim = 3;
}
} }
// Bug 0016155: EDF PAL 447: If the shape is a Shell, disable 3D tab
// else if ( exp.Init( aShape, TopAbs_SHELL ), exp.More() )
// {
// shapeDim = 2;
// for (; exp.More() && shapeDim == 2; exp.Next()) {
// if (/*exp.Current().Closed()*/BRep_Tool::IsClosed(exp.Current()))
// shapeDim = 3;
// }
// }
else if ( exp.Init( aShape, TopAbs_FACE ), exp.More() ) else if ( exp.Init( aShape, TopAbs_FACE ), exp.More() )
shapeDim = qMax(2, shapeDim); shapeDim = qMax(2, shapeDim);
else if ( exp.Init( aShape, TopAbs_EDGE ), exp.More() ) else if ( exp.Init( aShape, TopAbs_EDGE ), exp.More() )
@ -570,6 +575,8 @@ void SMESHGUI_MeshOp::selectionDone()
} }
} }
} }
if ( shapeDim == 3 )
break;
} }
} }
for (int i = SMESH::DIM_3D; i > shapeDim; i--) { for (int i = SMESH::DIM_3D; i > shapeDim; i--) {