mirror of
https://git.dev.opencascade.org/repos/occt.git
synced 2025-08-14 13:30:48 +03:00
0031382: Data Exchange - BinXCAF should preserve length unit information
Possibility for adding LengthUnit info to XCAF document using special class XCAFDoc_LenghtUnit and XCAFDoc_LenghtUnitTool is implemented. Package UnitsMethods is split: geom methods were placed to new file GeomConvert_Units which is in the toolkit TKXSBase, internal step scale factors was placed to StepData. Updated UnitMethods to convert scale factor to different unit types. Now, XSAlgo::XSAlgo_AlgoContainer is used to update unit info from static interface values. New Draw command "XSetLengthUnit" and "XGetLengthUnit" for set or get XDE attribute. Upgraded tests for STEP, IGES, OBJ, glTF, VRML formats to check area regressing with used unit. Upgraded tests\de test cases to use any units in the "loop back" algorithms.
This commit is contained in:
dpasukhi
bugmaster
@@ -18,3 +18,5 @@ GeomConvert_CompBezierSurfacesToBSplineSurface.hxx
|
||||
GeomConvert_CompBezierSurfacesToBSplineSurface.lxx
|
||||
GeomConvert_CompCurveToBSplineCurve.cxx
|
||||
GeomConvert_CompCurveToBSplineCurve.hxx
|
||||
GeomConvert_Units.cxx
|
||||
GeomConvert_Units.hxx
|
||||
|
||||
317
src/GeomConvert/GeomConvert_Units.cxx
Normal file
317
src/GeomConvert/GeomConvert_Units.cxx
Normal file
@@ -0,0 +1,317 @@
|
||||
// Copyright (c) 2021 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.
|
||||
|
||||
#include <GeomConvert_Units.hxx>
|
||||
#include <Geom2d_BoundedCurve.hxx>
|
||||
#include <Geom2d_BSplineCurve.hxx>
|
||||
#include <Geom2d_Circle.hxx>
|
||||
#include <Geom2d_Conic.hxx>
|
||||
#include <Geom2d_Curve.hxx>
|
||||
#include <Geom2d_Ellipse.hxx>
|
||||
#include <Geom2d_Hyperbola.hxx>
|
||||
#include <Geom2d_Line.hxx>
|
||||
#include <Geom2d_Parabola.hxx>
|
||||
#include <Geom2dConvert.hxx>
|
||||
#include <Geom_ConicalSurface.hxx>
|
||||
#include <Geom_CylindricalSurface.hxx>
|
||||
#include <Geom_Plane.hxx>
|
||||
#include <Geom_SphericalSurface.hxx>
|
||||
#include <Geom_Surface.hxx>
|
||||
#include <Geom_SurfaceOfRevolution.hxx>
|
||||
#include <Geom_ToroidalSurface.hxx>
|
||||
#include <gp.hxx>
|
||||
#include <gp_Dir2d.hxx>
|
||||
#include <gp_GTrsf2d.hxx>
|
||||
#include <gp_Pnt2d.hxx>
|
||||
#include <gp_Trsf2d.hxx>
|
||||
|
||||
// ============================================================================
|
||||
// Method : RadianToDegree
|
||||
// Purpose:
|
||||
// ============================================================================
|
||||
Handle(Geom2d_Curve) GeomConvert_Units::RadianToDegree(
|
||||
const Handle(Geom2d_Curve) & theCurve2d,
|
||||
const Handle(Geom_Surface) & theSurf,
|
||||
const Standard_Real theLengthFactor,
|
||||
const Standard_Real theFactorRadianDegree)
|
||||
{
|
||||
Handle(Geom2d_Curve) aCurve2d = Handle(Geom2d_Curve)::DownCast(theCurve2d->Copy());
|
||||
Standard_Real uFact = 1.;
|
||||
Standard_Real vFact = 1.;
|
||||
Standard_Real LengthFact = 1. / theLengthFactor;
|
||||
Standard_Real AngleFact = theFactorRadianDegree; // 180./PI; pilotable
|
||||
|
||||
gp_Pnt2d Pt1;
|
||||
gp_XY pXY;
|
||||
gp_GTrsf2d tMatu, tMatv;
|
||||
|
||||
// theSurf is a CylindricalSurface or a ConicalSurface or
|
||||
// a ToroidalSurface or a SphericalSurface or
|
||||
// a SurfaceOfRevolution
|
||||
if (theSurf->IsKind(STANDARD_TYPE(Geom_SphericalSurface)) || theSurf->IsKind(STANDARD_TYPE(Geom_ToroidalSurface)))
|
||||
{
|
||||
uFact = vFact = AngleFact;
|
||||
}
|
||||
else if (theSurf->IsKind(STANDARD_TYPE(Geom_CylindricalSurface)))
|
||||
{
|
||||
uFact = AngleFact;
|
||||
vFact = LengthFact;
|
||||
}
|
||||
else if (theSurf->IsKind(STANDARD_TYPE(Geom_SurfaceOfRevolution)))
|
||||
{
|
||||
uFact = AngleFact;
|
||||
}
|
||||
else if (theSurf->IsKind(STANDARD_TYPE(Geom_ConicalSurface)))
|
||||
{
|
||||
Handle(Geom_ConicalSurface) conicS = Handle(Geom_ConicalSurface)::DownCast(theSurf);
|
||||
Standard_Real semAng = conicS->SemiAngle();
|
||||
uFact = AngleFact;
|
||||
vFact = LengthFact * Cos(semAng);
|
||||
}
|
||||
else if (theSurf->IsKind(STANDARD_TYPE(Geom_Plane)))
|
||||
{
|
||||
uFact = vFact = LengthFact;
|
||||
if (aCurve2d->IsKind(STANDARD_TYPE(Geom2d_Circle)) || aCurve2d->IsKind(STANDARD_TYPE(Geom2d_Ellipse)))
|
||||
{
|
||||
gp_Trsf2d aT;
|
||||
aT.SetScale(gp::Origin2d(), LengthFact);
|
||||
aCurve2d->Transform(aT);
|
||||
return aCurve2d;
|
||||
}
|
||||
}
|
||||
else {
|
||||
return aCurve2d;
|
||||
}
|
||||
|
||||
if (aCurve2d->IsKind(STANDARD_TYPE(Geom2d_Line)))
|
||||
{
|
||||
Handle(Geom2d_Line) aLine2d = Handle(Geom2d_Line)::DownCast(aCurve2d);
|
||||
gp_Pnt2d myLoc = aLine2d->Location();
|
||||
gp_Dir2d myDir = aLine2d->Direction();
|
||||
gp_Pnt2d myNewLoc;
|
||||
myNewLoc.SetCoord(myLoc.X()*uFact, myLoc.Y()*vFact);
|
||||
gp_Dir2d myNewDir;
|
||||
myNewDir.SetCoord(myDir.X()*uFact, myDir.Y()*vFact);
|
||||
Handle(Geom2d_Line) myNewLine2d = Handle(Geom2d_Line)::DownCast(aLine2d->Copy());
|
||||
myNewLine2d->SetLocation(myNewLoc);
|
||||
myNewLine2d->SetDirection(myNewDir);
|
||||
return myNewLine2d;
|
||||
}
|
||||
else if (aCurve2d->IsKind(STANDARD_TYPE(Geom2d_Conic)))
|
||||
{
|
||||
if (aCurve2d->IsKind(STANDARD_TYPE(Geom2d_Circle)) || aCurve2d->IsKind(STANDARD_TYPE(Geom2d_Ellipse)))
|
||||
{
|
||||
Handle(Geom2d_BSplineCurve) aBSpline2d = Geom2dConvert::CurveToBSplineCurve(aCurve2d);
|
||||
aCurve2d = aBSpline2d;
|
||||
}
|
||||
else if (aCurve2d->IsKind(STANDARD_TYPE(Geom2d_Parabola)))
|
||||
{
|
||||
#ifdef OCCT_DEBUG
|
||||
std::cout << "PCURVE of Parabola type in U or V Periodic Surface" << std::endl;
|
||||
std::cout << "Parameters Not transformed to Degree" << std::endl;
|
||||
#endif
|
||||
}
|
||||
else if (aCurve2d->IsKind(STANDARD_TYPE(Geom2d_Hyperbola)))
|
||||
{
|
||||
#ifdef OCCT_DEBUG
|
||||
std::cout << "PCURVE of Hyperbola type in U or V Periodic Surface" << std::endl;
|
||||
std::cout << "Parameters Not transformed to Degree" << std::endl;
|
||||
#endif
|
||||
}
|
||||
}
|
||||
|
||||
// Compute affinity
|
||||
tMatu.SetAffinity(gp::OY2d(), uFact);
|
||||
tMatv.SetAffinity(gp::OX2d(), vFact);
|
||||
if (aCurve2d->IsKind(STANDARD_TYPE(Geom2d_BoundedCurve)))
|
||||
{
|
||||
if (aCurve2d->IsKind(STANDARD_TYPE(Geom2d_BSplineCurve)))
|
||||
{
|
||||
Handle(Geom2d_BSplineCurve) aBSpline2d =
|
||||
Handle(Geom2d_BSplineCurve)::DownCast(aCurve2d);
|
||||
Handle(Geom2d_BSplineCurve) myNewBSpline2d =
|
||||
Handle(Geom2d_BSplineCurve)::DownCast(aBSpline2d->Copy());
|
||||
Standard_Integer nbPol = aBSpline2d->NbPoles();
|
||||
for (Standard_Integer i = 1; i <= nbPol; i++)
|
||||
{
|
||||
pXY = aBSpline2d->Pole(i).XY();
|
||||
tMatu.Transforms(pXY);
|
||||
tMatv.Transforms(pXY);
|
||||
Pt1.SetXY(pXY);
|
||||
myNewBSpline2d->SetPole(i, Pt1);
|
||||
}
|
||||
return myNewBSpline2d;
|
||||
}
|
||||
else {
|
||||
#ifdef OCCT_DEBUG
|
||||
std::cout << "PCURVE of Other Types of Bounded Curve in U or V Periodic Surface" << std::endl;
|
||||
std::cout << "Parameters Not transformed to Degree" << std::endl;
|
||||
#endif
|
||||
}
|
||||
}
|
||||
return aCurve2d;
|
||||
}
|
||||
|
||||
// ============================================================================
|
||||
// Method : DegreeToRadian
|
||||
// Purpose: 1. Change definition of the pcurves according to LengthFactor
|
||||
// 2. STEP cylinder, torus, cone and sphere are parametrized
|
||||
// from 0 to 360 degree
|
||||
// Then pcurves parameter have to be transformed
|
||||
// from DEGREE to RADIAN
|
||||
// ============================================================================
|
||||
Handle(Geom2d_Curve) GeomConvert_Units::DegreeToRadian(
|
||||
const Handle(Geom2d_Curve) & thePcurve,
|
||||
const Handle(Geom_Surface) & theSurface,
|
||||
const Standard_Real theLengthFactor,
|
||||
const Standard_Real theFactorRadianDegree)
|
||||
{
|
||||
Handle(Geom2d_Curve) aPcurve = Handle(Geom2d_Curve)::DownCast(thePcurve->Copy());
|
||||
Standard_Real uFact = 1.;
|
||||
Standard_Real vFact = 1.;
|
||||
Standard_Real LengthFact = theLengthFactor;
|
||||
Standard_Real AngleFact = theFactorRadianDegree; // PI/180.; pilotable
|
||||
|
||||
gp_Pnt2d Pt1;
|
||||
gp_XY pXY;
|
||||
gp_GTrsf2d tMatu, tMatv;
|
||||
|
||||
// What to change ??
|
||||
|
||||
if (theSurface->IsKind(STANDARD_TYPE(Geom_SphericalSurface)) ||
|
||||
theSurface->IsKind(STANDARD_TYPE(Geom_ToroidalSurface)))
|
||||
{
|
||||
uFact = vFact = AngleFact;
|
||||
}
|
||||
else if (theSurface->IsKind(STANDARD_TYPE(Geom_CylindricalSurface)))
|
||||
{
|
||||
uFact = AngleFact;
|
||||
vFact = LengthFact;
|
||||
}
|
||||
else if (theSurface->IsKind(STANDARD_TYPE(Geom_SurfaceOfRevolution)))
|
||||
{
|
||||
uFact = AngleFact;
|
||||
}
|
||||
else if (theSurface->IsKind(STANDARD_TYPE(Geom_ConicalSurface)))
|
||||
{
|
||||
Handle(Geom_ConicalSurface) conicS = Handle(Geom_ConicalSurface)::DownCast(theSurface);
|
||||
Standard_Real semAng = conicS->SemiAngle();
|
||||
uFact = AngleFact;
|
||||
vFact = LengthFact / Cos(semAng);
|
||||
}
|
||||
else if (theSurface->IsKind(STANDARD_TYPE(Geom_Plane)))
|
||||
{
|
||||
uFact = vFact = LengthFact;
|
||||
if (aPcurve->IsKind(STANDARD_TYPE(Geom2d_Circle)) || aPcurve->IsKind(STANDARD_TYPE(Geom2d_Ellipse)))
|
||||
{
|
||||
gp_Trsf2d aT;
|
||||
aT.SetScale(gp::Origin2d(), LengthFact);
|
||||
aPcurve->Transform(aT);
|
||||
return aPcurve;
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
return aPcurve;
|
||||
}
|
||||
|
||||
if (aPcurve->IsKind(STANDARD_TYPE(Geom2d_Conic)))
|
||||
{
|
||||
if (aPcurve->IsKind(STANDARD_TYPE(Geom2d_Circle)) || aPcurve->IsKind(STANDARD_TYPE(Geom2d_Ellipse)))
|
||||
{
|
||||
Handle(Geom2d_BSplineCurve) aBSpline2d = Geom2dConvert::CurveToBSplineCurve(aPcurve);
|
||||
aPcurve = aBSpline2d;
|
||||
}
|
||||
else if (aPcurve->IsKind(STANDARD_TYPE(Geom2d_Parabola)))
|
||||
{
|
||||
#ifdef OCCT_DEBUG
|
||||
std::cout << "PCURVE of Parabola type" << std::endl;
|
||||
std::cout << "Parameters Not Yet transformed according to LengthUnit" << std::endl;
|
||||
#endif
|
||||
return aPcurve;
|
||||
}
|
||||
else if (aPcurve->IsKind(STANDARD_TYPE(Geom2d_Hyperbola)))
|
||||
{
|
||||
#ifdef OCCT_DEBUG
|
||||
std::cout << "PCURVE of Hyperbola type" << std::endl;
|
||||
std::cout << "Parameters Not Yet transformed according to LengthUnit" << std::endl;
|
||||
#endif
|
||||
return aPcurve;
|
||||
}
|
||||
}
|
||||
|
||||
// Compute affinity
|
||||
|
||||
tMatu.SetAffinity(gp::OY2d(), uFact);
|
||||
tMatv.SetAffinity(gp::OX2d(), vFact);
|
||||
|
||||
if (aPcurve->IsKind(STANDARD_TYPE(Geom2d_Line)))
|
||||
{
|
||||
Handle(Geom2d_Line) aLine2d = Handle(Geom2d_Line)::DownCast(aPcurve);
|
||||
|
||||
gp_Pnt2d myLoc = aLine2d->Location();
|
||||
gp_Dir2d myDir = aLine2d->Direction();
|
||||
|
||||
gp_Pnt2d myNewLoc;
|
||||
myNewLoc.SetCoord(myLoc.X()*uFact, myLoc.Y()*vFact);
|
||||
|
||||
gp_Dir2d myNewDir;
|
||||
myNewDir.SetCoord(myDir.X()*uFact, myDir.Y()*vFact);
|
||||
|
||||
aLine2d->SetLocation(myNewLoc);
|
||||
aLine2d->SetDirection(myNewDir);
|
||||
|
||||
aPcurve = aLine2d;
|
||||
}
|
||||
else if (aPcurve->IsKind(STANDARD_TYPE(Geom2d_BSplineCurve)))
|
||||
{
|
||||
Handle(Geom2d_BSplineCurve) aBSpline2d = Handle(Geom2d_BSplineCurve)::DownCast(aPcurve);
|
||||
|
||||
// transform the Poles of the BSplineCurve according to AngleFact and LengthFact
|
||||
|
||||
Standard_Integer nbPol = aBSpline2d->NbPoles();
|
||||
for (Standard_Integer i = 1; i <= nbPol; i++)
|
||||
{
|
||||
pXY = aBSpline2d->Pole(i).XY();
|
||||
tMatu.Transforms(pXY);
|
||||
tMatv.Transforms(pXY);
|
||||
Pt1.SetXY(pXY);
|
||||
aBSpline2d->SetPole(i, Pt1);
|
||||
}
|
||||
aPcurve = aBSpline2d;
|
||||
}
|
||||
else
|
||||
{
|
||||
#ifdef OCCT_DEBUG
|
||||
std::cout << "DegreeToRadian : Type " << aPcurve->DynamicType();
|
||||
std::cout << " not yet implemented" << std::endl;
|
||||
#endif
|
||||
}
|
||||
return aPcurve;
|
||||
}
|
||||
|
||||
// ============================================================================
|
||||
// Method : MirrorPCurve
|
||||
// Purpose:
|
||||
// ============================================================================
|
||||
Handle(Geom2d_Curve) GeomConvert_Units::MirrorPCurve(const Handle(Geom2d_Curve) & theCurve)
|
||||
{
|
||||
Handle(Geom2d_Curve) theMirrored = Handle(Geom2d_Curve)::DownCast(theCurve->Copy());
|
||||
gp_Trsf2d T;
|
||||
gp_Pnt2d Loc(0., 0.);
|
||||
gp_Dir2d Dir(1., 0.);
|
||||
gp_Ax2d ax2(Loc, Dir);
|
||||
T.SetMirror(ax2);
|
||||
theMirrored->Transform(T);
|
||||
return theMirrored;
|
||||
}
|
||||
48
src/GeomConvert/GeomConvert_Units.hxx
Normal file
48
src/GeomConvert/GeomConvert_Units.hxx
Normal file
@@ -0,0 +1,48 @@
|
||||
// Copyright (c) 2021 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 _GeomConvert_Units_HeaderFile
|
||||
#define _GeomConvert_Units_HeaderFile
|
||||
|
||||
#include <Standard_DefineAlloc.hxx>
|
||||
#include <Standard_Handle.hxx>
|
||||
class Geom2d_Curve;
|
||||
class Geom_Surface;
|
||||
|
||||
//! Class contains conversion methods for 2d geom objects
|
||||
class GeomConvert_Units
|
||||
{
|
||||
public:
|
||||
|
||||
DEFINE_STANDARD_ALLOC
|
||||
|
||||
//! Convert 2d curve for change angle unit from radian to degree
|
||||
Standard_EXPORT static Handle(Geom2d_Curve) RadianToDegree(
|
||||
const Handle(Geom2d_Curve)& theCurve,
|
||||
const Handle(Geom_Surface)& theSurface,
|
||||
const Standard_Real theLengthFactor,
|
||||
const Standard_Real theFactorRadianDegree);
|
||||
|
||||
//! Convert 2d curve for change angle unit from degree to radian
|
||||
Standard_EXPORT static Handle(Geom2d_Curve) DegreeToRadian(
|
||||
const Handle(Geom2d_Curve)& theCurve,
|
||||
const Handle(Geom_Surface)& theSurface,
|
||||
const Standard_Real theLengthFactor,
|
||||
const Standard_Real theFactorRadianDegree);
|
||||
|
||||
//! return 2d curve as 'mirror' for given
|
||||
Standard_EXPORT static Handle(Geom2d_Curve) MirrorPCurve(const Handle(Geom2d_Curve)& theCurve);
|
||||
|
||||
};
|
||||
|
||||
#endif // _GeomConvert_Units_HeaderFile
|
||||
Reference in New Issue
Block a user