OpenCascade/occt
1
0
Fork 0
mirror of https://git.dev.opencascade.org/repos/occt.git synced 2025-08-09 13:22:24 +03:00
Code Activity

0028599: Replacement of old Boolean operations with new ones in BRepProj_Projection algorithm

Browse Source 
The usage of *BRepAlgo_Section* has been replaced with the usage of *BRepAlgoAPI_Section* in *BRepProj_Projection* algorithm.

The TODO statements have been removed from the failing test case in the "prj" grid as they are working correctly now.

The following changes have been made to improve the performance *BRepAlgoAPI_Section*:
1. Revision of the *IntPolyh_Intersection* class to avoid repeated calculation of the deflection of the same triangulation.
2. Small revision of the Edge/Face intersection algorithm to perform Extrema computation on the whole intersection range of the edge instead of discrete ranges.
3. Implementation of the extrema computation for the Circle and Sphere.
4. Correct computation of the parameter of the point on the Circle.
This commit is contained in:
emv
2017-12-26 14:28:27 +03:00
committed by apn
parent 95f688263d
commit 03cca6f742
50 changed files with 2340 additions and 1978 deletions
Download Patch File Download Diff File Expand all files Collapse all files

115
src/BRepTest/BRepTest_ProjectionCommands.cxx
View File

@@ -26,67 +26,57 @@
#include <TopoDS.hxx>
#include <stdio.h>
//=======================================================================
//function : prj
//purpose : Draw command for Conical and Cylindrical projection
//=======================================================================
static Standard_Integer prj(Draw_Interpretor& di, Standard_Integer n, const char** a)
{
char newname[255];
if (n < 7) return 1;
TopoDS_Shape InpLine = DBRep::Get(a[2]);
TopoDS_Shape InpShape = DBRep::Get(a[3]);
Standard_Real DX=Draw::Atof(a[4]),DY=Draw::Atof(a[5]),DZ=Draw::Atof(a[6]);
gp_Dir TD(DX,DY,DZ);
BRepProj_Projection Prj(InpLine,InpShape,TD);
Standard_Integer i = 1;
char* temp = newname;
if (Prj.IsDone()) {
while (Prj.More()) {
Sprintf(newname,"%s_%d",a[1],i);
DBRep::Set(temp,Prj.Current());
//cout<<newname<<" ";
di<<newname<<" ";
i++;
Prj.Next();
}
{
if (n != 7)
{
di.PrintHelp(a[0]);
return 1;
}
//cout<<endl;
di<<"\n";
//
TopoDS_Shape anInputWire = DBRep::Get(a[2]);
TopoDS_Shape anInputShape = DBRep::Get(a[3]);
if (anInputWire.IsNull() || anInputShape.IsNull())
{
di << "Null input shapes\n";
return 1;
}
//
Standard_Real X = Draw::Atof(a[4]),
Y = Draw::Atof(a[5]),
Z = Draw::Atof(a[6]);
//
Standard_Boolean bCylProj = !strcmp(a[0], "prj");
//
BRepProj_Projection aPrj = bCylProj ?
BRepProj_Projection(anInputWire, anInputShape, gp_Dir(X, Y, Z)) :
BRepProj_Projection(anInputWire, anInputShape, gp_Pnt(X, Y, Z));
//
if (!aPrj.IsDone())
{
di << "Not done\n";
return 0;
}
//
for (Standard_Integer i = 1; aPrj.More(); aPrj.Next(), ++i)
{
char name[255];
Sprintf(name, "%s_%d", a[1], i);
DBRep::Set(name, aPrj.Current());
di << name << " ";
}
//
di << "\n";
return 0;
}
static Standard_Integer cprj(Draw_Interpretor& di, Standard_Integer n, const char** a)
{
char newname[255];
if (n < 7) return 1;
TopoDS_Shape InpLine = DBRep::Get(a[2]);
TopoDS_Shape InpShape = DBRep::Get(a[3]);
Standard_Real PX=Draw::Atof(a[4]),PY=Draw::Atof(a[5]),PZ=Draw::Atof(a[6]);
gp_Pnt P(PX,PY,PZ);
BRepProj_Projection Prj(InpLine,InpShape,P);
Standard_Integer i = 1;
char* temp = newname;
if (Prj.IsDone()) {
while (Prj.More()) {
Sprintf(newname,"%s_%d",a[1],i);
DBRep::Set(temp,Prj.Current());
//cout<<newname<<" ";
di<<newname<<" ";
i++;
Prj.Next();
}
}
//cout<<endl;
di<<"\n";
return 0;
}
/*********************************************************************************/
void BRepTest::ProjectionCommands(Draw_Interpretor& theCommands)
void BRepTest::ProjectionCommands(Draw_Interpretor& theCommands)
{
static Standard_Boolean loaded = Standard_False;
if (loaded) return;
@@ -94,14 +84,11 @@ void BRepTest::ProjectionCommands(Draw_Interpretor& theCommands)
const char* g = "Projection of wire commands";
theCommands.Add("prj","prj result w s x y z: cylindrical projection of w (wire or edge) on s (faces) along direction",
__FILE__,
prj,g);
theCommands.Add("cprj","cprj result w s x y z: conical projection of w (wire or edge) on s (faces)",
__FILE__,
cprj,g);
theCommands.Add("prj","prj result w s x y z: "
"Cylindrical projection of w (wire or edge) on s (faces) along direction.\n",
__FILE__, prj, g);
//
theCommands.Add("cprj","cprj result w s x y z: "
"Conical projection of w (wire or edge) on s (faces).\n",
__FILE__, prj, g);
}