Compare `b0ca5e6 ... +3 ... a478a82`

#include "contrib/MakePatches.hxx"
#include "geometry/CTiglTopoAlgorithms.h"
#include "geometry/CTiglBSplineAlgorithms.h"
#include "system/CTiglError.h"


#include <TopoDS.hxx>

@@ -240,6 +241,15 @@


void CTiglMakeLoft::makeLoftWithoutGuides()
{
    // check number of edges are all same
    std::vector<unsigned int> edgeCountPerProfile;
    for (const auto& profile : profiles) {
        edgeCountPerProfile.push_back(GetNumberOfEdges(profile));
    }
    if (!AllSame(edgeCountPerProfile.begin(), edgeCountPerProfile.end())) {
        throw tigl::CTiglError("Number of edges not equal in CTiglMakeLoft");
    }

    TopoDS_Shell faces;
    BRep_Builder builder;
    builder.MakeShell(faces);

@@ -449,6 +449,19 @@

    return theScale;
}

double CTiglBSplineAlgorithms::scale(const TColgp_Array1OfPnt& points)
{
    double theScale = 0.;

    for (int i = points.Lower(); i <= points.Upper(); ++i) {
        for (int j = i + 1; j < points.Upper(); ++j) {
            double dist = points.Value(i).Distance(points.Value(j));
            theScale = std::max(theScale, dist);
        }
    }
    return theScale;
}

std::vector<double> CTiglBSplineAlgorithms::computeParamsBSplineCurve(const Handle(TColgp_HArray1OfPnt)& points, const double alpha)
{
    return computeParamsBSplineCurve(points, 0., 1., alpha);

@@ -190,6 +190,19 @@


    // Build the B-Spline
    auto occPoints = OccArray(points);

    // we always want to include the endpoint, if it's the same as the startpoint
    // we use the middle to enforce closing of the spline
    gp_Pnt pStart =  points.front().Get_gp_Pnt();
    gp_Pnt pEnd   =  points.back().Get_gp_Pnt();

    // this check allows some tolerance, based on the absolute size of the profile
    if (pStart.Distance(pEnd) < 0.005*CTiglBSplineAlgorithms::scale(occPoints->Array1())) {
        gp_Pnt pMiddle = 0.5 * (pStart.XYZ() + pEnd.XYZ());
        occPoints->SetValue(occPoints->Lower(), pMiddle);
        occPoints->SetValue(occPoints->Upper(), pMiddle);
    }

    CTiglInterpolatePointsWithKinks interp(occPoints, kinks, params, 0.5, 3);
    auto spline = interp.Curve();


@@ -362,6 +362,15 @@

    return idx < array.size();
}

/**
 * Returns true, if all elements are the same
 */
template <typename ForwardIter>
bool AllSame(ForwardIter begin, ForwardIter end)
{
    return std::adjacent_find( begin, end, std::not_equal_to<typename std::iterator_traits<ForwardIter>::value_type>() ) == end;
}

template <class ArrayType, typename BinaryPredicate, typename BinaryMerge>
void ReplaceAdjacentWithMerged(ArrayType& list, BinaryPredicate is_adjacent, BinaryMerge merged)
{

@@ -242,6 +242,9 @@

    /// Returns the scale of the point matrix
    TIGL_EXPORT static double scale(const TColgp_Array2OfPnt& points);

    /// Returns the scale of the point list by searching for the largest distance between two points
    TIGL_EXPORT static double scale(const TColgp_Array1OfPnt& points);

    /**
     * Returns positions, where the curve has kinks (C1 Discontinuities)
     */

Everything is accounted for!

No changes detected that need to be reviewed.

What changes does Codecov check for?

Lines, not adjusted in diff, that have changed coverage data.

Files that introduced coverage data that had none before.

Files that have missing coverage data that once were tracked.

69.44% 100.00% +0.02%

Fixed #753

rainman110

#754 a478a82

CI Passed

Hiding 3 contexual commits

+20

69.42% 96.59% +0.41%

Merge pull request #748 from DLR-SC/687_fix_wing_guide_curves

joergbrech

b0ca5e6

CI Passed

Files		•	•	•	Coverage
src	+20	+20	ø	ø	^0.02% 69.44%
Project Totals (425 files)	23,359	16,222	0	7,137	69.44%

240	241
241	242		void CTiglMakeLoft::makeLoftWithoutGuides()
242	243		{
	244	+	// check number of edges are all same
	245	+	std::vector<unsigned int> edgeCountPerProfile;
	246	+	for (const auto& profile : profiles) {
	247	+	edgeCountPerProfile.push_back(GetNumberOfEdges(profile));
	248	+	}
	249	+	if (!AllSame(edgeCountPerProfile.begin(), edgeCountPerProfile.end())) {
	250	+	throw tigl::CTiglError("Number of edges not equal in CTiglMakeLoft");
	251	+	}
	252	+
243	253		TopoDS_Shell faces;
244	254		BRep_Builder builder;
245	255		builder.MakeShell(faces);

449	449		return theScale;
450	450		}
451	451
	452	+	double CTiglBSplineAlgorithms::scale(const TColgp_Array1OfPnt& points)
	453	+	{
	454	+	double theScale = 0.;
	455	+
	456	+	for (int i = points.Lower(); i <= points.Upper(); ++i) {
	457	+	for (int j = i + 1; j < points.Upper(); ++j) {
	458	+	double dist = points.Value(i).Distance(points.Value(j));
	459	+	theScale = std::max(theScale, dist);
	460	+	}
	461	+	}
	462	+	return theScale;
	463	+	}
	464	+
452	465		std::vector<double> CTiglBSplineAlgorithms::computeParamsBSplineCurve(const Handle(TColgp_HArray1OfPnt)& points, const double alpha)
453	466		{
454	467		return computeParamsBSplineCurve(points, 0., 1., alpha);

190	190
191	191		// Build the B-Spline
192	192		auto occPoints = OccArray(points);
	193	+
	194	+	// we always want to include the endpoint, if it's the same as the startpoint
	195	+	// we use the middle to enforce closing of the spline
	196	+	gp_Pnt pStart = points.front().Get_gp_Pnt();
	197	+	gp_Pnt pEnd = points.back().Get_gp_Pnt();
	198	+
	199	+	// this check allows some tolerance, based on the absolute size of the profile
	200	+	if (pStart.Distance(pEnd) < 0.005*CTiglBSplineAlgorithms::scale(occPoints->Array1())) {
	201	+	gp_Pnt pMiddle = 0.5 * (pStart.XYZ() + pEnd.XYZ());
	202	+	occPoints->SetValue(occPoints->Lower(), pMiddle);
	203	+	occPoints->SetValue(occPoints->Upper(), pMiddle);
	204	+	}
	205	+
193	206		CTiglInterpolatePointsWithKinks interp(occPoints, kinks, params, 0.5, 3);
194	207		auto spline = interp.Curve();
195	208

362	362		return idx < array.size();
363	363		}
364	364
	365	+	/**
	366	+	* Returns true, if all elements are the same
	367	+	*/
	368	+	template <typename ForwardIter>
	369	+	bool AllSame(ForwardIter begin, ForwardIter end)
	370	+	{
	371	+	return std::adjacent_find( begin, end, std::not_equal_to<typename std::iterator_traits<ForwardIter>::value_type>() ) == end;
	372	+	}
	373	+
365	374		template <class ArrayType, typename BinaryPredicate, typename BinaryMerge>
366	375		void ReplaceAdjacentWithMerged(ArrayType& list, BinaryPredicate is_adjacent, BinaryMerge merged)
367	376		{

242	242		/// Returns the scale of the point matrix
243	243		TIGL_EXPORT static double scale(const TColgp_Array2OfPnt& points);
244	244
	245	+	/// Returns the scale of the point list by searching for the largest distance between two points
	246	+	TIGL_EXPORT static double scale(const TColgp_Array1OfPnt& points);
	247	+
245	248		/**
246	249		* Returns positions, where the curve has kinks (C1 Discontinuities)
247	250		*/

Compare `b0ca5e6 ... +3 ... a478a82`

No flags found

Everything is accounted for!

What changes does Codecov check for?

Show failed CI and contexual commits `c`

5 Commits

31	31		#include "contrib/MakePatches.hxx"
32	32		#include "geometry/CTiglTopoAlgorithms.h"
33	33		#include "geometry/CTiglBSplineAlgorithms.h"
	34	+	#include "system/CTiglError.h"
34	35
35	36
36	37		#include <TopoDS.hxx>

Navigation	Overlay
`t` Navigate files	`h` Toggle hits
`y` Change url to tip of branch	`m` Toggle misses
`b / v` Jump to prev/next hit line	`p` Toggle partial
`z / x` Jump to prev/next missed or partial line	`1..9` Toggle flags
`shift + o` Open current page in GitHub	`a` Toggle all on
`/ or ?` Show keyboard shortcuts dialog	`c` Toggle context lines or commits

Compare b0ca5e6 ... +3 ... a478a82

No flags found

Everything is accounted for!

What changes does Codecov check for?

Show failed CI and contexual commits c 5 Commits

Compare `b0ca5e6 ... +3 ... a478a82`

Show failed CI and contexual commits `c`

5 Commits