From 81d2eb513ad88901537db7695351ac275573789f Mon Sep 17 00:00:00 2001 From: Roman Telezhynskyi Date: Wed, 17 Oct 2018 18:12:39 +0300 Subject: [PATCH] Fixed issues with seam allowance. (grafted from 79a6fe52de80fc8707e24574eff1ec75eb1cd424) --HG-- branch : develop --- ChangeLog.txt | 1 + src/libs/vlayout/vabstractpiece.cpp | 52 +- src/libs/vlayout/vabstractpiece.h | 4 +- src/libs/vmisc/def.h | 11 +- src/libs/vpatterndb/vpiece.cpp | 2 +- src/libs/vpatterndb/vpiecepath.cpp | 3 +- src/test/ValentinaTest/tst_vabstractpiece.cpp | 1853 ++++++++--------- 7 files changed, 962 insertions(+), 964 deletions(-) diff --git a/ChangeLog.txt b/ChangeLog.txt index b37637f8c..e2f42176d 100644 --- a/ChangeLog.txt +++ b/ChangeLog.txt @@ -1,5 +1,6 @@ # Version 0.6.1 (unreleased) - [#885] Regression. Broken support for multi size measurements. +- Fixed issues with seam allowance. # Version 0.6.0 October 1, 2018 - [#682] New feature. Export increments to Excel .csv. diff --git a/src/libs/vlayout/vabstractpiece.cpp b/src/libs/vlayout/vabstractpiece.cpp index b137a4bb0..c44d96097 100644 --- a/src/libs/vlayout/vabstractpiece.cpp +++ b/src/libs/vlayout/vabstractpiece.cpp @@ -268,16 +268,23 @@ QVector AngleByLength(QVector points, QPointF p2, const QLineF } else { - // Need to create artificial loop - QLineF loop1(sp2, sp1); - loop1.setLength(loop1.length()*0.1); + if (p.GetAngleType() != PieceNodeAngle::ByLengthCurve) + { + // Need to create artificial loop + QLineF loop1(sp2, sp1); + loop1.setLength(loop1.length()*0.1); - points.append(loop1.p2()); // Nedd for the main path rule + points.append(loop1.p2()); // Nedd for the main path rule - loop1.setAngle(loop1.angle() + 180); - loop1.setLength(localWidth * 3.); - points.append(loop1.p2()); - points.append(bigLine2.p1()); + loop1.setAngle(loop1.angle() + 180); + loop1.setLength(localWidth); + points.append(loop1.p2()); + points.append(bigLine2.p1()); + } + else + { + points.append(sp2); + } } } return points; @@ -683,7 +690,7 @@ void DumpVector(const QVector &points) QT_WARNING_PUSH QT_WARNING_DISABLE_GCC("-Wswitch-default") // This check helps to find missed angle types in the switch - Q_STATIC_ASSERT_X(static_cast(PieceNodeAngle::LAST_ONE_DO_NOT_USE) == 6, + Q_STATIC_ASSERT_X(static_cast(PieceNodeAngle::LAST_ONE_DO_NOT_USE) == 7, "Not all types were handled."); QString typeStr; @@ -708,6 +715,9 @@ QT_WARNING_DISABLE_GCC("-Wswitch-default") case PieceNodeAngle::BySecondEdgeRightAngle: typeStr = "BySecondEdgeRightAngle"; break; + case PieceNodeAngle::ByLengthCurve: + typeStr = "ByLengthCurve"; + break; } QT_WARNING_POP @@ -890,6 +900,7 @@ QVector VAbstractPiece::Equidistant(QVector points, qreal wid const bool removeFirstAndLast = false; ekvPoints = CheckLoops(CorrectEquidistantPoints(ekvPoints, removeFirstAndLast));//Result path can contain loops + ekvPoints = CheckLoops(CorrectEquidistantPoints(ekvPoints, removeFirstAndLast));//Result path can contain loops // DumpVector(ekvPoints); // Uncomment for dumping test data return ekvPoints; } @@ -1077,8 +1088,8 @@ QVector VAbstractPiece::CheckLoops(const QVector &points) * @param width global seam allowance width. * @return seam aloowance points. */ -QVector VAbstractPiece::EkvPoint(QVector points, const VSAPoint &p1Line1, const VSAPoint &p2Line1, - const VSAPoint &p1Line2, const VSAPoint &p2Line2, qreal width) +QVector VAbstractPiece::EkvPoint(QVector points, const VSAPoint &p1Line1, VSAPoint p2Line1, + const VSAPoint &p1Line2, VSAPoint p2Line2, qreal width) { if (width < 0) { // width can't be < 0 @@ -1091,6 +1102,19 @@ QVector VAbstractPiece::EkvPoint(QVector points, const VSAPoin return QVector(); // Wrong edges } + // Correct distorsion + if (VGObject::IsPointOnLineSegment(p2Line1, p1Line1, p1Line2)) + { + QLineF line = QLineF(p1Line1, p1Line2); + line.setLength(QLineF(p1Line1, p2Line1).length()); + + p2Line1.setX(line.p2().x()); + p2Line1.setY(line.p2().y()); + + p2Line2.setX(line.p2().x()); + p2Line2.setY(line.p2().y()); + } + const QLineF bigLine1 = ParallelLine(p1Line1, p2Line1, width ); const QLineF bigLine2 = ParallelLine(p2Line2, p1Line2, width ); QPointF crosPoint; @@ -1105,7 +1129,8 @@ QVector VAbstractPiece::EkvPoint(QVector points, const VSAPoin { // Most common case /* Case when a path has point on line (both segments lie on the same line) and seam allowance creates * prong. */ - if (VGObject::IsPointOnLineSegment(p2Line1, p1Line1, p1Line2)) + if (VGObject::IsPointOnLineSegment(p2Line1, p1Line1, p1Line2) + && qAbs(QLineF(p2Line1, bigLine1.p2()).angle() - QLineF(p2Line1, bigLine2.p1()).angle()) < 0.001) { points.append(bigLine1.p2()); points.append(bigLine2.p1()); @@ -1128,7 +1153,7 @@ QVector VAbstractPiece::EkvPoint(QVector points, const VSAPoin QT_WARNING_PUSH QT_WARNING_DISABLE_GCC("-Wswitch-default") // This check helps to find missed angle types in the switch - Q_STATIC_ASSERT_X(static_cast(PieceNodeAngle::LAST_ONE_DO_NOT_USE) == 6, + Q_STATIC_ASSERT_X(static_cast(PieceNodeAngle::LAST_ONE_DO_NOT_USE) == 7, "Not all types were handled."); switch (p2Line1.GetAngleType()) { @@ -1136,6 +1161,7 @@ QT_WARNING_DISABLE_GCC("-Wswitch-default") Q_UNREACHABLE(); //-V501 break; case PieceNodeAngle::ByLength: + case PieceNodeAngle::ByLengthCurve: return AngleByLength(points, p2Line1, bigLine1, crosPoint, bigLine2, p2Line1, width); case PieceNodeAngle::ByPointsIntersection: return AngleByIntersection(points, p1Line1, p2Line1, p1Line2, bigLine1, crosPoint, bigLine2, diff --git a/src/libs/vlayout/vabstractpiece.h b/src/libs/vlayout/vabstractpiece.h index 243224570..229840455 100644 --- a/src/libs/vlayout/vabstractpiece.h +++ b/src/libs/vlayout/vabstractpiece.h @@ -186,8 +186,8 @@ public: static QVector Equidistant(QVector points, qreal width); static qreal SumTrapezoids(const QVector &points); static QVector CheckLoops(const QVector &points); - static QVector EkvPoint(QVector points, const VSAPoint &p1Line1, const VSAPoint &p2Line1, - const VSAPoint &p1Line2, const VSAPoint &p2Line2, qreal width); + static QVector EkvPoint(QVector points, const VSAPoint &p1Line1, VSAPoint p2Line1, + const VSAPoint &p1Line2, VSAPoint p2Line2, qreal width); static QLineF ParallelLine(const VSAPoint &p1, const VSAPoint &p2, qreal width); template diff --git a/src/libs/vmisc/def.h b/src/libs/vmisc/def.h index 705c77b25..2247993c6 100644 --- a/src/libs/vmisc/def.h +++ b/src/libs/vmisc/def.h @@ -73,11 +73,12 @@ enum class Draw : char { Calculation, Modeling, Layout }; enum class PieceNodeAngle : unsigned char { ByLength = 0, - ByPointsIntersection, - ByFirstEdgeSymmetry, - BySecondEdgeSymmetry, - ByFirstEdgeRightAngle, - BySecondEdgeRightAngle, + ByPointsIntersection = 1, + ByFirstEdgeSymmetry = 2, + BySecondEdgeSymmetry = 3, + ByFirstEdgeRightAngle = 4, + BySecondEdgeRightAngle = 5, + ByLengthCurve = 6, // used only in runtime LAST_ONE_DO_NOT_USE }; diff --git a/src/libs/vpatterndb/vpiece.cpp b/src/libs/vpatterndb/vpiece.cpp index 069c9571e..f80778e18 100644 --- a/src/libs/vpatterndb/vpiece.cpp +++ b/src/libs/vpatterndb/vpiece.cpp @@ -423,7 +423,7 @@ QVector VPiece::SeamAllowancePoints(const VContainer *data) const for (int j = 0; j < r.size(); ++j) { - r[j].SetAngleType(PieceNodeAngle::ByLength); + r[j].SetAngleType(PieceNodeAngle::ByLengthCurve); r[j].SetSABefore(0); r[j].SetSAAfter(0); } diff --git a/src/libs/vpatterndb/vpiecepath.cpp b/src/libs/vpatterndb/vpiecepath.cpp index 4bdedaf80..6018223cd 100644 --- a/src/libs/vpatterndb/vpiecepath.cpp +++ b/src/libs/vpatterndb/vpiecepath.cpp @@ -1120,6 +1120,7 @@ QVector VPiecePath::CurveSeamAllowanceSegment(const VContainer *data, for(int i = 0; i < points.size(); ++i) { VSAPoint p(points.at(i)); + p.SetAngleType(PieceNodeAngle::ByLengthCurve); if (i == 0) { // first point p.SetSAAfter(begin.GetSAAfter()); @@ -1175,7 +1176,7 @@ QVector VPiecePath::CurveSeamAllowanceSegment(const VContainer *data, p.SetSAAfter(localWidth); p.SetSABefore(localWidth); - // curve points have angle type by default + p.SetAngleType(PieceNodeAngle::ByLengthCurve); } pointsEkv.append(p); diff --git a/src/test/ValentinaTest/tst_vabstractpiece.cpp b/src/test/ValentinaTest/tst_vabstractpiece.cpp index 261ded2bc..a76de06f5 100644 --- a/src/test/ValentinaTest/tst_vabstractpiece.cpp +++ b/src/test/ValentinaTest/tst_vabstractpiece.cpp @@ -396,63 +396,63 @@ QVector TST_VAbstractPiece::OutputPointsSeamTest1PieceByAngle() const { QVector points; - points += QPointF(30.0, 970.3935748031496); - points += QPointF(30.0, 2.2023778242823937); + points += QPointF(30.000000000000000, 970.393574803149590); + points += QPointF(30.000000000000000, 2.202377824282394); points += QPointF(46.111397855976776, 2.027726815668483); - points += QPointF(81.74605442368645, -0.2758951981748612); - points += QPointF(119.50208828052781, -5.192452541281906); - points += QPointF(148.42595722778273, -10.854963023883784); - points += QPointF(167.5566961450379, -15.490385095876569); - points += QPointF(186.61281642420556, -20.94495784777482); - points += QPointF(205.31950565747624, -27.21179180985321); - points += QPointF(223.51736443487215, -34.306381867523655); - points += QPointF(241.0503469884652, -42.23845350735769); - points += QPointF(257.76798751706616, -51.01164773556077); - points += QPointF(273.5285590176657, -60.62398316233916); - points += QPointF(284.94491218126115, -68.7504632158891); - points += QPointF(556.951317720607, -31.220946854728947); - points += QPointF(539.6101141051189, 79.89131577778124); - points += QPointF(585.9167315845332, -20.7024207218235); - points += QPointF(1117.4559101159903, 212.6634418802967); - points += QPointF(1101.8482040478996, 244.8082798528157); - points += QPointF(1080.077560308019, 292.3718325563429); - points += QPointF(1061.8089025447719, 335.54292908714797); - points += QPointF(1046.6013689355652, 374.7989965048928); - points += QPointF(1034.1843603449322, 410.2384638595293); - points += QPointF(1024.2819001340656, 441.96655926454446); - points += QPointF(1016.6128103198596, 470.0987514791764); - points += QPointF(1010.891548127259, 494.7652903217379); - points += QPointF(1006.8300406648392, 516.1171535751373); - points += QPointF(1004.1409514475167, 534.3338730421456); - points += QPointF(1002.5429209641059, 549.6340874837038); - points += QPointF(1001.8096437359794, 561.6175009318105); - points += QPointF(1001.632561636562, 577.0190278199144); - points += QPointF(1002.5982079396683, 593.4977885619218); - points += QPointF(1003.0419281414149, 597.870394747796); - points += QPointF(1003.1926540422378, 599.1363247745379); - points += QPointF(1004.4715714217981, 605.7139974891637); - points += QPointF(1006.6672239434022, 613.5972045855956); - points += QPointF(1010.1411052399322, 623.2360341722922); - points += QPointF(1014.8474980040493, 633.8337662374475); - points += QPointF(1020.6660121283516, 644.7426504865729); - points += QPointF(1027.4243046890665, 655.4292751847524); - points += QPointF(1034.913026324476, 665.4623428264111); - points += QPointF(1042.9029269068749, 674.5151720813944); - points += QPointF(1051.171411576988, 682.3761985416603); - points += QPointF(1060.1878101895825, 689.4651444417038); - points += QPointF(1066.6143341082677, 693.625487703081); - points += QPointF(1070.1212524493003, 695.6022659553572); - points += QPointF(1074.3830151134664, 697.7096649640414); - points += QPointF(1078.7265805419665, 699.565875909043); - points += QPointF(1083.206554246492, 701.1878034134409); - points += QPointF(1087.891993301369, 702.5858632116882); - points += QPointF(1092.8646688655851, 703.7605199081748); - points += QPointF(1098.2162239125396, 704.699271425244); - points += QPointF(1104.0444208482252, 705.3744462055462); - points += QPointF(1111.3488014116294, 705.7937559506272); - points += QPointF(1290.2705536650083, 707.4996206162249); - points += QPointF(1302.416131870577, 881.6558256043734); - points += QPointF(30.0, 970.3935748031496); + points += QPointF(81.746054423686445, -0.275895198174861); + points += QPointF(119.502088280527815, -5.192452541281906); + points += QPointF(148.425957227782732, -10.854963023883784); + points += QPointF(167.448600561093770, -15.907328733562260); + points += QPointF(186.612816424205562, -20.944957847774820); + points += QPointF(205.319505657476242, -27.211791809853210); + points += QPointF(223.517364434872150, -34.306381867523655); + points += QPointF(241.050346988465208, -42.238453507357690); + points += QPointF(257.767987517066160, -51.011647735560771); + points += QPointF(273.528559017665714, -60.623983162339158); + points += QPointF(284.944912181261145, -68.750463215889098); + points += QPointF(556.951317720606994, -31.220946854728947); + points += QPointF(539.610114105118896, 79.891315777781244); + points += QPointF(585.916731584533181, -20.702420721823501); + points += QPointF(1117.455910115990264, 212.663441880296688); + points += QPointF(1101.848204047899571, 244.808279852815701); + points += QPointF(1080.077560308018974, 292.371832556342895); + points += QPointF(1061.808902544771854, 335.542929087147968); + points += QPointF(1046.601368935565233, 374.798996504892784); + points += QPointF(1034.184360344932202, 410.238463859529304); + points += QPointF(1024.281900134065609, 441.966559264544458); + points += QPointF(1016.612810319859591, 470.098751479176428); + points += QPointF(1010.891548127258943, 494.765290321737893); + points += QPointF(1006.830040664839203, 516.117153575137309); + points += QPointF(1004.140951447516727, 534.333873042145569); + points += QPointF(1002.542920964105861, 549.634087483703752); + points += QPointF(1001.809643735979421, 561.617500931810469); + points += QPointF(1001.632561636561945, 577.019027819914413); + points += QPointF(1003.005943695759470, 595.324545904181832); + points += QPointF(1003.122677531314821, 597.878021988163141); + points += QPointF(1003.192654042237791, 599.136324774537911); + points += QPointF(1004.471571421798103, 605.713997489163717); + points += QPointF(1006.667223943402178, 613.597204585595591); + points += QPointF(1010.141105239932244, 623.236034172292193); + points += QPointF(1014.847498004049271, 633.833766237447549); + points += QPointF(1020.666012128351554, 644.742650486572870); + points += QPointF(1027.424304689066503, 655.429275184752441); + points += QPointF(1034.913026324476050, 665.462342826411145); + points += QPointF(1042.902926906874882, 674.515172081394439); + points += QPointF(1051.171411576988021, 682.376198541660301); + points += QPointF(1060.187810189582478, 689.465144441703842); + points += QPointF(1066.614334108267713, 693.625487703081035); + points += QPointF(1070.257199304126971, 695.293432907079136); + points += QPointF(1074.502615007352006, 697.381379428831451); + points += QPointF(1078.826982655972415, 699.218630270296671); + points += QPointF(1083.285021824863634, 700.822525916039240); + points += QPointF(1087.891993301368984, 702.585863211688206); + points += QPointF(1092.864668865585145, 703.760519908174842); + points += QPointF(1098.216223912539590, 704.699271425243978); + points += QPointF(1104.044420848225172, 705.374446205546178); + points += QPointF(1112.817242174511875, 705.622046059863806); + points += QPointF(1290.270553665008265, 707.499620616224888); + points += QPointF(1302.416131870576919, 881.655825604373376); + points += QPointF(30.000000000000000, 970.393574803149590); return points; } @@ -717,64 +717,64 @@ QVector TST_VAbstractPiece::OutputPointsSeamTest1PieceByIntersection() { QVector points; - points += QPointF(30.0, 970.3935748031496); - points += QPointF(30.0, 2.2023778242823937); + points += QPointF(30.000000000000000, 970.393574803149590); + points += QPointF(30.000000000000000, 2.202377824282394); points += QPointF(46.111397855976776, 2.027726815668483); - points += QPointF(81.74605442368645, -0.2758951981748612); - points += QPointF(119.50208828052781, -5.192452541281906); - points += QPointF(148.42595722778273, -10.854963023883784); - points += QPointF(167.5566961450379, -15.490385095876569); - points += QPointF(186.61281642420556, -20.94495784777482); - points += QPointF(205.31950565747624, -27.21179180985321); - points += QPointF(223.51736443487215, -34.306381867523655); - points += QPointF(241.0503469884652, -42.23845350735769); - points += QPointF(257.76798751706616, -51.01164773556077); - points += QPointF(273.5285590176657, -60.62398316233916); - points += QPointF(284.4959443876259, -68.4308753608727); - points += QPointF(334.91313141686754, -61.856202407499914); - points += QPointF(556.951317720607, -31.220946854728947); - points += QPointF(539.6101141051189, 79.89131577778124); - points += QPointF(585.9167315845332, -20.7024207218235); - points += QPointF(1117.4559101159903, 212.6634418802967); - points += QPointF(1101.8482040478996, 244.8082798528157); - points += QPointF(1080.077560308019, 292.3718325563429); - points += QPointF(1061.8089025447719, 335.54292908714797); - points += QPointF(1046.6013689355652, 374.7989965048928); - points += QPointF(1034.1843603449322, 410.2384638595293); - points += QPointF(1024.2819001340656, 441.96655926454446); - points += QPointF(1016.6128103198596, 470.0987514791764); - points += QPointF(1010.891548127259, 494.7652903217379); - points += QPointF(1006.8300406648392, 516.1171535751373); - points += QPointF(1004.1409514475167, 534.3338730421456); - points += QPointF(1002.5429209641059, 549.6340874837038); - points += QPointF(1001.8096437359794, 561.6175009318105); - points += QPointF(1001.632561636562, 577.0190278199144); - points += QPointF(1002.5982079396683, 593.4977885619218); - points += QPointF(1003.0419281414149, 597.870394747796); - points += QPointF(1003.1926540422378, 599.1363247745379); - points += QPointF(1004.4715714217981, 605.7139974891637); - points += QPointF(1006.6672239434022, 613.5972045855956); - points += QPointF(1010.1411052399322, 623.2360341722922); - points += QPointF(1014.8474980040493, 633.8337662374475); - points += QPointF(1020.6660121283516, 644.7426504865729); - points += QPointF(1027.4243046890665, 655.4292751847524); - points += QPointF(1034.913026324476, 665.4623428264111); - points += QPointF(1042.9029269068749, 674.5151720813944); - points += QPointF(1051.171411576988, 682.3761985416603); - points += QPointF(1060.1878101895825, 689.4651444417038); - points += QPointF(1066.6143341082677, 693.625487703081); - points += QPointF(1070.1212524493003, 695.6022659553572); - points += QPointF(1074.3830151134664, 697.7096649640414); - points += QPointF(1078.7265805419665, 699.565875909043); - points += QPointF(1083.206554246492, 701.1878034134409); - points += QPointF(1087.891993301369, 702.5858632116882); - points += QPointF(1092.8646688655851, 703.7605199081748); - points += QPointF(1098.2162239125396, 704.699271425244); - points += QPointF(1104.0444208482252, 705.3744462055462); - points += QPointF(1111.3488014116294, 705.7937559506272); - points += QPointF(1290.2705536650083, 707.4996206162249); - points += QPointF(1302.416131870577, 881.6558256043734); - points += QPointF(30.0, 970.3935748031496); + points += QPointF(81.746054423686445, -0.275895198174861); + points += QPointF(119.502088280527815, -5.192452541281906); + points += QPointF(148.425957227782732, -10.854963023883784); + points += QPointF(167.448600561093770, -15.907328733562260); + points += QPointF(186.612816424205562, -20.944957847774820); + points += QPointF(205.319505657476242, -27.211791809853210); + points += QPointF(223.517364434872150, -34.306381867523655); + points += QPointF(241.050346988465208, -42.238453507357690); + points += QPointF(257.767987517066160, -51.011647735560771); + points += QPointF(273.528559017665714, -60.623983162339158); + points += QPointF(284.495944387625912, -68.430875360872705); + points += QPointF(334.913131416867543, -61.856202407499914); + points += QPointF(556.951317720606994, -31.220946854728947); + points += QPointF(539.610114105118896, 79.891315777781244); + points += QPointF(585.916731584533181, -20.702420721823501); + points += QPointF(1117.455910115990264, 212.663441880296688); + points += QPointF(1101.848204047899571, 244.808279852815701); + points += QPointF(1080.077560308018974, 292.371832556342895); + points += QPointF(1061.808902544771854, 335.542929087147968); + points += QPointF(1046.601368935565233, 374.798996504892784); + points += QPointF(1034.184360344932202, 410.238463859529304); + points += QPointF(1024.281900134065609, 441.966559264544458); + points += QPointF(1016.612810319859591, 470.098751479176428); + points += QPointF(1010.891548127258943, 494.765290321737893); + points += QPointF(1006.830040664839203, 516.117153575137309); + points += QPointF(1004.140951447516727, 534.333873042145569); + points += QPointF(1002.542920964105861, 549.634087483703752); + points += QPointF(1001.809643735979421, 561.617500931810469); + points += QPointF(1001.632561636561945, 577.019027819914413); + points += QPointF(1003.005943695759470, 595.324545904181832); + points += QPointF(1003.122677531314821, 597.878021988163141); + points += QPointF(1003.192654042237791, 599.136324774537911); + points += QPointF(1004.471571421798103, 605.713997489163717); + points += QPointF(1006.667223943402178, 613.597204585595591); + points += QPointF(1010.141105239932244, 623.236034172292193); + points += QPointF(1014.847498004049271, 633.833766237447549); + points += QPointF(1020.666012128351554, 644.742650486572870); + points += QPointF(1027.424304689066503, 655.429275184752441); + points += QPointF(1034.913026324476050, 665.462342826411145); + points += QPointF(1042.902926906874882, 674.515172081394439); + points += QPointF(1051.171411576988021, 682.376198541660301); + points += QPointF(1060.187810189582478, 689.465144441703842); + points += QPointF(1066.614334108267713, 693.625487703081035); + points += QPointF(1070.257199304126971, 695.293432907079136); + points += QPointF(1074.502615007352006, 697.381379428831451); + points += QPointF(1078.826982655972415, 699.218630270296671); + points += QPointF(1083.285021824863634, 700.822525916039240); + points += QPointF(1087.891993301368984, 702.585863211688206); + points += QPointF(1092.864668865585145, 703.760519908174842); + points += QPointF(1098.216223912539590, 704.699271425243978); + points += QPointF(1104.044420848225172, 705.374446205546178); + points += QPointF(1112.817242174511875, 705.622046059863806); + points += QPointF(1290.270553665008265, 707.499620616224888); + points += QPointF(1302.416131870576919, 881.655825604373376); + points += QPointF(30.000000000000000, 970.393574803149590); return points; } @@ -1039,66 +1039,66 @@ QVector TST_VAbstractPiece::OutputPointsSeamTest1PieceByFirstEdgeSymmer { QVector points; - points += QPointF(30.0, 970.3935748031496); - points += QPointF(30.0, 2.2023778242823937); + points += QPointF(30.000000000000000, 970.393574803149590); + points += QPointF(30.000000000000000, 2.202377824282394); points += QPointF(46.111397855976776, 2.027726815668483); - points += QPointF(81.74605442368645, -0.2758951981748612); - points += QPointF(119.50208828052781, -5.192452541281906); - points += QPointF(148.42595722778273, -10.854963023883784); - points += QPointF(167.5566961450379, -15.490385095876569); - points += QPointF(186.61281642420556, -20.94495784777482); - points += QPointF(205.31950565747624, -27.21179180985321); - points += QPointF(223.51736443487215, -34.306381867523655); - points += QPointF(241.0503469884652, -42.23845350735769); - points += QPointF(257.76798751706616, -51.01164773556077); - points += QPointF(273.5285590176657, -60.62398316233916); - points += QPointF(288.203122586733, -71.06974867341756); - points += QPointF(301.89505943185964, -82.52353546533966); - points += QPointF(315.2716370538558, -95.41962699710956); - points += QPointF(334.9131314168676, -61.85620240749991); - points += QPointF(556.951317720607, -31.220946854728947); - points += QPointF(539.6101141051189, 79.89131577778124); - points += QPointF(585.9167315845332, -20.7024207218235); - points += QPointF(1117.4559101159903, 212.6634418802967); - points += QPointF(1101.8482040478996, 244.8082798528157); - points += QPointF(1080.077560308019, 292.3718325563429); - points += QPointF(1061.8089025447719, 335.54292908714797); - points += QPointF(1046.6013689355652, 374.7989965048928); - points += QPointF(1034.1843603449322, 410.2384638595293); - points += QPointF(1024.2819001340656, 441.96655926454446); - points += QPointF(1016.6128103198596, 470.0987514791764); - points += QPointF(1010.891548127259, 494.7652903217379); - points += QPointF(1006.8300406648392, 516.1171535751373); - points += QPointF(1004.1409514475167, 534.3338730421456); - points += QPointF(1002.5429209641059, 549.6340874837038); - points += QPointF(1001.8096437359794, 561.6175009318105); - points += QPointF(1001.632561636562, 577.0190278199144); - points += QPointF(1002.5982079396683, 593.4977885619218); - points += QPointF(1003.0419281414149, 597.870394747796); - points += QPointF(1003.1926540422378, 599.1363247745379); - points += QPointF(1004.4715714217981, 605.7139974891637); - points += QPointF(1006.6672239434022, 613.5972045855956); - points += QPointF(1010.1411052399322, 623.2360341722922); - points += QPointF(1014.8474980040493, 633.8337662374475); - points += QPointF(1020.6660121283516, 644.7426504865729); - points += QPointF(1027.4243046890665, 655.4292751847524); - points += QPointF(1034.913026324476, 665.4623428264111); - points += QPointF(1042.9029269068749, 674.5151720813944); - points += QPointF(1051.171411576988, 682.3761985416603); - points += QPointF(1060.1878101895825, 689.4651444417038); - points += QPointF(1066.6143341082677, 693.625487703081); - points += QPointF(1070.1212524493003, 695.6022659553572); - points += QPointF(1074.3830151134664, 697.7096649640414); - points += QPointF(1078.7265805419665, 699.565875909043); - points += QPointF(1083.206554246492, 701.1878034134409); - points += QPointF(1087.891993301369, 702.5858632116882); - points += QPointF(1092.8646688655851, 703.7605199081748); - points += QPointF(1098.2162239125396, 704.699271425244); - points += QPointF(1104.0444208482252, 705.3744462055462); - points += QPointF(1111.3488014116294, 705.7937559506272); - points += QPointF(1290.2705536650083, 707.4996206162249); - points += QPointF(1302.416131870577, 881.6558256043734); - points += QPointF(30.0, 970.3935748031496); + points += QPointF(81.746054423686445, -0.275895198174861); + points += QPointF(119.502088280527815, -5.192452541281906); + points += QPointF(148.425957227782732, -10.854963023883784); + points += QPointF(167.448600561093770, -15.907328733562260); + points += QPointF(186.612816424205562, -20.944957847774820); + points += QPointF(205.319505657476242, -27.211791809853210); + points += QPointF(223.517364434872150, -34.306381867523655); + points += QPointF(241.050346988465208, -42.238453507357690); + points += QPointF(257.767987517066160, -51.011647735560771); + points += QPointF(273.528559017665714, -60.623983162339158); + points += QPointF(288.203122586733002, -71.069748673417564); + points += QPointF(301.895059431859636, -82.523535465339663); + points += QPointF(315.271637053855784, -95.419626997109560); + points += QPointF(334.913131416867600, -61.856202407499907); + points += QPointF(556.951317720606994, -31.220946854728947); + points += QPointF(539.610114105118896, 79.891315777781244); + points += QPointF(585.916731584533181, -20.702420721823501); + points += QPointF(1117.455910115990264, 212.663441880296688); + points += QPointF(1101.848204047899571, 244.808279852815701); + points += QPointF(1080.077560308018974, 292.371832556342895); + points += QPointF(1061.808902544771854, 335.542929087147968); + points += QPointF(1046.601368935565233, 374.798996504892784); + points += QPointF(1034.184360344932202, 410.238463859529304); + points += QPointF(1024.281900134065609, 441.966559264544458); + points += QPointF(1016.612810319859591, 470.098751479176428); + points += QPointF(1010.891548127258943, 494.765290321737893); + points += QPointF(1006.830040664839203, 516.117153575137309); + points += QPointF(1004.140951447516727, 534.333873042145569); + points += QPointF(1002.542920964105861, 549.634087483703752); + points += QPointF(1001.809643735979421, 561.617500931810469); + points += QPointF(1001.632561636561945, 577.019027819914413); + points += QPointF(1003.005943695759470, 595.324545904181832); + points += QPointF(1003.122677531314821, 597.878021988163141); + points += QPointF(1003.192654042237791, 599.136324774537911); + points += QPointF(1004.471571421798103, 605.713997489163717); + points += QPointF(1006.667223943402178, 613.597204585595591); + points += QPointF(1010.141105239932244, 623.236034172292193); + points += QPointF(1014.847498004049271, 633.833766237447549); + points += QPointF(1020.666012128351554, 644.742650486572870); + points += QPointF(1027.424304689066503, 655.429275184752441); + points += QPointF(1034.913026324476050, 665.462342826411145); + points += QPointF(1042.902926906874882, 674.515172081394439); + points += QPointF(1051.171411576988021, 682.376198541660301); + points += QPointF(1060.187810189582478, 689.465144441703842); + points += QPointF(1066.614334108267713, 693.625487703081035); + points += QPointF(1070.257199304126971, 695.293432907079136); + points += QPointF(1074.502615007352006, 697.381379428831451); + points += QPointF(1078.826982655972415, 699.218630270296671); + points += QPointF(1083.285021824863634, 700.822525916039240); + points += QPointF(1087.891993301368984, 702.585863211688206); + points += QPointF(1092.864668865585145, 703.760519908174842); + points += QPointF(1098.216223912539590, 704.699271425243978); + points += QPointF(1104.044420848225172, 705.374446205546178); + points += QPointF(1112.817242174511875, 705.622046059863806); + points += QPointF(1290.270553665008265, 707.499620616224888); + points += QPointF(1302.416131870576919, 881.655825604373376); + points += QPointF(30.000000000000000, 970.393574803149590); return points; } @@ -1363,64 +1363,64 @@ QVector TST_VAbstractPiece::OutputPointsSeamTest1PieceBySecondEdgeSymme { QVector points; - points += QPointF(30.0, 970.3935748031496); - points += QPointF(30.0, 2.2023778242823937); + points += QPointF(30.000000000000000, 970.393574803149590); + points += QPointF(30.000000000000000, 2.202377824282394); points += QPointF(46.111397855976776, 2.027726815668483); - points += QPointF(81.74605442368645, -0.2758951981748612); - points += QPointF(119.50208828052781, -5.192452541281906); - points += QPointF(148.42595722778273, -10.854963023883784); - points += QPointF(167.5566961450379, -15.490385095876569); - points += QPointF(186.61281642420556, -20.94495784777482); - points += QPointF(205.31950565747624, -27.21179180985321); - points += QPointF(223.51736443487215, -34.306381867523655); - points += QPointF(241.0503469884652, -42.23845350735769); - points += QPointF(257.76798751706616, -51.01164773556077); - points += QPointF(273.5285590176657, -60.62398316233916); - points += QPointF(284.94491218126115, -68.7504632158891); - points += QPointF(286.89008170747013, -68.48208250840415); - points += QPointF(556.951317720607, -31.220946854728947); - points += QPointF(539.6101141051189, 79.89131577778124); - points += QPointF(585.9167315845332, -20.7024207218235); - points += QPointF(1117.4559101159903, 212.6634418802967); - points += QPointF(1101.8482040478996, 244.8082798528157); - points += QPointF(1080.077560308019, 292.3718325563429); - points += QPointF(1061.8089025447719, 335.54292908714797); - points += QPointF(1046.6013689355652, 374.7989965048928); - points += QPointF(1034.1843603449322, 410.2384638595293); - points += QPointF(1024.2819001340656, 441.96655926454446); - points += QPointF(1016.6128103198596, 470.0987514791764); - points += QPointF(1010.891548127259, 494.7652903217379); - points += QPointF(1006.8300406648392, 516.1171535751373); - points += QPointF(1004.1409514475167, 534.3338730421456); - points += QPointF(1002.5429209641059, 549.6340874837038); - points += QPointF(1001.8096437359794, 561.6175009318105); - points += QPointF(1001.632561636562, 577.0190278199144); - points += QPointF(1002.5982079396683, 593.4977885619218); - points += QPointF(1003.0419281414149, 597.870394747796); - points += QPointF(1003.1926540422378, 599.1363247745379); - points += QPointF(1004.4715714217981, 605.7139974891637); - points += QPointF(1006.6672239434022, 613.5972045855956); - points += QPointF(1010.1411052399322, 623.2360341722922); - points += QPointF(1014.8474980040493, 633.8337662374475); - points += QPointF(1020.6660121283516, 644.7426504865729); - points += QPointF(1027.4243046890665, 655.4292751847524); - points += QPointF(1034.913026324476, 665.4623428264111); - points += QPointF(1042.9029269068749, 674.5151720813944); - points += QPointF(1051.171411576988, 682.3761985416603); - points += QPointF(1060.1878101895825, 689.4651444417038); - points += QPointF(1066.6143341082677, 693.625487703081); - points += QPointF(1070.1212524493003, 695.6022659553572); - points += QPointF(1074.3830151134664, 697.7096649640414); - points += QPointF(1078.7265805419665, 699.565875909043); - points += QPointF(1083.206554246492, 701.1878034134409); - points += QPointF(1087.891993301369, 702.5858632116882); - points += QPointF(1092.8646688655851, 703.7605199081748); - points += QPointF(1098.2162239125396, 704.699271425244); - points += QPointF(1104.0444208482252, 705.3744462055462); - points += QPointF(1111.3488014116294, 705.7937559506272); - points += QPointF(1290.2705536650083, 707.4996206162249); - points += QPointF(1302.416131870577, 881.6558256043734); - points += QPointF(30.0, 970.3935748031496); + points += QPointF(81.746054423686445, -0.275895198174861); + points += QPointF(119.502088280527815, -5.192452541281906); + points += QPointF(148.425957227782732, -10.854963023883784); + points += QPointF(167.448600561093770, -15.907328733562260); + points += QPointF(186.612816424205562, -20.944957847774820); + points += QPointF(205.319505657476242, -27.211791809853210); + points += QPointF(223.517364434872150, -34.306381867523655); + points += QPointF(241.050346988465208, -42.238453507357690); + points += QPointF(257.767987517066160, -51.011647735560771); + points += QPointF(273.528559017665714, -60.623983162339158); + points += QPointF(284.944912181261145, -68.750463215889098); + points += QPointF(286.890081707470131, -68.482082508404147); + points += QPointF(556.951317720606994, -31.220946854728947); + points += QPointF(539.610114105118896, 79.891315777781244); + points += QPointF(585.916731584533181, -20.702420721823501); + points += QPointF(1117.455910115990264, 212.663441880296688); + points += QPointF(1101.848204047899571, 244.808279852815701); + points += QPointF(1080.077560308018974, 292.371832556342895); + points += QPointF(1061.808902544771854, 335.542929087147968); + points += QPointF(1046.601368935565233, 374.798996504892784); + points += QPointF(1034.184360344932202, 410.238463859529304); + points += QPointF(1024.281900134065609, 441.966559264544458); + points += QPointF(1016.612810319859591, 470.098751479176428); + points += QPointF(1010.891548127258943, 494.765290321737893); + points += QPointF(1006.830040664839203, 516.117153575137309); + points += QPointF(1004.140951447516727, 534.333873042145569); + points += QPointF(1002.542920964105861, 549.634087483703752); + points += QPointF(1001.809643735979421, 561.617500931810469); + points += QPointF(1001.632561636561945, 577.019027819914413); + points += QPointF(1003.005943695759470, 595.324545904181832); + points += QPointF(1003.122677531314821, 597.878021988163141); + points += QPointF(1003.192654042237791, 599.136324774537911); + points += QPointF(1004.471571421798103, 605.713997489163717); + points += QPointF(1006.667223943402178, 613.597204585595591); + points += QPointF(1010.141105239932244, 623.236034172292193); + points += QPointF(1014.847498004049271, 633.833766237447549); + points += QPointF(1020.666012128351554, 644.742650486572870); + points += QPointF(1027.424304689066503, 655.429275184752441); + points += QPointF(1034.913026324476050, 665.462342826411145); + points += QPointF(1042.902926906874882, 674.515172081394439); + points += QPointF(1051.171411576988021, 682.376198541660301); + points += QPointF(1060.187810189582478, 689.465144441703842); + points += QPointF(1066.614334108267713, 693.625487703081035); + points += QPointF(1070.257199304126971, 695.293432907079136); + points += QPointF(1074.502615007352006, 697.381379428831451); + points += QPointF(1078.826982655972415, 699.218630270296671); + points += QPointF(1083.285021824863634, 700.822525916039240); + points += QPointF(1087.891993301368984, 702.585863211688206); + points += QPointF(1092.864668865585145, 703.760519908174842); + points += QPointF(1098.216223912539590, 704.699271425243978); + points += QPointF(1104.044420848225172, 705.374446205546178); + points += QPointF(1112.817242174511875, 705.622046059863806); + points += QPointF(1290.270553665008265, 707.499620616224888); + points += QPointF(1302.416131870576919, 881.655825604373376); + points += QPointF(30.000000000000000, 970.393574803149590); return points; } @@ -1685,66 +1685,66 @@ QVector TST_VAbstractPiece::OutputPointsSeamTest1PieceByFirstRightAngle { QVector points; - points += QPointF(30.0, 970.3935748031496); - points += QPointF(30.0, 2.2023778242823937); + points += QPointF(30.000000000000000, 970.393574803149590); + points += QPointF(30.000000000000000, 2.202377824282394); points += QPointF(46.111397855976776, 2.027726815668483); - points += QPointF(81.74605442368645, -0.2758951981748612); - points += QPointF(119.50208828052781, -5.192452541281906); - points += QPointF(148.42595722778273, -10.854963023883784); - points += QPointF(167.5566961450379, -15.490385095876569); - points += QPointF(186.61281642420556, -20.94495784777482); - points += QPointF(205.31950565747624, -27.21179180985321); - points += QPointF(223.51736443487215, -34.306381867523655); - points += QPointF(241.0503469884652, -42.23845350735769); - points += QPointF(257.76798751706616, -51.01164773556077); - points += QPointF(273.5285590176657, -60.62398316233916); - points += QPointF(288.203122586733, -71.06974867341756); - points += QPointF(301.89505943185964, -82.52353546533966); - points += QPointF(308.6809861986896, -89.06571203590164); - points += QPointF(334.91313141686754, -61.856202407499914); - points += QPointF(556.951317720607, -31.220946854728947); - points += QPointF(539.6101141051189, 79.89131577778124); - points += QPointF(585.9167315845332, -20.7024207218235); - points += QPointF(1117.4559101159903, 212.6634418802967); - points += QPointF(1101.8482040478996, 244.8082798528157); - points += QPointF(1080.077560308019, 292.3718325563429); - points += QPointF(1061.8089025447719, 335.54292908714797); - points += QPointF(1046.6013689355652, 374.7989965048928); - points += QPointF(1034.1843603449322, 410.2384638595293); - points += QPointF(1024.2819001340656, 441.96655926454446); - points += QPointF(1016.6128103198596, 470.0987514791764); - points += QPointF(1010.891548127259, 494.7652903217379); - points += QPointF(1006.8300406648392, 516.1171535751373); - points += QPointF(1004.1409514475167, 534.3338730421456); - points += QPointF(1002.5429209641059, 549.6340874837038); - points += QPointF(1001.8096437359794, 561.6175009318105); - points += QPointF(1001.632561636562, 577.0190278199144); - points += QPointF(1002.5982079396683, 593.4977885619218); - points += QPointF(1003.0419281414149, 597.870394747796); - points += QPointF(1003.1926540422378, 599.1363247745379); - points += QPointF(1004.4715714217981, 605.7139974891637); - points += QPointF(1006.6672239434022, 613.5972045855956); - points += QPointF(1010.1411052399322, 623.2360341722922); - points += QPointF(1014.8474980040493, 633.8337662374475); - points += QPointF(1020.6660121283516, 644.7426504865729); - points += QPointF(1027.4243046890665, 655.4292751847524); - points += QPointF(1034.913026324476, 665.4623428264111); - points += QPointF(1042.9029269068749, 674.5151720813944); - points += QPointF(1051.171411576988, 682.3761985416603); - points += QPointF(1060.1878101895825, 689.4651444417038); - points += QPointF(1066.6143341082677, 693.625487703081); - points += QPointF(1070.1212524493003, 695.6022659553572); - points += QPointF(1074.3830151134664, 697.7096649640414); - points += QPointF(1078.7265805419665, 699.565875909043); - points += QPointF(1083.206554246492, 701.1878034134409); - points += QPointF(1087.891993301369, 702.5858632116882); - points += QPointF(1092.8646688655851, 703.7605199081748); - points += QPointF(1098.2162239125396, 704.699271425244); - points += QPointF(1104.0444208482252, 705.3744462055462); - points += QPointF(1111.3488014116294, 705.7937559506272); - points += QPointF(1290.2705536650083, 707.4996206162249); - points += QPointF(1302.416131870577, 881.6558256043734); - points += QPointF(30.0, 970.3935748031496); + points += QPointF(81.746054423686445, -0.275895198174861); + points += QPointF(119.502088280527815, -5.192452541281906); + points += QPointF(148.425957227782732, -10.854963023883784); + points += QPointF(167.448600561093770, -15.907328733562260); + points += QPointF(186.612816424205562, -20.944957847774820); + points += QPointF(205.319505657476242, -27.211791809853210); + points += QPointF(223.517364434872150, -34.306381867523655); + points += QPointF(241.050346988465208, -42.238453507357690); + points += QPointF(257.767987517066160, -51.011647735560771); + points += QPointF(273.528559017665714, -60.623983162339158); + points += QPointF(288.203122586733002, -71.069748673417564); + points += QPointF(301.895059431859636, -82.523535465339663); + points += QPointF(308.680986198689595, -89.065712035901640); + points += QPointF(334.913131416867543, -61.856202407499914); + points += QPointF(556.951317720606994, -31.220946854728947); + points += QPointF(539.610114105118896, 79.891315777781244); + points += QPointF(585.916731584533181, -20.702420721823501); + points += QPointF(1117.455910115990264, 212.663441880296688); + points += QPointF(1101.848204047899571, 244.808279852815701); + points += QPointF(1080.077560308018974, 292.371832556342895); + points += QPointF(1061.808902544771854, 335.542929087147968); + points += QPointF(1046.601368935565233, 374.798996504892784); + points += QPointF(1034.184360344932202, 410.238463859529304); + points += QPointF(1024.281900134065609, 441.966559264544458); + points += QPointF(1016.612810319859591, 470.098751479176428); + points += QPointF(1010.891548127258943, 494.765290321737893); + points += QPointF(1006.830040664839203, 516.117153575137309); + points += QPointF(1004.140951447516727, 534.333873042145569); + points += QPointF(1002.542920964105861, 549.634087483703752); + points += QPointF(1001.809643735979421, 561.617500931810469); + points += QPointF(1001.632561636561945, 577.019027819914413); + points += QPointF(1003.005943695759470, 595.324545904181832); + points += QPointF(1003.122677531314821, 597.878021988163141); + points += QPointF(1003.192654042237791, 599.136324774537911); + points += QPointF(1004.471571421798103, 605.713997489163717); + points += QPointF(1006.667223943402178, 613.597204585595591); + points += QPointF(1010.141105239932244, 623.236034172292193); + points += QPointF(1014.847498004049271, 633.833766237447549); + points += QPointF(1020.666012128351554, 644.742650486572870); + points += QPointF(1027.424304689066503, 655.429275184752441); + points += QPointF(1034.913026324476050, 665.462342826411145); + points += QPointF(1042.902926906874882, 674.515172081394439); + points += QPointF(1051.171411576988021, 682.376198541660301); + points += QPointF(1060.187810189582478, 689.465144441703842); + points += QPointF(1066.614334108267713, 693.625487703081035); + points += QPointF(1070.257199304126971, 695.293432907079136); + points += QPointF(1074.502615007352006, 697.381379428831451); + points += QPointF(1078.826982655972415, 699.218630270296671); + points += QPointF(1083.285021824863634, 700.822525916039240); + points += QPointF(1087.891993301368984, 702.585863211688206); + points += QPointF(1092.864668865585145, 703.760519908174842); + points += QPointF(1098.216223912539590, 704.699271425243978); + points += QPointF(1104.044420848225172, 705.374446205546178); + points += QPointF(1112.817242174511875, 705.622046059863806); + points += QPointF(1290.270553665008265, 707.499620616224888); + points += QPointF(1302.416131870576919, 881.655825604373376); + points += QPointF(30.000000000000000, 970.393574803149590); return points; } @@ -2009,63 +2009,63 @@ QVector TST_VAbstractPiece::OutputPointsSeamTest1PieceBySecondRightAngl { QVector points; - points += QPointF(30.0, 970.3935748031496); - points += QPointF(30.0, 2.2023778242823937); + points += QPointF(30.000000000000000, 970.393574803149590); + points += QPointF(30.000000000000000, 2.202377824282394); points += QPointF(46.111397855976776, 2.027726815668483); - points += QPointF(81.74605442368645, -0.2758951981748612); - points += QPointF(119.50208828052781, -5.192452541281906); - points += QPointF(148.42595722778273, -10.854963023883784); - points += QPointF(167.5566961450379, -15.490385095876569); - points += QPointF(186.61281642420556, -20.94495784777482); - points += QPointF(205.31950565747624, -27.21179180985321); - points += QPointF(223.51736443487215, -34.306381867523655); - points += QPointF(241.0503469884652, -42.23845350735769); - points += QPointF(257.76798751706616, -51.01164773556077); - points += QPointF(273.5285590176657, -60.62398316233916); - points += QPointF(284.4959443876259, -68.4308753608727); - points += QPointF(556.951317720607, -31.220946854728947); - points += QPointF(539.6101141051189, 79.89131577778124); - points += QPointF(585.9167315845332, -20.7024207218235); - points += QPointF(1117.4559101159903, 212.6634418802967); - points += QPointF(1101.8482040478996, 244.8082798528157); - points += QPointF(1080.077560308019, 292.3718325563429); - points += QPointF(1061.8089025447719, 335.54292908714797); - points += QPointF(1046.6013689355652, 374.7989965048928); - points += QPointF(1034.1843603449322, 410.2384638595293); - points += QPointF(1024.2819001340656, 441.96655926454446); - points += QPointF(1016.6128103198596, 470.0987514791764); - points += QPointF(1010.891548127259, 494.7652903217379); - points += QPointF(1006.8300406648392, 516.1171535751373); - points += QPointF(1004.1409514475167, 534.3338730421456); - points += QPointF(1002.5429209641059, 549.6340874837038); - points += QPointF(1001.8096437359794, 561.6175009318105); - points += QPointF(1001.632561636562, 577.0190278199144); - points += QPointF(1002.5982079396683, 593.4977885619218); - points += QPointF(1003.0419281414149, 597.870394747796); - points += QPointF(1003.1926540422378, 599.1363247745379); - points += QPointF(1004.4715714217981, 605.7139974891637); - points += QPointF(1006.6672239434022, 613.5972045855956); - points += QPointF(1010.1411052399322, 623.2360341722922); - points += QPointF(1014.8474980040493, 633.8337662374475); - points += QPointF(1020.6660121283516, 644.7426504865729); - points += QPointF(1027.4243046890665, 655.4292751847524); - points += QPointF(1034.913026324476, 665.4623428264111); - points += QPointF(1042.9029269068749, 674.5151720813944); - points += QPointF(1051.171411576988, 682.3761985416603); - points += QPointF(1060.1878101895825, 689.4651444417038); - points += QPointF(1066.6143341082677, 693.625487703081); - points += QPointF(1070.1212524493003, 695.6022659553572); - points += QPointF(1074.3830151134664, 697.7096649640414); - points += QPointF(1078.7265805419665, 699.565875909043); - points += QPointF(1083.206554246492, 701.1878034134409); - points += QPointF(1087.891993301369, 702.5858632116882); - points += QPointF(1092.8646688655851, 703.7605199081748); - points += QPointF(1098.2162239125396, 704.699271425244); - points += QPointF(1104.0444208482252, 705.3744462055462); - points += QPointF(1111.3488014116294, 705.7937559506272); - points += QPointF(1290.2705536650083, 707.4996206162249); - points += QPointF(1302.416131870577, 881.6558256043734); - points += QPointF(30.0, 970.3935748031496); + points += QPointF(81.746054423686445, -0.275895198174861); + points += QPointF(119.502088280527815, -5.192452541281906); + points += QPointF(148.425957227782732, -10.854963023883784); + points += QPointF(167.448600561093770, -15.907328733562260); + points += QPointF(186.612816424205562, -20.944957847774820); + points += QPointF(205.319505657476242, -27.211791809853210); + points += QPointF(223.517364434872150, -34.306381867523655); + points += QPointF(241.050346988465208, -42.238453507357690); + points += QPointF(257.767987517066160, -51.011647735560771); + points += QPointF(273.528559017665714, -60.623983162339158); + points += QPointF(284.495944387625912, -68.430875360872705); + points += QPointF(556.951317720606994, -31.220946854728947); + points += QPointF(539.610114105118896, 79.891315777781244); + points += QPointF(585.916731584533181, -20.702420721823501); + points += QPointF(1117.455910115990264, 212.663441880296688); + points += QPointF(1101.848204047899571, 244.808279852815701); + points += QPointF(1080.077560308018974, 292.371832556342895); + points += QPointF(1061.808902544771854, 335.542929087147968); + points += QPointF(1046.601368935565233, 374.798996504892784); + points += QPointF(1034.184360344932202, 410.238463859529304); + points += QPointF(1024.281900134065609, 441.966559264544458); + points += QPointF(1016.612810319859591, 470.098751479176428); + points += QPointF(1010.891548127258943, 494.765290321737893); + points += QPointF(1006.830040664839203, 516.117153575137309); + points += QPointF(1004.140951447516727, 534.333873042145569); + points += QPointF(1002.542920964105861, 549.634087483703752); + points += QPointF(1001.809643735979421, 561.617500931810469); + points += QPointF(1001.632561636561945, 577.019027819914413); + points += QPointF(1003.005943695759470, 595.324545904181832); + points += QPointF(1003.122677531314821, 597.878021988163141); + points += QPointF(1003.192654042237791, 599.136324774537911); + points += QPointF(1004.471571421798103, 605.713997489163717); + points += QPointF(1006.667223943402178, 613.597204585595591); + points += QPointF(1010.141105239932244, 623.236034172292193); + points += QPointF(1014.847498004049271, 633.833766237447549); + points += QPointF(1020.666012128351554, 644.742650486572870); + points += QPointF(1027.424304689066503, 655.429275184752441); + points += QPointF(1034.913026324476050, 665.462342826411145); + points += QPointF(1042.902926906874882, 674.515172081394439); + points += QPointF(1051.171411576988021, 682.376198541660301); + points += QPointF(1060.187810189582478, 689.465144441703842); + points += QPointF(1066.614334108267713, 693.625487703081035); + points += QPointF(1070.257199304126971, 695.293432907079136); + points += QPointF(1074.502615007352006, 697.381379428831451); + points += QPointF(1078.826982655972415, 699.218630270296671); + points += QPointF(1083.285021824863634, 700.822525916039240); + points += QPointF(1087.891993301368984, 702.585863211688206); + points += QPointF(1092.864668865585145, 703.760519908174842); + points += QPointF(1098.216223912539590, 704.699271425243978); + points += QPointF(1104.044420848225172, 705.374446205546178); + points += QPointF(1112.817242174511875, 705.622046059863806); + points += QPointF(1290.270553665008265, 707.499620616224888); + points += QPointF(1302.416131870576919, 881.655825604373376); + points += QPointF(30.000000000000000, 970.393574803149590); return points; } @@ -2332,51 +2332,42 @@ QVector TST_VAbstractPiece::OutputPointsCase2() const QVector points; points += QPointF(6.735602489575015, 2.204598425196849); - points += QPointF(445.74803149606305, 2.204598425196849); - points += QPointF(445.748031496063, 251.4844627007215); - points += QPointF(421.3353745697487, 264.71175899157447); - points += QPointF(418.8511557813181, 265.9375381882219); - points += QPointF(409.64132100578746, 270.0863170137037); - points += QPointF(406.534680371908, 271.3182540481497); - points += QPointF(397.2710759906872, 274.5415428980511); - points += QPointF(394.0919849710222, 275.48841417378816); - points += QPointF(384.8024194256035, 277.83219356243256); - points += QPointF(381.6170070948525, 278.48670406257685); - points += QPointF(372.3292888267279, 279.99695450428766); - points += QPointF(369.1984911888747, 280.3682097399039); - points += QPointF(358.2408334277008, 281.22358539078493); - points += QPointF(340.1284056058474, 280.95032539874563); - points += QPointF(317.1003672226287, 277.46101449907337); - points += QPointF(295.1519528906243, 271.0847085461394); - points += QPointF(274.68871290802866, 262.4196148903778); - points += QPointF(255.81310453620574, 251.94235440791147); - points += QPointF(238.61081765006833, 240.0508703303418); - points += QPointF(223.16837814314113, 227.06961282699527); - points += QPointF(209.5774971397173, 213.23886816257252); - points += QPointF(197.93811921404816, 198.6726417606856); - points += QPointF(195.59837660985662, 194.8969375402249); - points += QPointF(195.2927772651506, 194.97641969682226); - points += QPointF(187.62154404176044, 196.50069439568804); - points += QPointF(183.8778341349861, 197.05831567247884); - points += QPointF(173.80935665477787, 198.03576335366748); - points += QPointF(156.58462346404755, 197.97207956246808); - points += QPointF(133.84749301666088, 194.8740254865072); - points += QPointF(111.24564892141993, 188.99632536164253); - points += QPointF(89.23016638120879, 180.74760051351964); - points += QPointF(68.08422273452526, 170.36786581256206); - points += QPointF(48.14786227034436, 157.9960303610079); - points += QPointF(29.800888286137585, 143.65294976668383); - points += QPointF(13.683525778751441, 127.38445078151254); - points += QPointF(3.3994938238576147, 113.51550175712616); - points += QPointF(-1.6212069307357524, 104.9101180366734); - points += QPointF(-3.5070767733614048, 101.24376431773773); - points += QPointF(-7.59130229548195, 92.07847667888365); - points += QPointF(-11.18749819246625, 80.23547351371789); - points += QPointF(-13.151329445248951, 67.6232425750484); - points += QPointF(-13.149174973239838, 54.47473007846592); + points += QPointF(445.748031496063049, 2.204598425196849); + points += QPointF(445.748031496062993, 251.484462700721508); + points += QPointF(419.591110849233189, 265.317270648671297); + points += QPointF(407.953210071604417, 270.322402348478022); + points += QPointF(395.580263781148915, 274.639711080216728); + points += QPointF(383.140340834693006, 277.792967801099280); + points += QPointF(370.724173666002685, 279.828447786037486); + points += QPointF(358.240833427700807, 281.223585390784933); + points += QPointF(340.128405605847377, 280.950325398745633); + points += QPointF(317.100367222628677, 277.461014499073372); + points += QPointF(295.151952890624273, 271.084708546139382); + points += QPointF(274.688712908028663, 262.419614890377773); + points += QPointF(255.813104536205742, 251.942354407911466); + points += QPointF(238.610817650068327, 240.050870330341809); + points += QPointF(223.168378143141126, 227.069612826995268); + points += QPointF(209.577497139717309, 213.238868162572516); + points += QPointF(197.938119214048157, 198.672641760685593); + points += QPointF(195.334197289257986, 194.470624417595133); + points += QPointF(185.650431199796770, 196.441071788419436); + points += QPointF(173.809356654777872, 198.035763353667477); + points += QPointF(156.584623464047553, 197.972079562468082); + points += QPointF(133.847493016660877, 194.874025486507207); + points += QPointF(111.245648921419928, 188.996325361642533); + points += QPointF(89.230166381208790, 180.747600513519643); + points += QPointF(68.084222734525255, 170.367865812562059); + points += QPointF(48.147862270344362, 157.996030361007911); + points += QPointF(29.800888286137585, 143.652949766683832); + points += QPointF(13.683525778751441, 127.384450781512541); + points += QPointF(3.399493823857615, 113.515501757126160); + points += QPointF(-2.224241185040267, 102.935005111895975); + points += QPointF(-7.591302295481950, 92.078476678883646); + points += QPointF(-11.187498192466251, 80.235473513717892); + points += QPointF(-13.151329445248951, 67.623242575048394); + points += QPointF(-13.149174973239838, 54.474730078465917); points += QPointF(-10.943375405772395, 41.194056317965945); - points += QPointF(-7.507583651313517, 31.220471153284027); - points += QPointF(-5.523329117990919, 26.502419601905103); + points += QPointF(-6.573018301423769, 29.688707734798065); points += QPointF(6.735602489575015, 2.204598425196849); return points; @@ -2715,71 +2706,65 @@ QVector TST_VAbstractPiece::OutputPointsCase3() const QVector points; points += QPointF(10.185624773347756, 2.204598425196849); - points += QPointF(445.74803149606305, 2.204598425196849); - points += QPointF(445.748031496063, 239.54370877454926); - points += QPointF(434.2772499516588, 257.60252755179886); - points += QPointF(421.70410911168364, 272.23247310841623); - points += QPointF(406.8215280616999, 283.81580578394335); - points += QPointF(390.4268690095888, 291.4924548133903); - points += QPointF(373.43168069161504, 294.97206109652825); - points += QPointF(356.88925393255363, 294.44576261629163); - points += QPointF(341.59261122311955, 290.5110196449043); - points += QPointF(327.9415795488323, 283.8601978892787); - points += QPointF(316.0766275069774, 275.06080862168557); - points += QPointF(306.0568354718494, 264.51533811547125); - points += QPointF(297.96706395968476, 252.511650805464); - points += QPointF(291.95795669012034, 239.28944839897594); - points += QPointF(288.2457014751128, 225.09982730403647); - points += QPointF(287.08291204680114, 210.25330053220583); - points += QPointF(288.70312350739385, 195.14331998915887); - points += QPointF(293.1661864923215, 180.51562637269953); - points += QPointF(295.67056116540294, 175.36866212621038); - points += QPointF(297.03278914138764, 169.78727745627393); - points += QPointF(298.4272653364355, 158.08534773323754); - points += QPointF(297.94225297413215, 150.9565650350354); - points += QPointF(296.9126887137917, 147.81469899066454); - points += QPointF(296.3972469066644, 147.0940064443774); - points += QPointF(294.21114346945865, 146.12370067508155); - points += QPointF(290.48115362247165, 145.59912885424706); - points += QPointF(285.00652997672506, 145.7209025858372); - points += QPointF(278.36163578883384, 146.69497061341855); - points += QPointF(266.15085284299454, 149.72785233297387); - points += QPointF(268.76683081190356, 149.29112994946044); - points += QPointF(264.11356456471754, 150.8634687956155); - points += QPointF(254.1976334991026, 155.20769360077045); - points += QPointF(247.5665032053911, 159.21880811798434); - points += QPointF(240.66667729218545, 164.69290058326322); - points += QPointF(245.03051571796473, 161.55629083592723); - points += QPointF(243.53306498622524, 163.14262925675627); - points += QPointF(226.1305060641393, 173.66370879502696); - points += QPointF(209.78346359977252, 181.5593960732169); - points += QPointF(205.70527201989748, 183.03741399670108); - points += QPointF(202.38658536147173, 184.69191672318945); - points += QPointF(188.21241736536905, 188.00791613383734); - points += QPointF(177.31502181326212, 188.81402560575697); - points += QPointF(166.19214722698052, 187.3732642424327); - points += QPointF(155.57437225205163, 183.1763006101058); - points += QPointF(146.72924182900442, 176.50793105628702); - points += QPointF(140.1685902867883, 168.24813556221721); - points += QPointF(134.85380559162166, 156.67751165744627); - points += QPointF(132.20863928510303, 142.1050670962771); - points += QPointF(131.96761370902018, 132.827500480644); - points += QPointF(129.15133677704625, 135.35186071252022); - points += QPointF(111.11355282491606, 146.22365885487164); - points += QPointF(91.37199519960252, 152.42334659042638); - points += QPointF(71.0892515601446, 152.98732013057335); - points += QPointF(52.404520155294485, 148.14379692629467); - points += QPointF(36.77389835731295, 139.5232504514038); - points += QPointF(24.295634363907766, 128.84573062197663); - points += QPointF(14.420075278530305, 117.169833926539); - points += QPointF(6.592092174103988, 105.03828991585254); - points += QPointF(0.43109819620662115, 92.75351406859714); - points += QPointF(-3.633892542136806, 82.1990453602945); - points += QPointF(-4.775453591602712, 78.74896433599663); - points += QPointF(-7.124529092917548, 70.30865341050259); - points += QPointF(-8.006297887627618, 66.31522508588391); - points += QPointF(-9.70470173566634, 56.00020752908148); - points += QPointF(-9.960881193587724, 42.34587460321338); + points += QPointF(445.748031496063049, 2.204598425196849); + points += QPointF(445.748031496062993, 239.543708774549259); + points += QPointF(434.277249951658803, 257.602527551798858); + points += QPointF(421.704109111683636, 272.232473108416229); + points += QPointF(406.821528061699894, 283.815805783943347); + points += QPointF(390.426869009588813, 291.492454813390282); + points += QPointF(373.431680691615043, 294.972061096528250); + points += QPointF(356.889253932553629, 294.445762616291631); + points += QPointF(341.592611223119548, 290.511019644904309); + points += QPointF(327.941579548832294, 283.860197889278709); + points += QPointF(316.076627506977388, 275.060808621685567); + points += QPointF(306.056835471849411, 264.515338115471252); + points += QPointF(297.967063959684765, 252.511650805464001); + points += QPointF(291.957956690120341, 239.289448398975935); + points += QPointF(288.245701475112810, 225.099827304036467); + points += QPointF(287.082912046801141, 210.253300532205827); + points += QPointF(288.703123507393855, 195.143319989158869); + points += QPointF(293.166186492321515, 180.515626372699529); + points += QPointF(295.750834317039335, 175.266984212723173); + points += QPointF(297.032789141387639, 169.787277456273927); + points += QPointF(298.427265336435482, 158.085347733237541); + points += QPointF(297.942252974132145, 150.956565035035396); + points += QPointF(296.912688713791681, 147.814698990664539); + points += QPointF(296.397246906664407, 147.094006444377413); + points += QPointF(294.211143469458648, 146.123700675081551); + points += QPointF(290.481153622471652, 145.599128854247056); + points += QPointF(285.006529976725062, 145.720902585837194); + points += QPointF(278.361635788833837, 146.694970613418548); + points += QPointF(267.519968122858188, 149.956925613013397); + points += QPointF(264.113564564717535, 150.863468795615489); + points += QPointF(254.197633499102608, 155.207693600770455); + points += QPointF(247.566503205391086, 159.218808117984338); + points += QPointF(242.133205734663164, 164.068016868286207); + points += QPointF(226.130506064139297, 173.663708795026963); + points += QPointF(209.783463599772517, 181.559396073216902); + points += QPointF(204.008719733376893, 183.449807040567407); + points += QPointF(188.212417365369049, 188.007916133837341); + points += QPointF(177.315021813262121, 188.814025605756967); + points += QPointF(166.192147226980524, 187.373264242432697); + points += QPointF(155.574372252051631, 183.176300610105812); + points += QPointF(146.729241829004422, 176.507931056287021); + points += QPointF(140.168590286788287, 168.248135562217215); + points += QPointF(134.853805591621665, 156.677511657446274); + points += QPointF(132.208639285103033, 142.105067096277111); + points += QPointF(131.967613709020185, 132.827500480644005); + points += QPointF(129.151336777046254, 135.351860712520221); + points += QPointF(111.113552824916056, 146.223658854871644); + points += QPointF(91.371995199602523, 152.423346590426377); + points += QPointF(71.089251560144604, 152.987320130573352); + points += QPointF(52.404520155294485, 148.143796926294669); + points += QPointF(36.773898357312952, 139.523250451403811); + points += QPointF(24.295634363907766, 128.845730621976628); + points += QPointF(14.420075278530305, 117.169833926538999); + points += QPointF(6.592092174103988, 105.038289915852545); + points += QPointF(0.431098196206621, 92.753514068597141); + points += QPointF(-3.811839725119704, 80.407158989437562); + points += QPointF(-7.160548513622416, 68.341960678446355); + points += QPointF(-9.704701735666340, 56.000207529081479); + points += QPointF(-9.960881193587724, 42.345874603213382); points += QPointF(-6.297329478268652, 26.037464411020956); points += QPointF(10.185624773347756, 2.204598425196849); @@ -2849,27 +2834,27 @@ QVector TST_VAbstractPiece::OutputPointsIssue627() const { QVector points; - points += QPointF(11561.41547872419, -14.638641388671703); - points += QPointF(11760.258895120205, -3158.7131695287526); - points += QPointF(11781.963967565265, -3501.9096738073645); - points += QPointF(11867.496139886349, -3648.1946350753437); - points += QPointF(11962.541506347354, -3812.580249902983); - points += QPointF(12058.65110785104, -3980.602304924286); - points += QPointF(12156.571541308, -4153.523816526403); - points += QPointF(12257.041160881332, -4332.593222274458); - points += QPointF(12413.634876614758, -4614.375203387231); - points += QPointF(12638.875580780275, -5024.643354851167); - points += QPointF(12887.730780405262, -5482.200047474014); - points += QPointF(13313.529827372417, -6270.219194236017); - points += QPointF(13707.971545534987, -7002.489438444618); - points += QPointF(13491.504163312642, -14.778496052733317); - points += QPointF(13226.693612049832, -21.703416545128476); - points += QPointF(12939.151113441983, -27.11598122480561); - points += QPointF(12664.386257521342, -29.82135826771654); - points += QPointF(12393.881459014092, -29.82135826771654); - points += QPointF(12119.116603093453, -27.11598122480561); - points += QPointF(11831.5741044856, -21.70341654512845); - points += QPointF(11561.41547872419, -14.638641388671703); + points += QPointF(11561.415478724189597, -14.638641388671703); + points += QPointF(11760.258895120205125, -3158.713169528752587); + points += QPointF(11781.996734110334728, -3502.427772226710658); + points += QPointF(11867.496139886348828, -3648.194635075343740); + points += QPointF(11962.154877960796512, -3812.801737355388468); + points += QPointF(12058.281041510977957, -3980.811598798730756); + points += QPointF(12156.222991903809088, -4153.718629724788116); + points += QPointF(12257.041160881331962, -4332.593222274457730); + points += QPointF(12413.634876614758468, -4614.375203387230613); + points += QPointF(12638.875580780275413, -5024.643354851166805); + points += QPointF(12887.730780405261612, -5482.200047474014355); + points += QPointF(13313.529827372416548, -6270.219194236016847); + points += QPointF(13707.971545534986944, -7002.489438444617917); + points += QPointF(13491.504163312642049, -14.778496052733317); + points += QPointF(13226.693612049832154, -21.703416545128476); + points += QPointF(12939.151113441983398, -27.115981224805608); + points += QPointF(12664.386257521342486, -29.821358267716541); + points += QPointF(12393.881459014091888, -29.821358267716541); + points += QPointF(12119.116603093452795, -27.115981224805608); + points += QPointF(11831.574104485600401, -21.703416545128452); + points += QPointF(11561.415478724189597, -14.638641388671703); return points; } @@ -3176,63 +3161,59 @@ QVector TST_VAbstractPiece::OutputPointsIssue767_Fabric_TopCollar() con { QVector points; - points += QPointF(-3011.0517548790103, -958.3219444006113); - points += QPointF(-2875.704655596311, -988.873180340486); - points += QPointF(-2868.785856897648, -997.0427375924612); - points += QPointF(-2869.7392507631107, -995.9600609286653); - points += QPointF(-2852.5415024022873, -1017.6725348741263); - points += QPointF(-2834.5617365102394, -1042.0076837341114); - points += QPointF(-2816.318152801347, -1068.2197024431434); - points += QPointF(-2788.3520303679693, -1110.8598835568037); - points += QPointF(-2748.84326164774, -1175.7792341372995); - points += QPointF(-2749.463357194371, -1174.8146939231094); - points += QPointF(-2735.5637236883463, -1198.8327989055008); - points += QPointF(-2709.3979303070278, -1242.234412525294); - points += QPointF(-2667.7155430266657, -1313.9462711856888); - points += QPointF(-2603.3069903890537, -1428.3146296654857); - points += QPointF(-2559.7159427255197, -1507.0184553230588); - points += QPointF(-2514.227494695693, -1585.1196674161204); - points += QPointF(-2449.1583954294993, -1698.6620182726447); - points += QPointF(-2408.901620525935, -1771.183767809588); - points += QPointF(-2384.8455512861474, -1816.21584000147); - points += QPointF(-2371.503784159133, -1840.1189454999956); - points += QPointF(-2372.0148030467776, -1839.0924387985017); - points += QPointF(-2336.479706267199, -1906.2692337682788); - points += QPointF(-2314.171878902582, -1952.123894247254); - points += QPointF(-2300.9973669393667, -1981.2156543505293); - points += QPointF(-2289.299963085879, -2009.1198152343736); - points += QPointF(-2279.45497012318, -2035.0093920383335); - points += QPointF(-2279.8968116139968, -2033.636102295412); - points += QPointF(-2276.4218852914523, -2043.7621246230262); - points += QPointF(-2319.4788717575434, -2175.664782739319); - points += QPointF(-2117.1714492551437, -2194.168101599941); - points += QPointF(-2068.2154029909548, -2065.2779091126845); - points += QPointF(-1952.6366140283867, -1890.801039106245); - points += QPointF(-1917.5866708240478, -1837.8899156844163); - points += QPointF(-2058.482716230266, -1695.5698799023787); - points += QPointF(-2088.4965443596293, -1664.6582745816295); - points += QPointF(-2140.249137288814, -1608.8138823251727); - points += QPointF(-2176.2589010959327, -1568.108510006008); - points += QPointF(-2212.3342540344497, -1525.2626688631194); - points += QPointF(-2247.2342025287544, -1481.1740984291687); - points += QPointF(-2279.7666296737902, -1436.6932724131166); - points += QPointF(-2301.7153187064755, -1403.691786696855); - points += QPointF(-2315.030637739082, -1382.066893805181); - points += QPointF(-2321.1285274245947, -1371.4891377154586); - points += QPointF(-2327.0923575597108, -1360.8352223500915); - points += QPointF(-2338.84998341349, -1338.3254034298122); - points += QPointF(-2355.95941674385, -1302.57473489304); - points += QPointF(-2377.5102970264106, -1251.8552883456102); - points += QPointF(-2397.5120320442174, -1199.3030377360624); - points += QPointF(-2415.8444669892974, -1146.3774388092156); - points += QPointF(-2432.371872429092, -1094.6041320326606); - points += QPointF(-2453.842769979148, -1021.5566982667648); - points += QPointF(-2465.02757138208, -979.9483164185621); - points += QPointF(-2515.136197939205, -786.0519169140614); - points += QPointF(-2578.5317097224242, -789.0676889577924); - points += QPointF(-2787.581316069137, -799.0123226453655); - points += QPointF(-2923.36118702248, -775.0706679591581); - points += QPointF(-3011.0517548790103, -958.3219444006113); + points += QPointF(-3011.051754879010332, -958.321944400611301); + points += QPointF(-2875.704655596311113, -988.873180340485987); + points += QPointF(-2869.673059677899346, -996.524365493772848); + points += QPointF(-2852.541502402287279, -1017.672534874126313); + points += QPointF(-2834.561736510239371, -1042.007683734111424); + points += QPointF(-2816.318152801346969, -1068.219702443143433); + points += QPointF(-2788.352030367969292, -1110.859883556803652); + points += QPointF(-2749.386875540295023, -1175.765108151581899); + points += QPointF(-2735.802578699315291, -1198.692835538001191); + points += QPointF(-2709.397930307027764, -1242.234412525293919); + points += QPointF(-2667.715543026665728, -1313.946271185688829); + points += QPointF(-2603.712719729991932, -1428.363509653913525); + points += QPointF(-2559.695881072102566, -1507.019334818998004); + points += QPointF(-2514.669030745282726, -1585.102888953246520); + points += QPointF(-2449.158395429499251, -1698.662018272644673); + points += QPointF(-2408.901620525934959, -1771.183767809588062); + points += QPointF(-2385.019807124009731, -1816.159092763202125); + points += QPointF(-2372.278829778459112, -1839.571054304704830); + points += QPointF(-2336.479706267199163, -1906.269233768278809); + points += QPointF(-2314.171878902582193, -1952.123894247253929); + points += QPointF(-2300.997366939366657, -1981.215654350529348); + points += QPointF(-2289.299963085878971, -2009.119815234373618); + points += QPointF(-2279.904176693012232, -2034.668560352101622); + points += QPointF(-2276.421885291452327, -2043.762124623026239); + points += QPointF(-2319.478871757543402, -2175.664782739318980); + points += QPointF(-2117.171449255143671, -2194.168101599941110); + points += QPointF(-2068.215402990954772, -2065.277909112684483); + points += QPointF(-1952.636612250339113, -1890.801040797071892); + points += QPointF(-1917.586670824047815, -1837.889915684416337); + points += QPointF(-2058.290157817677482, -1695.288962930576417); + points += QPointF(-2088.496544359629297, -1664.658274581629485); + points += QPointF(-2140.249137288813927, -1608.813882325172699); + points += QPointF(-2176.258901095932742, -1568.108510006007918); + points += QPointF(-2212.334254034449714, -1525.262668863119416); + points += QPointF(-2247.234202528754395, -1481.174098429168680); + points += QPointF(-2279.766629673790248, -1436.693272413116574); + points += QPointF(-2301.715318706475500, -1403.691786696854933); + points += QPointF(-2314.880004231360545, -1381.841888079642331); + points += QPointF(-2321.059426304634599, -1371.449590621683228); + points += QPointF(-2326.823644233704272, -1360.817879791030009); + points += QPointF(-2338.849983413490008, -1338.325403429812241); + points += QPointF(-2355.959416743849943, -1302.574734893039931); + points += QPointF(-2377.510297026410626, -1251.855288345610234); + points += QPointF(-2397.512032044217449, -1199.303037736062379); + points += QPointF(-2415.844466989297416, -1146.377438809215619); + points += QPointF(-2432.371872429092036, -1094.604132032660573); + points += QPointF(-2453.842769979148215, -1021.556698266764784); + points += QPointF(-2464.688086893720538, -979.925175945867977); + points += QPointF(-2515.136197939204976, -786.051916914061394); + points += QPointF(-2578.531707943902347, -789.067686454400928); + points += QPointF(-2787.581316069136847, -799.012322645365543); + points += QPointF(-2923.361187022479953, -775.070667959158072); + points += QPointF(-3011.051754879010332, -958.321944400611301); return points; } @@ -3535,55 +3516,55 @@ QVector TST_VAbstractPiece::OutputPointsIssue767_SkinFusing_TopCollar_N { QVector points; - points += QPointF(-2956.503052984476, -931.8887725360864); - points += QPointF(-2845.8999353737872, -956.8546710275792); - points += QPointF(-2836.5851689927185, -967.7355423437981); - points += QPointF(-2817.8474487692724, -991.136726507766); - points += QPointF(-2798.925476794025, -1016.4643697746903); - points += QPointF(-2779.83354016522, -1043.5867062304706); - points += QPointF(-2750.887165791067, -1087.2141100776162); - points += QPointF(-2711.65687579555, -1150.9111085764941); - points += QPointF(-2671.760583609897, -1219.7424702384794); - points += QPointF(-2631.217741006335, -1292.785732104274); - points += QPointF(-2569.022589526747, -1408.5260882408015); - points += QPointF(-2526.849928574273, -1488.3554445590923); - points += QPointF(-2479.8121574890624, -1565.559731854928); - points += QPointF(-2412.2945618796525, -1678.145787075361); - points += QPointF(-2370.3106788529753, -1750.3703933828758); - points += QPointF(-2331.6136749119755, -1819.8830711074306); - points += QPointF(-2296.985964337713, -1886.194796550727); - points += QPointF(-2274.3320398964784, -1933.3969433585041); - points += QPointF(-2260.809956115591, -1963.683515123611); - points += QPointF(-2248.7424468838362, -1992.9051810211831); - points += QPointF(-2238.2310088750087, -2020.9957910056432); - points += QPointF(-2233.6582717055753, -2034.5545386613094); - points += QPointF(-2268.843635583417, -2142.3429233856164); - points += QPointF(-2142.3122611221115, -2153.915659267329); - points += QPointF(-2102.05157470339, -2047.9183817466978); - points += QPointF(-1957.540323165074, -1829.765289335082); - points += QPointF(-2074.675746476508, -1711.446016505495); - points += QPointF(-2104.9501005136362, -1680.2660923950884); - points += QPointF(-2157.060300446018, -1624.0358190720049); - points += QPointF(-2193.427447844697, -1582.9264609829493); - points += QPointF(-2229.9021223993304, -1539.6063550266792); - points += QPointF(-2265.283071500467, -1494.9101438927273); - points += QPointF(-2298.369042538657, -1449.6724702706276); - points += QPointF(-2320.8174013740727, -1415.9196938584569); - points += QPointF(-2334.512979024599, -1393.6772377027328); - points += QPointF(-2340.8464205786395, -1382.6908795653735); - points += QPointF(-2347.0406240734856, -1371.625420238929); - points += QPointF(-2359.1340239739197, -1348.4727663549988); - points += QPointF(-2376.632959709957, -1311.9082209860264); - points += QPointF(-2398.5505312977116, -1260.3257758135142); - points += QPointF(-2418.8279356815838, -1207.049235756178); - points += QPointF(-2437.3632941454625, -1153.5377981886413); - points += QPointF(-2454.0547279732336, -1101.2506604855253); - points += QPointF(-2475.6739880089963, -1027.6984737710059); - points += QPointF(-2486.9558756792776, -985.7289230170218); - points += QPointF(-2528.6142143955344, -824.5310925952923); - points += QPointF(-2789.994527521454, -836.9651369943699); - points += QPointF(-2901.6577688078787, -817.2758948021979); - points += QPointF(-2956.503052984476, -931.8887725360864); + points += QPointF(-2956.503052984476199, -931.888772536086435); + points += QPointF(-2845.899935373787230, -956.854671027579229); + points += QPointF(-2836.829206609389075, -967.939801293693108); + points += QPointF(-2817.847448769272432, -991.136726507765957); + points += QPointF(-2798.925476794025144, -1016.464369774690340); + points += QPointF(-2779.833540165219802, -1043.586706230470554); + points += QPointF(-2750.887165791067218, -1087.214110077616169); + points += QPointF(-2711.656875795550150, -1150.911108576494144); + points += QPointF(-2671.760583609896912, -1219.742470238479427); + points += QPointF(-2631.217741006335018, -1292.785732104274075); + points += QPointF(-2569.371672884839427, -1408.673435611815421); + points += QPointF(-2526.833380893804133, -1488.350137219814769); + points += QPointF(-2480.172583413850589, -1565.686358992571968); + points += QPointF(-2412.294561879652520, -1678.145787075361113); + points += QPointF(-2370.310678852975343, -1750.370393382875818); + points += QPointF(-2331.613674911975522, -1819.883071107430624); + points += QPointF(-2296.985964337713085, -1886.194796550727006); + points += QPointF(-2274.332039896478364, -1933.396943358504132); + points += QPointF(-2260.809956115590921, -1963.683515123610960); + points += QPointF(-2248.742446883836237, -1992.905181021183125); + points += QPointF(-2238.534158510385168, -2021.092198893151817); + points += QPointF(-2233.658271705575316, -2034.554538661309380); + points += QPointF(-2268.843635583416926, -2142.342923385616359); + points += QPointF(-2142.312261122111522, -2153.915659267328920); + points += QPointF(-2102.051574703390088, -2047.918381746697833); + points += QPointF(-1957.540323165073914, -1829.765289335081889); + points += QPointF(-2074.437778770928162, -1711.210902701150189); + points += QPointF(-2104.950100513636244, -1680.266092395088435); + points += QPointF(-2157.060300446018118, -1624.035819072004870); + points += QPointF(-2193.427447844696871, -1582.926460982949266); + points += QPointF(-2229.902122399330437, -1539.606355026679239); + points += QPointF(-2265.283071500467031, -1494.910143892727319); + points += QPointF(-2298.369042538657141, -1449.672470270627628); + points += QPointF(-2320.817401374072688, -1415.919693858456867); + points += QPointF(-2334.301819293990775, -1393.548592491243653); + points += QPointF(-2340.776926411613658, -1382.651109181193078); + points += QPointF(-2346.823691803941529, -1371.506749034128916); + points += QPointF(-2359.134023973919739, -1348.472766354998839); + points += QPointF(-2376.632959709957049, -1311.908220986026436); + points += QPointF(-2398.550531297711586, -1260.325775813514156); + points += QPointF(-2418.827935681583767, -1207.049235756177950); + points += QPointF(-2437.363294145462532, -1153.537798188641318); + points += QPointF(-2454.054727973233639, -1101.250660485525259); + points += QPointF(-2475.673988008996275, -1027.698473771005865); + points += QPointF(-2486.632484779730930, -985.643325115674202); + points += QPointF(-2528.614214395534418, -824.531092595292307); + points += QPointF(-2789.994527521454074, -836.965136994369914); + points += QPointF(-2901.657768807878711, -817.275894802197854); + points += QPointF(-2956.503052984476199, -931.888772536086435); return points; } @@ -3707,86 +3688,84 @@ QVector TST_VAbstractPiece::OutputPointsIssue880_Piece_Detail() const { QVector points; - points += QPointF(207.97524435031346, 1768.5451872439698); - points += QPointF(192.0523574292865, 1678.5917597177247); - points += QPointF(173.06637823139368, 1567.4188366954345); - points += QPointF(155.04852197223198, 1457.1320947077754); - points += QPointF(137.95319893013118, 1347.5909857555691); - points += QPointF(113.94865296170948, 1185.0253559450243); - points += QPointF(85.13262246004243, 971.2759567707533); - points += QPointF(59.56333814296166, 760.5113339757822); - points += QPointF(37.00526380453169, 552.491340651304); - points += QPointF(17.2197909125064, 346.95390918468786); - points += QPointF(-0.029116486330288183, 143.66841923390743); + points += QPointF(207.975244350313460, 1768.545187243969849); + points += QPointF(192.251204248591591, 1678.402467017463778); + points += QPointF(173.441824083164022, 1567.217943760191474); + points += QPointF(155.417517581674048, 1456.936677653171955); + points += QPointF(137.953198930131180, 1347.590985755569136); + points += QPointF(113.948652961709485, 1185.025355945024330); + points += QPointF(85.132622460042427, 971.275956770753282); + points += QPointF(59.563338142961662, 760.511333975782236); + points += QPointF(37.005263804531687, 552.491340651303972); + points += QPointF(17.219790912506401, 346.953909184687859); + points += QPointF(-0.029116486330288, 143.668419233907429); points += QPointF(-12.288070724611142, -17.710595485938104); - points += QPointF(26.31665967166907, -20.64315536140112); + points += QPointF(26.316659671669068, -20.643155361401121); points += QPointF(45.449182757960564, -46.830007644639885); - points += QPointF(76.80902542176231, -85.80275109276256); - points += QPointF(108.32184223768654, -121.07549507561193); - points += QPointF(140.03960977826148, -152.7518093937674); - points += QPointF(172.0109643794434, -180.92508772882493); - points += QPointF(204.27687396752606, -205.6775245587238); - points += QPointF(236.86536116641804, -227.0807873159393); - points += QPointF(269.7862380601783, -245.1992338515816); - points += QPointF(303.02747320804565, -260.09601694470166); - points += QPointF(336.55504181349585, -271.8413567367945); - points += QPointF(370.3174391861959, -280.5210157594255); - points += QPointF(404.25444394855236, -286.242355156443); - points += QPointF(438.30793239230167, -289.13593911030426); - points += QPointF(472.43167053063326, -289.3523422699121); - points += QPointF(506.39354740949744, -287.06933462111243); - points += QPointF(523.3262726926384, -284.95829981953244); - points += QPointF(524.1590713325393, -284.84505611031716); - points += QPointF(535.7696471633229, -283.1345656408276); - points += QPointF(537.9564634081299, -282.7464387285754); - points += QPointF(561.2586117828608, -277.9004199361857); - points += QPointF(584.4735176539314, -271.2405394534338); - points += QPointF(606.3291152578626, -263.09320228624324); - points += QPointF(626.8443757152221, -253.53448553817316); - points += QPointF(646.0388521585816, -242.66198182567126); - points += QPointF(663.9421664899236, -230.592040397069); - points += QPointF(680.6014176242785, -217.45310890781045); - points += QPointF(696.0845837791157, -203.37717044914066); - points += QPointF(710.4796074150597, -188.49177267151234); - points += QPointF(723.8903257348999, -172.9144816918925); - points += QPointF(736.5088929791715, -156.65000627864362); - points += QPointF(753.9481523879648, -131.65576420615508); - points += QPointF(775.2314496504125, -96.86047247508529); - points += QPointF(804.6599580426928, -43.46259731691744); - points += QPointF(834.3104997062314, 11.42928555575623); - points += QPointF(855.028099173095, 47.20538546427957); - points += QPointF(877.5611048277024, 82.24558222378279); - points += QPointF(896.0956388425119, 107.64709808599238); - points += QPointF(909.1935793406782, 123.99650588254744); - points += QPointF(923.186035221142, 140.00772229515948); - points += QPointF(938.0932990305748, 155.55152005811772); - points += QPointF(954.0130809543497, 170.5913517795987); - points += QPointF(967.4782824078412, 182.05248051659785); - points += QPointF(1004.0810458391544, 191.4716400415735); - points += QPointF(988.9976255298626, 250.08566646847305); - points += QPointF(977.8259070734451, 296.82410160649124); - points += QPointF(965.149517480306, 354.35695262370325); - points += QPointF(951.5014069310696, 421.6716303754821); - points += QPointF(937.4212488890727, 497.7174388481253); - points += QPointF(923.444794947317, 581.4548412888578); - points += QPointF(910.1057337999374, 671.8482997696264); - points += QPointF(897.9362480985484, 767.8632391288859); - points += QPointF(887.4670427019098, 868.4644297171681); - points += QPointF(879.2234261603584, 972.6607837009217); - points += QPointF(874.9207445088272, 1052.5483850157796); - points += QPointF(872.9674776789623, 1106.266056241682); - points += QPointF(871.8649319396666, 1160.3312151973862); - points += QPointF(871.6796386709575, 1214.5669734562434); - points += QPointF(872.4760820545193, 1268.8421328907752); - points += QPointF(874.3182959750076, 1323.025174797752); - points += QPointF(877.269773413631, 1376.984247710642); - points += QPointF(881.3933583565541, 1430.5871656635104); - points += QPointF(886.7511179913885, 1483.701422556393); - points += QPointF(893.4041934667935, 1536.1942305045375); - points += QPointF(901.4126286647522, 1587.9325929330282); - points += QPointF(910.8542351538612, 1638.8862690551816); - points += QPointF(925.0965474653889, 1705.8052028484663); - points += QPointF(207.97524435031346, 1768.5451872439698); + points += QPointF(76.809025421762314, -85.802751092762563); + points += QPointF(108.321842237686539, -121.075495075611926); + points += QPointF(140.039609778261479, -152.751809393767388); + points += QPointF(172.010964379443408, -180.925087728824934); + points += QPointF(204.276873967526058, -205.677524558723803); + points += QPointF(236.865361166418040, -227.080787315939290); + points += QPointF(269.786238060178277, -245.199233851581596); + points += QPointF(303.027473208045649, -260.096016944701660); + points += QPointF(336.555041813495848, -271.841356736794523); + points += QPointF(370.317439186195884, -280.521015759425495); + points += QPointF(404.254443948552364, -286.242355156443011); + points += QPointF(438.307932392301666, -289.135939110304264); + points += QPointF(472.431670530633255, -289.352342269912128); + points += QPointF(506.393547409497444, -287.069334621112432); + points += QPointF(523.659788432941014, -284.763366956816640); + points += QPointF(537.132657080684112, -282.447979406543027); + points += QPointF(561.258611782860839, -277.900419936185699); + points += QPointF(584.473517653931367, -271.240539453433826); + points += QPointF(606.329115257862554, -263.093202286243240); + points += QPointF(626.844375715222100, -253.534485538173158); + points += QPointF(646.038852158581562, -242.661981825671262); + points += QPointF(663.942166489923579, -230.592040397069013); + points += QPointF(680.601417624278497, -217.453108907810446); + points += QPointF(696.084583779115746, -203.377170449140664); + points += QPointF(710.479607415059718, -188.491772671512337); + points += QPointF(723.890325734899875, -172.914481691892490); + points += QPointF(736.508892979171492, -156.650006278643616); + points += QPointF(753.948152387964797, -131.655764206155084); + points += QPointF(775.231449650412515, -96.860472475085288); + points += QPointF(804.510801021029010, -43.194675282815112); + points += QPointF(834.310499706231440, 11.429285555756231); + points += QPointF(855.028099173095029, 47.205385464279573); + points += QPointF(877.561104827702366, 82.245582223782790); + points += QPointF(896.095638842511903, 107.647098085992383); + points += QPointF(909.193579340678184, 123.996505882547439); + points += QPointF(923.186035221141992, 140.007722295159482); + points += QPointF(938.093299030574826, 155.551520058117717); + points += QPointF(954.013080954349675, 170.591351779598710); + points += QPointF(967.555698092657849, 181.751643909074176); + points += QPointF(1004.158461523971027, 191.170803434049844); + points += QPointF(989.262064918097849, 250.007556316099055); + points += QPointF(977.825907073445137, 296.824101606491240); + points += QPointF(965.149517480306031, 354.356952623703251); + points += QPointF(951.501406931069596, 421.671630375482096); + points += QPointF(937.421248889072672, 497.717438848125312); + points += QPointF(923.444794947316950, 581.454841288857779); + points += QPointF(910.105733799937411, 671.848299769626351); + points += QPointF(897.936248098548390, 767.863239128885880); + points += QPointF(887.467042701909804, 868.464429717168059); + points += QPointF(879.223426160358372, 972.660783700921684); + points += QPointF(874.920744508827170, 1052.548385015779559); + points += QPointF(873.401191077498538, 1106.279226085242499); + points += QPointF(871.864931939666576, 1160.331215197386200); + points += QPointF(871.679638670957502, 1214.566973456243431); + points += QPointF(872.476082054519338, 1268.842132890775247); + points += QPointF(874.318295975007572, 1323.025174797752015); + points += QPointF(877.269773413631015, 1376.984247710641966); + points += QPointF(881.393358356554131, 1430.587165663510405); + points += QPointF(886.751117991388469, 1483.701422556393027); + points += QPointF(893.404193466793458, 1536.194230504537472); + points += QPointF(901.412628664752219, 1587.932592933028218); + points += QPointF(910.854235153861168, 1638.886269055181629); + points += QPointF(925.096547465388880, 1705.805202848466251); + points += QPointF(207.975244350313460, 1768.545187243969849); return points; } @@ -3906,81 +3885,80 @@ QVector TST_VAbstractPiece::OutputPointsIssue880_Piece_Detail_1() const { QVector points; - points += QPointF(176.43300321313995, 1809.2444231688892); - points += QPointF(153.78313541824667, 1677.3246962809667); - points += QPointF(133.87793658475465, 1548.7525013540196); - points += QPointF(116.13042064136965, 1418.8761921325834); - points += QPointF(100.47483551040597, 1288.7786029156107); - points += QPointF(86.82794509892291, 1159.4153812471877); - points += QPointF(75.10856636006955, 1031.7452255369717); - points += QPointF(65.2370069141379, 906.7286088476662); - points += QPointF(57.13470030186313, 785.3265367259893); - points += QPointF(50.723988203508114, 668.4991453010994); - points += QPointF(45.92803421919151, 557.203853977457); - points += QPointF(42.670896438097856, 452.3925716567163); - points += QPointF(40.87786536674168, 355.006959561548); - points += QPointF(40.47636977532461, 265.9695473970137); - points += QPointF(41.39833199038787, 186.1652735021885); - points += QPointF(43.58687052785413, 116.39817805128028); + points += QPointF(176.433003213139955, 1809.244423168889170); + points += QPointF(153.783135418246673, 1677.324696280966691); + points += QPointF(133.877936584754650, 1548.752501354019614); + points += QPointF(116.130420641369653, 1418.876192132583355); + points += QPointF(100.474835510405967, 1288.778602915610691); + points += QPointF(86.827945098922910, 1159.415381247187725); + points += QPointF(75.108566360069545, 1031.745225536971702); + points += QPointF(65.237006914137893, 906.728608847666237); + points += QPointF(57.134700301863127, 785.326536725989286); + points += QPointF(50.723988203508114, 668.499145301099361); + points += QPointF(45.928034219191510, 557.203853977457015); + points += QPointF(42.670896438097856, 452.392571656716314); + points += QPointF(40.877865366741680, 355.006959561548001); + points += QPointF(40.476369775324613, 265.969547397013685); + points += QPointF(41.398331990387867, 186.165273502188512); + points += QPointF(43.586870527854131, 116.398178051280283); points += QPointF(47.000830659421496, 57.582630079953006); - points += QPointF(65.68957312272546, -149.23704714976648); - points += QPointF(140.97338867071443, -142.43421359312867); - points += QPointF(202.09509240490257, 32.99596074790383); - points += QPointF(215.1760179357478, 66.46292333957582); - points += QPointF(228.91247186136482, 97.22835696106226); - points += QPointF(243.32162407629943, 125.58628332767515); - points += QPointF(258.3193167174947, 151.58030642877873); - points += QPointF(273.82133547133117, 175.26098152608563); - points += QPointF(289.7450120582673, 196.68684969815953); - points += QPointF(306.0113435768183, 215.92517884608725); - points += QPointF(322.54758976689817, 233.05217073860985); - points += QPointF(339.2901947112362, 248.1523672201739); - points += QPointF(356.187735703955, 261.31701737912283); - points += QPointF(373.20345965213, 272.6412775724043); - points += QPointF(390.3168780918559, 282.22031642578816); - points += QPointF(407.5239155726528, 290.1446608341238); - points += QPointF(424.8352834117022, 296.495377493676); - points += QPointF(442.27307072936014, 301.3398413607568); - points += QPointF(459.86592925304035, 304.7288150104031); - points += QPointF(477.6435530680066, 306.6953299983464); - points += QPointF(495.63130278250605, 307.2554863722674); - points += QPointF(513.8457455201286, 306.4108940021393); - points += QPointF(532.2916184779821, 304.1521959323631); - points += QPointF(550.9603800691451, 300.4630103015354); - points += QPointF(569.8302035956763, 295.3236970657534); - points += QPointF(588.8670691430791, 288.71453548788656); - points += QPointF(608.0265381189225, 280.6181087615205); - points += QPointF(627.2558255674835, 271.02087194401406); - points += QPointF(646.49587350226, 259.9139991901456); - points += QPointF(665.6832327130836, 247.2936645466005); - points += QPointF(684.7516535483287, 233.16092151690435); - points += QPointF(703.6333557352625, 217.52132882153552); - points += QPointF(722.2599918458167, 200.3844392540231); - points += QPointF(740.775593812871, 181.5472991146096); - points += QPointF(827.8905206609868, 85.40475654403389); - points += QPointF(902.5287659069734, 97.36568353412399); - points += QPointF(875.7406670161695, 264.52803611283815); - points += QPointF(875.6040535669327, 265.3514075972125); - points += QPointF(858.0066884529067, 367.9016115788377); - points += QPointF(840.9224284397759, 473.9943970664766); - points += QPointF(828.8632024485165, 555.064398169016); - points += QPointF(816.7758887510091, 644.0579522451663); - points += QPointF(805.2076743624673, 739.845495712356); - points += QPointF(794.6970759283694, 841.3455282095892); - points += QPointF(785.7814316001975, 947.4685104254818); - points += QPointF(778.9905248854037, 1057.2015565957809); - points += QPointF(775.7129148747653, 1141.1721677964533); - points += QPointF(774.4165452653767, 1197.5233022801074); - points += QPointF(773.9475654146959, 1254.2162469276998); - points += QPointF(774.3725935699175, 1311.0266010527719); - points += QPointF(775.7556236491987, 1367.8134323501624); - points += QPointF(778.1598154813046, 1424.435109901397); - points += QPointF(781.6473200844314, 1480.7492730591212); - points += QPointF(786.2790701026621, 1536.6128151220523); - points += QPointF(792.1145299697872, 1591.8818919022567); - points += QPointF(799.2334640707138, 1646.5814965577908); - points += QPointF(815.4824145904547, 1753.3348442404624); - points += QPointF(176.43300321313995, 1809.2444231688892); + points += QPointF(65.689573122725463, -149.237047149766482); + points += QPointF(140.973388670714428, -142.434213593128675); + points += QPointF(202.095092404902573, 32.995960747903830); + points += QPointF(215.176017935747808, 66.462923339575823); + points += QPointF(228.912471861364821, 97.228356961062261); + points += QPointF(243.321624076299429, 125.586283327675147); + points += QPointF(258.319316717494701, 151.580306428778727); + points += QPointF(273.821335471331167, 175.260981526085629); + points += QPointF(289.745012058267321, 196.686849698159534); + points += QPointF(306.011343576818319, 215.925178846087249); + points += QPointF(322.547589766898170, 233.052170738609846); + points += QPointF(339.290194711236211, 248.152367220173886); + points += QPointF(356.187735703955013, 261.317017379122831); + points += QPointF(373.203459652129993, 272.641277572404306); + points += QPointF(390.316878091855926, 282.220316425788155); + points += QPointF(407.523915572652811, 290.144660834123783); + points += QPointF(424.835283411702221, 296.495377493676017); + points += QPointF(442.273070729360143, 301.339841360756793); + points += QPointF(459.865929253040349, 304.728815010403082); + points += QPointF(477.643553068006611, 306.695329998346381); + points += QPointF(495.631302782506054, 307.255486372267399); + points += QPointF(513.845745520128617, 306.410894002139287); + points += QPointF(532.291618477982070, 304.152195932363099); + points += QPointF(550.960380069145117, 300.463010301535405); + points += QPointF(569.830203595676267, 295.323697065753379); + points += QPointF(588.867069143079107, 288.714535487886565); + points += QPointF(608.026538118922531, 280.618108761520489); + points += QPointF(627.255825567483498, 271.020871944014061); + points += QPointF(646.495873502259997, 259.913999190145603); + points += QPointF(665.683232713083612, 247.293664546600496); + points += QPointF(684.751653548328704, 233.160921516904352); + points += QPointF(703.633355735262512, 217.521328821535519); + points += QPointF(722.259991845816671, 200.384439254023107); + points += QPointF(740.836644528519173, 180.911600318108782); + points += QPointF(827.890520660986795, 85.404756544033887); + points += QPointF(902.528765906973376, 97.365683534123988); + points += QPointF(875.376910079016625, 265.121443536514221); + points += QPointF(858.006688452906701, 367.901611578837674); + points += QPointF(840.922428439775899, 473.994397066476608); + points += QPointF(828.863202448516518, 555.064398169016044); + points += QPointF(816.775888751009120, 644.057952245166348); + points += QPointF(805.207674362467287, 739.845495712355955); + points += QPointF(794.697075928369372, 841.345528209589247); + points += QPointF(785.781431600197493, 947.468510425481782); + points += QPointF(778.990524885403715, 1057.201556595780858); + points += QPointF(775.712914874765261, 1141.172167796453323); + points += QPointF(774.839277375508800, 1197.529933383505750); + points += QPointF(773.947565414695873, 1254.216246927699785); + points += QPointF(774.372593569917512, 1311.026601052771866); + points += QPointF(775.755623649198697, 1367.813432350162429); + points += QPointF(778.159815481304577, 1424.435109901397027); + points += QPointF(781.647320084431385, 1480.749273059121151); + points += QPointF(786.279070102662104, 1536.612815122052325); + points += QPointF(792.114529969787213, 1591.881891902256712); + points += QPointF(799.671600568179883, 1646.800706819577044); + points += QPointF(815.482414590454709, 1753.334844240462417); + points += QPointF(176.433003213139955, 1809.244423168889170); return points; } @@ -4759,29 +4737,27 @@ void TST_VAbstractPiece::BrokenDetailEquidistant_data() const points.append(p); ekvOrig.clear(); - ekvOrig.append(QPointF(1085.0494488188979, 129.65140157480317)); - ekvOrig.append(QPointF(1085.0494488188976, -664.0493858267716)); - ekvOrig.append(QPointF(1085.0535993023548, -664.60949305358)); - ekvOrig.append(QPointF(1085.4769360432513, -693.172544862023)); - ekvOrig.append(QPointF(1087.8146106807237, -749.0759201835479)); - ekvOrig.append(QPointF(1091.8475344926537, -804.1192779617469)); - ekvOrig.append(QPointF(1097.4551144472157, -858.8963549321579)); - ekvOrig.append(QPointF(1104.5179360066466, -914.1146778774624)); - ekvOrig.append(QPointF(1112.9230524620698, -970.5378147459013)); - ekvOrig.append(QPointF(1127.6248148552152, -1058.4237879476814)); - ekvOrig.append(QPointF(1138.969731038904, -1121.1243937910851)); - ekvOrig.append(QPointF(1142.3634069799264, -1142.7932918177955)); - ekvOrig.append(QPointF(1142.4567081704688, -1143.360751675907)); - ekvOrig.append(QPointF(1149.4580345095278, -1184.0088261935134)); - ekvOrig.append(QPointF(1160.3539624659516, -1239.2839819734102)); - ekvOrig.append(QPointF(1176.3990996347318, -1307.1814137078704)); - ekvOrig.append(QPointF(1195.269438012279, -1378.6789451473478)); - ekvOrig.append(QPointF(1214.661499217333, -1450.7350183203587)); - ekvOrig.append(QPointF(2044.1045669291343, -1379.0333442132135)); - ekvOrig.append(QPointF(2044.104566929134, -664.0493858267716)); - ekvOrig.append(QPointF(2063.0022047244097, -664.0493858267716)); - ekvOrig.append(QPointF(2063.0022047244097, 129.651401574803)); - ekvOrig.append(QPointF(1085.0494488188979, 129.65140157480317)); + ekvOrig += QPointF(1085.049448818897872, 129.651401574803174); + ekvOrig += QPointF(1085.450358303082339, -664.069324722867464); + ekvOrig += QPointF(1085.476936043251271, -693.172544862022960); + ekvOrig += QPointF(1087.814610680723717, -749.075920183547851); + ekvOrig += QPointF(1091.847534492653722, -804.119277961746889); + ekvOrig += QPointF(1097.455114447215692, -858.896354932157919); + ekvOrig += QPointF(1104.517936006646551, -914.114677877462441); + ekvOrig += QPointF(1112.923052462069791, -970.537814745901301); + ekvOrig += QPointF(1127.624814855215163, -1058.423787947681376); + ekvOrig += QPointF(1138.622808193283390, -1121.404564318377652); + ekvOrig += QPointF(1142.639738372909278, -1143.124791902604784); + ekvOrig += QPointF(1149.458034509527806, -1184.008826193513414); + ekvOrig += QPointF(1160.353962465951554, -1239.283981973410164); + ekvOrig += QPointF(1176.399099634731783, -1307.181413707870433); + ekvOrig += QPointF(1195.413665418974006, -1378.710633001728411); + ekvOrig += QPointF(1214.661499217332903, -1450.735018320358677); + ekvOrig += QPointF(2044.104566929134307, -1379.033344213213468); + ekvOrig += QPointF(2044.104566929134080, -664.049385826771640); + ekvOrig += QPointF(2063.002204724409694, -664.049385826771640); + ekvOrig += QPointF(2063.002204724409694, 129.651401574803003); + ekvOrig += QPointF(1085.049448818897872, 129.651401574803174); // See private test cases in file collection/bugs/Issue_#883_case1.val, piece "ledge" QTest::newRow("Issue #883. Piece 'ledge'") << points << 37.795275590551185 << ekvOrig; @@ -4818,29 +4794,27 @@ void TST_VAbstractPiece::BrokenDetailEquidistant_data() const points.append(VSAPoint(2006.3092913385829, 91.85612598425197)); ekvOrig.clear(); - ekvOrig.append(QPointF(1085.0494488188979, 129.65140157480317)); - ekvOrig.append(QPointF(1085.0494488188976, -664.0493858267716)); - ekvOrig.append(QPointF(1085.0535993023548, -664.60949305358)); - ekvOrig.append(QPointF(1085.4769360432513, -693.172544862023)); - ekvOrig.append(QPointF(1087.8146106807237, -749.0759201835479)); - ekvOrig.append(QPointF(1091.8475344926537, -804.1192779617469)); - ekvOrig.append(QPointF(1097.4551144472157, -858.8963549321579)); - ekvOrig.append(QPointF(1104.5179360066466, -914.1146778774624)); - ekvOrig.append(QPointF(1112.9230524620698, -970.5378147459013)); - ekvOrig.append(QPointF(1127.6248148552152, -1058.4237879476814)); - ekvOrig.append(QPointF(1138.969731038904, -1121.1243937910851)); - ekvOrig.append(QPointF(1142.3634069799264, -1142.7932918177955)); - ekvOrig.append(QPointF(1142.4567081704688, -1143.360751675907)); - ekvOrig.append(QPointF(1149.4580345095278, -1184.0088261935134)); - ekvOrig.append(QPointF(1160.3539624659516, -1239.2839819734102)); - ekvOrig.append(QPointF(1176.3990996347318, -1307.1814137078704)); - ekvOrig.append(QPointF(1195.269438012279, -1378.6789451473478)); - ekvOrig.append(QPointF(1214.661499217333, -1450.7350183203587)); - ekvOrig.append(QPointF(2044.1045669291343, -1379.0333442132135)); - ekvOrig.append(QPointF(2044.104566929134, -664.0493858267716)); - ekvOrig.append(QPointF(2063.0022047244097, -664.0493858267716)); - ekvOrig.append(QPointF(2043.1596850393703, 129.651401574803)); - ekvOrig.append(QPointF(1085.0494488188979, 129.65140157480317)); + ekvOrig += QPointF(1085.049448818897872, 129.651401574803174); + ekvOrig += QPointF(1085.450358303082339, -664.069324722867464); + ekvOrig += QPointF(1085.476936043251271, -693.172544862022960); + ekvOrig += QPointF(1087.814610680723717, -749.075920183547851); + ekvOrig += QPointF(1091.847534492653722, -804.119277961746889); + ekvOrig += QPointF(1097.455114447215692, -858.896354932157919); + ekvOrig += QPointF(1104.517936006646551, -914.114677877462441); + ekvOrig += QPointF(1112.923052462069791, -970.537814745901301); + ekvOrig += QPointF(1127.624814855215163, -1058.423787947681376); + ekvOrig += QPointF(1138.622808193283390, -1121.404564318377652); + ekvOrig += QPointF(1142.639738372909278, -1143.124791902604784); + ekvOrig += QPointF(1149.458034509527806, -1184.008826193513414); + ekvOrig += QPointF(1160.353962465951554, -1239.283981973410164); + ekvOrig += QPointF(1176.399099634731783, -1307.181413707870433); + ekvOrig += QPointF(1195.413665418974006, -1378.710633001728411); + ekvOrig += QPointF(1214.661499217332903, -1450.735018320358677); + ekvOrig += QPointF(2044.104566929134307, -1379.033344213213468); + ekvOrig += QPointF(2044.104566929134080, -664.049385826771640); + ekvOrig += QPointF(2063.002204724409694, -664.049385826771640); + ekvOrig += QPointF(2043.159685039370288, 129.651401574803003); + ekvOrig += QPointF(1085.049448818897872, 129.651401574803174); // See private test cases in file collection/bugs/Issue_#883_case1.val, piece "prong" QTest::newRow("Issue #883. Piece 'prong'") << points << 37.795275590551185 << ekvOrig; @@ -5778,34 +5752,34 @@ QVector TST_VAbstractPiece::OutputPointsIssue298Case1() const { QVector points; - points += QPointF(1181.3702112033552, -59.406362870594705); - points += QPointF(1269.0394640469171, 38.62919078337234); - points += QPointF(1216.9245192058738, 100.21766491121537); - points += QPointF(1198.8808131327262, 123.03980191699638); - points += QPointF(1182.221067861894, 145.9367408453258); - points += QPointF(1166.7329413673538, 169.11045943642068); - points += QPointF(1152.3625684065119, 192.56656574522466); - points += QPointF(1139.0585460343918, 216.3113654260635); - points += QPointF(1126.7720261028358, 240.35129609014484); - points += QPointF(1115.456677001793, 264.6923827640837); - points += QPointF(1105.0685270464996, 289.3397503891491); - points += QPointF(1095.5657115675733, 314.29722092044074); - points += QPointF(1086.9081516638566, 339.5670119653025); - points += QPointF(1079.05719443133, 365.14954287895875); - points += QPointF(1071.975242726908, 391.04334443729294); - points += QPointF(1065.6650892202777, 417.08128115689766); - points += QPointF(1057.3401968224273, 456.97510616238503); - points += QPointF(1048.5682451589698, 511.3172850182788); - points += QPointF(1042.0910863010336, 566.5823635228949); - points += QPointF(1037.5780007657413, 622.8445512489122); - points += QPointF(1034.7149371280923, 680.0016643255938); - points += QPointF(1033.1771512850767, 737.9466090605974); - points += QPointF(1032.63006888955, 796.5212904492478); - points += QPointF(1032.8954266362925, 885.6214237282716); - points += QPointF(1033.62206579804, 991.8906443458876); - points += QPointF(940.8759712878797, 1031.2978406173477); - points += QPointF(376.98902117953776, 480.04021757016505); - points += QPointF(1181.3702112033552, -59.406362870594705); + points += QPointF(1181.370211203355211, -59.406362870594705); + points += QPointF(1269.039464046917146, 38.629190783372337); + points += QPointF(1217.450644318709010, 100.120104210239219); + points += QPointF(1198.880813132726189, 123.039801916996382); + points += QPointF(1182.221067861893971, 145.936740845325801); + points += QPointF(1166.732941367353760, 169.110459436420683); + points += QPointF(1152.362568406511855, 192.566565745224665); + points += QPointF(1139.058546034391838, 216.311365426063503); + points += QPointF(1126.772026102835753, 240.351296090144842); + points += QPointF(1115.456677001792968, 264.692382764083675); + points += QPointF(1105.068527046499639, 289.339750389149117); + points += QPointF(1095.565711567573317, 314.297220920440736); + points += QPointF(1086.908151663856643, 339.567011965302527); + points += QPointF(1079.478145695263947, 365.275940243457455); + points += QPointF(1072.378301707078663, 391.150604919231398); + points += QPointF(1065.665089220277650, 417.081281156897660); + points += QPointF(1057.340196822427288, 456.975106162385032); + points += QPointF(1048.568245158969830, 511.317285018278824); + points += QPointF(1042.091086301033556, 566.582363522894866); + points += QPointF(1037.578000765741308, 622.844551248912239); + points += QPointF(1034.714937128092288, 680.001664325593765); + points += QPointF(1033.177151285076661, 737.946609060597439); + points += QPointF(1033.070378460275606, 796.430233334258673); + points += QPointF(1033.028555453234048, 885.654637352061627); + points += QPointF(1033.622065798040012, 991.890644345887608); + points += QPointF(940.875971287879679, 1031.297840617347674); + points += QPointF(376.989021179537758, 480.040217570165055); + points += QPointF(1181.370211203355211, -59.406362870594705); return points; } @@ -5856,36 +5830,32 @@ QVector TST_VAbstractPiece::OutputPointsIssue298Case2() const points += QPointF(-10.830702765714818, 24.587011512350955); points += QPointF(39.855615789834275, -8.108689868294974); - points += QPointF(995.4203583783104, 926.0543521489114); - points += QPointF(995.7390712145076, 1005.5914525468322); - points += QPointF(994.5954771294847, 1095.2809750974982); - points += QPointF(992.4764226198034, 1155.061981412451); - points += QPointF(988.7898546287646, 1214.554597181484); - points += QPointF(983.1461162030054, 1273.7175168242372); - points += QPointF(975.1622593873819, 1332.3739943859748); - points += QPointF(967.2940111839067, 1376.0309394806493); - points += QPointF(961.2519128953934, 1404.5389014377904); - points += QPointF(961.0174119331466, 1405.5735214303666); - points += QPointF(954.3249938675699, 1433.2902127565162); - points += QPointF(954.0443121744452, 1434.3811384277756); - points += QPointF(946.5363402871264, 1461.8588008162212); - points += QPointF(946.2045616347446, 1463.0019319630142); - points += QPointF(937.6515558315413, 1490.8264962646508); - points += QPointF(927.9590662522897, 1519.0002540634812); - points += QPointF(917.2525136214659, 1546.9351054719114); - points += QPointF(905.4832013554212, 1574.6108628886288); - points += QPointF(892.6034200213376, 1602.0064006098492); - points += QPointF(878.5666407075367, 1629.0998226411741); - points += QPointF(863.3276693496916, 1655.8686930581748); - points += QPointF(846.8427441486504, 1682.2903192093897); - points += QPointF(829.0695617338297, 1708.3420710912978); - points += QPointF(809.967223824731, 1734.001714595386); - points += QPointF(789.4961040754649, 1759.2477332554781); - points += QPointF(767.6176433472375, 1784.0596133526062); - points += QPointF(744.2940893691135, 1808.418070909965); - points += QPointF(720.0315154937306, 1831.7820154759668); - points += QPointF(719.1107590616128, 1832.6395921505045); - points += QPointF(664.9901879624223, 1881.3896483836077); + points += QPointF(995.420358378310425, 926.054352148911448); + points += QPointF(995.739071214507590, 1005.591452546832215); + points += QPointF(994.595477129484721, 1095.280975097498185); + points += QPointF(992.476422619803429, 1155.061981412450905); + points += QPointF(988.789854628764601, 1214.554597181484041); + points += QPointF(983.146116203005363, 1273.717516824237237); + points += QPointF(975.162259387381937, 1332.373994385974811); + points += QPointF(967.294011183906719, 1376.030939480649295); + points += QPointF(960.747162663436256, 1404.970782901272059); + points += QPointF(953.776698619438662, 1433.733694668130738); + points += QPointF(945.943213422085364, 1462.310028497729036); + points += QPointF(937.651555831541259, 1490.826496264650814); + points += QPointF(927.959066252289745, 1519.000254063481179); + points += QPointF(917.252513621465937, 1546.935105471911356); + points += QPointF(905.483201355421215, 1574.610862888628844); + points += QPointF(892.603420021337570, 1602.006400609849152); + points += QPointF(878.566640707536749, 1629.099822641174114); + points += QPointF(863.327669349691632, 1655.868693058174813); + points += QPointF(846.842744148650354, 1682.290319209389736); + points += QPointF(829.069561733829687, 1708.342071091297839); + points += QPointF(809.967223824731036, 1734.001714595385920); + points += QPointF(789.496104075464928, 1759.247733255478124); + points += QPointF(767.617643347237504, 1784.059613352606220); + points += QPointF(744.294089369113522, 1808.418070909965081); + points += QPointF(719.468376809343567, 1831.807034970131099); + points += QPointF(664.990187962422283, 1881.389648383607664); points += QPointF(-10.830702765714818, 24.587011512350955); return points; @@ -6318,113 +6288,112 @@ QVector TST_VAbstractPiece::OutputPointsIssue646() const { QVector points; - points += QPointF(1391.2089508950362, 1170.962993556315); - points += QPointF(1352.8346456692914, 1362.8345196850394); - points += QPointF(1350.6660166205588, 1367.7550606147208); - points += QPointF(1344.6776732217286, 1376.7202577023593); - points += QPointF(1336.7920071638646, 1384.6921570699324); - points += QPointF(1327.102329227638, 1391.7349409463345); - points += QPointF(1315.7019501937195, 1397.9127915604581); - points += QPointF(1302.6841808427803, 1403.289891141198); - points += QPointF(1288.142331955491, 1407.930421917447); - points += QPointF(1272.169714312523, 1411.8985661180982); - points += QPointF(1245.881900239392, 1416.7944475909562); - points += QPointF(1206.4717817874364, 1421.4666032853988); - points += QPointF(1163.0181823648445, 1424.6044927975377); - points += QPointF(1116.2675882169847, 1426.7215739585208); - points += QPointF(1041.771617936041, 1429.0735145188771); - points += QPointF(963.6986998754783, 1432.082545646023); - points += QPointF(911.2249892802281, 1435.25097171387); - points += QPointF(859.186715186551, 1439.9658785863046); - points += QPointF(808.3303638398154, 1446.7407240944754); - points += QPointF(771.4905538168089, 1453.5750227393632); - points += QPointF(747.6486510586797, 1458.9887661869527); - points += QPointF(724.5221275003055, 1465.2063143234973); - points += QPointF(702.2042939223572, 1472.2918493778907); - points += QPointF(691.4173228346457, 1476.2203464566928); - points += QPointF(674.314621551016, 1482.390491353628); - points += QPointF(639.4466353664043, 1492.6483289419746); - points += QPointF(603.7620983221955, 1500.410735703404); - points += QPointF(567.2371765086411, 1505.6816136598163); - points += QPointF(529.8480360159926, 1508.4648648331117); - points += QPointF(491.5708429345011, 1508.7643912451913); - points += QPointF(452.3817633544179, 1506.5840949179556); - points += QPointF(412.2569633659944, 1501.9278778733042); - points += QPointF(371.1726090594818, 1494.7996421331377); - points += QPointF(329.10486652513146, 1485.2032897193571); - points += QPointF(286.0299018531947, 1473.1427226538626); - points += QPointF(241.92388113392275, 1458.6218429585542); - points += QPointF(196.762970457567, 1441.644552655333); - points += QPointF(150.52333591437866, 1422.2147537660987); - points += QPointF(103.18114359460913, 1400.3363483127525); - points += QPointF(54.712559588509635, 1376.013238317194); - points += QPointF(30.0, 1362.8345196850394); - points += QPointF(-7.795275590551185, 1173.8581417322835); + points += QPointF(1391.208950895036196, 1170.962993556315041); + points += QPointF(1352.834645669291376, 1362.834519685039368); + points += QPointF(1350.666016620558821, 1367.755060614720833); + points += QPointF(1344.677673221728583, 1376.720257702359277); + points += QPointF(1336.792007163864582, 1384.692157069932364); + points += QPointF(1327.102329227637938, 1391.734940946334518); + points += QPointF(1315.701950193719540, 1397.912791560458118); + points += QPointF(1302.684180842780279, 1403.289891141198041); + points += QPointF(1288.142331955491045, 1407.930421917446893); + points += QPointF(1272.169714312522956, 1411.898566118098188); + points += QPointF(1245.881900239392053, 1416.794447590956224); + points += QPointF(1206.471781787436385, 1421.466603285398833); + points += QPointF(1163.018182364844506, 1424.604492797537659); + points += QPointF(1116.251434660549648, 1426.328266269482128); + points += QPointF(1041.780469940170860, 1429.338905293278913); + points += QPointF(963.698699875478269, 1432.082545646022936); + points += QPointF(911.224989280228101, 1435.250971713870058); + points += QPointF(859.186715186551055, 1439.965878586304598); + points += QPointF(808.330363839815391, 1446.740724094475354); + points += QPointF(771.490553816808870, 1453.575022739363249); + points += QPointF(747.648651058679661, 1458.988766186952716); + points += QPointF(724.522127500305487, 1465.206314323497281); + points += QPointF(702.303930175478968, 1472.598351272474929); + points += QPointF(691.410064634745709, 1476.200359149115229); + points += QPointF(674.314621551015989, 1482.390491353628022); + points += QPointF(639.446635366404280, 1492.648328941974569); + points += QPointF(603.762098322195470, 1500.410735703404043); + points += QPointF(567.237176508641141, 1505.681613659816321); + points += QPointF(529.848036015992648, 1508.464864833111733); + points += QPointF(491.570842934501115, 1508.764391245191291); + points += QPointF(452.381763354417899, 1506.584094917955554); + points += QPointF(412.256963365994409, 1501.927877873304169); + points += QPointF(371.172609059481772, 1494.799642133137695); + points += QPointF(329.104866525131456, 1485.203289719357144); + points += QPointF(286.029901853194701, 1473.142722653862620); + points += QPointF(241.923881133922748, 1458.621842958554225); + points += QPointF(196.762970457567008, 1441.644552655332973); + points += QPointF(150.523335914378663, 1422.214753766098738); + points += QPointF(103.181143594609125, 1400.336348312752534); + points += QPointF(54.712559588509635, 1376.013238317194009); + points += QPointF(30.000000000000000, 1362.834519685039368); + points += QPointF(-7.795275590551185, 1173.858141732283457); points += QPointF(-7.795275590551185, 5.415841095792075); - points += QPointF(61.10102183090257, -0.7096412239110919); - points += QPointF(70.80478764466314, 53.4304855617782); - points += QPointF(79.62189394925582, 91.85820794938732); - points += QPointF(90.24647240417782, 128.2383365484458); - points += QPointF(102.59852571928553, 162.80689648286); - points += QPointF(116.56115662664025, 195.6221419778608); - points += QPointF(132.02082032795917, 226.74055755921066); - points += QPointF(148.86669418977533, 256.2159967948307); - points += QPointF(166.98986206810577, 284.0990676177162); - points += QPointF(186.28241554481536, 310.43680926354347); - points += QPointF(206.63657487261227, 335.2726596298501); - points += QPointF(227.94391425163948, 358.6466726486652); - points += QPointF(250.09474647931083, 380.59592025988565); - points += QPointF(272.9776896673481, 401.15500478550797); - points += QPointF(296.4794106724578, 420.3566124641626); - points += QPointF(320.484520119942, 438.23205271508306); - points += QPointF(344.8755832173259, 454.8117451133494); - points += QPointF(369.5332075351913, 470.1256329571135); - points += QPointF(394.3361710694345, 484.2035162296996); - points += QPointF(419.16155857757695, 497.0753067992062); - points += QPointF(443.88487919288957, 508.7712150476781); - points += QPointF(468.38014199619704, 519.3218805863685); - points += QPointF(492.51986728337727, 528.7584613476225); - points += QPointF(516.1750084818626, 537.1126962804666); - points += QPointF(539.1179506668893, 544.3862697375826); - points += QPointF(572.3449900777376, 553.5656597660253); - points += QPointF(613.1894237885367, 562.2944254702461); - points += QPointF(648.9334985308346, 567.4292093937121); - points += QPointF(678.66913409911, 569.356067120192); - points += QPointF(690.5719737333277, 569.1428122736005); - points += QPointF(705.3925728033803, 568.7451994046356); - points += QPointF(735.4747135391233, 569.5340065404794); - points += QPointF(765.5663997881065, 572.1930384040452); - points += QPointF(795.4123023513292, 576.6410528859776); - points += QPointF(824.965602108301, 582.8015441033587); - points += QPointF(854.1835470423481, 590.5983253180048); - points += QPointF(883.0268449918112, 599.9562219974732); - points += QPointF(911.4589877868528, 610.8015283739601); - points += QPointF(939.445585340395, 623.0622581751827); - points += QPointF(966.9537607342976, 636.6682333974711); - points += QPointF(993.9516330911679, 651.551057077312); - points += QPointF(1020.4078966730021, 667.6440112755474); - points += QPointF(1046.2914925169705, 684.8819135818707); - points += QPointF(1071.5713620583545, 703.2009569179793); - points += QPointF(1096.216269205861, 722.5385497176682); - points += QPointF(1120.1946768785947, 742.8331673228507); - points += QPointF(1143.4746649906995, 764.0242207567912); - points += QPointF(1166.0238785179056, 786.0519457597056); - points += QPointF(1187.809496086383, 808.8573128063048); - points += QPointF(1208.7982112227505, 832.3819574965946); - points += QPointF(1228.9562198237943, 856.5681299364861); - points += QPointF(1248.2492085181873, 881.3586613164374); - points += QPointF(1266.6423393728555, 906.696945663311); - points += QPointF(1284.1002268781353, 932.5269345592678); - points += QPointF(1300.5869033558602, 958.7931423679257); - points += QPointF(1316.065768928307, 985.4406590911037); - points += QPointF(1330.4995219936793, 1012.4151672497809); - points += QPointF(1343.850065889632, 1039.6629580676176); - points += QPointF(1356.0783871611402, 1067.1309405095865); - points += QPointF(1367.1444008135065, 1094.7666342875323); - points += QPointF(1377.006758382479, 1122.5181345255592); - points += QPointF(1385.3821076646018, 1149.5575609882246); - points += QPointF(1385.7580931557095, 1150.8527362570703); - points += QPointF(1391.2089508950362, 1170.962993556315); + points += QPointF(61.101021830902567, -0.709641223911092); + points += QPointF(70.804787644663136, 53.430485561778198); + points += QPointF(79.621893949255821, 91.858207949387321); + points += QPointF(90.246472404177823, 128.238336548445801); + points += QPointF(102.598525719285533, 162.806896482859997); + points += QPointF(116.561156626640255, 195.622141977860792); + points += QPointF(132.020820327959171, 226.740557559210657); + points += QPointF(148.866694189775330, 256.215996794830687); + points += QPointF(166.989862068105765, 284.099067617716173); + points += QPointF(186.282415544815365, 310.436809263543466); + points += QPointF(206.636574872612272, 335.272659629850125); + points += QPointF(227.943914251639484, 358.646672648665174); + points += QPointF(250.094746479310828, 380.595920259885645); + points += QPointF(272.977689667348102, 401.155004785507970); + points += QPointF(296.479410672457789, 420.356612464162595); + points += QPointF(320.484520119941976, 438.232052715083057); + points += QPointF(344.875583217325925, 454.811745113349389); + points += QPointF(369.533207535191309, 470.125632957113510); + points += QPointF(394.336171069434499, 484.203516229699574); + points += QPointF(419.161558577576955, 497.075306799206203); + points += QPointF(443.884879192889571, 508.771215047678083); + points += QPointF(468.380141996197040, 519.321880586368479); + points += QPointF(492.685597452467846, 528.352504009663221); + points += QPointF(516.320650508090694, 536.723905788816978); + points += QPointF(539.117950666889328, 544.386269737582552); + points += QPointF(572.344990077737634, 553.565659766025306); + points += QPointF(613.189423788536715, 562.294425470246097); + points += QPointF(648.933498530834640, 567.429209393712085); + points += QPointF(678.669134099110011, 569.356067120192051); + points += QPointF(690.568570597070675, 569.081735831889887); + points += QPointF(705.392572803380290, 568.745199404635628); + points += QPointF(735.474713539123286, 569.534006540479368); + points += QPointF(765.566399788106537, 572.193038404045183); + points += QPointF(795.412302351329231, 576.641052885977615); + points += QPointF(824.965602108301027, 582.801544103358651); + points += QPointF(854.183547042348096, 590.598325318004754); + points += QPointF(883.026844991811231, 599.956221997473222); + points += QPointF(911.458987786852845, 610.801528373960082); + points += QPointF(939.445585340395041, 623.062258175182706); + points += QPointF(966.953760734297589, 636.668233397471113); + points += QPointF(993.951633091167878, 651.551057077311953); + points += QPointF(1020.407896673002142, 667.644011275547427); + points += QPointF(1046.291492516970493, 684.881913581870663); + points += QPointF(1071.571362058354453, 703.200956917979283); + points += QPointF(1096.216269205860954, 722.538549717668161); + points += QPointF(1120.194676878594692, 742.833167322850727); + points += QPointF(1143.474664990699466, 764.024220756791237); + points += QPointF(1166.023878517905587, 786.051945759705632); + points += QPointF(1187.809496086382978, 808.857312806304776); + points += QPointF(1208.798211222750524, 832.381957496594623); + points += QPointF(1228.956219823794299, 856.568129936486116); + points += QPointF(1248.249208518187288, 881.358661316437406); + points += QPointF(1266.642339372855531, 906.696945663310998); + points += QPointF(1284.100226878135345, 932.526934559267829); + points += QPointF(1300.586903355860159, 958.793142367925725); + points += QPointF(1316.065768928307079, 985.440659091103726); + points += QPointF(1330.499521993679309, 1012.415167249780893); + points += QPointF(1343.850065889632106, 1039.662958067617637); + points += QPointF(1356.078387161140199, 1067.130940509586480); + points += QPointF(1367.144400813506536, 1094.766634287532270); + points += QPointF(1377.006758382478893, 1122.518134525559162); + points += QPointF(1385.200774121173936, 1150.078352724689012); + points += QPointF(1391.208950895036196, 1170.962993556315041); return points; }