Skip to content

IfcSeventhOrderPolynomialSpiral #552

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jschlenger merged 7 commits into from
Aug 18, 2022
Merged

IfcSeventhOrderPolynomialSpiral #552

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
8410d68
Implementation for IfcSeventhOrderPolynomialSpiral has been added
Elvira2227 Jun 13, 2022
a95e68c
Small corrections
Elvira2227 Jun 13, 2022
e7e3ea3
added improvements
Elvira2227 Jul 15, 2022
dc216da
Merge branch 'development' into IfcSeventhOrderPolynomialSpiral
jschlenger Aug 1, 2022
29737f3
Fixed mistake; add info to documentation
Elvira2227 Aug 9, 2022
bd72521
Added improvements
Elvira2227 Aug 9, 2022
e8c4538
Merge branch 'development' into IfcSeventhOrderPolynomialSpiral
jschlenger Aug 18, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
141 changes: 139 additions & 2 deletions Core/src/IfcGeometryConverter/CurveConverter.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1593,11 +1593,16 @@ namespace OpenInfraPlatform
point = getPointOnCurve(curveSegment->ParentCurve.as<typename IfcEntityTypesT::IfcCircle>(), runningLength);
direction = getDirectionOfCurve(curveSegment->ParentCurve.as<typename IfcEntityTypesT::IfcCircle>(), runningLength);
}
else if (curveSegment->ParentCurve.isOfType<typename IfcEntityTypesT::IfcSeventhOrderPolynomialSpiral>())
{
point = getPointOnCurve(curveSegment->ParentCurve.as<typename IfcEntityTypesT::IfcSeventhOrderPolynomialSpiral>(), runningLength);
direction = getDirectionOfCurve(curveSegment->ParentCurve.as<typename IfcEntityTypesT::IfcSeventhOrderPolynomialSpiral>(), runningLength);
}
else if (curveSegment->ParentCurve.isOfType<typename IfcEntityTypesT::IfcThirdOrderPolynomialSpiral>())
{
point = getPointOnCurve(curveSegment->ParentCurve.as<typename IfcEntityTypesT::IfcThirdOrderPolynomialSpiral>(), runningLength);
direction = getDirectionOfCurve(curveSegment->ParentCurve.as<typename IfcEntityTypesT::IfcThirdOrderPolynomialSpiral>(), runningLength);
}
}
else if (curveSegment->ParentCurve.isOfType<typename IfcEntityTypesT::IfcSine>())
{
point = getPointOnCurve(curveSegment->ParentCurve.as<typename IfcEntityTypesT::IfcSine>(), runningLength, length);
Expand Down Expand Up @@ -2669,6 +2674,75 @@ namespace OpenInfraPlatform
return carve::geom::VECTOR(x, y, 0.);
}
#endif

#if defined(OIP_MODULE_EARLYBINDING_IFC4X3_RC4)

/*! \brief Calculates a trimming point on the seventh order polymonial spiral
* \param[in] seventhOrderPolynomial A pointer to data from \c IfcSeventhOrderPolynomialSpiral.
* \param[in] parameter A pointer to data from \c IfcParameterValue.
* \return The location of the trimming point.
* \note
*/
template <>
carve::geom::vector<3> getPointOnCurve(const EXPRESSReference<typename IfcEntityTypesT::IfcSeventhOrderPolynomialSpiral>& seventhOrderPolynomial,
const typename IfcEntityTypesT::IfcParameterValue& parameter) const noexcept(false)
{
return getPointOnCurve(seventhOrderPolynomial, parameter * this->UnitConvert()->getLengthInMeterFactor());
}
template <>
carve::geom::vector<3> getPointOnCurve(const EXPRESSReference<typename IfcEntityTypesT::IfcSeventhOrderPolynomialSpiral>& seventhOrderPolynomial,
const typename IfcEntityTypesT::IfcNonNegativeLengthMeasure& parameter) const noexcept(false)
{
return getPointOnCurve(seventhOrderPolynomial, parameter * this->UnitConvert()->getLengthInMeterFactor());
}
carve::geom::vector<3> getPointOnCurve(const EXPRESSReference<typename IfcEntityTypesT::IfcSeventhOrderPolynomialSpiral>& seventhOrderPolynomial,
const double& parameter) const noexcept(false)
{
// Interpret parameter
// SepticTerm is default parameter
auto SepticTerm = seventhOrderPolynomial->SepticTerm;
// SexticTerm, QuinticTerm, QuadraticTerm, LinearTerm, ConstantTerm are optional parameters
EXPRESSOptional<typename IfcEntityTypesT::IfcLengthMeasure> st = seventhOrderPolynomial->SexticTerm;
EXPRESSOptional<typename IfcEntityTypesT::IfcLengthMeasure> quit = seventhOrderPolynomial->QuinticTerm;
EXPRESSOptional<typename IfcEntityTypesT::IfcLengthMeasure> quat = seventhOrderPolynomial->QuarticTerm;
EXPRESSOptional<typename IfcEntityTypesT::IfcLengthMeasure> cut = seventhOrderPolynomial->CubicTerm;
EXPRESSOptional<typename IfcEntityTypesT::IfcLengthMeasure> qt = seventhOrderPolynomial->QuadraticTerm;
EXPRESSOptional<typename IfcEntityTypesT::IfcLengthMeasure> lt = seventhOrderPolynomial->LinearTerm;
EXPRESSOptional<typename IfcEntityTypesT::IfcLengthMeasure> ct = seventhOrderPolynomial->ConstantTerm;
//define variables
double SexticTerm, QuinticTerm, QuarticTerm, CubicTerm, QuadraticTerm, LinearTerm, ConstantTerm;
// check the existence
if (st) SexticTerm = st;
else SexticTerm = 0.;

if (quit) QuinticTerm = quit;
else QuinticTerm = 0.;

if (quat) QuarticTerm = quat;
else QuarticTerm = 0.;

if (cut) CubicTerm = cut;
else CubicTerm = 0.;

if (qt) QuadraticTerm = qt;
else QuadraticTerm = 0.;

if (lt) LinearTerm = lt;
else LinearTerm = 0.;

if (ct) ConstantTerm = ct;
else ConstantTerm = 0.;

// Implement Taylor series for x coordinate
double x = SpiralUtils::XbyAngleDeviationPolynomialByTerms(SepticTerm, SexticTerm, QuinticTerm, QuarticTerm, CubicTerm, QuadraticTerm, LinearTerm, ConstantTerm, parameter);

// Implement Taylor series for y coordinate
double y = SpiralUtils::YbyAngleDeviationPolynomialByTerms(SepticTerm, SexticTerm, QuinticTerm, QuarticTerm, CubicTerm, QuadraticTerm, LinearTerm, ConstantTerm, parameter);

return carve::geom::VECTOR(x, y, 0.);
}
#endif

#if defined(OIP_MODULE_EARLYBINDING_IFC4X3_RC4)

/*! \brief Calculates a trimming point on the third order polymonial spiral
Expand All @@ -2677,7 +2751,7 @@ namespace OpenInfraPlatform
* \return The location of the trimming point.
* \note
*/
template <>
template <>
carve::geom::vector<3> getPointOnCurve(const EXPRESSReference<typename IfcEntityTypesT::IfcThirdOrderPolynomialSpiral>& thirdOrderPolynomial,
const typename IfcEntityTypesT::IfcParameterValue& parameter) const noexcept(false)
{
Expand Down Expand Up @@ -3104,6 +3178,69 @@ namespace OpenInfraPlatform
return carve::geom::VECTOR(std::cos(angle), std::sin(angle), 0.);
}
#endif
#if defined(OIP_MODULE_EARLYBINDING_IFC4X3_RC4)
/*! \brief Calculates an angle of the seventh order polynomial spiral.
* \param[in] seventhOrderPolynomial A pointer to data from \c IfcSeventhOrderPolynomialSpiral.
* \param[in] parameter The length.
* \return The Angle in radians.
* \note
*/
template <>
carve::geom::vector<3> getDirectionOfCurve(const EXPRESSReference<typename IfcEntityTypesT::IfcSeventhOrderPolynomialSpiral>& seventhOrderPolynomial,
const typename IfcEntityTypesT::IfcParameterValue& parameter) const noexcept(false)
{
return getDirectionOfCurve(seventhOrderPolynomial, parameter * this->UnitConvert()->getLengthInMeterFactor());
}
template <>
carve::geom::vector<3> getDirectionOfCurve(const EXPRESSReference<typename IfcEntityTypesT::IfcSeventhOrderPolynomialSpiral>& seventhOrderPolynomial,
const typename IfcEntityTypesT::IfcNonNegativeLengthMeasure& parameter) const noexcept(false)
{
return getDirectionOfCurve(seventhOrderPolynomial, parameter * this->UnitConvert()->getLengthInMeterFactor());
}
template<>
carve::geom::vector<3> getDirectionOfCurve(const EXPRESSReference<typename IfcEntityTypesT::IfcSeventhOrderPolynomialSpiral>& seventhOrderPolynomial,
const double& parameter) const noexcept(false)
{
// Interpret parameter
// SepticTerm is default parameter
auto SepticTerm = seventhOrderPolynomial->SepticTerm;
// SexticTerm, QuinticTerm, QuadraticTerm, LinearTerm, ConstantTerm are optional parameters
EXPRESSOptional<typename IfcEntityTypesT::IfcLengthMeasure> st = seventhOrderPolynomial->SexticTerm;
EXPRESSOptional<typename IfcEntityTypesT::IfcLengthMeasure> quit = seventhOrderPolynomial->QuinticTerm;
EXPRESSOptional<typename IfcEntityTypesT::IfcLengthMeasure> quat = seventhOrderPolynomial->QuarticTerm;
EXPRESSOptional<typename IfcEntityTypesT::IfcLengthMeasure> cut = seventhOrderPolynomial->CubicTerm;
EXPRESSOptional<typename IfcEntityTypesT::IfcLengthMeasure> qt = seventhOrderPolynomial->QuadraticTerm;
EXPRESSOptional<typename IfcEntityTypesT::IfcLengthMeasure> lt = seventhOrderPolynomial->LinearTerm;
EXPRESSOptional<typename IfcEntityTypesT::IfcLengthMeasure> ct = seventhOrderPolynomial->ConstantTerm;
//define variables
double SexticTerm, QuinticTerm, QuarticTerm, CubicTerm, QuadraticTerm, LinearTerm, ConstantTerm;
// check the existence
if (st) SexticTerm = st;
else SexticTerm = 0.;

if (quit) QuinticTerm = quit;
else QuinticTerm = 0.;

if (quat) QuarticTerm = quat;
else QuarticTerm = 0.;

if (cut) CubicTerm = cut;
else CubicTerm = 0.;

if (qt) QuadraticTerm = qt;
else QuadraticTerm = 0.;

if (lt) LinearTerm = lt;
else LinearTerm = 0.;

if (ct) ConstantTerm = ct;
else ConstantTerm = 0.;
//calculate angle
double angle = SpiralUtils::AngleByAngleDeviationPolynomialByTerms(SepticTerm, SexticTerm, QuinticTerm, QuarticTerm, CubicTerm, QuadraticTerm, LinearTerm, ConstantTerm, parameter);

return carve::geom::VECTOR(std::cos(angle), std::sin(angle), 0.);
}
#endif
#if defined(OIP_MODULE_EARLYBINDING_IFC4X3_RC4)
/*! \brief Calculates an angle of the third order polynomial spiral.
* \param[in] thirdOrderPolynomial A pointer to data from \c IfcThirdOrderPolynomialSpiral.
Expand Down
2 changes: 2 additions & 0 deletions Documentation/markdown/ReleaseNotes.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,8 @@

* Adjusted the density of mesh grid lines on B-spline and NURBS surfaces ([#547](https://github.com/tumcms/Open-Infra-Platform/pull/547))

* Supporting IfcSeventhOrderPolynomialSpiral ([#552](https://github.com/tumcms/Open-Infra-Platform/pull/552))

* Supporting IfcThirdOrderPolynomialSpiral ([#553](https://github.com/tumcms/Open-Infra-Platform/pull/553))

## 4.0.0 Release Notes
Expand Down
2 changes: 1 addition & 1 deletion Documentation/markdown/SupportedIFCrepresentations.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,7 @@ Meaning of columns:
| `IfcSectionedSpine` | :x: | `RepresentationConverter` | - | - |
| `IfcSegmentedReferenceCurve` | :x: | `CurveConverter` | - | - |
| `IfcSeriesParameterCurve` | :x: | `CurveConverter` | - | - |
| `IfcSeventhOrderPolynomialSpiral` | :x: | `CurveConverter` | :x: | [#524](https://github.com/tumcms/Open-Infra-Platform/issues/524)|
| `IfcSeventhOrderPolynomialSpiral` | :heavy_check_mark: | `CurveConverter` | :x: | [#524](https://github.com/tumcms/Open-Infra-Platform/issues/524)|
| `IfcShellBasedSurfaceModel` | :heavy_check_mark: | `FaceConverter` | :x: | - |
| `IfcSine` | :heavy_check_mark: | `CurveConverter` | :x: | [#524](https://github.com/tumcms/Open-Infra-Platform/issues/524)|
| `IfcSphere` | :heavy_check_mark: | `SolidModelConverter` | :x: | - |
Expand Down