mirror of
https://git.salome-platform.org/gitpub/modules/geom.git
synced 2025-01-01 04:10:34 +05:00
0021018: EDF 1592 GEOM: Problems with the radius input field in the Fillet 1D dialog box
This commit is contained in:
vsr
parent
087dcc5c95
commit
25b91b8d9d
File diff suppressed because it is too large
Load Diff
@ -1,141 +1,142 @@
|
|||||||
// Copyright (C) 2007-2010 CEA/DEN, EDF R&D, OPEN CASCADE
|
// Copyright (C) 2007-2010 CEA/DEN, EDF R&D, OPEN CASCADE
|
||||||
//
|
//
|
||||||
// This library is free software; you can redistribute it and/or
|
// This library is free software; you can redistribute it and/or
|
||||||
// modify it under the terms of the GNU Lesser General Public
|
// modify it under the terms of the GNU Lesser General Public
|
||||||
// License as published by the Free Software Foundation; either
|
// License as published by the Free Software Foundation; either
|
||||||
// version 2.1 of the License.
|
// version 2.1 of the License.
|
||||||
//
|
//
|
||||||
// This library is distributed in the hope that it will be useful,
|
// This library is distributed in the hope that it will be useful,
|
||||||
// but WITHOUT ANY WARRANTY; without even the implied warranty of
|
// but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
||||||
// Lesser General Public License for more details.
|
// Lesser General Public License for more details.
|
||||||
//
|
//
|
||||||
// You should have received a copy of the GNU Lesser General Public
|
// You should have received a copy of the GNU Lesser General Public
|
||||||
// License along with this library; if not, write to the Free Software
|
// License along with this library; if not, write to the Free Software
|
||||||
// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
||||||
//
|
//
|
||||||
// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
|
// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
|
||||||
//
|
//
|
||||||
|
|
||||||
// File : GEOMImpl_Fillet1d.hxx
|
// File : GEOMImpl_Fillet1d.hxx
|
||||||
// Module : GEOMImpl
|
// Module : GEOMImpl
|
||||||
//
|
//
|
||||||
#ifndef _GEOMImpl_Fillet1d_HeaderFile
|
#ifndef _GEOMImpl_Fillet1d_HeaderFile
|
||||||
#define _GEOMImpl_Fillet1d_HeaderFile
|
#define _GEOMImpl_Fillet1d_HeaderFile
|
||||||
|
|
||||||
#include <gp_Pnt.hxx>
|
#include <gp_Pnt.hxx>
|
||||||
#include <Geom_Plane.hxx>
|
#include <Geom_Plane.hxx>
|
||||||
#include <Geom2d_Curve.hxx>
|
#include <Geom2d_Curve.hxx>
|
||||||
|
|
||||||
#include <TopoDS_Edge.hxx>
|
#include <TopoDS_Edge.hxx>
|
||||||
#include <TColStd_ListOfReal.hxx>
|
#include <TColStd_ListOfReal.hxx>
|
||||||
#include <TColStd_SequenceOfReal.hxx>
|
#include <TColStd_SequenceOfReal.hxx>
|
||||||
#include <TColStd_SequenceOfInteger.hxx>
|
#include <TColStd_SequenceOfInteger.hxx>
|
||||||
|
|
||||||
class GEOMImpl_Fillet1dPoint;
|
class GEOMImpl_Fillet1dPoint;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* GEOMImpl_Fillet1d is 1D fillet algorithm on two planar edges with given radius
|
* GEOMImpl_Fillet1d is 1D fillet algorithm on two planar edges with given radius
|
||||||
*/
|
*/
|
||||||
|
|
||||||
class GEOMImpl_Fillet1d
|
class GEOMImpl_Fillet1d
|
||||||
{
|
{
|
||||||
public:
|
public:
|
||||||
//! Constructor
|
//! Constructor
|
||||||
//! The fillet 1D algorithm initialise by two edges and plane
|
//! The fillet 1D algorithm initialise by two edges and plane
|
||||||
Standard_EXPORT GEOMImpl_Fillet1d(const TopoDS_Edge& theEdge1,
|
Standard_EXPORT GEOMImpl_Fillet1d(const TopoDS_Edge& theEdge1,
|
||||||
const TopoDS_Edge& theEdge2,
|
const TopoDS_Edge& theEdge2,
|
||||||
const gp_Pln& thePlane);
|
const gp_Pln& thePlane);
|
||||||
//! Makes fillet with given radius
|
//! Makes fillet with given radius
|
||||||
//! @returns Standard_True, if at least one result computed
|
//! @returns Standard_True, if at least one result computed
|
||||||
Standard_EXPORT Standard_Boolean Perform(const Standard_Real theRadius);
|
Standard_EXPORT Standard_Boolean Perform(const Standard_Real theRadius);
|
||||||
//! Returns result fillet edge and modified edges as out parameters
|
//! Returns result fillet edge and modified edges as out parameters
|
||||||
Standard_EXPORT TopoDS_Edge Result(const gp_Pnt& thePoint, TopoDS_Edge& theEdge1, TopoDS_Edge& theEdge2);
|
Standard_EXPORT TopoDS_Edge Result(const gp_Pnt& thePoint, TopoDS_Edge& theEdge1, TopoDS_Edge& theEdge2);
|
||||||
|
|
||||||
private:
|
private:
|
||||||
//! private methods
|
//! private methods
|
||||||
void fillPoint(GEOMImpl_Fillet1dPoint*);
|
void fillPoint(GEOMImpl_Fillet1dPoint*);
|
||||||
void fillDiff(GEOMImpl_Fillet1dPoint*, Standard_Real, Standard_Boolean);
|
void fillDiff(GEOMImpl_Fillet1dPoint*, Standard_Real, Standard_Boolean);
|
||||||
void performNewton(GEOMImpl_Fillet1dPoint*, GEOMImpl_Fillet1dPoint*);
|
void performNewton(GEOMImpl_Fillet1dPoint*, GEOMImpl_Fillet1dPoint*);
|
||||||
Standard_Boolean processPoint(GEOMImpl_Fillet1dPoint*, GEOMImpl_Fillet1dPoint*, Standard_Real);
|
Standard_Boolean processPoint(GEOMImpl_Fillet1dPoint*, GEOMImpl_Fillet1dPoint*, Standard_Real);
|
||||||
|
|
||||||
|
|
||||||
private:
|
private:
|
||||||
//! private fields
|
//! private fields
|
||||||
TopoDS_Edge myEdge1, myEdge2;
|
TopoDS_Edge myEdge1, myEdge2;
|
||||||
Handle(Geom_Plane) myPlane;
|
Handle(Geom_Plane) myPlane;
|
||||||
Handle(Geom2d_Curve) myCurve1, myCurve2;
|
Handle(Geom2d_Curve) myCurve1, myCurve2;
|
||||||
Standard_Real myStart1, myEnd1, myStart2, myEnd2, myRadius;
|
Standard_Real myStart1, myEnd1, myStart2, myEnd2, myRadius;
|
||||||
TColStd_ListOfReal myResultParams;
|
TColStd_ListOfReal myResultParams;
|
||||||
TColStd_SequenceOfInteger myResultOrientation;
|
TColStd_SequenceOfInteger myResultOrientation;
|
||||||
Standard_Boolean myStartSide, myEdgesExchnged;
|
Standard_Boolean myStartSide, myEdgesExchnged;
|
||||||
};
|
Standard_Integer myDegreeOfRecursion;
|
||||||
|
};
|
||||||
|
|
||||||
/**
|
|
||||||
* GEOMImpl_Fillet1dPoint is an internal class for 1D fillet algorithm
|
/**
|
||||||
* to store and compare computed solutions on edges
|
* GEOMImpl_Fillet1dPoint is an internal class for 1D fillet algorithm
|
||||||
*/
|
* to store and compare computed solutions on edges
|
||||||
|
*/
|
||||||
class GEOMImpl_Fillet1dPoint
|
|
||||||
{
|
class GEOMImpl_Fillet1dPoint
|
||||||
public:
|
{
|
||||||
//! Puiblic methods
|
public:
|
||||||
|
//! Puiblic methods
|
||||||
//! Constructor
|
|
||||||
Standard_EXPORT GEOMImpl_Fillet1dPoint(Standard_Real theParam)
|
//! Constructor
|
||||||
{myParam = theParam;}
|
Standard_EXPORT GEOMImpl_Fillet1dPoint(Standard_Real theParam)
|
||||||
|
{myParam = theParam;}
|
||||||
//! Make copy of point
|
|
||||||
//!WARNING: Copies only field values: myParam, myV, myD, myValid
|
//! Make copy of point
|
||||||
Standard_EXPORT GEOMImpl_Fillet1dPoint* Copy(); // warning: this is not the full copy!
|
//!WARNING: Copies only field values: myParam, myV, myD, myValid
|
||||||
|
Standard_EXPORT GEOMImpl_Fillet1dPoint* Copy(); // warning: this is not the full copy!
|
||||||
//! Set/Get parameter
|
|
||||||
Standard_EXPORT inline void SetParam(Standard_Real theParam)
|
//! Set/Get parameter
|
||||||
{myParam = theParam;}
|
Standard_EXPORT inline void SetParam(Standard_Real theParam)
|
||||||
Standard_EXPORT inline Standard_Real GetParam() const
|
{myParam = theParam;}
|
||||||
{return myParam;}
|
Standard_EXPORT inline Standard_Real GetParam() const
|
||||||
Standard_EXPORT inline void SetParam2(const Standard_Real theParam2)
|
{return myParam;}
|
||||||
{myParam2 = theParam2;}
|
Standard_EXPORT inline void SetParam2(const Standard_Real theParam2)
|
||||||
Standard_EXPORT inline Standard_Real GetParam2()
|
{myParam2 = theParam2;}
|
||||||
{ return myParam2 ; }
|
Standard_EXPORT inline Standard_Real GetParam2()
|
||||||
|
{ return myParam2 ; }
|
||||||
//! Returns validity
|
|
||||||
Standard_EXPORT inline Standard_Boolean IsValid(int theIndex)
|
//! Returns validity
|
||||||
{return (Standard_Boolean)myValid.Value(theIndex);}
|
Standard_EXPORT inline Standard_Boolean IsValid(int theIndex)
|
||||||
|
{return (Standard_Boolean)myValid.Value(theIndex);}
|
||||||
//! Get values
|
|
||||||
Standard_EXPORT inline Standard_Integer GetNBValues() {return myV.Length();}
|
//! Get values
|
||||||
Standard_EXPORT inline Standard_Real GetValue(Standard_Integer theIndex)
|
Standard_EXPORT inline Standard_Integer GetNBValues() {return myV.Length();}
|
||||||
{return myV.Value(theIndex);}
|
Standard_EXPORT inline Standard_Real GetValue(Standard_Integer theIndex)
|
||||||
Standard_EXPORT inline Standard_Real GetDiff(Standard_Integer theIndex)
|
{return myV.Value(theIndex);}
|
||||||
{return myD.Value(theIndex);}
|
Standard_EXPORT inline Standard_Real GetDiff(Standard_Integer theIndex)
|
||||||
Standard_EXPORT inline Standard_Integer GetNear(Standard_Integer theIndex)
|
{return myD.Value(theIndex);}
|
||||||
{return myNear.Value(theIndex);}
|
Standard_EXPORT inline Standard_Integer GetNear(Standard_Integer theIndex)
|
||||||
|
{return myNear.Value(theIndex);}
|
||||||
//! Set/Get center point
|
|
||||||
Standard_EXPORT inline void SetCenter(const gp_Pnt2d thePoint)
|
//! Set/Get center point
|
||||||
{myCenter = thePoint;}
|
Standard_EXPORT inline void SetCenter(const gp_Pnt2d thePoint)
|
||||||
Standard_EXPORT inline const gp_Pnt2d GetCenter()
|
{myCenter = thePoint;}
|
||||||
{return myCenter;}
|
Standard_EXPORT inline const gp_Pnt2d GetCenter()
|
||||||
|
{return myCenter;}
|
||||||
Standard_EXPORT void AddValue(Standard_Real theValue, Standard_Boolean theIsValid);
|
|
||||||
|
Standard_EXPORT void AddValue(Standard_Real theValue, Standard_Boolean theIsValid);
|
||||||
//! compute difference between this and given point
|
|
||||||
Standard_EXPORT Standard_Boolean ComputeDifference(GEOMImpl_Fillet1dPoint*);
|
//! compute difference between this and given point
|
||||||
Standard_EXPORT void FilterPoints(GEOMImpl_Fillet1dPoint*);
|
Standard_EXPORT Standard_Boolean ComputeDifference(GEOMImpl_Fillet1dPoint*);
|
||||||
|
Standard_EXPORT void FilterPoints(GEOMImpl_Fillet1dPoint*);
|
||||||
//! Check is point contains solution and returns the index of them if any
|
|
||||||
Standard_EXPORT Standard_Integer HasSolution(Standard_Real theRadius);
|
//! Check is point contains solution and returns the index of them if any
|
||||||
//! Remove solution by index
|
Standard_EXPORT Standard_Integer HasSolution(Standard_Real theRadius);
|
||||||
void RemoveSolution(Standard_Integer theIndex);
|
//! Remove solution by index
|
||||||
|
void RemoveSolution(Standard_Integer theIndex);
|
||||||
private:
|
|
||||||
//! Private fields
|
private:
|
||||||
gp_Pnt2d myCenter;
|
//! Private fields
|
||||||
Standard_Real myParam, myParam2;
|
gp_Pnt2d myCenter;
|
||||||
TColStd_SequenceOfReal myV, myD;
|
Standard_Real myParam, myParam2;
|
||||||
TColStd_SequenceOfInteger myValid, myNear;
|
TColStd_SequenceOfReal myV, myD;
|
||||||
};
|
TColStd_SequenceOfInteger myValid, myNear;
|
||||||
|
};
|
||||||
#endif
|
|
||||||
|
#endif
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user