diff --git a/src/libs/vlayout/vabstractpiece.cpp b/src/libs/vlayout/vabstractpiece.cpp index 1b56d84bc..27b6d2a99 100644 --- a/src/libs/vlayout/vabstractpiece.cpp +++ b/src/libs/vlayout/vabstractpiece.cpp @@ -134,7 +134,7 @@ QVector AngleByLength(QVector points, QPointF p1, QPoi QLineF edge2(p2, p3); const qreal angle = edge1.angleTo(edge2); - if (angle > 268) + if (angle > 180 && p.GetAngleType() != PieceNodeAngle::ByLengthCurve) { QLineF loop(sp2, bigLine1.p1()); loop.setLength(accuracyPointOnLine*2.); @@ -142,8 +142,10 @@ QVector AngleByLength(QVector points, QPointF p1, QPoi points.append(sp2); loop = QLineF(bigLine1.p1(), sp2); - loop.setLength(loop.length() + localWidth*3.); - points.append(loop.p2()); + loop.setLength(loop.length() + localWidth); + VRawSAPoint loopPoint(loop.p2()); + loopPoint.SetLoopPoint(true); + points.append(loopPoint); } else { @@ -1340,8 +1342,8 @@ QVector VAbstractPiece::EkvPoint(QVector points, const } return true; }; - if (VGObject::IsPointOnLineSegment(p2Line1, p1Line1, p1Line2, ToPixel(1, Unit::Mm)) && - IsOnLine(p2Line1, bigLine1.p2(), bigLine2.p1(), ToPixel(1, Unit::Mm))) + if (VGObject::IsPointOnLineSegment(p2Line1, p1Line1, p1Line2, ToPixel(0.5, Unit::Mm)) && + IsOnLine(p2Line1, bigLine1.p2(), bigLine2.p1(), ToPixel(0.5, Unit::Mm))) { points.append(bigLine1.p2()); points.append(bigLine2.p1()); @@ -1402,20 +1404,43 @@ QT_WARNING_POP const qreal result2 = PointPosition(bisector.p2(), QLineF(p2Line2, p1Line2)); if ((result1 < 0 || qFuzzyIsNull(result1)) && (result2 < 0 || qFuzzyIsNull(result2))) - {// Dart case. A bisector watch outside. In some cases a point still valid, but ignore if going - // outside of an equdistant. + {// Dart case. A bisector watches outside. + QLineF edge1(p1Line1, p2Line1); + QLineF edge2(p1Line2, p2Line2); - const QLineF bigEdge = ParallelLine(p1Line1, p1Line2, localWidth ); - QPointF px; - const QLineF::IntersectType type = bigEdge.intersect(line, &px); - if (type != QLineF::BoundedIntersection) + if (qAbs(edge1.length() - edge2.length()) <= qMax(edge1.length(), edge2.length())*0.2) { - if (line.length() < QLineF(p2Line1, px).length()) + // Classic dart must be symmetrical. + // In some cases a point still valid, but ignore if going outside of an equdistant. + + const QLineF bigEdge = ParallelLine(p1Line1, p1Line2, localWidth ); + QPointF px; + const QLineF::IntersectType type = bigEdge.intersect(line, &px); + if (type != QLineF::BoundedIntersection && line.length() < QLineF(p2Line1, px).length()) { points.append(crosPoint); return points; } } + else + { // Just an acute angle with big seam allowance + if (IsSameDirection(bigLine2.p1(), bigLine2.p2(), crosPoint)) + { + QLineF loop(crosPoint, bigLine1.p1()); + loop.setAngle(loop.angle() + 180); + loop.setLength(accuracyPointOnLine*2.); + points.append(loop.p2()); + points.append(crosPoint); + + loop = QLineF(crosPoint, bigLine1.p1()); + loop.setLength(loop.length() + localWidth*2.); + VRawSAPoint loopPoint(loop.p2()); + loopPoint.SetLoopPoint(true); + points.append(loopPoint); + } + + return points; + } } else { // New subcase. This is not a dart. An angle is acute and bisector watch inside. diff --git a/src/test/ValentinaTest/share/DP_6/output.json b/src/test/ValentinaTest/share/DP_6/output.json index cd750821d..257edd3b3 100644 --- a/src/test/ValentinaTest/share/DP_6/output.json +++ b/src/test/ValentinaTest/share/DP_6/output.json @@ -242,73 +242,98 @@ }, { "type": "QPointF", - "x": 2003.0609167151038, - "y": 3106.64420303187 + "x": 2004.4489089247609, + "y": 3106.800175086281 }, { "type": "QPointF", - "x": 1978.6864703707051, - "y": 3103.8324085145887 + "x": 1979.8384926896974, + "y": 3104.034642863993 }, { "type": "QPointF", - "x": 1946.7311458024346, - "y": 3097.178804862954 + "x": 1963.5219202319072, + "y": 3101.170313448572 }, { "type": "QPointF", - "x": 1916.5669120498787, - "y": 3087.105165289196 + "x": 1947.7870186709108, + "y": 3097.4915108883592 }, { "type": "QPointF", - "x": 1888.3519305768446, - "y": 3073.6128646371717 + "x": 1932.4866203274846, + "y": 3092.960163511294 }, { "type": "QPointF", - "x": 1862.2485349404565, - "y": 3056.7997458780815 + "x": 1917.6380745560268, + "y": 3087.5706762455434 }, { "type": "QPointF", - "x": 1838.3637143608191, - "y": 3036.8422480234512 + "x": 1903.2617297211123, + "y": 3081.3229351283258 }, { "type": "QPointF", - "x": 1827.0296344066358, - "y": 3025.4888754097633 + "x": 1889.3792433172657, + "y": 3074.223031918129 }, { "type": "QPointF", - "x": 1811.0210136428477, - "y": 3007.105554233083 + "x": 1876.0115774702263, + "y": 3066.2833734269016 }, { "type": "QPointF", - "x": 1792.1855441829048, - "y": 2980.8365702349024 + "x": 1863.176964716937, + "y": 3057.5220916626295 }, { "type": "QPointF", - "x": 1775.3116652088074, - "y": 2951.992857886853 + "x": 1850.8891565017675, + "y": 3047.961813986908 }, { "type": "QPointF", - "x": 1760.23344616566, - "y": 2920.6275157771556 + "x": 1839.1562115587467, + "y": 3037.627987682699 }, { "type": "QPointF", - "x": 1746.7910292682213, - "y": 2886.7559216818995 + "x": 1827.855988045905, + "y": 3026.4241199647795 }, { "type": "QPointF", - "x": 1734.8389324840682, - "y": 2850.3704157806915 + "x": 1812.0913886300827, + "y": 3008.5821754690814 + }, + { + "type": "QPointF", + "x": 1793.0898024110759, + "y": 2982.3687959868835 + }, + { + "type": "QPointF", + "x": 1775.9896963294439, + "y": 2953.3934191712606 + }, + { + "type": "QPointF", + "x": 1760.7318950942315, + "y": 2921.8764503407356 + }, + { + "type": "QPointF", + "x": 1747.152418440646, + "y": 2887.851143482119 + }, + { + "type": "QPointF", + "x": 1735.098369251984, + "y": 2851.3202829591896 }, { "type": "QPointF", diff --git a/src/test/ValentinaTest/share/DP_6_hem_by_first_edge_right_angle/output.json b/src/test/ValentinaTest/share/DP_6_hem_by_first_edge_right_angle/output.json index 7c43ad59f..3b4a7bfd7 100644 --- a/src/test/ValentinaTest/share/DP_6_hem_by_first_edge_right_angle/output.json +++ b/src/test/ValentinaTest/share/DP_6_hem_by_first_edge_right_angle/output.json @@ -12,68 +12,93 @@ }, { "type": "QPointF", - "x": 1996.0802270270285, - "y": 3106.4896422772294 + "x": 1997.303734527605, + "y": 3106.611912858666 }, { "type": "QPointF", - "x": 1963.1919295261307, - "y": 3102.1109579065387 + "x": 1964.1663907800346, + "y": 3102.675519252714 }, { "type": "QPointF", - "x": 1931.9727603936067, - "y": 3094.3937506039188 + "x": 1948.436218685301, + "y": 3099.0319694836626 }, { "type": "QPointF", - "x": 1902.6252954541021, - "y": 3083.0643675794754 + "x": 1933.0740804353488, + "y": 3094.7734942073407 }, { "type": "QPointF", - "x": 1875.3148025158484, - "y": 3068.250269775299 + "x": 1918.1596207747095, + "y": 3089.6308740424874 }, { "type": "QPointF", - "x": 1850.1979929146235, - "y": 3050.1040435011655 + "x": 1903.7149997558406, + "y": 3083.603735754006 }, { "type": "QPointF", - "x": 1827.3469276041935, - "y": 3028.8401561988053 + "x": 1889.7639653061897, + "y": 3076.698427614985 }, { "type": "QPointF", - "x": 1806.5434332627558, - "y": 3004.4171401472677 + "x": 1876.3296359067554, + "y": 3068.928192459463 }, { "type": "QPointF", - "x": 1792.1752542182253, - "y": 2984.1108079098112 + "x": 1863.4322329609852, + "y": 3060.3125496336684 }, { "type": "QPointF", - "x": 1775.2813658756738, - "y": 2955.31641051052 + "x": 1851.0871243894192, + "y": 3050.8759478468655 }, { "type": "QPointF", - "x": 1760.193622299537, - "y": 2923.9613674686166 + "x": 1839.3034779579243, + "y": 3040.645910842773 }, { "type": "QPointF", - "x": 1746.7478267536426, - "y": 2890.0634027709293 + "x": 1828.0836807590824, + "y": 3029.6509944986296 }, { "type": "QPointF", - "x": 1734.7957064337616, - "y": 2853.6168595567024 + "x": 1807.2123162125029, + "y": 3005.3510253795666 + }, + { + "type": "QPointF", + "x": 1793.013631885906, + "y": 2985.527016387119 + }, + { + "type": "QPointF", + "x": 1775.9676961769578, + "y": 2956.7325964195143 + }, + { + "type": "QPointF", + "x": 1760.6959473366912, + "y": 2925.220603618355 + }, + { + "type": "QPointF", + "x": 1747.1106252328786, + "y": 2891.1647086626153 + }, + { + "type": "QPointF", + "x": 1735.0553113691292, + "y": 2854.5697697526543 }, { "type": "QPointF", diff --git a/src/test/ValentinaTest/share/DP_6_hem_by_first_edge_symmetry/output.json b/src/test/ValentinaTest/share/DP_6_hem_by_first_edge_symmetry/output.json index 83e1b4659..f92f73131 100644 --- a/src/test/ValentinaTest/share/DP_6_hem_by_first_edge_symmetry/output.json +++ b/src/test/ValentinaTest/share/DP_6_hem_by_first_edge_symmetry/output.json @@ -7,63 +7,88 @@ }, { "type": "QPointF", - "x": 1963.1731656779998, - "y": 3102.186865126004 + "x": 1964.2273050875103, + "y": 3102.4125360082517 }, { "type": "QPointF", - "x": 1931.9727603936067, - "y": 3094.3937506039188 + "x": 1948.436218685301, + "y": 3099.0319694836626 }, { "type": "QPointF", - "x": 1902.6252954541021, - "y": 3083.0643675794754 + "x": 1933.0740804353488, + "y": 3094.7734942073407 }, { "type": "QPointF", - "x": 1875.3148025158484, - "y": 3068.250269775299 + "x": 1918.1596207747095, + "y": 3089.6308740424874 }, { "type": "QPointF", - "x": 1850.1979929146235, - "y": 3050.1040435011655 + "x": 1903.7149997558406, + "y": 3083.603735754006 }, { "type": "QPointF", - "x": 1827.3469276041935, - "y": 3028.8401561988053 + "x": 1889.7639653061897, + "y": 3076.698427614985 }, { "type": "QPointF", - "x": 1806.5434332627558, - "y": 3004.4171401472677 + "x": 1876.3296359067554, + "y": 3068.928192459463 }, { "type": "QPointF", - "x": 1792.1752542182253, - "y": 2984.1108079098112 + "x": 1863.4322329609852, + "y": 3060.3125496336684 }, { "type": "QPointF", - "x": 1775.2813658756738, - "y": 2955.31641051052 + "x": 1851.0871243894192, + "y": 3050.8759478468655 }, { "type": "QPointF", - "x": 1760.193622299537, - "y": 2923.9613674686166 + "x": 1839.3034779579243, + "y": 3040.645910842773 }, { "type": "QPointF", - "x": 1746.7478267536426, - "y": 2890.0634027709293 + "x": 1828.0836807590824, + "y": 3029.6509944986296 }, { "type": "QPointF", - "x": 1734.7957064337616, - "y": 2853.6168595567024 + "x": 1807.2123162125029, + "y": 3005.3510253795666 + }, + { + "type": "QPointF", + "x": 1793.013631885906, + "y": 2985.527016387119 + }, + { + "type": "QPointF", + "x": 1775.9676961769578, + "y": 2956.7325964195143 + }, + { + "type": "QPointF", + "x": 1760.6959473366912, + "y": 2925.220603618355 + }, + { + "type": "QPointF", + "x": 1747.1106252328786, + "y": 2891.1647086626153 + }, + { + "type": "QPointF", + "x": 1735.0553113691292, + "y": 2854.5697697526543 }, { "type": "QPointF", diff --git a/src/test/ValentinaTest/share/DP_6_hem_by_intersection/output.json b/src/test/ValentinaTest/share/DP_6_hem_by_intersection/output.json index 83e1b4659..f92f73131 100644 --- a/src/test/ValentinaTest/share/DP_6_hem_by_intersection/output.json +++ b/src/test/ValentinaTest/share/DP_6_hem_by_intersection/output.json @@ -7,63 +7,88 @@ }, { "type": "QPointF", - "x": 1963.1731656779998, - "y": 3102.186865126004 + "x": 1964.2273050875103, + "y": 3102.4125360082517 }, { "type": "QPointF", - "x": 1931.9727603936067, - "y": 3094.3937506039188 + "x": 1948.436218685301, + "y": 3099.0319694836626 }, { "type": "QPointF", - "x": 1902.6252954541021, - "y": 3083.0643675794754 + "x": 1933.0740804353488, + "y": 3094.7734942073407 }, { "type": "QPointF", - "x": 1875.3148025158484, - "y": 3068.250269775299 + "x": 1918.1596207747095, + "y": 3089.6308740424874 }, { "type": "QPointF", - "x": 1850.1979929146235, - "y": 3050.1040435011655 + "x": 1903.7149997558406, + "y": 3083.603735754006 }, { "type": "QPointF", - "x": 1827.3469276041935, - "y": 3028.8401561988053 + "x": 1889.7639653061897, + "y": 3076.698427614985 }, { "type": "QPointF", - "x": 1806.5434332627558, - "y": 3004.4171401472677 + "x": 1876.3296359067554, + "y": 3068.928192459463 }, { "type": "QPointF", - "x": 1792.1752542182253, - "y": 2984.1108079098112 + "x": 1863.4322329609852, + "y": 3060.3125496336684 }, { "type": "QPointF", - "x": 1775.2813658756738, - "y": 2955.31641051052 + "x": 1851.0871243894192, + "y": 3050.8759478468655 }, { "type": "QPointF", - "x": 1760.193622299537, - "y": 2923.9613674686166 + "x": 1839.3034779579243, + "y": 3040.645910842773 }, { "type": "QPointF", - "x": 1746.7478267536426, - "y": 2890.0634027709293 + "x": 1828.0836807590824, + "y": 3029.6509944986296 }, { "type": "QPointF", - "x": 1734.7957064337616, - "y": 2853.6168595567024 + "x": 1807.2123162125029, + "y": 3005.3510253795666 + }, + { + "type": "QPointF", + "x": 1793.013631885906, + "y": 2985.527016387119 + }, + { + "type": "QPointF", + "x": 1775.9676961769578, + "y": 2956.7325964195143 + }, + { + "type": "QPointF", + "x": 1760.6959473366912, + "y": 2925.220603618355 + }, + { + "type": "QPointF", + "x": 1747.1106252328786, + "y": 2891.1647086626153 + }, + { + "type": "QPointF", + "x": 1735.0553113691292, + "y": 2854.5697697526543 }, { "type": "QPointF", diff --git a/src/test/ValentinaTest/share/DP_6_hem_by_length/output.json b/src/test/ValentinaTest/share/DP_6_hem_by_length/output.json index 83e1b4659..f92f73131 100644 --- a/src/test/ValentinaTest/share/DP_6_hem_by_length/output.json +++ b/src/test/ValentinaTest/share/DP_6_hem_by_length/output.json @@ -7,63 +7,88 @@ }, { "type": "QPointF", - "x": 1963.1731656779998, - "y": 3102.186865126004 + "x": 1964.2273050875103, + "y": 3102.4125360082517 }, { "type": "QPointF", - "x": 1931.9727603936067, - "y": 3094.3937506039188 + "x": 1948.436218685301, + "y": 3099.0319694836626 }, { "type": "QPointF", - "x": 1902.6252954541021, - "y": 3083.0643675794754 + "x": 1933.0740804353488, + "y": 3094.7734942073407 }, { "type": "QPointF", - "x": 1875.3148025158484, - "y": 3068.250269775299 + "x": 1918.1596207747095, + "y": 3089.6308740424874 }, { "type": "QPointF", - "x": 1850.1979929146235, - "y": 3050.1040435011655 + "x": 1903.7149997558406, + "y": 3083.603735754006 }, { "type": "QPointF", - "x": 1827.3469276041935, - "y": 3028.8401561988053 + "x": 1889.7639653061897, + "y": 3076.698427614985 }, { "type": "QPointF", - "x": 1806.5434332627558, - "y": 3004.4171401472677 + "x": 1876.3296359067554, + "y": 3068.928192459463 }, { "type": "QPointF", - "x": 1792.1752542182253, - "y": 2984.1108079098112 + "x": 1863.4322329609852, + "y": 3060.3125496336684 }, { "type": "QPointF", - "x": 1775.2813658756738, - "y": 2955.31641051052 + "x": 1851.0871243894192, + "y": 3050.8759478468655 }, { "type": "QPointF", - "x": 1760.193622299537, - "y": 2923.9613674686166 + "x": 1839.3034779579243, + "y": 3040.645910842773 }, { "type": "QPointF", - "x": 1746.7478267536426, - "y": 2890.0634027709293 + "x": 1828.0836807590824, + "y": 3029.6509944986296 }, { "type": "QPointF", - "x": 1734.7957064337616, - "y": 2853.6168595567024 + "x": 1807.2123162125029, + "y": 3005.3510253795666 + }, + { + "type": "QPointF", + "x": 1793.013631885906, + "y": 2985.527016387119 + }, + { + "type": "QPointF", + "x": 1775.9676961769578, + "y": 2956.7325964195143 + }, + { + "type": "QPointF", + "x": 1760.6959473366912, + "y": 2925.220603618355 + }, + { + "type": "QPointF", + "x": 1747.1106252328786, + "y": 2891.1647086626153 + }, + { + "type": "QPointF", + "x": 1735.0553113691292, + "y": 2854.5697697526543 }, { "type": "QPointF", diff --git a/src/test/ValentinaTest/share/DP_6_hem_by_second_edge_right_angle/output.json b/src/test/ValentinaTest/share/DP_6_hem_by_second_edge_right_angle/output.json index 83e1b4659..f92f73131 100644 --- a/src/test/ValentinaTest/share/DP_6_hem_by_second_edge_right_angle/output.json +++ b/src/test/ValentinaTest/share/DP_6_hem_by_second_edge_right_angle/output.json @@ -7,63 +7,88 @@ }, { "type": "QPointF", - "x": 1963.1731656779998, - "y": 3102.186865126004 + "x": 1964.2273050875103, + "y": 3102.4125360082517 }, { "type": "QPointF", - "x": 1931.9727603936067, - "y": 3094.3937506039188 + "x": 1948.436218685301, + "y": 3099.0319694836626 }, { "type": "QPointF", - "x": 1902.6252954541021, - "y": 3083.0643675794754 + "x": 1933.0740804353488, + "y": 3094.7734942073407 }, { "type": "QPointF", - "x": 1875.3148025158484, - "y": 3068.250269775299 + "x": 1918.1596207747095, + "y": 3089.6308740424874 }, { "type": "QPointF", - "x": 1850.1979929146235, - "y": 3050.1040435011655 + "x": 1903.7149997558406, + "y": 3083.603735754006 }, { "type": "QPointF", - "x": 1827.3469276041935, - "y": 3028.8401561988053 + "x": 1889.7639653061897, + "y": 3076.698427614985 }, { "type": "QPointF", - "x": 1806.5434332627558, - "y": 3004.4171401472677 + "x": 1876.3296359067554, + "y": 3068.928192459463 }, { "type": "QPointF", - "x": 1792.1752542182253, - "y": 2984.1108079098112 + "x": 1863.4322329609852, + "y": 3060.3125496336684 }, { "type": "QPointF", - "x": 1775.2813658756738, - "y": 2955.31641051052 + "x": 1851.0871243894192, + "y": 3050.8759478468655 }, { "type": "QPointF", - "x": 1760.193622299537, - "y": 2923.9613674686166 + "x": 1839.3034779579243, + "y": 3040.645910842773 }, { "type": "QPointF", - "x": 1746.7478267536426, - "y": 2890.0634027709293 + "x": 1828.0836807590824, + "y": 3029.6509944986296 }, { "type": "QPointF", - "x": 1734.7957064337616, - "y": 2853.6168595567024 + "x": 1807.2123162125029, + "y": 3005.3510253795666 + }, + { + "type": "QPointF", + "x": 1793.013631885906, + "y": 2985.527016387119 + }, + { + "type": "QPointF", + "x": 1775.9676961769578, + "y": 2956.7325964195143 + }, + { + "type": "QPointF", + "x": 1760.6959473366912, + "y": 2925.220603618355 + }, + { + "type": "QPointF", + "x": 1747.1106252328786, + "y": 2891.1647086626153 + }, + { + "type": "QPointF", + "x": 1735.0553113691292, + "y": 2854.5697697526543 }, { "type": "QPointF", diff --git a/src/test/ValentinaTest/share/DP_6_hem_by_second_edge_symmetry/output.json b/src/test/ValentinaTest/share/DP_6_hem_by_second_edge_symmetry/output.json index 83e1b4659..f92f73131 100644 --- a/src/test/ValentinaTest/share/DP_6_hem_by_second_edge_symmetry/output.json +++ b/src/test/ValentinaTest/share/DP_6_hem_by_second_edge_symmetry/output.json @@ -7,63 +7,88 @@ }, { "type": "QPointF", - "x": 1963.1731656779998, - "y": 3102.186865126004 + "x": 1964.2273050875103, + "y": 3102.4125360082517 }, { "type": "QPointF", - "x": 1931.9727603936067, - "y": 3094.3937506039188 + "x": 1948.436218685301, + "y": 3099.0319694836626 }, { "type": "QPointF", - "x": 1902.6252954541021, - "y": 3083.0643675794754 + "x": 1933.0740804353488, + "y": 3094.7734942073407 }, { "type": "QPointF", - "x": 1875.3148025158484, - "y": 3068.250269775299 + "x": 1918.1596207747095, + "y": 3089.6308740424874 }, { "type": "QPointF", - "x": 1850.1979929146235, - "y": 3050.1040435011655 + "x": 1903.7149997558406, + "y": 3083.603735754006 }, { "type": "QPointF", - "x": 1827.3469276041935, - "y": 3028.8401561988053 + "x": 1889.7639653061897, + "y": 3076.698427614985 }, { "type": "QPointF", - "x": 1806.5434332627558, - "y": 3004.4171401472677 + "x": 1876.3296359067554, + "y": 3068.928192459463 }, { "type": "QPointF", - "x": 1792.1752542182253, - "y": 2984.1108079098112 + "x": 1863.4322329609852, + "y": 3060.3125496336684 }, { "type": "QPointF", - "x": 1775.2813658756738, - "y": 2955.31641051052 + "x": 1851.0871243894192, + "y": 3050.8759478468655 }, { "type": "QPointF", - "x": 1760.193622299537, - "y": 2923.9613674686166 + "x": 1839.3034779579243, + "y": 3040.645910842773 }, { "type": "QPointF", - "x": 1746.7478267536426, - "y": 2890.0634027709293 + "x": 1828.0836807590824, + "y": 3029.6509944986296 }, { "type": "QPointF", - "x": 1734.7957064337616, - "y": 2853.6168595567024 + "x": 1807.2123162125029, + "y": 3005.3510253795666 + }, + { + "type": "QPointF", + "x": 1793.013631885906, + "y": 2985.527016387119 + }, + { + "type": "QPointF", + "x": 1775.9676961769578, + "y": 2956.7325964195143 + }, + { + "type": "QPointF", + "x": 1760.6959473366912, + "y": 2925.220603618355 + }, + { + "type": "QPointF", + "x": 1747.1106252328786, + "y": 2891.1647086626153 + }, + { + "type": "QPointF", + "x": 1735.0553113691292, + "y": 2854.5697697526543 }, { "type": "QPointF", diff --git a/src/test/ValentinaTest/share/Issue_646/output.json b/src/test/ValentinaTest/share/Issue_646/output.json index 360b04cc2..f045437c6 100644 --- a/src/test/ValentinaTest/share/Issue_646/output.json +++ b/src/test/ValentinaTest/share/Issue_646/output.json @@ -2,188 +2,188 @@ "vector": [ { "type": "QPointF", - "x": 1391.2089508950362, - "y": 1170.962993556315 + "x": 1391.2086175709487, + "y": 1170.9617637988192 }, { "type": "QPointF", - "x": 1352.8346456692914, + "x": 1352.8724409448819, "y": 1362.8345196850394 }, { "type": "QPointF", - "x": 1350.6660166205588, - "y": 1367.7550606147208 + "x": 1350.7006018935115, + "y": 1367.7703033753553 }, { "type": "QPointF", - "x": 1344.6776732217286, - "y": 1376.7202577023593 + "x": 1344.7091020991327, + "y": 1376.7412507612619 }, { "type": "QPointF", - "x": 1336.7920071638646, - "y": 1384.6921570699324 + "x": 1336.8188773941715, + "y": 1384.7187366406629 }, { "type": "QPointF", - "x": 1327.102329227638, - "y": 1391.7349409463345 + "x": 1327.1245505580102, + "y": 1391.7655137338006 }, { "type": "QPointF", - "x": 1315.7019501937195, - "y": 1397.9127915604581 + "x": 1315.719957407725, + "y": 1397.9460214130117 }, { "type": "QPointF", - "x": 1302.6841808427803, - "y": 1403.289891141198 + "x": 1302.6986100196889, + "y": 1403.3248236720353 }, { "type": "QPointF", - "x": 1288.142331955491, - "y": 1407.930421917447 + "x": 1288.1538221481612, + "y": 1407.96642828257 }, { "type": "QPointF", - "x": 1272.169714312523, - "y": 1411.8985661180982 + "x": 1272.1788269472245, + "y": 1411.9352463954385 }, { "type": "QPointF", - "x": 1245.881900239392, - "y": 1416.7944475909562 + "x": 1245.8888202964258, + "y": 1416.8316039587498 }, { "type": "QPointF", - "x": 1206.4717817874364, - "y": 1421.4666032853988 + "x": 1206.4762313406886, + "y": 1421.5041357291352 }, { "type": "QPointF", - "x": 1163.0181823648445, - "y": 1424.6044927975377 + "x": 1163.020904564699, + "y": 1424.642189912612 }, { "type": "QPointF", - "x": 963.6986998754783, - "y": 1432.082545646023 + "x": 963.7001554735343, + "y": 1432.1203128817076 }, { "type": "QPointF", - "x": 911.2249892802281, - "y": 1435.25097171387 + "x": 911.2272672558029, + "y": 1435.2886982785724 }, { "type": "QPointF", - "x": 859.186715186551, - "y": 1439.9658785863046 + "x": 859.1901256423455, + "y": 1440.0035196761964 }, { "type": "QPointF", - "x": 808.3303638398154, - "y": 1446.7407240944754 + "x": 808.3353546602272, + "y": 1446.7781884050733 }, { "type": "QPointF", - "x": 771.4905538168089, - "y": 1453.5750227393632 + "x": 771.4974477424232, + "y": 1453.6121839644047 }, { "type": "QPointF", - "x": 747.6486510586797, - "y": 1458.9887661869527 + "x": 747.6570201292775, + "y": 1459.0256232285362 }, { "type": "QPointF", - "x": 724.5221275003055, - "y": 1465.2063143234973 + "x": 724.5319402842023, + "y": 1465.2428135307375 }, { "type": "QPointF", - "x": 674.314621551016, - "y": 1482.390491353628 + "x": 674.3274477843926, + "y": 1482.4260437177454 }, { "type": "QPointF", - "x": 639.4466353664043, - "y": 1492.6483289419746 + "x": 639.457302358586, + "y": 1492.6845877082906 }, { "type": "QPointF", - "x": 603.7620983221955, - "y": 1500.410735703404 + "x": 603.7701320001938, + "y": 1500.4476673006452 }, { "type": "QPointF", - "x": 567.2371765086411, - "y": 1505.6816136598163 + "x": 567.2425747899177, + "y": 1505.719021431953 }, { "type": "QPointF", - "x": 529.8480360159926, - "y": 1508.4648648331117 + "x": 529.850841736931, + "y": 1508.5025558239051 }, { "type": "QPointF", - "x": 491.5708429345011, - "y": 1508.7643912451913 + "x": 491.5711386807613, + "y": 1508.8021853636637 }, { "type": "QPointF", - "x": 452.3817633544179, - "y": 1506.5840949179556 + "x": 452.3796638495728, + "y": 1506.6218318353756 }, { "type": "QPointF", - "x": 412.2569633659944, - "y": 1501.9278778733042 + "x": 412.2526067102235, + "y": 1501.9654212136918 }, { "type": "QPointF", - "x": 371.1726090594818, - "y": 1494.7996421331377 + "x": 371.16614801459684, + "y": 1494.8368810611023 }, { "type": "QPointF", - "x": 329.10486652513146, - "y": 1485.2032897193571 + "x": 329.0964607271508, + "y": 1485.2401384020645 }, { "type": "QPointF", - "x": 286.0299018531947, - "y": 1473.1427226538626 + "x": 286.01971144731027, + "y": 1473.179118237178 }, { "type": "QPointF", - "x": 241.92388113392275, - "y": 1458.6218429585542 + "x": 241.91206198448054, + "y": 1458.657742687849 }, { "type": "QPointF", - "x": 196.762970457567, - "y": 1441.644552655333 + "x": 196.74967084445657, + "y": 1441.6799306590651 }, { "type": "QPointF", - "x": 150.52333591437866, - "y": 1422.2147537660987 + "x": 150.50869449347155, + "y": 1422.2495978710633 }, { "type": "QPointF", - "x": 103.18114359460913, - "y": 1400.3363483127525 + "x": 103.16528835176109, + "y": 1400.3706571181995 }, { "type": "QPointF", - "x": 54.712559588509635, - "y": 1376.013238317194 + "x": 54.695607523982886, + "y": 1376.0470186423145 }, { "type": "QPointF", - "x": 30, - "y": 1362.8345196850394 + "x": 29.982215367626612, + "y": 1362.8678691934062 }, { "type": "QPointF", @@ -337,33 +337,33 @@ }, { "type": "QPointF", - "x": 736.640679411305, - "y": 569.6370363401493 + "x": 735.4747135391233, + "y": 569.5340065404794 }, { "type": "QPointF", - "x": 766.6846232826167, - "y": 572.3596902346301 + "x": 765.5663997881065, + "y": 572.1930384040452 }, { "type": "QPointF", - "x": 796.4775820349748, - "y": 576.8631142526988 + "x": 795.4123023513292, + "y": 576.6410528859776 }, { "type": "QPointF", - "x": 825.9748734993844, - "y": 583.0708672279056 + "x": 824.965602108301, + "y": 582.8015441033587 }, { "type": "QPointF", - "x": 855.1355940441956, - "y": 590.9072066911715 + "x": 854.1835470423481, + "y": 590.5983253180048 }, { "type": "QPointF", - "x": 883.9219621065691, - "y": 600.2976601867215 + "x": 883.0268449918112, + "y": 599.9562219974732 }, { "type": "QPointF", @@ -487,8 +487,8 @@ }, { "type": "QPointF", - "x": 1391.2089508950362, - "y": 1170.962993556315 + "x": 1391.2086175709487, + "y": 1170.9617637988192 } ] } diff --git a/src/test/ValentinaTest/share/Issue_880_Detail/output.json b/src/test/ValentinaTest/share/Issue_880_Detail/output.json index 7e2590aad..d574ef4a3 100644 --- a/src/test/ValentinaTest/share/Issue_880_Detail/output.json +++ b/src/test/ValentinaTest/share/Issue_880_Detail/output.json @@ -62,138 +62,138 @@ }, { "type": "QPointF", - "x": 77.45861484081108, - "y": -86.52984576684123 + "x": 76.80902542176231, + "y": -85.80275109276256 }, { "type": "QPointF", - "x": 109.08278604225141, - "y": -121.83544437220145 + "x": 108.32184223768654, + "y": -121.07549507561193 }, { "type": "QPointF", - "x": 140.92478132381103, - "y": -153.5318259003598 + "x": 140.03960977826148, + "y": -152.7518093937674 }, { "type": "QPointF", - "x": 173.03023079960266, - "y": -181.70700672630292 + "x": 172.0109643794434, + "y": -180.92508772882493 }, { "type": "QPointF", - "x": 205.43453742955458, - "y": -206.43784752526722 + "x": 204.27687396752606, + "y": -205.6775245587238 }, { "type": "QPointF", - "x": 238.1573767892806, - "y": -227.79186545828628 + "x": 236.86536116641804, + "y": -227.0807873159393 }, { "type": "QPointF", - "x": 271.1979313258137, - "y": -245.83187244875293 + "x": 269.7862380601783, + "y": -245.1992338515816 }, { "type": "QPointF", - "x": 304.5327165357186, - "y": -260.62333207934057 + "x": 303.02747320804565, + "y": -260.09601694470166 }, { "type": "QPointF", - "x": 338.11769207175917, - "y": -272.24308387908326 + "x": 336.55504181349585, + "y": -271.8413567367945 }, { "type": "QPointF", - "x": 371.89515496166723, - "y": -280.7869982020927 + "x": 370.3174391861959, + "y": -280.5210157594255 }, { "type": "QPointF", - "x": 405.8040382385457, - "y": -286.37402686989833 + "x": 404.25444394855236, + "y": -286.242355156443 }, { "type": "QPointF", - "x": 439.7907378495311, - "y": -289.1453426458937 + "x": 438.30793239230167, + "y": -289.13593911030426 }, { "type": "QPointF", - "x": 473.8174506731321, - "y": -289.25918644474484 + "x": 472.43167053063326, + "y": -289.3523422699121 }, { "type": "QPointF", - "x": 507.81388046262117, - "y": -286.8905714985036 + "x": 506.5712073399975, + "y": -287.0573918482891 }, { "type": "QPointF", - "x": 537.9564634081299, - "y": -282.7464387285754 + "x": 536.6312348117178, + "y": -283.02203918305497 }, { "type": "QPointF", - "x": 562.6095195669259, - "y": -277.5128721927204 + "x": 561.2586117828608, + "y": -277.9004199361857 }, { "type": "QPointF", - "x": 585.8455745079714, - "y": -270.72906362902495 + "x": 584.4735176539314, + "y": -271.2405394534338 }, { "type": "QPointF", - "x": 607.6864925086287, - "y": -262.46075676173643 + "x": 606.3291152578626, + "y": -263.09320228624324 }, { "type": "QPointF", - "x": 628.1498610705121, - "y": -252.7950074693708 + "x": 626.8443757152221, + "y": -253.53448553817316 }, { "type": "QPointF", - "x": 647.2586146206663, - "y": -241.83965020585507 + "x": 646.0388521585816, + "y": -242.66198182567126 }, { "type": "QPointF", - "x": 665.0499413588421, - "y": -229.7183529791377 + "x": 663.9421664899236, + "y": -230.592040397069 }, { "type": "QPointF", - "x": 681.580938285693, - "y": -216.56261452112076 + "x": 680.6014176242785, + "y": -217.45310890781045 }, { "type": "QPointF", - "x": 696.9298121754468, - "y": -202.50314889762902 + "x": 696.0845837791157, + "y": -203.37717044914066 }, { "type": "QPointF", - "x": 711.1931395277443, - "y": -187.66296566226012 + "x": 710.4796074150597, + "y": -188.49177267151234 }, { "type": "QPointF", - "x": 724.4808222402369, - "y": -172.15337183633238 + "x": 723.8903257348999, + "y": -172.9144816918925 }, { "type": "QPointF", - "x": 737.0565029886579, - "y": -155.865162334438 + "x": 736.5088929791715, + "y": -156.65000627864362 }, { "type": "QPointF", - "x": 754.5423840349387, - "y": -130.68427641188504 + "x": 753.9481523879648, + "y": -131.65576420615508 }, { "type": "QPointF", diff --git a/src/test/ValentinaTest/share/Issue_880_Detail_1/output.json b/src/test/ValentinaTest/share/Issue_880_Detail_1/output.json index 02994fd68..1cb4aab4b 100644 --- a/src/test/ValentinaTest/share/Issue_880_Detail_1/output.json +++ b/src/test/ValentinaTest/share/Issue_880_Detail_1/output.json @@ -77,13 +77,13 @@ }, { "type": "QPointF", - "x": 43.64517836705224, - "y": 115.39365328200992 + "x": 43.58687052785413, + "y": 116.39817805128028 }, { "type": "QPointF", - "x": 47.11015346407565, - "y": 56.37280511624469 + "x": 47.000830659421496, + "y": 57.582630079953006 }, { "type": "QPointF", diff --git a/src/test/ValentinaTest/share/Issue_883_ledge/output.json b/src/test/ValentinaTest/share/Issue_883_ledge/output.json index dedfb2b19..aeef26cc0 100644 --- a/src/test/ValentinaTest/share/Issue_883_ledge/output.json +++ b/src/test/ValentinaTest/share/Issue_883_ledge/output.json @@ -7,8 +7,8 @@ }, { "type": "QPointF", - "x": 1085.4982327679375, - "y": -693.6818367772322 + "x": 1085.4656504337784, + "y": -692.9026597154831 }, { "type": "QPointF", @@ -47,13 +47,13 @@ }, { "type": "QPointF", - "x": 1176.5417359019957, - "y": -1307.721609412787 + "x": 1176.5244363705685, + "y": -1307.6563001159316 }, { "type": "QPointF", - "x": 1214.563099834782, - "y": -1450.7435245105175 + "x": 1214.661499217333, + "y": -1450.7350183203587 }, { "type": "QPointF", diff --git a/src/test/ValentinaTest/share/Issue_883_prong/output.json b/src/test/ValentinaTest/share/Issue_883_prong/output.json index 20c9f4a51..d501d9274 100644 --- a/src/test/ValentinaTest/share/Issue_883_prong/output.json +++ b/src/test/ValentinaTest/share/Issue_883_prong/output.json @@ -7,8 +7,8 @@ }, { "type": "QPointF", - "x": 1085.4982327679375, - "y": -693.6818367772322 + "x": 1085.4656504337784, + "y": -692.9026597154831 }, { "type": "QPointF", @@ -47,13 +47,13 @@ }, { "type": "QPointF", - "x": 1176.5417359019957, - "y": -1307.721609412787 + "x": 1176.5244363705685, + "y": -1307.6563001159316 }, { "type": "QPointF", - "x": 1214.563099834782, - "y": -1450.7435245105175 + "x": 1214.661499217333, + "y": -1450.7350183203587 }, { "type": "QPointF", diff --git a/src/test/ValentinaTest/share/Issue_923_test1/output.json b/src/test/ValentinaTest/share/Issue_923_test1/output.json index 563691c58..229677e95 100644 --- a/src/test/ValentinaTest/share/Issue_923_test1/output.json +++ b/src/test/ValentinaTest/share/Issue_923_test1/output.json @@ -7,13 +7,13 @@ }, { "type": "QPointF", - "x": -814.7149606299213, + "x": -814.7527559055118, "y": 331.31319685039375 }, { "type": "QPointF", - "x": -814.7149606299213, - "y": -46.7381274080184 + "x": -814.7527559055118, + "y": -46.735396006941144 }, { "type": "QPointF", @@ -107,38 +107,43 @@ }, { "type": "QPointF", - "x": -281.3615391339286, - "y": 371.0303001817342 + "x": -274.5095925153328, + "y": 368.5444651427917 }, { "type": "QPointF", - "x": -309.89377622824026, - "y": 377.93937224400145 + "x": -295.7605238049826, + "y": 375.0706690235611 }, { "type": "QPointF", - "x": -357.3015804224907, - "y": 384.10843195749214 + "x": -324.3767295101649, + "y": 380.2653300530379 }, { "type": "QPointF", - "x": -435.9520270040894, - "y": 389.07661798449516 + "x": -375.5837936477569, + "y": 385.67430269319027 }, { "type": "QPointF", - "x": -549.0970864147907, - "y": 390.9068680348474 + "x": -457.7859582653625, + "y": 389.818484035946 }, { "type": "QPointF", - "x": -682.5877079123347, - "y": 387.3931112039713 + "x": -595.1846601171007, + "y": 390.3891909827686 }, { "type": "QPointF", - "x": -756.9739837313467, - "y": 381.8746246893899 + "x": -702.630213618707, + "y": 386.255904969502 + }, + { + "type": "QPointF", + "x": -772.4984867981542, + "y": 380.09530156453326 }, { "type": "QPointF", @@ -147,13 +152,13 @@ }, { "type": "QPointF", - "x": -825.0430241964601, - "y": 368.66478991105026 + "x": -818.0929557813755, + "y": 371.2795759163598 }, { "type": "QPointF", - "x": -835.8151397150936, - "y": 362.8920896668543 + "x": -829.5753368833404, + "y": 366.62694879394627 }, { "type": "QPointF", diff --git a/src/test/ValentinaTest/share/Issue_923_test1_1/output.json b/src/test/ValentinaTest/share/Issue_923_test1_1/output.json index 01512aed6..b34e42e62 100644 --- a/src/test/ValentinaTest/share/Issue_923_test1_1/output.json +++ b/src/test/ValentinaTest/share/Issue_923_test1_1/output.json @@ -2,13 +2,13 @@ "vector": [ { "type": "QPointF", - "x": -941.3934146087294, - "y": 276.18223798775136 + "x": -941.3979025221786, + "y": 276.1785521318314 }, { "type": "QPointF", - "x": -797.0489745843311, - "y": -48.59275206714484 + "x": -797.0932693502834, + "y": -48.588064159004134 }, { "type": "QPointF", @@ -102,38 +102,43 @@ }, { "type": "QPointF", - "x": -281.3615391339286, - "y": 371.0303001817342 + "x": -274.5095925153328, + "y": 368.5444651427917 }, { "type": "QPointF", - "x": -309.89377622824026, - "y": 377.93937224400145 + "x": -295.7605238049826, + "y": 375.0706690235611 }, { "type": "QPointF", - "x": -357.3015804224907, - "y": 384.10843195749214 + "x": -324.3767295101649, + "y": 380.2653300530379 }, { "type": "QPointF", - "x": -435.9520270040894, - "y": 389.07661798449516 + "x": -375.5837936477569, + "y": 385.67430269319027 }, { "type": "QPointF", - "x": -549.0970864147907, - "y": 390.9068680348474 + "x": -457.7859582653625, + "y": 389.818484035946 }, { "type": "QPointF", - "x": -682.5877079123347, - "y": 387.3931112039713 + "x": -595.1846601171007, + "y": 390.3891909827686 }, { "type": "QPointF", - "x": -756.9739837313467, - "y": 381.8746246893899 + "x": -702.630213618707, + "y": 386.255904969502 + }, + { + "type": "QPointF", + "x": -772.4984867981542, + "y": 380.09530156453326 }, { "type": "QPointF", @@ -142,8 +147,13 @@ }, { "type": "QPointF", - "x": -825.0430241964601, - "y": 368.66478991105026 + "x": -818.0929557813755, + "y": 371.2795759163598 + }, + { + "type": "QPointF", + "x": -829.5753368833404, + "y": 366.62694879394627 }, { "type": "QPointF", @@ -152,8 +162,8 @@ }, { "type": "QPointF", - "x": -941.3934146087294, - "y": 276.18223798775136 + "x": -941.3979025221786, + "y": 276.1785521318314 } ] } diff --git a/src/test/ValentinaTest/share/Issue_923_test2/output.json b/src/test/ValentinaTest/share/Issue_923_test2/output.json index 563691c58..229677e95 100644 --- a/src/test/ValentinaTest/share/Issue_923_test2/output.json +++ b/src/test/ValentinaTest/share/Issue_923_test2/output.json @@ -7,13 +7,13 @@ }, { "type": "QPointF", - "x": -814.7149606299213, + "x": -814.7527559055118, "y": 331.31319685039375 }, { "type": "QPointF", - "x": -814.7149606299213, - "y": -46.7381274080184 + "x": -814.7527559055118, + "y": -46.735396006941144 }, { "type": "QPointF", @@ -107,38 +107,43 @@ }, { "type": "QPointF", - "x": -281.3615391339286, - "y": 371.0303001817342 + "x": -274.5095925153328, + "y": 368.5444651427917 }, { "type": "QPointF", - "x": -309.89377622824026, - "y": 377.93937224400145 + "x": -295.7605238049826, + "y": 375.0706690235611 }, { "type": "QPointF", - "x": -357.3015804224907, - "y": 384.10843195749214 + "x": -324.3767295101649, + "y": 380.2653300530379 }, { "type": "QPointF", - "x": -435.9520270040894, - "y": 389.07661798449516 + "x": -375.5837936477569, + "y": 385.67430269319027 }, { "type": "QPointF", - "x": -549.0970864147907, - "y": 390.9068680348474 + "x": -457.7859582653625, + "y": 389.818484035946 }, { "type": "QPointF", - "x": -682.5877079123347, - "y": 387.3931112039713 + "x": -595.1846601171007, + "y": 390.3891909827686 }, { "type": "QPointF", - "x": -756.9739837313467, - "y": 381.8746246893899 + "x": -702.630213618707, + "y": 386.255904969502 + }, + { + "type": "QPointF", + "x": -772.4984867981542, + "y": 380.09530156453326 }, { "type": "QPointF", @@ -147,13 +152,13 @@ }, { "type": "QPointF", - "x": -825.0430241964601, - "y": 368.66478991105026 + "x": -818.0929557813755, + "y": 371.2795759163598 }, { "type": "QPointF", - "x": -835.8151397150936, - "y": 362.8920896668543 + "x": -829.5753368833404, + "y": 366.62694879394627 }, { "type": "QPointF", diff --git a/src/test/ValentinaTest/share/Issue_923_test2_2/output.json b/src/test/ValentinaTest/share/Issue_923_test2_2/output.json index 6257472ca..ad6250054 100644 --- a/src/test/ValentinaTest/share/Issue_923_test2_2/output.json +++ b/src/test/ValentinaTest/share/Issue_923_test2_2/output.json @@ -7,13 +7,13 @@ }, { "type": "QPointF", - "x": -925.4690854411813, - "y": 240.3524973607683 + "x": -925.4764900602008, + "y": 240.34641605836427 }, { "type": "QPointF", - "x": -797.0489745843311, - "y": -48.59275206714484 + "x": -797.0932693502834, + "y": -48.588064159004134 }, { "type": "QPointF", @@ -107,38 +107,43 @@ }, { "type": "QPointF", - "x": -281.3615391339286, - "y": 371.0303001817342 + "x": -274.5095925153328, + "y": 368.5444651427917 }, { "type": "QPointF", - "x": -309.89377622824026, - "y": 377.93937224400145 + "x": -295.7605238049826, + "y": 375.0706690235611 }, { "type": "QPointF", - "x": -357.3015804224907, - "y": 384.10843195749214 + "x": -324.3767295101649, + "y": 380.2653300530379 }, { "type": "QPointF", - "x": -435.9520270040894, - "y": 389.07661798449516 + "x": -375.5837936477569, + "y": 385.67430269319027 }, { "type": "QPointF", - "x": -549.0970864147907, - "y": 390.9068680348474 + "x": -457.7859582653625, + "y": 389.818484035946 }, { "type": "QPointF", - "x": -682.5877079123347, - "y": 387.3931112039713 + "x": -595.1846601171007, + "y": 390.3891909827686 }, { "type": "QPointF", - "x": -756.9739837313467, - "y": 381.8746246893899 + "x": -702.630213618707, + "y": 386.255904969502 + }, + { + "type": "QPointF", + "x": -772.4984867981542, + "y": 380.09530156453326 }, { "type": "QPointF", diff --git a/src/test/ValentinaTest/share/Issue_923_test3/output.json b/src/test/ValentinaTest/share/Issue_923_test3/output.json index 563691c58..229677e95 100644 --- a/src/test/ValentinaTest/share/Issue_923_test3/output.json +++ b/src/test/ValentinaTest/share/Issue_923_test3/output.json @@ -7,13 +7,13 @@ }, { "type": "QPointF", - "x": -814.7149606299213, + "x": -814.7527559055118, "y": 331.31319685039375 }, { "type": "QPointF", - "x": -814.7149606299213, - "y": -46.7381274080184 + "x": -814.7527559055118, + "y": -46.735396006941144 }, { "type": "QPointF", @@ -107,38 +107,43 @@ }, { "type": "QPointF", - "x": -281.3615391339286, - "y": 371.0303001817342 + "x": -274.5095925153328, + "y": 368.5444651427917 }, { "type": "QPointF", - "x": -309.89377622824026, - "y": 377.93937224400145 + "x": -295.7605238049826, + "y": 375.0706690235611 }, { "type": "QPointF", - "x": -357.3015804224907, - "y": 384.10843195749214 + "x": -324.3767295101649, + "y": 380.2653300530379 }, { "type": "QPointF", - "x": -435.9520270040894, - "y": 389.07661798449516 + "x": -375.5837936477569, + "y": 385.67430269319027 }, { "type": "QPointF", - "x": -549.0970864147907, - "y": 390.9068680348474 + "x": -457.7859582653625, + "y": 389.818484035946 }, { "type": "QPointF", - "x": -682.5877079123347, - "y": 387.3931112039713 + "x": -595.1846601171007, + "y": 390.3891909827686 }, { "type": "QPointF", - "x": -756.9739837313467, - "y": 381.8746246893899 + "x": -702.630213618707, + "y": 386.255904969502 + }, + { + "type": "QPointF", + "x": -772.4984867981542, + "y": 380.09530156453326 }, { "type": "QPointF", @@ -147,13 +152,13 @@ }, { "type": "QPointF", - "x": -825.0430241964601, - "y": 368.66478991105026 + "x": -818.0929557813755, + "y": 371.2795759163598 }, { "type": "QPointF", - "x": -835.8151397150936, - "y": 362.8920896668543 + "x": -829.5753368833404, + "y": 366.62694879394627 }, { "type": "QPointF", diff --git a/src/test/ValentinaTest/share/Issue_923_test3_3/output.json b/src/test/ValentinaTest/share/Issue_923_test3_3/output.json index bcc40177b..5d1260655 100644 --- a/src/test/ValentinaTest/share/Issue_923_test3_3/output.json +++ b/src/test/ValentinaTest/share/Issue_923_test3_3/output.json @@ -2,18 +2,18 @@ "vector": [ { "type": "QPointF", - "x": -957.5200506095728, - "y": 262.93767401732646 + "x": -957.530371934163, + "y": 262.92919726843803 }, { "type": "QPointF", - "x": -925.4690854411813, - "y": 240.35249736076804 + "x": -925.476490060202, + "y": 240.3464160583648 }, { "type": "QPointF", - "x": -797.0489745843311, - "y": -48.59275206714484 + "x": -797.0932693502834, + "y": -48.588064159004134 }, { "type": "QPointF", @@ -107,38 +107,43 @@ }, { "type": "QPointF", - "x": -281.3615391339286, - "y": 371.0303001817342 + "x": -274.5095925153328, + "y": 368.5444651427917 }, { "type": "QPointF", - "x": -309.89377622824026, - "y": 377.93937224400145 + "x": -295.7605238049826, + "y": 375.0706690235611 }, { "type": "QPointF", - "x": -357.3015804224907, - "y": 384.10843195749214 + "x": -324.3767295101649, + "y": 380.2653300530379 }, { "type": "QPointF", - "x": -435.9520270040894, - "y": 389.07661798449516 + "x": -375.5837936477569, + "y": 385.67430269319027 }, { "type": "QPointF", - "x": -549.0970864147907, - "y": 390.9068680348474 + "x": -457.7859582653625, + "y": 389.818484035946 }, { "type": "QPointF", - "x": -682.5877079123347, - "y": 387.3931112039713 + "x": -595.1846601171007, + "y": 390.3891909827686 }, { "type": "QPointF", - "x": -756.9739837313467, - "y": 381.8746246893899 + "x": -702.630213618707, + "y": 386.255904969502 + }, + { + "type": "QPointF", + "x": -772.4984867981542, + "y": 380.09530156453326 }, { "type": "QPointF", @@ -147,8 +152,13 @@ }, { "type": "QPointF", - "x": -825.0430241964601, - "y": 368.66478991105026 + "x": -818.0929557813755, + "y": 371.2795759163598 + }, + { + "type": "QPointF", + "x": -829.5753368833404, + "y": 366.62694879394627 }, { "type": "QPointF", @@ -157,8 +167,8 @@ }, { "type": "QPointF", - "x": -957.5200506095728, - "y": 262.93767401732646 + "x": -957.530371934163, + "y": 262.92919726843803 } ] } diff --git a/src/test/ValentinaTest/share/Issue_923_test4/output.json b/src/test/ValentinaTest/share/Issue_923_test4/output.json index 563691c58..229677e95 100644 --- a/src/test/ValentinaTest/share/Issue_923_test4/output.json +++ b/src/test/ValentinaTest/share/Issue_923_test4/output.json @@ -7,13 +7,13 @@ }, { "type": "QPointF", - "x": -814.7149606299213, + "x": -814.7527559055118, "y": 331.31319685039375 }, { "type": "QPointF", - "x": -814.7149606299213, - "y": -46.7381274080184 + "x": -814.7527559055118, + "y": -46.735396006941144 }, { "type": "QPointF", @@ -107,38 +107,43 @@ }, { "type": "QPointF", - "x": -281.3615391339286, - "y": 371.0303001817342 + "x": -274.5095925153328, + "y": 368.5444651427917 }, { "type": "QPointF", - "x": -309.89377622824026, - "y": 377.93937224400145 + "x": -295.7605238049826, + "y": 375.0706690235611 }, { "type": "QPointF", - "x": -357.3015804224907, - "y": 384.10843195749214 + "x": -324.3767295101649, + "y": 380.2653300530379 }, { "type": "QPointF", - "x": -435.9520270040894, - "y": 389.07661798449516 + "x": -375.5837936477569, + "y": 385.67430269319027 }, { "type": "QPointF", - "x": -549.0970864147907, - "y": 390.9068680348474 + "x": -457.7859582653625, + "y": 389.818484035946 }, { "type": "QPointF", - "x": -682.5877079123347, - "y": 387.3931112039713 + "x": -595.1846601171007, + "y": 390.3891909827686 }, { "type": "QPointF", - "x": -756.9739837313467, - "y": 381.8746246893899 + "x": -702.630213618707, + "y": 386.255904969502 + }, + { + "type": "QPointF", + "x": -772.4984867981542, + "y": 380.09530156453326 }, { "type": "QPointF", @@ -147,13 +152,13 @@ }, { "type": "QPointF", - "x": -825.0430241964601, - "y": 368.66478991105026 + "x": -818.0929557813755, + "y": 371.2795759163598 }, { "type": "QPointF", - "x": -835.8151397150936, - "y": 362.8920896668543 + "x": -829.5753368833404, + "y": 366.62694879394627 }, { "type": "QPointF", diff --git a/src/test/ValentinaTest/share/Issue_923_test4_4/output.json b/src/test/ValentinaTest/share/Issue_923_test4_4/output.json index dc0087c6b..6aa804221 100644 --- a/src/test/ValentinaTest/share/Issue_923_test4_4/output.json +++ b/src/test/ValentinaTest/share/Issue_923_test4_4/output.json @@ -2,13 +2,13 @@ "vector": [ { "type": "QPointF", - "x": -1087.033532676749, - "y": 603.872503640796 + "x": -1086.9858464447993, + "y": 603.8333396546097 }, { "type": "QPointF", - "x": -797.0489745843311, - "y": -48.59275206714484 + "x": -797.0932693502834, + "y": -48.588064159004134 }, { "type": "QPointF", @@ -102,43 +102,43 @@ }, { "type": "QPointF", - "x": -281.3615391339286, - "y": 371.0303001817342 + "x": -274.5095925153328, + "y": 368.5444651427917 }, { "type": "QPointF", - "x": -309.89377622824026, - "y": 377.93937224400145 + "x": -295.7605238049826, + "y": 375.0706690235611 }, { "type": "QPointF", - "x": -357.3015804224907, - "y": 384.10843195749214 + "x": -324.3767295101649, + "y": 380.2653300530379 }, { "type": "QPointF", - "x": -435.9520270040894, - "y": 389.07661798449516 + "x": -375.5837936477569, + "y": 385.67430269319027 }, { "type": "QPointF", - "x": -549.0970864147907, - "y": 390.9068680348474 + "x": -457.7859582653625, + "y": 389.818484035946 }, { "type": "QPointF", - "x": -682.5877079123347, - "y": 387.3931112039713 + "x": -595.1846601171007, + "y": 390.3891909827686 }, { "type": "QPointF", - "x": -756.9739837313467, - "y": 381.8746246893899 + "x": -702.630213618707, + "y": 386.255904969502 }, { "type": "QPointF", - "x": -799.6540182965299, - "y": 375.86453190867064 + "x": -772.4984867981542, + "y": 380.09530156453326 }, { "type": "QPointF", @@ -147,8 +147,8 @@ }, { "type": "QPointF", - "x": -1087.033532676749, - "y": 603.872503640796 + "x": -1086.9858464447993, + "y": 603.8333396546097 } ] } diff --git a/src/test/ValentinaTest/share/Issue_923_test5/output.json b/src/test/ValentinaTest/share/Issue_923_test5/output.json index 563691c58..229677e95 100644 --- a/src/test/ValentinaTest/share/Issue_923_test5/output.json +++ b/src/test/ValentinaTest/share/Issue_923_test5/output.json @@ -7,13 +7,13 @@ }, { "type": "QPointF", - "x": -814.7149606299213, + "x": -814.7527559055118, "y": 331.31319685039375 }, { "type": "QPointF", - "x": -814.7149606299213, - "y": -46.7381274080184 + "x": -814.7527559055118, + "y": -46.735396006941144 }, { "type": "QPointF", @@ -107,38 +107,43 @@ }, { "type": "QPointF", - "x": -281.3615391339286, - "y": 371.0303001817342 + "x": -274.5095925153328, + "y": 368.5444651427917 }, { "type": "QPointF", - "x": -309.89377622824026, - "y": 377.93937224400145 + "x": -295.7605238049826, + "y": 375.0706690235611 }, { "type": "QPointF", - "x": -357.3015804224907, - "y": 384.10843195749214 + "x": -324.3767295101649, + "y": 380.2653300530379 }, { "type": "QPointF", - "x": -435.9520270040894, - "y": 389.07661798449516 + "x": -375.5837936477569, + "y": 385.67430269319027 }, { "type": "QPointF", - "x": -549.0970864147907, - "y": 390.9068680348474 + "x": -457.7859582653625, + "y": 389.818484035946 }, { "type": "QPointF", - "x": -682.5877079123347, - "y": 387.3931112039713 + "x": -595.1846601171007, + "y": 390.3891909827686 }, { "type": "QPointF", - "x": -756.9739837313467, - "y": 381.8746246893899 + "x": -702.630213618707, + "y": 386.255904969502 + }, + { + "type": "QPointF", + "x": -772.4984867981542, + "y": 380.09530156453326 }, { "type": "QPointF", @@ -147,13 +152,13 @@ }, { "type": "QPointF", - "x": -825.0430241964601, - "y": 368.66478991105026 + "x": -818.0929557813755, + "y": 371.2795759163598 }, { "type": "QPointF", - "x": -835.8151397150936, - "y": 362.8920896668543 + "x": -829.5753368833404, + "y": 366.62694879394627 }, { "type": "QPointF", diff --git a/src/test/ValentinaTest/share/Issue_923_test5_5/output.json b/src/test/ValentinaTest/share/Issue_923_test5_5/output.json index 25f64026b..4f4890a54 100644 --- a/src/test/ValentinaTest/share/Issue_923_test5_5/output.json +++ b/src/test/ValentinaTest/share/Issue_923_test5_5/output.json @@ -2,18 +2,18 @@ "vector": [ { "type": "QPointF", - "x": -949.4567326091518, - "y": 269.5599560025389 + "x": -949.4641372281714, + "y": 269.5538747001349 }, { "type": "QPointF", - "x": -925.4690854411814, - "y": 240.35249736076847 + "x": -925.4764900602046, + "y": 240.34641605836896 }, { "type": "QPointF", - "x": -797.0489745843311, - "y": -48.59275206714484 + "x": -797.0932693502834, + "y": -48.588064159004134 }, { "type": "QPointF", @@ -107,38 +107,43 @@ }, { "type": "QPointF", - "x": -281.3615391339286, - "y": 371.0303001817342 + "x": -274.5095925153328, + "y": 368.5444651427917 }, { "type": "QPointF", - "x": -309.89377622824026, - "y": 377.93937224400145 + "x": -295.7605238049826, + "y": 375.0706690235611 }, { "type": "QPointF", - "x": -357.3015804224907, - "y": 384.10843195749214 + "x": -324.3767295101649, + "y": 380.2653300530379 }, { "type": "QPointF", - "x": -435.9520270040894, - "y": 389.07661798449516 + "x": -375.5837936477569, + "y": 385.67430269319027 }, { "type": "QPointF", - "x": -549.0970864147907, - "y": 390.9068680348474 + "x": -457.7859582653625, + "y": 389.818484035946 }, { "type": "QPointF", - "x": -682.5877079123347, - "y": 387.3931112039713 + "x": -595.1846601171007, + "y": 390.3891909827686 }, { "type": "QPointF", - "x": -756.9739837313467, - "y": 381.8746246893899 + "x": -702.630213618707, + "y": 386.255904969502 + }, + { + "type": "QPointF", + "x": -772.4984867981542, + "y": 380.09530156453326 }, { "type": "QPointF", @@ -147,8 +152,13 @@ }, { "type": "QPointF", - "x": -825.0430241964601, - "y": 368.66478991105026 + "x": -818.0929557813755, + "y": 371.2795759163598 + }, + { + "type": "QPointF", + "x": -829.5753368833404, + "y": 366.62694879394627 }, { "type": "QPointF", @@ -157,8 +167,8 @@ }, { "type": "QPointF", - "x": -949.4567326091518, - "y": 269.5599560025389 + "x": -949.4641372281714, + "y": 269.5538747001349 } ] } diff --git a/src/test/ValentinaTest/share/Issue_923_test6/output.json b/src/test/ValentinaTest/share/Issue_923_test6/output.json index 563691c58..229677e95 100644 --- a/src/test/ValentinaTest/share/Issue_923_test6/output.json +++ b/src/test/ValentinaTest/share/Issue_923_test6/output.json @@ -7,13 +7,13 @@ }, { "type": "QPointF", - "x": -814.7149606299213, + "x": -814.7527559055118, "y": 331.31319685039375 }, { "type": "QPointF", - "x": -814.7149606299213, - "y": -46.7381274080184 + "x": -814.7527559055118, + "y": -46.735396006941144 }, { "type": "QPointF", @@ -107,38 +107,43 @@ }, { "type": "QPointF", - "x": -281.3615391339286, - "y": 371.0303001817342 + "x": -274.5095925153328, + "y": 368.5444651427917 }, { "type": "QPointF", - "x": -309.89377622824026, - "y": 377.93937224400145 + "x": -295.7605238049826, + "y": 375.0706690235611 }, { "type": "QPointF", - "x": -357.3015804224907, - "y": 384.10843195749214 + "x": -324.3767295101649, + "y": 380.2653300530379 }, { "type": "QPointF", - "x": -435.9520270040894, - "y": 389.07661798449516 + "x": -375.5837936477569, + "y": 385.67430269319027 }, { "type": "QPointF", - "x": -549.0970864147907, - "y": 390.9068680348474 + "x": -457.7859582653625, + "y": 389.818484035946 }, { "type": "QPointF", - "x": -682.5877079123347, - "y": 387.3931112039713 + "x": -595.1846601171007, + "y": 390.3891909827686 }, { "type": "QPointF", - "x": -756.9739837313467, - "y": 381.8746246893899 + "x": -702.630213618707, + "y": 386.255904969502 + }, + { + "type": "QPointF", + "x": -772.4984867981542, + "y": 380.09530156453326 }, { "type": "QPointF", @@ -147,13 +152,13 @@ }, { "type": "QPointF", - "x": -825.0430241964601, - "y": 368.66478991105026 + "x": -818.0929557813755, + "y": 371.2795759163598 }, { "type": "QPointF", - "x": -835.8151397150936, - "y": 362.8920896668543 + "x": -829.5753368833404, + "y": 366.62694879394627 }, { "type": "QPointF", diff --git a/src/test/ValentinaTest/share/Issue_923_test6_6/output.json b/src/test/ValentinaTest/share/Issue_923_test6_6/output.json index bee3bccfc..0cce9e6b4 100644 --- a/src/test/ValentinaTest/share/Issue_923_test6_6/output.json +++ b/src/test/ValentinaTest/share/Issue_923_test6_6/output.json @@ -2,13 +2,13 @@ "vector": [ { "type": "QPointF", - "x": -831.0306988705379, - "y": 27.86612757682032 + "x": -831.0655338039053, + "y": 27.86864503893777 }, { "type": "QPointF", - "x": -797.0489745843311, - "y": -48.59275206714484 + "x": -797.0932693502834, + "y": -48.588064159004134 }, { "type": "QPointF", @@ -42,8 +42,8 @@ }, { "type": "QPointF", - "x": -631.792532121404, - "y": -91.34157727887384 + "x": -631.7930917515523, + "y": -91.34256217336385 }, { "type": "QPointF", @@ -102,38 +102,43 @@ }, { "type": "QPointF", - "x": -281.3615391339286, - "y": 371.0303001817342 + "x": -274.5095925153328, + "y": 368.5444651427917 }, { "type": "QPointF", - "x": -309.89377622824026, - "y": 377.93937224400145 + "x": -295.7605238049826, + "y": 375.0706690235611 }, { "type": "QPointF", - "x": -357.3015804224907, - "y": 384.10843195749214 + "x": -324.3767295101649, + "y": 380.2653300530379 }, { "type": "QPointF", - "x": -435.9520270040894, - "y": 389.07661798449516 + "x": -375.5837936477569, + "y": 385.67430269319027 }, { "type": "QPointF", - "x": -549.0970864147907, - "y": 390.9068680348474 + "x": -457.7859582653625, + "y": 389.818484035946 }, { "type": "QPointF", - "x": -682.5877079123347, - "y": 387.3931112039713 + "x": -595.1846601171007, + "y": 390.3891909827686 }, { "type": "QPointF", - "x": -756.9739837313467, - "y": 381.8746246893899 + "x": -702.630213618707, + "y": 386.255904969502 + }, + { + "type": "QPointF", + "x": -772.4984867981542, + "y": 380.09530156453326 }, { "type": "QPointF", @@ -152,8 +157,8 @@ }, { "type": "QPointF", - "x": -831.0306988705379, - "y": 27.86612757682032 + "x": -831.0655338039053, + "y": 27.86864503893777 } ] } diff --git a/src/test/ValentinaTest/share/Issue_923_test7_1/output.json b/src/test/ValentinaTest/share/Issue_923_test7_1/output.json index 9bc49bd4c..09012f608 100644 --- a/src/test/ValentinaTest/share/Issue_923_test7_1/output.json +++ b/src/test/ValentinaTest/share/Issue_923_test7_1/output.json @@ -47,38 +47,43 @@ }, { "type": "QPointF", - "x": -281.3615391339286, - "y": 371.0303001817342 + "x": -274.5095925153328, + "y": 368.5444651427917 }, { "type": "QPointF", - "x": -309.89377622824026, - "y": 377.93937224400145 + "x": -295.7605238049826, + "y": 375.0706690235611 }, { "type": "QPointF", - "x": -357.3015804224907, - "y": 384.10843195749214 + "x": -324.3767295101649, + "y": 380.2653300530379 }, { "type": "QPointF", - "x": -435.9520270040894, - "y": 389.07661798449516 + "x": -375.5837936477569, + "y": 385.67430269319027 }, { "type": "QPointF", - "x": -549.0970864147907, - "y": 390.9068680348474 + "x": -457.7859582653625, + "y": 389.818484035946 }, { "type": "QPointF", - "x": -682.5877079123347, - "y": 387.3931112039713 + "x": -595.1846601171007, + "y": 390.3891909827686 }, { "type": "QPointF", - "x": -756.9739837313467, - "y": 381.8746246893899 + "x": -702.630213618707, + "y": 386.255904969502 + }, + { + "type": "QPointF", + "x": -772.4984867981542, + "y": 380.09530156453326 }, { "type": "QPointF", @@ -87,13 +92,13 @@ }, { "type": "QPointF", - "x": -825.0430241964601, - "y": 368.66478991105026 + "x": -818.0929557813755, + "y": 371.2795759163598 }, { "type": "QPointF", - "x": -835.8151397150936, - "y": 362.8920896668543 + "x": -829.5753368833404, + "y": 366.62694879394627 }, { "type": "QPointF", @@ -102,13 +107,13 @@ }, { "type": "QPointF", - "x": -814.7149606299213, + "x": -814.7527559055118, "y": 331.31319685039375 }, { "type": "QPointF", - "x": -814.7149606299213, - "y": -46.7381274080184 + "x": -814.7527559055118, + "y": -46.735396006941144 }, { "type": "QPointF", diff --git a/src/test/ValentinaTest/share/Issue_923_test7_2/output.json b/src/test/ValentinaTest/share/Issue_923_test7_2/output.json index b7ead57af..5bf1ff1f7 100644 --- a/src/test/ValentinaTest/share/Issue_923_test7_2/output.json +++ b/src/test/ValentinaTest/share/Issue_923_test7_2/output.json @@ -52,38 +52,43 @@ }, { "type": "QPointF", - "x": -281.3615391339286, - "y": 371.0303001817342 + "x": -274.5095925153328, + "y": 368.5444651427917 }, { "type": "QPointF", - "x": -309.89377622824026, - "y": 377.93937224400145 + "x": -295.7605238049826, + "y": 375.0706690235611 }, { "type": "QPointF", - "x": -357.3015804224907, - "y": 384.10843195749214 + "x": -324.3767295101649, + "y": 380.2653300530379 }, { "type": "QPointF", - "x": -435.9520270040894, - "y": 389.07661798449516 + "x": -375.5837936477569, + "y": 385.67430269319027 }, { "type": "QPointF", - "x": -549.0970864147907, - "y": 390.9068680348474 + "x": -457.7859582653625, + "y": 389.818484035946 }, { "type": "QPointF", - "x": -682.5877079123347, - "y": 387.3931112039713 + "x": -595.1846601171007, + "y": 390.3891909827686 }, { "type": "QPointF", - "x": -756.9739837313467, - "y": 381.8746246893899 + "x": -702.630213618707, + "y": 386.255904969502 + }, + { + "type": "QPointF", + "x": -772.4984867981542, + "y": 380.09530156453326 }, { "type": "QPointF", @@ -92,13 +97,13 @@ }, { "type": "QPointF", - "x": -825.0430241964601, - "y": 368.66478991105026 + "x": -818.0929557813755, + "y": 371.2795759163598 }, { "type": "QPointF", - "x": -835.8151397150936, - "y": 362.8920896668543 + "x": -829.5753368833404, + "y": 366.62694879394627 }, { "type": "QPointF", @@ -107,13 +112,13 @@ }, { "type": "QPointF", - "x": -814.7149606299213, + "x": -814.7527559055118, "y": 331.31319685039375 }, { "type": "QPointF", - "x": -814.7149606299213, - "y": -46.7381274080184 + "x": -814.7527559055118, + "y": -46.735396006941144 }, { "type": "QPointF", diff --git a/src/test/ValentinaTest/share/Issue_923_test7_3/output.json b/src/test/ValentinaTest/share/Issue_923_test7_3/output.json index b8fa189a3..961de83dd 100644 --- a/src/test/ValentinaTest/share/Issue_923_test7_3/output.json +++ b/src/test/ValentinaTest/share/Issue_923_test7_3/output.json @@ -2,8 +2,8 @@ "vector": [ { "type": "QPointF", - "x": -814.7149606299213, - "y": -46.838449875625074 + "x": -814.7527559055118, + "y": -46.83456737329983 }, { "type": "QPointF", @@ -97,38 +97,43 @@ }, { "type": "QPointF", - "x": -281.3615391339286, - "y": 371.0303001817342 + "x": -274.5095925153328, + "y": 368.5444651427917 }, { "type": "QPointF", - "x": -309.89377622824026, - "y": 377.93937224400145 + "x": -295.7605238049826, + "y": 375.0706690235611 }, { "type": "QPointF", - "x": -357.3015804224907, - "y": 384.10843195749214 + "x": -324.3767295101649, + "y": 380.2653300530379 }, { "type": "QPointF", - "x": -435.9520270040894, - "y": 389.07661798449516 + "x": -375.5837936477569, + "y": 385.67430269319027 }, { "type": "QPointF", - "x": -549.0970864147907, - "y": 390.9068680348474 + "x": -457.7859582653625, + "y": 389.818484035946 }, { "type": "QPointF", - "x": -682.5877079123347, - "y": 387.3931112039713 + "x": -595.1846601171007, + "y": 390.3891909827686 }, { "type": "QPointF", - "x": -756.9739837313467, - "y": 381.8746246893899 + "x": -702.630213618707, + "y": 386.255904969502 + }, + { + "type": "QPointF", + "x": -772.4984867981542, + "y": 380.09530156453326 }, { "type": "QPointF", @@ -137,13 +142,13 @@ }, { "type": "QPointF", - "x": -825.0430241964601, - "y": 368.66478991105026 + "x": -818.0929557813755, + "y": 371.2795759163598 }, { "type": "QPointF", - "x": -835.8151397150936, - "y": 362.8920896668543 + "x": -829.5753368833404, + "y": 366.62694879394627 }, { "type": "QPointF", @@ -152,13 +157,13 @@ }, { "type": "QPointF", - "x": -814.7149606299213, + "x": -814.7527559055118, "y": 331.31319685039375 }, { "type": "QPointF", - "x": -814.7149606299213, - "y": -46.838449875625074 + "x": -814.7527559055118, + "y": -46.83456737329983 } ] } diff --git a/src/test/ValentinaTest/share/Issue_937_case_3/output.json b/src/test/ValentinaTest/share/Issue_937_case_3/output.json index 69365b3cf..e45409d39 100644 --- a/src/test/ValentinaTest/share/Issue_937_case_3/output.json +++ b/src/test/ValentinaTest/share/Issue_937_case_3/output.json @@ -67,43 +67,43 @@ }, { "type": "QPointF", - "x": 1560.773648005152, - "y": 621.3726906358827 + "x": 1562.3105514164024, + "y": 621.2039304577579 }, { "type": "QPointF", - "x": 1467.6597036329138, - "y": 630.7179791807318 + "x": 1468.9776219120495, + "y": 630.6195769132337 }, { "type": "QPointF", - "x": 1367.699112322525, - "y": 637.2232556116992 + "x": 1369.087082921325, + "y": 637.1700380511596 }, { "type": "QPointF", - "x": 1315.6181593378337, - "y": 639.1925146344335 + "x": 1317.0625781659908, + "y": 639.1647613066468 }, { "type": "QPointF", - "x": 1262.3878469141227, - "y": 640.1849369893473 + "x": 1263.902550577329, + "y": 640.1861878084698 }, { "type": "QPointF", - "x": 1208.196048358889, - "y": 640.1063467543435 + "x": 1209.7951086739927, + "y": 640.14150671035 }, { "type": "QPointF", - "x": 1153.2293985758472, - "y": 638.8595206914382 + "x": 1154.9274721014283, + "y": 638.9350833691831 }, { "type": "QPointF", - "x": 1097.6726949942515, - "y": 636.3435926033591 + "x": 1099.4853104352849, + "y": 636.4679592238815 }, { "type": "QPointF", @@ -112,8 +112,8 @@ }, { "type": "QPointF", - "x": 986.2418498716639, - "y": 627.1650053673587 + "x": 987.9729753626337, + "y": 627.3691634020139 }, { "type": "QPointF", diff --git a/src/test/ValentinaTest/share/doll/output.json b/src/test/ValentinaTest/share/doll/output.json index b06723390..4bd12ccb7 100644 --- a/src/test/ValentinaTest/share/doll/output.json +++ b/src/test/ValentinaTest/share/doll/output.json @@ -27,13 +27,13 @@ }, { "type": "QPointF", - "x": 160.62481365253532, - "y": 398.54611214375194 + "x": 160.40794669733856, + "y": 400.2063871299499 }, { "type": "QPointF", - "x": 162.9913997998063, - "y": 381.1618103267805 + "x": 162.7523565987428, + "y": 382.2582164961856 }, { "type": "QPointF", diff --git a/src/test/ValentinaTest/share/loop_by_intersection/output.json b/src/test/ValentinaTest/share/loop_by_intersection/output.json index 8fdf41892..e32c54fb0 100644 --- a/src/test/ValentinaTest/share/loop_by_intersection/output.json +++ b/src/test/ValentinaTest/share/loop_by_intersection/output.json @@ -47,18 +47,18 @@ }, { "type": "QPointF", - "x": -98.16620370270377, - "y": -124.26621938370769 + "x": -99.77946852184245, + "y": -123.82089884830452 }, { "type": "QPointF", - "x": -79.03697368453624, - "y": -129.44187386271707 + "x": -80.4254673057649, + "y": -129.16331633704564 }, { "type": "QPointF", - "x": -59.649170195935206, - "y": -133.26132597686694 + "x": -60.80620147593467, + "y": -133.0993042749749 }, { "type": "QPointF", @@ -72,153 +72,153 @@ }, { "type": "QPointF", - "x": 42.910363313495886, - "y": -139.51815744765946 + "x": 41.943895636462756, + "y": -139.555647320738 }, { "type": "QPointF", - "x": 66.68023598861984, - "y": -138.53630805724418 + "x": 65.59569198261529, + "y": -138.63817965558195 }, { "type": "QPointF", - "x": 89.39744531212133, - "y": -136.32564901911675 + "x": 88.1798239338667, + "y": -136.51684423147074 }, { "type": "QPointF", - "x": 111.11175958744691, - "y": -132.81899300157508 + "x": 109.76687822830704, + "y": -133.12716866923762 }, { "type": "QPointF", - "x": 131.849273635868, - "y": -127.94728225453339 + "x": 130.3950740635637, + "y": -128.40027734830377 }, { "type": "QPointF", - "x": 151.60699847308524, - "y": -121.64875784315865 + "x": 150.07592388593054, + "y": -122.26953121100647 }, { "type": "QPointF", - "x": 170.35248944251788, - "y": -113.88134187328731 + "x": 168.79110685051424, + "y": -114.68147034428995 }, { "type": "QPointF", - "x": 188.03154360657538, - "y": -104.6349240216735 + "x": 186.49605055143408, + "y": -105.60859505724969 }, { "type": "QPointF", - "x": 204.5842326679355, - "y": -93.93825842596878 + "x": 203.13204877377575, + "y": -95.05954726914332 }, { "type": "QPointF", - "x": 219.96505724025516, - "y": -81.85595130961987 + "x": 218.64492845706968, + "y": -83.08143693178066 }, { "type": "QPointF", - "x": 234.15990665736646, - "y": -68.4752802431224 + "x": 233.00419499996835, + "y": -69.75162023720404 }, { "type": "QPointF", - "x": 247.19371855986597, - "y": -53.88774944821138 + "x": 246.21556214467594, + "y": -55.16130598767145 }, { "type": "QPointF", - "x": 259.1276105630506, - "y": -38.17240755237481 + "x": 258.3230922830817, + "y": -39.397340281347255 }, { "type": "QPointF", - "x": 270.04898813073834, - "y": -21.385797552698936 + "x": 269.40232183582737, + "y": -22.52847449065218 }, { "type": "QPointF", "x": 277.7495810952065, - "y": -7.77864026259455 + "y": -7.778640262594529 }, { "type": "QPointF", "x": 278.4228013054904, - "y": 86.58878986518009 + "y": 86.5887898651801 }, { "type": "QPointF", - "x": 268.68154201422317, - "y": 103.62565786432592 + "x": 269.4023218358267, + "y": 102.52822252214926 }, { "type": "QPointF", - "x": 257.43041876497244, - "y": 120.55934639236527 + "x": 258.3230922830817, + "y": 119.39708831284334 }, { "type": "QPointF", - "x": 245.13770399345265, - "y": 136.35141448455406 + "x": 246.2155621446766, + "y": 135.16105401916667 }, { "type": "QPointF", - "x": 231.74228008436702, - "y": 150.92281351340424 + "x": 233.00419499996818, + "y": 149.75136826870033 }, { "type": "QPointF", - "x": 217.21920939711887, - "y": 164.18203925718115 + "x": 218.64492845706377, + "y": 163.0811849632816 }, { "type": "QPointF", - "x": 201.58260259787613, - "y": 176.0418141453883 + "x": 203.1320487737801, + "y": 175.05929530063636 }, { "type": "QPointF", - "x": 184.87795907298187, - "y": 186.43753195457916 + "x": 186.496050551439, + "y": 185.60834308874269 }, { "type": "QPointF", - "x": 167.16520711975835, - "y": 195.34043854710424 + "x": 168.79110685050364, + "y": 194.6812183757909 }, { "type": "QPointF", - "x": 148.4985496757961, - "y": 202.76064424620657 + "x": 150.07592388593088, + "y": 202.26927924250302 }, { "type": "QPointF", - "x": 128.91043139767586, - "y": 208.74022694605023 + "x": 130.39507406357035, + "y": 208.40002537979836 }, { "type": "QPointF", - "x": 108.40384126969701, - "y": 213.34094558146998 + "x": 109.7668782282991, + "y": 213.12691670073548 }, { "type": "QPointF", - "x": 86.95268447058817, - "y": 216.63185790254988 + "x": 88.17982393386717, + "y": 216.5165922629673 }, { "type": "QPointF", - "x": 64.5071926969024, - "y": 218.68015124099267 + "x": 65.59569198261497, + "y": 218.6379276870786 }, { "type": "QPointF", - "x": 40.97674910454281, - "y": 219.5457596304243 + "x": 41.94389563646253, + "y": 219.5553953522346 }, { "type": "QPointF", @@ -232,18 +232,18 @@ }, { "type": "QPointF", - "x": -61.95169737013356, - "y": 212.86924462347156 + "x": -60.80620147594401, + "y": 213.09905230646967 }, { "type": "QPointF", - "x": -81.79057380311542, - "y": 208.78624467404973 + "x": -80.42546730575734, + "y": 209.1630643685438 }, { "type": "QPointF", - "x": -101.3495117381284, - "y": 203.24107975259506 + "x": -99.77946852184263, + "y": 203.82064687980053 }, { "type": "QPointF", diff --git a/src/test/ValentinaTest/share/loop_start_point_on_line/output.json b/src/test/ValentinaTest/share/loop_start_point_on_line/output.json index dc07eeda1..7616a0518 100644 --- a/src/test/ValentinaTest/share/loop_start_point_on_line/output.json +++ b/src/test/ValentinaTest/share/loop_start_point_on_line/output.json @@ -7,8 +7,8 @@ }, { "type": "QPointF", - "x": -2117.3179885209165, - "y": -1210.8767704599727 + "x": -2118.43416950323, + "y": -1210.583578833799 }, { "type": "QPointF", @@ -57,73 +57,78 @@ }, { "type": "QPointF", - "x": -1780.3502628472847, - "y": -1241.626100901175 + "x": -1781.292519497052, + "y": -1241.7610725895388 }, { "type": "QPointF", - "x": -1760.4970449804373, - "y": -1238.7266144218304 + "x": -1761.4981418780226, + "y": -1238.9256661554102 }, { "type": "QPointF", - "x": -1741.6493367603232, - "y": -1234.9162692221335 + "x": -1742.694090792693, + "y": -1235.186788354582 }, { "type": "QPointF", - "x": -1723.7569894844275, - "y": -1230.2145987625852 + "x": -1724.8248472704702, + "y": -1230.5598885242202 }, { "type": "QPointF", - "x": -1706.778822353567, - "y": -1224.651886083608 + "x": -1707.845034473584, + "y": -1225.0694987083878 }, { "type": "QPointF", - "x": -1675.4184392909124, - "y": -1211.1296471756543 + "x": -1691.716210701753, + "y": -1218.7521812595326 }, { "type": "QPointF", - "x": -1660.6630747998215, - "y": -1203.1133988462257 + "x": -1676.4018476854003, + "y": -1211.657815401919 }, { "type": "QPointF", - "x": -1639.8825842105048, - "y": -1189.956966345783 + "x": -1661.710243746763, + "y": -1203.7672600266078 }, { "type": "QPointF", - "x": -1615.1860006009808, - "y": -1171.1107711092463 + "x": -1641.241379036374, + "y": -1190.9863271315796 }, { "type": "QPointF", - "x": -1573.715513007515, - "y": -1132.2762210578392 + "x": -1616.263360186903, + "y": -1172.06412296872 }, { "type": "QPointF", - "x": -1561.6105191787583, - "y": -1117.5205958875613 + "x": -1574.7272893318411, + "y": -1133.4913295743909 }, { "type": "QPointF", - "x": -1550.5218235301147, - "y": -1101.4250233865039 + "x": -1562.5392555073986, + "y": -1118.8539207479248 }, { "type": "QPointF", - "x": -1540.337834300065, - "y": -1084.110067218381 + "x": -1551.2262388304146, + "y": -1102.612576551544 }, { "type": "QPointF", - "x": -1530.9818691246735, - "y": -1065.6839029363284 + "x": -1540.8782542250674, + "y": -1085.1672117722196 + }, + { + "type": "QPointF", + "x": -1531.4018600286245, + "y": -1066.6299261331826 }, { "type": "QPointF", @@ -142,28 +147,28 @@ }, { "type": "QPointF", - "x": -1488.0989211021315, - "y": -925.7865995055545 + "x": -1488.267238313915, + "y": -926.909863842091 }, { "type": "QPointF", - "x": -1481.192165254231, - "y": -879.16427654198 + "x": -1481.29475396107, + "y": -880.3790133864592 }, { "type": "QPointF", - "x": -1477.3422766976819, - "y": -832.8751403029819 + "x": -1477.3721976018426, + "y": -833.9326365783504 }, { "type": "QPointF", - "x": -1476.901533650334, - "y": -795.5171348542633 + "x": -1476.767245881819, + "y": -797.0677843390893 }, { "type": "QPointF", - "x": -1479.4311937433415, - "y": -767.3575645372299 + "x": -1479.2281213432814, + "y": -768.6515308802761 }, { "type": "QPointF", @@ -262,38 +267,43 @@ }, { "type": "QPointF", - "x": -2016.4030986201262, - "y": -63.16404554509921 + "x": -2015.1669643320547, + "y": -64.22689118534491 }, { "type": "QPointF", - "x": -2032.8574460444615, - "y": -49.187886190486154 + "x": -2031.5869934545, + "y": -50.10871928937255 }, { "type": "QPointF", - "x": -2052.9452867141617, - "y": -34.83085264969631 + "x": -2051.4273628312376, + "y": -35.72827805087996 }, { "type": "QPointF", - "x": -2076.4011247938793, - "y": -21.161006754962017 + "x": -2074.776055519778, + "y": -21.924087907458294 }, { "type": "QPointF", - "x": -2096.0388669896165, - "y": -12.028679708944303 + "x": -2094.889981957966, + "y": -12.479223979324637 }, { "type": "QPointF", - "x": -2126.104986397641, - "y": -1.4059180555205941 + "x": -2109.565617761303, + "y": -6.724058368119403 }, { "type": "QPointF", - "x": -2142.0853551497758, - "y": 2.694128071485423 + "x": -2124.99134854044, + "y": -1.6953392797686782 + }, + { + "type": "QPointF", + "x": -2141.1199442290053, + "y": 2.4962907724991394 }, { "type": "QPointF", diff --git a/src/test/ValentinaTest/share/seamtest2/output.json b/src/test/ValentinaTest/share/seamtest2/output.json index 1a292a6a6..e43edac37 100644 --- a/src/test/ValentinaTest/share/seamtest2/output.json +++ b/src/test/ValentinaTest/share/seamtest2/output.json @@ -17,23 +17,33 @@ }, { "type": "QPointF", - "x": 418.8511557813181, - "y": 265.9375381882219 + "x": 420.16724988344697, + "y": 265.3446737692248 }, { "type": "QPointF", - "x": 394.0919849710222, - "y": 275.48841417378816 + "x": 408.1686876009398, + "y": 270.74969810974267 }, { "type": "QPointF", - "x": 369.1984911888747, - "y": 280.3682097399039 + "x": 395.75743486167045, + "y": 275.0682172219031 }, { "type": "QPointF", - "x": 356.42115628649094, - "y": 281.1961321434339 + "x": 383.2801588758375, + "y": 278.21626350448145 + }, + { + "type": "QPointF", + "x": 370.8288018696072, + "y": 280.2409445806824 + }, + { + "type": "QPointF", + "x": 358.2408334277008, + "y": 281.22358539078493 }, { "type": "QPointF", @@ -57,18 +67,18 @@ }, { "type": "QPointF", - "x": 254.23057330138423, - "y": 250.84839259308427 + "x": 255.81310453620574, + "y": 251.94235440791147 }, { "type": "QPointF", - "x": 237.19463661860715, - "y": 238.8603971131726 + "x": 238.61081765006833, + "y": 240.0508703303418 }, { "type": "QPointF", - "x": 221.85822539428258, - "y": 225.7363373655819 + "x": 223.16837814314113, + "y": 227.06961282699527 }, { "type": "QPointF", @@ -107,13 +117,13 @@ }, { "type": "QPointF", - "x": 87.60829210847307, - "y": 179.95148448528337 + "x": 89.23016638120879, + "y": 180.74760051351964 }, { "type": "QPointF", - "x": 66.52960687232702, - "y": 169.40312344285778 + "x": 68.08422273452526, + "y": 170.36786581256206 }, { "type": "QPointF", diff --git a/src/test/ValentinaTest/share/seamtest3/output.json b/src/test/ValentinaTest/share/seamtest3/output.json index 38d8e5865..4fbdd9443 100644 --- a/src/test/ValentinaTest/share/seamtest3/output.json +++ b/src/test/ValentinaTest/share/seamtest3/output.json @@ -92,14 +92,19 @@ }, { "type": "QPointF", - "x": 292.8993165675273, - "y": 181.06409460955842 + "x": 293.1661864923215, + "y": 180.51562637269953 }, { "type": "QPointF", "x": 295.67056116540294, "y": 175.36866212621038 }, + { + "type": "QPointF", + "x": 297.03278914138764, + "y": 169.78727745627393 + }, { "type": "QPointF", "x": 298.4272653364355, @@ -122,13 +127,13 @@ }, { "type": "QPointF", - "x": 276.2492306727302, - "y": 147.2196441654211 + "x": 278.36163578883384, + "y": 146.69497061341855 }, { "type": "QPointF", - "x": 261.7960142104263, - "y": 151.87880055515345 + "x": 264.11356456471754, + "y": 150.8634687956155 }, { "type": "QPointF", @@ -147,18 +152,18 @@ }, { "type": "QPointF", - "x": 230.18574923520515, - "y": 171.70501002822886 + "x": 226.1305060641393, + "y": 173.66370879502696 }, { "type": "QPointF", - "x": 213.57342754049571, - "y": 180.18583759170994 + "x": 209.78346359977252, + "y": 181.5593960732169 }, { "type": "QPointF", - "x": 202.38658536147173, - "y": 184.69191672318945 + "x": 198.87033214089615, + "y": 185.51453245698937 }, { "type": "QPointF", @@ -197,13 +202,13 @@ }, { "type": "QPointF", - "x": 132.2673292124439, - "y": 144.36416224883658 + "x": 132.20863928510303, + "y": 142.1050670962771 }, { "type": "QPointF", - "x": 131.96903386459138, - "y": 132.88216516864307 + "x": 131.96761370902018, + "y": 132.827500480644 }, { "type": "QPointF", @@ -252,13 +257,13 @@ }, { "type": "QPointF", - "x": -0.22976729680955543, - "y": 91.03762229530402 + "x": 0.43109819620662115, + "y": 92.75351406859714 }, { "type": "QPointF", - "x": -4.775453591602712, - "y": 78.74896433599663 + "x": -4.287700865002472, + "y": 80.5014770436381 }, { "type": "QPointF",