mirror of
https://git.dev.opencascade.org/repos/occt.git
synced 2025-08-09 13:22:24 +03:00
0029807: [Regression to 7.0.0] Impossible to cut cone from prism
The algorithm has been improved for the cases when the intersection line goes through the cone apex. <!break> 1. All special points are put to the ALine forcefully (if they are true intersection point). Currently this step has not been implemented yet. 2. Now the tolerance of IntPatch_Point (put into ALine) is computed in order to cover the distance between it and the correspond ALine. 3. Test cases have been created. 4. Procedure of trimming IntAna_Curve has been improved. 5. Criterion when the discriminant of IntAna_Curve can be considered to be equal to 0 has been improved. 6. Methods IntAna_Curve::FindParameter(...) (and IntPatch_ALine::FindParameter(...)) currently returns list of all parameters corresponding the given point (IntAna_Curve can be self-interfered curve). Before the fix, this method always returned only one (randomly chosen) parameter. 7. Interfaces of the following methods have been changed: IntAna_Curve::FindParameter(...), IntPatch_ALine::FindParameter(...), IntPatch_ALine::ChangeVertex(...), IntPatch_SpecialPoints::AddPointOnUorVIso(...), IntPatch_SpecialPoints::AddSingularPole(...), IntPatch_WLineTool::ExtendTwoWLines(). 8. Following methods have been added: IntAna_Quadric::SpecialPoints(...), IntPatch_ALineToWLine::GetSectionRadius(...), IntPatch_SpecialPoints::ProcessSphere(...), IntPatch_SpecialPoints::ProcessCone(...), IntPatch_SpecialPoints::GetTangentToIntLineForCone(...). ------------------ 1) tests/boolean/volumemaker/C5 tests/boolean/volumemaker/C6 tests/boolean/volumemaker/E7 They are real IMPROVEMENTS. In the FIX (in compare with MASTER), section result between pairs of faces f2&f6 (C5), f3&f7 (C6) and f1&f5 (E7) is closed. Separated test cases have been created in order to focus on the problem with section. Bug #28503 has been fixed. Correction in test cases.
This commit is contained in:
@@ -298,9 +298,25 @@ static Standard_Integer checksection(Draw_Interpretor& di,
|
||||
Standard_Integer narg, const char** a)
|
||||
{
|
||||
if (narg < 2) {
|
||||
di << a[0] << " shape [-r <ref_val>]\n";
|
||||
return 1;
|
||||
}
|
||||
|
||||
Standard_Integer aCompareValue = -1;
|
||||
TopoDS_Shape S = DBRep::Get(a[1]);
|
||||
|
||||
for (Standard_Integer anAI = 2; anAI < narg; anAI++)
|
||||
{
|
||||
if (!strcmp(a[anAI], "-r"))
|
||||
{
|
||||
aCompareValue = Draw::Atoi(a[++anAI]);
|
||||
}
|
||||
else
|
||||
{
|
||||
di << "Error: Wrong option" << a[anAI] << "\n";
|
||||
}
|
||||
}
|
||||
|
||||
TopTools_MapOfShape theVertices;
|
||||
TopExp_Explorer exp;
|
||||
for (exp.Init(S, TopAbs_VERTEX); exp.More(); exp.Next()) {
|
||||
@@ -309,6 +325,20 @@ static Standard_Integer checksection(Draw_Interpretor& di,
|
||||
}
|
||||
//cout << " nb alone Vertices : " << theVertices.Extent() << endl;
|
||||
di << " nb alone Vertices : " << theVertices.Extent() << "\n";
|
||||
|
||||
if (aCompareValue >= 0)
|
||||
{
|
||||
if (theVertices.Extent() == aCompareValue)
|
||||
{
|
||||
di << "Section is OK\n";
|
||||
}
|
||||
else
|
||||
{
|
||||
di << "Error: "<< aCompareValue << " vertices are expected but " <<
|
||||
theVertices.Extent() << " are found.\n";
|
||||
}
|
||||
}
|
||||
|
||||
char Name[32];
|
||||
Standard_Integer ipp=0;
|
||||
TopTools_MapIteratorOfMapOfShape itvx;
|
||||
@@ -1698,7 +1728,8 @@ void BRepTest::CheckCommands(Draw_Interpretor& theCommands)
|
||||
// Modified by skv - Tue Apr 27 13:35:39 2004 End
|
||||
|
||||
theCommands.Add("checksection",
|
||||
"checks the closure of a section : checksection name",
|
||||
"checks the closure of a section : checksection name [-r <RefVal>]\n"
|
||||
"\"-r\" - allowed number of allone vertices.",
|
||||
__FILE__,
|
||||
checksection,
|
||||
g);
|
||||
|
Reference in New Issue
Block a user