mirror of
https://git.dev.opencascade.org/repos/occt.git
synced 2025-04-09 18:50:54 +03:00
3306fdd954
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.
110 lines
3.2 KiB
C++
110 lines
3.2 KiB
C++
// Created on: 1992-07-01
|
|
// Created by: Laurent BUCHARD
|
|
// Copyright (c) 1992-1999 Matra Datavision
|
|
// Copyright (c) 1999-2014 OPEN CASCADE SAS
|
|
//
|
|
// This file is part of Open CASCADE Technology software library.
|
|
//
|
|
// This library is free software; you can redistribute it and/or modify it under
|
|
// the terms of the GNU Lesser General Public License version 2.1 as published
|
|
// by the Free Software Foundation, with special exception defined in the file
|
|
// OCCT_LGPL_EXCEPTION.txt. Consult the file LICENSE_LGPL_21.txt included in OCCT
|
|
// distribution for complete text of the license and disclaimer of any warranty.
|
|
//
|
|
// Alternatively, this file may be used under the terms of Open CASCADE
|
|
// commercial license or contractual agreement.
|
|
|
|
#ifndef _IntAna_Quadric_HeaderFile
|
|
#define _IntAna_Quadric_HeaderFile
|
|
|
|
#include <Standard_DefineAlloc.hxx>
|
|
#include <NCollection_List.hxx>
|
|
|
|
//! This class provides a description of Quadrics by their
|
|
//! Coefficients in natural coordinate system.
|
|
class IntAna_Quadric
|
|
{
|
|
public:
|
|
|
|
DEFINE_STANDARD_ALLOC
|
|
|
|
|
|
//! Empty Constructor
|
|
Standard_EXPORT IntAna_Quadric();
|
|
|
|
//! Creates a Quadric from a Pln
|
|
Standard_EXPORT IntAna_Quadric(const gp_Pln& P);
|
|
|
|
//! Creates a Quadric from a Sphere
|
|
Standard_EXPORT IntAna_Quadric(const gp_Sphere& Sph);
|
|
|
|
//! Creates a Quadric from a Cylinder
|
|
Standard_EXPORT IntAna_Quadric(const gp_Cylinder& Cyl);
|
|
|
|
//! Creates a Quadric from a Cone
|
|
Standard_EXPORT IntAna_Quadric(const gp_Cone& Cone);
|
|
|
|
//! Initializes the quadric with a Pln
|
|
Standard_EXPORT void SetQuadric (const gp_Pln& P);
|
|
|
|
//! Initialize the quadric with a Sphere
|
|
Standard_EXPORT void SetQuadric (const gp_Sphere& Sph);
|
|
|
|
//! Initializes the quadric with a Cone
|
|
Standard_EXPORT void SetQuadric (const gp_Cone& Con);
|
|
|
|
//! Initializes the quadric with a Cylinder
|
|
Standard_EXPORT void SetQuadric (const gp_Cylinder& Cyl);
|
|
|
|
//! Returns the coefficients of the polynomial equation
|
|
//! which define the quadric:
|
|
//! xCXX x**2 + xCYY y**2 + xCZZ z**2
|
|
//! + 2 ( xCXY x y + xCXZ x z + xCYZ y z )
|
|
//! + 2 ( xCX x + xCY y + xCZ z )
|
|
//! + xCCte
|
|
Standard_EXPORT void Coefficients (Standard_Real& xCXX, Standard_Real& xCYY, Standard_Real& xCZZ, Standard_Real& xCXY, Standard_Real& xCXZ, Standard_Real& xCYZ, Standard_Real& xCX, Standard_Real& xCY, Standard_Real& xCZ, Standard_Real& xCCte) const;
|
|
|
|
//! Returns the coefficients of the polynomial equation
|
|
//! ( written in the natural coordinates system )
|
|
//! in the local coordinates system defined by Axis
|
|
Standard_EXPORT void NewCoefficients (Standard_Real& xCXX, Standard_Real& xCYY, Standard_Real& xCZZ, Standard_Real& xCXY, Standard_Real& xCXZ, Standard_Real& xCYZ, Standard_Real& xCX, Standard_Real& xCY, Standard_Real& xCZ, Standard_Real& xCCte, const gp_Ax3& Axis) const;
|
|
|
|
//! Returns the list of special points (with singularities)
|
|
const NCollection_List<gp_Pnt>& SpecialPoints() const
|
|
{
|
|
return mySpecialPoints;
|
|
}
|
|
|
|
|
|
protected:
|
|
|
|
|
|
|
|
|
|
|
|
private:
|
|
|
|
|
|
|
|
Standard_Real CXX;
|
|
Standard_Real CYY;
|
|
Standard_Real CZZ;
|
|
Standard_Real CXY;
|
|
Standard_Real CXZ;
|
|
Standard_Real CYZ;
|
|
Standard_Real CX;
|
|
Standard_Real CY;
|
|
Standard_Real CZ;
|
|
Standard_Real CCte;
|
|
NCollection_List<gp_Pnt> mySpecialPoints;
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
#endif // _IntAna_Quadric_HeaderFile
|