mirror of
https://github.com/Open-Cascade-SAS/OCCT.git
synced 2026-08-09 07:20:52 +08:00
Pasukhin Dmitry
498e7cd173
Refactor the Convert package to eliminate heap-allocated handle-based storage in favor of direct NCollection_Array members, improving performance and simplifying the API. Deprecate single-element accessors (Pole, Knot, etc.) in favor of batch const-reference accessors (Poles, Knots, etc.). Convert_ConicToBSplineCurve: - Replace handle members (poles, weights, knots, mults) with direct NCollection_Array1 fields (myPoles, myWeights, myKnots, myMults). - Replace BuildCosAndSin handle-based parameters with array references. - Add batch accessors: Poles(), Weights(), Knots(), Multiplicities(). - Deprecate single-element accessors: Pole(), Weight(), Knot(), Multiplicity(). - Update all conic subclasses: Circle, Ellipse, Hyperbola, Parabola. Convert_ElementarySurfaceToBSplineSurface: - Replace handle members with direct NCollection_Array fields (myPoles, myWeights, myUKnots, myVKnots, myUMults, myVMults). - Add Finalize() to trim oversized arrays in derived constructors. - Add batch accessors: Poles(), Weights(), UKnots(), VKnots(), UMultiplicities(), VMultiplicities(). - Deprecate single-element accessors: Pole(), Weight(), UKnot(), VKnot(), UMultiplicity(), VMultiplicity(). - Update all surface subclasses: Cone, Cylinder, Sphere, Torus. Convert_CompPolynomialToPoles / Convert_GridPolynomialToPoles: - Replace handle-based output parameters with direct const-reference accessors for Poles, Knots, Multiplicities. - Deprecate old handle-based Poles(), Knots(), Multiplicities() overloads. Convert_CompBezierCurvesToBSplineCurve (2D and 3D): - Extract common logic into Convert_CompBezierCurvesToBSplineCurveBase template header to eliminate code duplication. - Replace handle<HArray1> members with direct NCollection_Array1 storage in the internal sequence, removing unnecessary heap indirection. NCollection_Sequence: - Fix Node constructors to use member initializer lists (copy/move construction) instead of default-construct + assign, which failed for types like NCollection_Array1 where operator= requires matching sizes. Downstream callers migrated: - AdvApprox_ApproxAFunction: use new const-ref Knots()/Multiplicities(). - AppDef_Variational: use new const-ref Knots()/Multiplicities(). - AdvApp2Var_ApproxAFunc2Var, AdvApp2Var_Patch: use new const-ref API. - Geom2dConvert, GeomConvert, GeomConvert_1: use new const-ref API. - GeomFill_PolynomialConvertor, GeomFill_QuasiAngularConvertor: adapted. - Geom_OsculatingSurface: use direct array references instead of handle->Array*() calls. Added GTests for all Convert classes covering conic curves, elementary surfaces, CompBezier, CompPolynomial, and GridPolynomial conversions.
70 lines
2.4 KiB
C++
70 lines
2.4 KiB
C++
// Copyright (c) 1995-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.
|
|
|
|
// JCV 16/10/91
|
|
|
|
#include <Convert_ParabolaToBSplineCurve.hxx>
|
|
#include <gp.hxx>
|
|
#include <gp_Dir2d.hxx>
|
|
#include <gp_Parab2d.hxx>
|
|
#include <gp_Pnt2d.hxx>
|
|
#include <gp_Trsf2d.hxx>
|
|
#include <NCollection_Array1.hxx>
|
|
#include <Standard_Integer.hxx>
|
|
|
|
constexpr int TheDegree = 2;
|
|
constexpr int MaxNbKnots = 2;
|
|
constexpr int MaxNbPoles = 3;
|
|
|
|
//==================================================================================================
|
|
|
|
Convert_ParabolaToBSplineCurve::Convert_ParabolaToBSplineCurve(const gp_Parab2d& Prb,
|
|
const double U1,
|
|
const double U2)
|
|
: Convert_ConicToBSplineCurve(MaxNbPoles, MaxNbKnots, TheDegree)
|
|
{
|
|
Standard_DomainError_Raise_if(std::abs(U2 - U1) < Epsilon(0.), "Convert_ParabolaToBSplineCurve");
|
|
|
|
double UF = std::min(U1, U2);
|
|
double UL = std::max(U1, U2);
|
|
|
|
double p = Prb.Parameter();
|
|
|
|
myIsPeriodic = false;
|
|
myKnots(1) = UF;
|
|
myMults(1) = 3;
|
|
myKnots(2) = UL;
|
|
myMults(2) = 3;
|
|
|
|
myWeights(1) = 1.;
|
|
myWeights(2) = 1.;
|
|
myWeights(3) = 1.;
|
|
|
|
gp_Dir2d Ox = Prb.Axis().XDirection();
|
|
gp_Dir2d Oy = Prb.Axis().YDirection();
|
|
double S = (Ox.X() * Oy.Y() - Ox.Y() * Oy.X() > 0.) ? 1 : -1;
|
|
|
|
// poles expressed in the reference mark
|
|
myPoles(1) = gp_Pnt2d((UF * UF) / (2. * p), S * UF);
|
|
myPoles(2) = gp_Pnt2d((UF * UL) / (2. * p), S * (UF + UL) / 2.);
|
|
myPoles(3) = gp_Pnt2d((UL * UL) / (2. * p), S * UL);
|
|
|
|
// replace the bspline in the mark of the parabola
|
|
gp_Trsf2d Trsf;
|
|
Trsf.SetTransformation(Prb.Axis().XAxis(), gp::OX2d());
|
|
myPoles(1).Transform(Trsf);
|
|
myPoles(2).Transform(Trsf);
|
|
myPoles(3).Transform(Trsf);
|
|
}
|