mirror of
https://git.dev.opencascade.org/repos/occt.git
synced 2025-04-08 18:40:55 +03:00
f542b7bbf1
1. Earlier we could not put any IntPatch_Point to the intersection curve. The fix makes the algorithm of IntPatch_Points searching more precise. It is achieved by redetermination of earlier found vertices with help of minimization the distance between boundary of one intersection argument and another intersection argument (surface). 2. Additional check has been added, if IntPatch_Point adjusted to the domain boundary is true intersection point. 3. Method Contap_ArcFunction::Surface() has been added. 4. Method LastComputedPoint() has been added for IntPatch_ArcFunction and Contap_ArcFunction classes. 5. Correction in FindMaxDistance() method (see IntTools_FaceFace.cxx file) according to pure Golden-ratio minimization algorithm. Earlier this function worked wrong with small searching intervals. 6. Insignificant correction in math_BrentMinimum.cxx file (elimination of "defines"). Creation of test case for issues #27221 an #27252. Adjusting some test cases according to their new behavior. Correction according to the last remarks. Small correction of shape names for issue CR27252 Test case for issue 28210 Small correction of test case for issue 28210
116 lines
2.9 KiB
C++
116 lines
2.9 KiB
C++
// Created on: 1993-06-03
|
|
// Created by: Jacques GOUSSARD
|
|
// Copyright (c) 1993-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 _Contap_ArcFunction_HeaderFile
|
|
#define _Contap_ArcFunction_HeaderFile
|
|
|
|
#include <Standard.hxx>
|
|
#include <Standard_DefineAlloc.hxx>
|
|
#include <Standard_Handle.hxx>
|
|
|
|
#include <Standard_Real.hxx>
|
|
#include <Contap_TFunction.hxx>
|
|
#include <gp_Dir.hxx>
|
|
#include <gp_Pnt.hxx>
|
|
#include <TColgp_SequenceOfPnt.hxx>
|
|
#include <IntSurf_Quadric.hxx>
|
|
#include <math_FunctionWithDerivative.hxx>
|
|
#include <Standard_Boolean.hxx>
|
|
#include <Standard_Integer.hxx>
|
|
class Adaptor2d_HCurve2d;
|
|
class Adaptor3d_HSurface;
|
|
class gp_Dir;
|
|
class gp_Pnt;
|
|
class IntSurf_Quadric;
|
|
|
|
|
|
|
|
class Contap_ArcFunction : public math_FunctionWithDerivative
|
|
{
|
|
public:
|
|
|
|
DEFINE_STANDARD_ALLOC
|
|
|
|
|
|
Standard_EXPORT Contap_ArcFunction();
|
|
|
|
Standard_EXPORT void Set (const Handle(Adaptor3d_HSurface)& S);
|
|
|
|
void Set (const gp_Dir& Direction);
|
|
|
|
void Set (const gp_Dir& Direction, const Standard_Real Angle);
|
|
|
|
void Set (const gp_Pnt& Eye);
|
|
|
|
void Set (const gp_Pnt& Eye, const Standard_Real Angle);
|
|
|
|
void Set (const Handle(Adaptor2d_HCurve2d)& A);
|
|
|
|
Standard_EXPORT Standard_Boolean Value (const Standard_Real X, Standard_Real& F) Standard_OVERRIDE;
|
|
|
|
Standard_EXPORT Standard_Boolean Derivative (const Standard_Real X, Standard_Real& D) Standard_OVERRIDE;
|
|
|
|
Standard_EXPORT Standard_Boolean Values (const Standard_Real X, Standard_Real& F, Standard_Real& D) Standard_OVERRIDE;
|
|
|
|
Standard_EXPORT Standard_Integer NbSamples() const;
|
|
|
|
Standard_EXPORT virtual Standard_Integer GetStateNumber() Standard_OVERRIDE;
|
|
|
|
const gp_Pnt& Valpoint (const Standard_Integer Index) const;
|
|
|
|
Standard_EXPORT const IntSurf_Quadric& Quadric() const;
|
|
|
|
//! Returns mySurf field
|
|
const Handle(Adaptor3d_HSurface)& Surface() const;
|
|
|
|
//! Returns the point, which has been computed
|
|
//! while the last calling Value() method
|
|
const gp_Pnt& LastComputedPoint() const;
|
|
|
|
|
|
protected:
|
|
|
|
|
|
|
|
|
|
|
|
private:
|
|
|
|
|
|
|
|
Handle(Adaptor2d_HCurve2d) myArc;
|
|
Handle(Adaptor3d_HSurface) mySurf;
|
|
Standard_Real myMean;
|
|
Contap_TFunction myType;
|
|
gp_Dir myDir;
|
|
Standard_Real myCosAng;
|
|
gp_Pnt myEye;
|
|
gp_Pnt solpt;
|
|
TColgp_SequenceOfPnt seqpt;
|
|
IntSurf_Quadric myQuad;
|
|
|
|
|
|
};
|
|
|
|
|
|
#include <Contap_ArcFunction.lxx>
|
|
|
|
|
|
|
|
|
|
|
|
#endif // _Contap_ArcFunction_HeaderFile
|