mirror of
https://git.dev.opencascade.org/repos/occt.git
synced 2025-08-24 13:50:49 +03:00
0029293: Boolean Operations algorithm does not preserve the orientations of the faces
While building splits of faces (BOPAlgo_Builder::FillImagesFaces()) make sure that the orientation of the input face will be passed to its splits. Extend draw command "normals" with new key "[-print]" which allows printing values of the normal vector.
This commit is contained in:
@@ -1140,6 +1140,7 @@ static Standard_Integer normals (Draw_Interpretor& theDI,
|
||||
Standard_Boolean toUseMesh = Standard_False;
|
||||
Standard_Real aLength = 10.0;
|
||||
Standard_Integer aNbAlongU = 1, aNbAlongV = 1;
|
||||
Standard_Boolean bPrint = Standard_False;
|
||||
for (Standard_Integer anArgIter = 2; anArgIter< theArgNum; ++anArgIter)
|
||||
{
|
||||
TCollection_AsciiString aParam (theArgs[anArgIter]);
|
||||
@@ -1204,9 +1205,13 @@ static Standard_Integer normals (Draw_Interpretor& theDI,
|
||||
return 1;
|
||||
}
|
||||
}
|
||||
else if (aParam == "-print")
|
||||
{
|
||||
bPrint = Standard_True;
|
||||
}
|
||||
else
|
||||
{
|
||||
std::cout << "Syntax error: unknwon argument '" << aParam << "'\n";
|
||||
std::cout << "Syntax error: unknown argument '" << aParam << "'\n";
|
||||
return 1;
|
||||
}
|
||||
}
|
||||
@@ -1225,12 +1230,29 @@ static Standard_Integer normals (Draw_Interpretor& theDI,
|
||||
|
||||
for (NCollection_DataMap<TopoDS_Face, NCollection_Vector<std::pair<gp_Pnt, gp_Pnt> > >::Iterator aFaceIt (aNormals); aFaceIt.More(); aFaceIt.Next())
|
||||
{
|
||||
const Draw_Color aColor = DBRep_ColorOrientation (aFaceIt.Key().Orientation());
|
||||
Standard_Boolean bReverse = Standard_False;
|
||||
TopAbs_Orientation aFaceOri = aFaceIt.Key().Orientation();
|
||||
const Draw_Color aColor = DBRep_ColorOrientation (aFaceOri);
|
||||
if (aFaceOri == TopAbs_REVERSED)
|
||||
bReverse = Standard_True;
|
||||
|
||||
for (NCollection_Vector<std::pair<gp_Pnt, gp_Pnt> >::Iterator aNormalsIt (aFaceIt.Value()); aNormalsIt.More(); aNormalsIt.Next())
|
||||
{
|
||||
const std::pair<gp_Pnt, gp_Pnt>& aVec = aNormalsIt.Value();
|
||||
Handle(Draw_Segment3D) aSeg = new Draw_Segment3D(aVec.first, aVec.second, aColor);
|
||||
dout << aSeg;
|
||||
if (bPrint)
|
||||
{
|
||||
// Make the normal vector from the points
|
||||
gp_Vec aV(aVec.first, aVec.second);
|
||||
if (bReverse)
|
||||
aV.Reverse();
|
||||
|
||||
// Print values of the vector avoiding printing "-0" values
|
||||
theDI << "(" << (aV.X() == 0 ? 0 : aV.X()) << ", "
|
||||
<< (aV.Y() == 0 ? 0 : aV.Y()) << ", "
|
||||
<< (aV.Z() == 0 ? 0 : aV.Z()) << ")\n";
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1406,7 +1428,7 @@ void DBRep::BasicCommands(Draw_Interpretor& theCommands)
|
||||
theCommands.Add("treverse","treverse name1 name2 ...",__FILE__,orientation,g);
|
||||
theCommands.Add("complement","complement name1 name2 ...",__FILE__,orientation,g);
|
||||
theCommands.Add("invert","invert name, reverse subshapes",__FILE__,invert,g);
|
||||
theCommands.Add("normals","normals shape [Length {10}] [-NbAlongU {1}] [-NbAlongV {1}] [-UseMesh], display normals",__FILE__,normals,g);
|
||||
theCommands.Add("normals","normals shape [Length {10}] [-NbAlongU {1}] [-NbAlongV {1}] [-UseMesh] [-print], display normals",__FILE__,normals,g);
|
||||
theCommands.Add("nbshapes",
|
||||
"\n nbshapes s - shows the number of sub-shapes in <s>;\n nbshapes s -t - shows the number of sub-shapes in <s> counting the same sub-shapes with different location as different sub-shapes.",
|
||||
__FILE__,nbshapes,g);
|
||||
|
Reference in New Issue
Block a user