From fb86e6c51f78f565c3663cc5f7580f7f066f1a9e Mon Sep 17 00:00:00 2001
From: Roman Telezhynskyi <kroluku@gmail.com>
Date: Sun, 22 Jan 2017 11:20:33 +0200
Subject: [PATCH] Remove class VAbstractDetail.
--HG--
branch : feature
---
src/libs/vlayout/vabstractdetail.cpp | 855 ----------
src/libs/vlayout/vabstractdetail.h | 98 --
src/libs/vlayout/vabstractdetail_p.h | 75 -
src/libs/vlayout/vlayout.pri | 3 -
src/test/ValentinaTest/ValentinaTest.pro | 2 -
src/test/ValentinaTest/qttestmainlambda.cpp | 2 -
.../ValentinaTest/tst_vabstractdetail.cpp | 1386 -----------------
src/test/ValentinaTest/tst_vabstractdetail.h | 87 --
src/test/ValentinaTest/tst_vabstractpiece.cpp | 1311 ++++++++++++++++
src/test/ValentinaTest/tst_vabstractpiece.h | 39 +
src/test/ValentinaTest/tst_varc.cpp | 4 +-
src/test/ValentinaTest/tst_vellipticalarc.cpp | 4 +-
12 files changed, 1354 insertions(+), 2512 deletions(-)
delete mode 100644 src/libs/vlayout/vabstractdetail.cpp
delete mode 100644 src/libs/vlayout/vabstractdetail.h
delete mode 100644 src/libs/vlayout/vabstractdetail_p.h
delete mode 100644 src/test/ValentinaTest/tst_vabstractdetail.cpp
delete mode 100644 src/test/ValentinaTest/tst_vabstractdetail.h
diff --git a/src/libs/vlayout/vabstractdetail.cpp b/src/libs/vlayout/vabstractdetail.cpp
deleted file mode 100644
index 00372a5c2..000000000
--- a/src/libs/vlayout/vabstractdetail.cpp
+++ /dev/null
@@ -1,855 +0,0 @@
-/************************************************************************
- **
- ** @file vabstractdetail.cpp
- ** @author Roman Telezhynskyi <dismine(at)gmail.com>
- ** @date 2 1, 2015
- **
- ** @brief
- ** @copyright
- ** This source code is part of the Valentine project, a pattern making
- ** program, whose allow create and modeling patterns of clothing.
- ** Copyright (C) 2013-2015 Valentina project
- ** <https://bitbucket.org/dismine/valentina> All Rights Reserved.
- **
- ** Valentina is free software: you can redistribute it and/or modify
- ** it under the terms of the GNU General Public License as published by
- ** the Free Software Foundation, either version 3 of the License, or
- ** (at your option) any later version.
- **
- ** Valentina is distributed in the hope that it will be useful,
- ** but WITHOUT ANY WARRANTY; without even the implied warranty of
- ** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- ** GNU General Public License for more details.
- **
- ** You should have received a copy of the GNU General Public License
- ** along with Valentina. If not, see <http://www.gnu.org/licenses/>.
- **
- *************************************************************************/
-
-#include "vabstractdetail.h"
-
-#include <QLine>
-#include <QLineF>
-#include <QMessageLogger>
-#include <QPainterPath>
-#include <QPoint>
-#include <QPointF>
-#include <QString>
-#include <QVector>
-#include <QtDebug>
-
-#include "../vgeometry/vgobject.h"
-#include "vabstractdetail_p.h"
-
-//---------------------------------------------------------------------------------------------------------------------
-/**
- * @brief VAbstractDetail default contructor. Create empty detail.
- */
-VAbstractDetail::VAbstractDetail()
- :d(new VAbstractDetailData)
-{}
-
-//---------------------------------------------------------------------------------------------------------------------
-/**
- * @brief VAbstractDetail constructor.
- * @param name detail name.
- */
-VAbstractDetail::VAbstractDetail(const QString &name)
- :d(new VAbstractDetailData(name))
-{}
-
-//---------------------------------------------------------------------------------------------------------------------
-/**
- * @brief VAbstractDetail copy constructor.
- * @param detail detail.
- */
-VAbstractDetail::VAbstractDetail(const VAbstractDetail &detail)
- :d (detail.d)
-{}
-
-//---------------------------------------------------------------------------------------------------------------------
-/**
- * @brief operator = assignment operator.
- * @param detail detail.
- * @return new detail.
- */
-VAbstractDetail &VAbstractDetail::operator=(const VAbstractDetail &detail)
-{
- if ( &detail == this )
- {
- return *this;
- }
- d = detail.d;
- return *this;
-}
-
-//---------------------------------------------------------------------------------------------------------------------
-VAbstractDetail::~VAbstractDetail()
-{}
-
-//---------------------------------------------------------------------------------------------------------------------
-/**
- * @brief Clear detail full clear.
- */
-void VAbstractDetail::Clear()
-{
- d->name.clear();
- d->seamAllowance = false;
- d->closed = true;
- d->width = 0;
-}
-
-//---------------------------------------------------------------------------------------------------------------------
-/**
- * @brief getName return detail name.
- * @return name.
- */
-QString VAbstractDetail::getName() const
-{
- return d->name;
-}
-
-//---------------------------------------------------------------------------------------------------------------------
-/**
- * @brief setName set detail name.
- * @param value new name.
- */
-void VAbstractDetail::setName(const QString &value)
-{
- d->name = value;
-}
-
-//---------------------------------------------------------------------------------------------------------------------
-/**
- * @brief getSeamAllowance keep status for seam allowance detail.
- * @return true - need seam allowance, false - no need seam allowance.
- */
-bool VAbstractDetail::getSeamAllowance() const
-{
- return d->seamAllowance;
-}
-
-//---------------------------------------------------------------------------------------------------------------------
-/**
- * @brief setSeamAllowance set status for seam allowance detail.
- * @param value true - need seam allowance, false - no need seam allowance.
- */
-void VAbstractDetail::setSeamAllowance(bool value)
-{
- d->seamAllowance = value;
-}
-
-//---------------------------------------------------------------------------------------------------------------------
-/**
- * @brief getClosed keep close status for detail equdistant.
- * @return true - close equdistant, false - don't close equdistant.
- */
-bool VAbstractDetail::getClosed() const
-{
- return d->closed;
-}
-
-//---------------------------------------------------------------------------------------------------------------------
-/**
- * @brief setClosed set close status for detail equdistant.
- * @param value true - close equdistant, false - don't close equdistant.
- */
-void VAbstractDetail::setClosed(bool value)
-{
- d->closed = value;
-}
-
-//---------------------------------------------------------------------------------------------------------------------
-/**
- * @brief getWidth return value detail seam allowance.
- * @return value in mm.
- */
-qreal VAbstractDetail::getWidth() const
-{
- return d->width;
-}
-
-//---------------------------------------------------------------------------------------------------------------------
-/**
- * @brief setWidth set value detail seam allowance.
- * @param value width in mm.
- */
-void VAbstractDetail::setWidth(const qreal &value)
-{
- d->width = value;
-}
-
-//---------------------------------------------------------------------------------------------------------------------
-bool VAbstractDetail::getForbidFlipping() const
-{
- return d->forbidFlipping;
-}
-
-//---------------------------------------------------------------------------------------------------------------------
-void VAbstractDetail::setForbidFlipping(bool value)
-{
- d->forbidFlipping = value;
-}
-
-//---------------------------------------------------------------------------------------------------------------------
-QVector<QPointF> VAbstractDetail::Equidistant(const QVector<QPointF> &points, const EquidistantType &eqv, qreal width)
-{
- QVector<QPointF> ekvPoints;
-
- if (width <= 0)
- {
- qDebug()<<"Width <= 0.";
- return QVector<QPointF>();
- }
-
- QVector<QPointF> p = CorrectEquidistantPoints(points);
- if ( p.size() < 3 )
- {
- qDebug()<<"Not enough points for building the equidistant.";
- return QVector<QPointF>();
- }
-
- if (eqv == EquidistantType::CloseEquidistant)
- {
- p.append(p.at(0));
- }
- for (qint32 i = 0; i < p.size(); ++i )
- {
- if ( i == 0 && eqv == EquidistantType::CloseEquidistant)
- {//first point, polyline closed
- ekvPoints<<EkvPoint(QLineF(p.at(p.size()-2), p.at(p.size()-1)), QLineF(p.at(1), p.at(0)), width);
- continue;
- }
- else if (i == 0 && eqv == EquidistantType::OpenEquidistant)
- {//first point, polyline doesn't closed
- ekvPoints.append(UnclosedEkvPoint(QLineF(p.at(0), p.at(1)), QLineF(p.at(0), p.at(p.size()-1)), width));
- continue;
- }
- if (i == p.size()-1 && eqv == EquidistantType::CloseEquidistant)
- {//last point, polyline closed
- if (not ekvPoints.isEmpty())
- {
- ekvPoints.append(ekvPoints.at(0));
- }
- continue;
- }
- else if (i == p.size()-1 && eqv == EquidistantType::OpenEquidistant)
- {//last point, polyline doesn't closed
- ekvPoints.append(UnclosedEkvPoint(QLineF(p.at(p.size()-2), p.at(p.size()-1)),
- QLineF(p.at(0), p.at(p.size()-1)), width));
- continue;
- }
- //points in the middle of polyline
- ekvPoints<<EkvPoint(QLineF(p.at(i-1), p.at(i)), QLineF(p.at(i+1), p.at(i)), width);
- }
-
- bool removeFirstAndLast = true;
- if (eqv == EquidistantType::CloseEquidistant)
- {
- removeFirstAndLast = false;
- }
-
- ekvPoints = CheckLoops(CorrectEquidistantPoints(ekvPoints, removeFirstAndLast));//Result path can contain loops
- return ekvPoints;
-}
-
-//---------------------------------------------------------------------------------------------------------------------
-QVector<QPointF> VAbstractDetail::RemoveDublicates(const QVector<QPointF> &points, bool removeFirstAndLast)
-{
- QVector<QPointF> p = points;
-
- if (removeFirstAndLast)
- {
- if (not p.isEmpty() && p.size() > 1)
- {
- // Path can't be closed
- if (p.first() == p.last())
- {
- #if QT_VERSION < QT_VERSION_CHECK(5, 1, 0)
- p.remove(p.size() - 1);
- #else
- p.removeLast();
- #endif
- }
- }
- }
-
- for (int i = 0; i < p.size()-1; ++i)
- {
- if (p.at(i) == p.at(i+1))
- {
- if (not removeFirstAndLast && (i == p.size()-1))
- {
- continue;
- }
-
- p.erase(p.begin() + i + 1);
- --i;
- continue;
- }
- }
-
- return p;
-}
-
-//---------------------------------------------------------------------------------------------------------------------
-bool VAbstractDetail::CheckIntersection(const QVector<QPointF> &points, int i, int iNext, int j, int jNext,
- const QPointF &crossPoint)
-{
- QVector<QPointF> sub1 = SubPath(points, iNext, j);
- sub1.append(crossPoint);
- sub1 = CheckLoops(CorrectEquidistantPoints(sub1, false));
- const qreal sub1Sum = SumTrapezoids(sub1);
-
- QVector<QPointF> sub2 = SubPath(points, jNext, i);
- sub2.append(crossPoint);
- sub2 = CheckLoops(CorrectEquidistantPoints(sub2, false));
- const qreal sub2Sum = SumTrapezoids(sub2);
-
- if (sub1Sum < 0 && sub2Sum < 0)
- {
- if (Crossing(sub1, sub2))
- {
- return true;
- }
- }
- else
- {
- if (not Crossing(sub1, sub2))
- {
- return true;
- }
- }
- return false;
-}
-
-//---------------------------------------------------------------------------------------------------------------------
-bool VAbstractDetail::ParallelCrossPoint(const QLineF &line1, const QLineF &line2, QPointF &point)
-{
- const bool l1p1el2p1 = (line1.p1() == line2.p1());
- const bool l1p2el2p2 = (line1.p2() == line2.p2());
- const bool l1p1el2p2 = (line1.p1() == line2.p2());
- const bool l1p2el2p1 = (line1.p2() == line2.p1());
-
- if (l1p2el2p2 || l1p2el2p1)
- {
- point = line1.p2();
- return true;
- }
- else if (l1p1el2p1 || l1p1el2p2)
- {
- point = line1.p1();
- return true;
- }
- else
- {
- point = QPointF();
- return false;
- }
-}
-
-//---------------------------------------------------------------------------------------------------------------------
-bool VAbstractDetail::Crossing(const QVector<QPointF> &sub1, const QVector<QPointF> &sub2)
-{
- if (sub1.isEmpty() || sub2.isEmpty())
- {
- return false;
- }
-
- const QRectF sub1Rect = QPolygonF(sub1).boundingRect();
- const QRectF sub2Rect = QPolygonF(sub2).boundingRect();
- if (not sub1Rect.intersects(sub2Rect))
- {
- return false;
- }
-
- QPainterPath sub1Path;
- sub1Path.setFillRule(Qt::WindingFill);
- sub1Path.moveTo(sub1.at(0));
- for (qint32 i = 1; i < sub1.count(); ++i)
- {
- sub1Path.lineTo(sub1.at(i));
- }
- sub1Path.lineTo(sub1.at(0));
-
- QPainterPath sub2Path;
- sub2Path.setFillRule(Qt::WindingFill);
- sub2Path.moveTo(sub2.at(0));
- for (qint32 i = 1; i < sub2.count(); ++i)
- {
- sub2Path.lineTo(sub2.at(i));
- }
- sub2Path.lineTo(sub2.at(0));
-
- if (not sub1Path.intersects(sub2Path))
- {
- return false;
- }
- else
- {
- return true;
- }
-}
-
-//---------------------------------------------------------------------------------------------------------------------
-QVector<QPointF> VAbstractDetail::SubPath(const QVector<QPointF> &path, int startIndex, int endIndex)
-{
- if (path.isEmpty()
- || startIndex < 0 || startIndex >= path.size()
- || endIndex < 0 || endIndex >= path.size()
- || startIndex == endIndex)
- {
- return path;
- }
-
- QVector<QPointF> subPath;
- int i = startIndex - 1;
- do
- {
- ++i;
- if (i >= path.size())
- {
- i = 0;
- }
- subPath.append(path.at(i));
- } while (i != endIndex);
-
- return subPath;
-}
-
-//---------------------------------------------------------------------------------------------------------------------
-/**
- * @brief CorrectEquidistantPoints clear equivalent points and remove point on line from equdistant.
- * @param points list of points equdistant.
- * @return corrected list.
- */
-QVector<QPointF> VAbstractDetail::CorrectEquidistantPoints(const QVector<QPointF> &points, bool removeFirstAndLast)
-{
- if (points.size()<4)//Better don't check if only three points. We can destroy equidistant.
- {
- qDebug()<<"Only three points.";
- return points;
- }
-
- //Clear equivalent points
- QVector<QPointF> buf1 = RemoveDublicates(points, removeFirstAndLast);
-
- if (buf1.size()<3)
- {
- return buf1;
- }
-
- QVector<QPointF> buf2;
- //Remove point on line
- for (qint32 i = 0; i < buf1.size(); ++i)
- {// In this case we alwayse will have bounded intersection, so all is need is to check if point i is on line.
- // Unfortunatelly QLineF::intersect can't be used in this case because of the floating-point accuraccy problem.
- int prev = i-1;
- int next = i+1;
- if (i == 0)
- {
- prev = buf1.size() - 1;
- }
- else if (i == buf1.size() - 1)
- {
- next = 0;
- }
-
- const QPointF &iPoint = buf1.at(i);
- const QPointF &prevPoint = buf1.at(prev);
- const QPointF &nextPoint = buf1.at(next);
-
- if (not VGObject::IsPointOnLineviaPDP(buf1.at(i), buf1.at(prev), buf1.at(next))
- && prevPoint != nextPoint) // not zigzag
- {
- buf2.append(buf1.at(i));
- }
- else if ((i == 0 || i == buf1.size() - 1) && (iPoint == prevPoint || iPoint == nextPoint))
- {
- // If RemoveDublicates does not remove these points it is a valid case.
- // Case where last point equal first point
- buf2.append(buf1.at(i));
- }
- }
-
- buf2 = RemoveDublicates(buf2, false);
-
- return buf2;
-}
-
-//---------------------------------------------------------------------------------------------------------------------
-/**
- * @brief CheckLoops seek and delete loops in equidistant.
- * @param points vector of points of equidistant.
- * @return vector of points of equidistant.
- */
-QVector<QPointF> VAbstractDetail::CheckLoops(const QVector<QPointF> &points)
-{
- int count = points.size();
- /*If we got less than 4 points no need seek loops.*/
- if (count < 4)
- {
- return points;
- }
-
- const bool pathClosed = (points.first() == points.last());
-
- QVector<QPointF> ekvPoints;
-
- qint32 i, j, jNext = 0;
- for (i = 0; i < count; ++i)
- {
- /*Last three points no need check.*/
- /*Triangle has not contain loops*/
- if (i > count-3)
- {
- ekvPoints.append(points.at(i));
- continue;
- }
-
- enum LoopIntersectType { NoIntersection, BoundedIntersection, ParallelIntersection };
-
- QPointF crosPoint;
- LoopIntersectType status = NoIntersection;
- const QLineF line1(points.at(i), points.at(i+1));
- // Because a path can contains several loops we will seek the last and only then remove the loop(s)
- // That's why we parse from the end
- for (j = count-1; j >= i+2; --j)
- {
- j == count-1 ? jNext = 0 : jNext = j+1;
- QLineF line2(points.at(j), points.at(jNext));
-
- if(qFuzzyIsNull(line2.length()))
- {//If a path is closed the edge (count-1;0) length will be 0
- continue;
- }
-
- QSet<qint32> uniqueVertices;
- uniqueVertices << i << i+1 << j;
-
- // For closed path last point is equal to first. Using index of the first.
- pathClosed && jNext == count-1 ? uniqueVertices << 0 : uniqueVertices << jNext;
-
- const QLineF::IntersectType intersect = line1.intersect(line2, &crosPoint);
- if (intersect == QLineF::NoIntersection)
- { // According to the documentation QLineF::NoIntersection indicates that the lines do not intersect;
- // i.e. they are parallel. But parallel also mean they can be on the same line.
- // Method IsPointOnLineviaPDP will check it.
- if (VGObject::IsPointOnLineviaPDP(points.at(j), points.at(i), points.at(i+1))
- // Lines are not neighbors
- && uniqueVertices.size() == 4)
- {
- // Left to catch case where segments are on the same line, but do not have real intersections.
- QLineF tmpLine1 = line1;
- QLineF tmpLine2 = line2;
-
- tmpLine1.setAngle(tmpLine1.angle()+90);
-
- QPointF tmpCrosPoint;
- const QLineF::IntersectType tmpIntrs1 = tmpLine1.intersect(tmpLine2, &tmpCrosPoint);
-
- tmpLine1 = line1;
- tmpLine2.setAngle(tmpLine2.angle()+90);
-
- const QLineF::IntersectType tmpIntrs2 = tmpLine1.intersect(tmpLine2, &tmpCrosPoint);
-
- if (tmpIntrs1 == QLineF::BoundedIntersection || tmpIntrs2 == QLineF::BoundedIntersection)
- { // Now we really sure that lines are on the same line and have real intersections.
- QPointF cPoint;
- const bool caseFlag = ParallelCrossPoint(line1, line2, cPoint);
- if (not caseFlag || CheckIntersection(points, i, i+1, j, jNext, cPoint))
- {
- status = ParallelIntersection;
- break;
- }
- }
- }
- }
- else if (intersect == QLineF::BoundedIntersection)
- {
- if (uniqueVertices.size() == 4)
- { // Break, but not if lines are neighbors
- if ((line1.p1() != crosPoint
- && line1.p2() != crosPoint
- && line2.p1() != crosPoint
- && line2.p2() != crosPoint) || CheckIntersection(points, i, i+1, j, jNext, crosPoint))
- {
- status = BoundedIntersection;
- break;
- }
- }
- }
- status = NoIntersection;
- }
-
- switch (status)
- {
- case ParallelIntersection:
- /*We have found a loop.*/
- ekvPoints.append(points.at(i));
- ekvPoints.append(points.at(jNext));
- jNext > j ? i = jNext : i = j; // Skip a loop
- break;
- case BoundedIntersection:
- ekvPoints.append(points.at(i));
- ekvPoints.append(crosPoint);
- i = j;
- break;
- case NoIntersection:
- /*We have not found loop.*/
- ekvPoints.append(points.at(i));
- break;
- default:
- break;
- }
- }
- return ekvPoints;
-}
-
-//---------------------------------------------------------------------------------------------------------------------
-/**
- * @brief EkvPoint return vector of points of equidistant two lines. Last point of two lines must be equal.
- * @param line1 first line.
- * @param line2 second line.
- * @param width width of equidistant.
- * @return vector of points.
- */
-QVector<QPointF> VAbstractDetail::EkvPoint(const QLineF &line1, const QLineF &line2, const qreal &width)
-{
- if (width <= 0)
- {
- return QVector<QPointF>();
- }
- QVector<QPointF> points;
- if (line1.p2() != line2.p2())
- {
- qDebug()<<"Last points of two lines must be equal.";
- return QVector<QPointF>();
- }
- QPointF CrosPoint;
- const QLineF bigLine1 = ParallelLine(line1, width );
- const QLineF bigLine2 = ParallelLine(QLineF(line2.p2(), line2.p1()), width );
- QLineF::IntersectType type = bigLine1.intersect( bigLine2, &CrosPoint );
- switch (type)
- {
- case (QLineF::BoundedIntersection):
- points.append(CrosPoint);
- return points;
- break;
- case (QLineF::UnboundedIntersection):
- {
- QLineF line( line1.p2(), CrosPoint );
-
- const int angle1 = BisectorAngle(line1.p1(), line1.p2(), line2.p1());
- const int angle2 = BisectorAngle(bigLine1.p1(), CrosPoint, bigLine2.p2());
-
- if (angle1 == angle2)
- {//Regular equdistant case
- const qreal length = line.length();
- if (length > width*2.4)
- { // Cutting too long a cut angle
- line.setLength(width); // Not sure about width value here
- QLineF cutLine(line.p2(), CrosPoint); // Cut line is a perpendicular
- cutLine.setLength(length); // Decided take this length
-
- // We do not check intersection type because intersection must alwayse exist
- QPointF px;
- cutLine.setAngle(cutLine.angle()+90);
- QLineF::IntersectType type = bigLine1.intersect( cutLine, &px );
- if (type == QLineF::NoIntersection)
- {
- qDebug()<<"Couldn't find intersection with cut line.";
- }
- points.append(px);
-
- cutLine.setAngle(cutLine.angle()-180);
- type = bigLine2.intersect( cutLine, &px );
- if (type == QLineF::NoIntersection)
- {
- qDebug()<<"Couldn't find intersection with cut line.";
- }
- points.append(px);
- }
- else
- {
- points.append(CrosPoint);
- return points;
- }
- }
- else
- {// Dart. Create a loop.
- points.append(bigLine1.p2());
- points.append(bigLine2.p1());
- return points;
- }
- break;
- }
- case (QLineF::NoIntersection):
- /*If we have correct lines this means lines lie on a line.*/
- points.append(bigLine1.p2());
- return points;
- break;
- default:
- break;
- }
- return points;
-}
-
-//---------------------------------------------------------------------------------------------------------------------
-/**
- * @brief UnclosedEkvPoint helps find point of an unclosed seam allowance. One side of two lines should be equal.
- *
- * In case of the first seam allowance point equal should be the first point of the two lines. In case the last point -
- * the last point of the two lines.
- *
- * @param line line of a seam allowance
- * @param helpLine help line of the main path that cut unclosed seam allowance
- * @param width seam allowance width
- * @return seam allowance point
- */
-QPointF VAbstractDetail::UnclosedEkvPoint(const QLineF &line, const QLineF &helpLine, const qreal &width)
-{
- if (width <= 0)
- {
- return QPointF();
- }
-
- const bool firstPoint = line.p1() == helpLine.p1();
- if (not (line.p2() == helpLine.p2() || firstPoint))
- {
- qDebug()<<"Two points of two lines must be equal.";
- return QPointF();
- }
-
- QPointF CrosPoint;
- const QLineF bigLine = ParallelLine(line, width );
- QLineF::IntersectType type = bigLine.intersect( helpLine, &CrosPoint );
- switch (type)
- {
- case (QLineF::BoundedIntersection):
- return CrosPoint;
- break;
- case (QLineF::UnboundedIntersection):
- {
- // This case is very tricky.
- // User can create very wrong path that will create crospoint far from main path.
- // Such an annomaly we try to catch and fix.
- // If don't do this the program will crash.
- QLineF test;
- firstPoint ? test = QLineF(line.p1(), CrosPoint) : test = QLineF(line.p2(), CrosPoint);
- const qreal length = test.length();
- if (length > width*2.4)
- {
- test.setLength(width);
- return test.p2();
- }
- else
- {
- return CrosPoint;
- }
- break;
- }
- case (QLineF::NoIntersection):
- /*If we have correct lines this means lines lie on a line.*/
- if (firstPoint)
- {
- return bigLine.p1();
- }
- else
- {
- return bigLine.p2();
- }
- break;
- default:
- break;
- }
- return QPointF();
-}
-
-//---------------------------------------------------------------------------------------------------------------------
-/**
- * @brief ParallelLine create parallel line.
- * @param line starting line.
- * @param width width to parallel line.
- * @return parallel line.
- */
-QLineF VAbstractDetail::ParallelLine(const QLineF &line, qreal width)
-{
- QLineF paralel = QLineF (SingleParallelPoint(line, 90, width), SingleParallelPoint(QLineF(line.p2(), line.p1()),
- -90, width));
- return paralel;
-}
-
-//---------------------------------------------------------------------------------------------------------------------
-/**
- * @brief SingleParallelPoint return point of parallel line.
- * @param line starting line.
- * @param angle angle in degree.
- * @param width width to parallel line.
- * @return point of parallel line.
- */
-QPointF VAbstractDetail::SingleParallelPoint(const QLineF &line, const qreal &angle, const qreal &width)
-{
- QLineF pLine = line;
- pLine.setAngle( pLine.angle() + angle );
- pLine.setLength( width );
- return pLine.p2();
-}
-
-//---------------------------------------------------------------------------------------------------------------------
-int VAbstractDetail::BisectorAngle(const QPointF &p1, const QPointF &p2, const QPointF &p3)
-{
- QLineF line1(p2, p1);
- QLineF line2(p2, p3);
- QLineF bLine;
-
- const qreal angle1 = line1.angleTo(line2);
- const qreal angle2 = line2.angleTo(line1);
-
- if (angle1 <= angle2)
- {
- bLine = line1;
- bLine.setAngle(bLine.angle() + angle1/2.0);
- }
- else
- {
- bLine = line2;
- bLine.setAngle(bLine.angle() + angle2/2.0);
- }
-
- return qRound(bLine.angle());
-}
-
-//---------------------------------------------------------------------------------------------------------------------
-qreal VAbstractDetail::SumTrapezoids(const QVector<QPointF> &points)
-{
- // Calculation a polygon area through the sum of the areas of trapezoids
- qreal s, res = 0;
- const int n = points.size();
-
- if(n > 2)
- {
- for (int i = 0; i < n; ++i)
- {
- if (i == 0)
- {
- s = points.at(i).x()*(points.at(n-1).y() - points.at(i+1).y()); //if i == 0, then y[i-1] replace on y[n-1]
- res += s;
- }
- else
- {
- if (i == n-1)
- {
- s = points.at(i).x()*(points.at(i-1).y() - points.at(0).y()); // if i == n-1, then y[i+1] replace on y[0]
- res += s;
- }
- else
- {
- s = points.at(i).x()*(points.at(i-1).y() - points.at(i+1).y());
- res += s;
- }
- }
- }
- }
- return res;
-}
diff --git a/src/libs/vlayout/vabstractdetail.h b/src/libs/vlayout/vabstractdetail.h
deleted file mode 100644
index 902b15dd2..000000000
--- a/src/libs/vlayout/vabstractdetail.h
+++ /dev/null
@@ -1,98 +0,0 @@
-/************************************************************************
- **
- ** @file vabstractdetail.h
- ** @author Roman Telezhynskyi <dismine(at)gmail.com>
- ** @date 2 1, 2015
- **
- ** @brief
- ** @copyright
- ** This source code is part of the Valentine project, a pattern making
- ** program, whose allow create and modeling patterns of clothing.
- ** Copyright (C) 2013-2015 Valentina project
- ** <https://bitbucket.org/dismine/valentina> All Rights Reserved.
- **
- ** Valentina is free software: you can redistribute it and/or modify
- ** it under the terms of the GNU General Public License as published by
- ** the Free Software Foundation, either version 3 of the License, or
- ** (at your option) any later version.
- **
- ** Valentina is distributed in the hope that it will be useful,
- ** but WITHOUT ANY WARRANTY; without even the implied warranty of
- ** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- ** GNU General Public License for more details.
- **
- ** You should have received a copy of the GNU General Public License
- ** along with Valentina. If not, see <http://www.gnu.org/licenses/>.
- **
- *************************************************************************/
-
-#ifndef VABSTRACTDETAIL_H
-#define VABSTRACTDETAIL_H
-
-#include <QSharedDataPointer>
-#include <QTypeInfo>
-#include <QtGlobal>
-
-#include "vlayoutdef.h"
-
-class QLineF;
-class QPointF;
-class QString;
-class VAbstractDetailData;
-template <typename T> class QVector;
-
-/**
- * @brief The VAbstractDetail class abstract class for all details.
- */
-class VAbstractDetail
-{
-public:
- VAbstractDetail();
- explicit VAbstractDetail(const QString &name);
- VAbstractDetail(const VAbstractDetail &detail);
- VAbstractDetail &operator=(const VAbstractDetail &detail);
- virtual ~VAbstractDetail();
-
- void Clear();
-
- QString getName() const;
- void setName(const QString &value);
-
- bool getSeamAllowance() const;
- void setSeamAllowance(bool value);
-
- bool getClosed() const;
- void setClosed(bool value);
-
- qreal getWidth() const;
- void setWidth(const qreal &value);
-
- bool getForbidFlipping() const;
- void setForbidFlipping(bool value);
-
- static QVector<QPointF> Equidistant(const QVector<QPointF> &points, const EquidistantType &eqv, qreal width);
- static qreal SumTrapezoids(const QVector<QPointF> &points);
- static QVector<QPointF> CheckLoops(const QVector<QPointF> &points);
- static QVector<QPointF> CorrectEquidistantPoints(const QVector<QPointF> &points, bool removeFirstAndLast = true);
-
-protected:
- static QVector<QPointF> RemoveDublicates(const QVector<QPointF> &points, bool removeFirstAndLast = true);
-
-private:
- QSharedDataPointer<VAbstractDetailData> d;
-
- static bool CheckIntersection(const QVector<QPointF> &points, int i, int iNext, int j, int jNext,
- const QPointF &crossPoint);
- static bool ParallelCrossPoint(const QLineF &line1, const QLineF &line2, QPointF &point);
- static bool Crossing(const QVector<QPointF> &sub1, const QVector<QPointF> &sub2);
- static QVector<QPointF> SubPath(const QVector<QPointF> &path, int startIndex, int endIndex);
- static QVector<QPointF> EkvPoint(const QLineF &line1, const QLineF &line2, const qreal &width);
- static QPointF UnclosedEkvPoint(const QLineF &line, const QLineF &helpLine, const qreal &width);
- static QLineF ParallelLine(const QLineF &line, qreal width );
- static QPointF SingleParallelPoint(const QLineF &line, const qreal &angle, const qreal &width);
- static int BisectorAngle(const QPointF &p1, const QPointF &p2, const QPointF &p3);
-};
-
-Q_DECLARE_TYPEINFO(VAbstractDetail, Q_MOVABLE_TYPE);
-
-#endif // VABSTRACTDETAIL_H
diff --git a/src/libs/vlayout/vabstractdetail_p.h b/src/libs/vlayout/vabstractdetail_p.h
deleted file mode 100644
index 54fded0b3..000000000
--- a/src/libs/vlayout/vabstractdetail_p.h
+++ /dev/null
@@ -1,75 +0,0 @@
-/************************************************************************
- **
- ** @file vabstractdetail_p.h
- ** @author Roman Telezhynskyi <dismine(at)gmail.com>
- ** @date 2 1, 2015
- **
- ** @brief
- ** @copyright
- ** This source code is part of the Valentine project, a pattern making
- ** program, whose allow create and modeling patterns of clothing.
- ** Copyright (C) 2013-2015 Valentina project
- ** <https://bitbucket.org/dismine/valentina> All Rights Reserved.
- **
- ** Valentina is free software: you can redistribute it and/or modify
- ** it under the terms of the GNU General Public License as published by
- ** the Free Software Foundation, either version 3 of the License, or
- ** (at your option) any later version.
- **
- ** Valentina is distributed in the hope that it will be useful,
- ** but WITHOUT ANY WARRANTY; without even the implied warranty of
- ** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- ** GNU General Public License for more details.
- **
- ** You should have received a copy of the GNU General Public License
- ** along with Valentina. If not, see <http://www.gnu.org/licenses/>.
- **
- *************************************************************************/
-
-#ifndef VABSTRACTDETAIL_P_H
-#define VABSTRACTDETAIL_P_H
-
-#include <QSharedData>
-#include <QString>
-
-#include "../vmisc/diagnostic.h"
-
-QT_WARNING_PUSH
-QT_WARNING_DISABLE_GCC("-Weffc++")
-
-class VAbstractDetailData : public QSharedData
-{
-public:
- VAbstractDetailData()
- :name(QString()), seamAllowance(false), closed(true), width(0), forbidFlipping(false)
- {}
-
- explicit VAbstractDetailData(const QString &name)
- :name(name), seamAllowance(false), closed(true), width(0), forbidFlipping(false)
- {}
-
- VAbstractDetailData(const VAbstractDetailData &detail)
- :QSharedData(detail), name(detail.name), seamAllowance(detail.seamAllowance), closed(detail.closed),
- width(detail.width), forbidFlipping(detail.forbidFlipping)
- {}
-
- ~VAbstractDetailData() {}
-
- /** @brief name detail name. */
- QString name;
- /** @brief seamAllowance status seamAllowance detail. */
- bool seamAllowance;
- /** @brief closed status equdistant detail. */
- bool closed;
- /** @brief width value seamAllowance in mm. */
- qreal width;
- /** @brief forbidFlipping forbid piece be mirrored in a layout. */
- bool forbidFlipping;
-
-private:
- VAbstractDetailData &operator=(const VAbstractDetailData &) Q_DECL_EQ_DELETE;
-};
-
-QT_WARNING_POP
-
-#endif // VABSTRACTDETAIL_P_H
diff --git a/src/libs/vlayout/vlayout.pri b/src/libs/vlayout/vlayout.pri
index 1ed0558d0..11a46ad9c 100644
--- a/src/libs/vlayout/vlayout.pri
+++ b/src/libs/vlayout/vlayout.pri
@@ -4,8 +4,6 @@
HEADERS += \
$$PWD/stable.h \
$$PWD/vlayoutgenerator.h \
- $$PWD/vabstractdetail.h \
- $$PWD/vabstractdetail_p.h \
$$PWD/vlayoutdef.h \
$$PWD/vlayoutpaper.h \
$$PWD/vlayoutpaper_p.h \
@@ -24,7 +22,6 @@ HEADERS += \
SOURCES += \
$$PWD/vlayoutgenerator.cpp \
- $$PWD/vabstractdetail.cpp \
$$PWD/vlayoutpaper.cpp \
$$PWD/vbank.cpp \
$$PWD/vcontour.cpp \
diff --git a/src/test/ValentinaTest/ValentinaTest.pro b/src/test/ValentinaTest/ValentinaTest.pro
index 3d31c6c76..a421d5acf 100644
--- a/src/test/ValentinaTest/ValentinaTest.pro
+++ b/src/test/ValentinaTest/ValentinaTest.pro
@@ -36,7 +36,6 @@ DEFINES += SRCDIR=\\\"$$PWD/\\\"
SOURCES += \
qttestmainlambda.cpp \
tst_vposter.cpp \
- tst_vabstractdetail.cpp \
tst_vspline.cpp \
tst_nameregexp.cpp \
tst_vlayoutdetail.cpp \
@@ -62,7 +61,6 @@ win32-msvc*:SOURCES += stable.cpp
HEADERS += \
tst_vposter.h \
- tst_vabstractdetail.h \
tst_vspline.h \
tst_nameregexp.h \
tst_vlayoutdetail.h \
diff --git a/src/test/ValentinaTest/qttestmainlambda.cpp b/src/test/ValentinaTest/qttestmainlambda.cpp
index 00c0ded7a..6bbf8113c 100644
--- a/src/test/ValentinaTest/qttestmainlambda.cpp
+++ b/src/test/ValentinaTest/qttestmainlambda.cpp
@@ -29,7 +29,6 @@
#include <QtTest>
#include "tst_vposter.h"
-#include "tst_vabstractdetail.h"
#include "tst_vabstractpiece.h"
#include "tst_vspline.h"
#include "tst_nameregexp.h"
@@ -70,7 +69,6 @@ int main(int argc, char** argv)
ASSERT_TEST(new TST_FindPoint());
ASSERT_TEST(new TST_VDetail());
ASSERT_TEST(new TST_VPoster());
- //ASSERT_TEST(new TST_VAbstractDetail());
ASSERT_TEST(new TST_VAbstractPiece());
ASSERT_TEST(new TST_VSpline());
ASSERT_TEST(new TST_VSplinePath());
diff --git a/src/test/ValentinaTest/tst_vabstractdetail.cpp b/src/test/ValentinaTest/tst_vabstractdetail.cpp
deleted file mode 100644
index 9a900dc89..000000000
--- a/src/test/ValentinaTest/tst_vabstractdetail.cpp
+++ /dev/null
@@ -1,1386 +0,0 @@
-/************************************************************************
- **
- ** @file tst_vabstractdetail.cpp
- ** @author Roman Telezhynskyi <dismine(at)gmail.com>
- ** @date 16 4, 2015
- **
- ** @brief
- ** @copyright
- ** This source code is part of the Valentine project, a pattern making
- ** program, whose allow create and modeling patterns of clothing.
- ** Copyright (C) 2015 Valentina project
- ** <https://bitbucket.org/dismine/valentina> All Rights Reserved.
- **
- ** Valentina is free software: you can redistribute it and/or modify
- ** it under the terms of the GNU General Public License as published by
- ** the Free Software Foundation, either version 3 of the License, or
- ** (at your option) any later version.
- **
- ** Valentina is distributed in the hope that it will be useful,
- ** but WITHOUT ANY WARRANTY; without even the implied warranty of
- ** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- ** GNU General Public License for more details.
- **
- ** You should have received a copy of the GNU General Public License
- ** along with Valentina. If not, see <http://www.gnu.org/licenses/>.
- **
- *************************************************************************/
-
-#include "tst_vabstractdetail.h"
-#include "../vlayout/vabstractdetail.h"
-
-#include <QPointF>
-#include <QVector>
-
-#include <QtTest>
-
-//---------------------------------------------------------------------------------------------------------------------
-TST_VAbstractDetail::TST_VAbstractDetail(QObject *parent)
- :AbstractTest(parent)
-{
-}
-
-//---------------------------------------------------------------------------------------------------------------------
-void TST_VAbstractDetail::EquidistantRemoveLoop_data()
-{
- QTest::addColumn<QVector<QPointF>>("points");
- QTest::addColumn<int>("eqv");
- QTest::addColumn<qreal>("width");
- QTest::addColumn<QVector<QPointF>>("ekvOrig");
-
- // These are two real cases where equdistant has loop.
- // See issue #298. Segmented Curve isn't selected in Seam Allowance tool.
- // https://bitbucket.org/dismine/valentina/issue/298/segmented-curve-isnt-selected-in-seam
- // Code should clean loops in path.
- QTest::newRow("Issue 298. Case1") << InputPointsIssue298Case1()
- << static_cast<int>(EquidistantType::CloseEquidistant)
- << 75.5906 // seam allowance width
- << OutputPointsIssue298Case1();
-
- QTest::newRow("Issue 298. Case2") << InputPointsIssue298Case2()
- << static_cast<int>(EquidistantType::CloseEquidistant)
- << 37.7953 // seam allowance width
- << OutputPointsIssue298Case2();
-
- // See issue #548. Bug Detail tool. Case when seam allowance is wrong.
- // https://bitbucket.org/dismine/valentina/issues/548/bug-detail-tool-case-when-seam-allowance
- // Files: Steampunk_trousers.val and marie.vit
- // Actually buggy detail see in file src/app/share/collection/bugs/Steampunk_trousers_issue_#548.val
- // Code should clean loops in path.
- QTest::newRow("Issue 548. Case1") << InputPointsIssue548Case1()
- << static_cast<int>(EquidistantType::CloseEquidistant)
- << 11.338582677165354 // seam allowance width (0.3 cm)
- << OutputPointsIssue548Case1();
-
- QTest::newRow("Issue 548. Case2") << InputPointsIssue548Case2()
- << static_cast<int>(EquidistantType::CloseEquidistant)
- << 37.795275590551185 // seam allowance width (1.0 cm)
- << OutputPointsIssue548Case2();
-
- QTest::newRow("Issue 548. Case3") << InputPointsIssue548Case3()
- << static_cast<int>(EquidistantType::CloseEquidistant)
- << 75.59055118110237 // seam allowance width (2.0 cm)
- << OutputPointsIssue548Case3();
-}
-
-//---------------------------------------------------------------------------------------------------------------------
-// cppcheck-suppress unusedFunction
-void TST_VAbstractDetail::EquidistantRemoveLoop() const
-{
- QFETCH(QVector<QPointF>, points);
- QFETCH(int, eqv);
- QFETCH(qreal, width);
- QFETCH(QVector<QPointF>, ekvOrig);
-
- const QVector<QPointF> ekv = VAbstractDetail::Equidistant(points, static_cast<EquidistantType>(eqv), width);
-
- // Begin comparison
- Comparison(ekv, ekvOrig);
-}
-
-//---------------------------------------------------------------------------------------------------------------------
-void TST_VAbstractDetail::SumTrapezoids() const
-{
- // Case3 checks that the method 'SumTrapezoids' returns negative value for three clockwise allocated points
- // Case4 checks that the method 'SumTrapezoids' returns positive value for three counterclock-wise allocated points
- // Case5 checks that the method 'SumTrapezoids' returns 0 for one point
- Case3();
- Case4();
- Case5();
-}
-
-//---------------------------------------------------------------------------------------------------------------------
-void TST_VAbstractDetail::PathRemoveLoop_data() const
-{
- QTest::addColumn<QVector<QPointF>>("path");
- QTest::addColumn<QVector<QPointF>>("expect");
-
- QVector<QPointF> path;
- path << QPointF(10, 10);
- path << QPointF(20, 10);
- path << QPointF(20, 20);
- path << QPointF(10, 20);
- path << QPointF(10, 10);
- QTest::newRow("Correct closed a path (four unique points)") << path << path;
-
-#if QT_VERSION < QT_VERSION_CHECK(5, 1, 0)
- path.remove(path.size() - 1);
-#else
- path.removeLast();
-#endif
- QTest::newRow("Correct unclosed a path (four unique points)") << path << path;
-
- path.clear();
- path << QPointF(0, 10);
- path << QPointF(10, 10);
- path << QPointF(20, 10);
- path << QPointF(20, 20);
- path << QPointF(10, 20);
- path << QPointF(0, 20);
- path << QPointF(0, 10);
- QTest::newRow("Correct closed a path (six unique points)") << path << path;
-
-#if QT_VERSION < QT_VERSION_CHECK(5, 1, 0)
- path.remove(path.size() - 1);
-#else
- path.removeLast();
-#endif
- QTest::newRow("Correct unclosed a path (six unique points)") << path << path;
-
- path.clear();
- path << QPointF(20, 10);
- path << QPointF(20, 20);
- path << QPointF(10, 10);
- path << QPointF(10, 20);
- path << QPointF(20, 10);
-
- QVector<QPointF> res;
- res << QPointF(20, 10);
- res << QPointF(20, 20);
- res << QPointF(15, 15);
- res << QPointF(20, 10);
- QTest::newRow("One loop, closed a path (four unique points)") << path << res;
-
-#if QT_VERSION < QT_VERSION_CHECK(5, 1, 0)
- path.remove(path.size() - 1);
- res.remove(res.size() - 1);
-#else
- path.removeLast();
- res.removeLast();
-#endif
- QTest::newRow("One loop, unclosed a path (four unique points)") << path << res;
-
- path.clear();
- path << QPointF(20, 10);
- path << QPointF(20, 20);
- path << QPointF(10, 10);
- path << QPointF(0, 20);
- path << QPointF(0, 10);
- path << QPointF(10, 20);
- path << QPointF(20, 10);
-
- res.clear();
- res << QPointF(20, 10);
- res << QPointF(20, 20);
- res << QPointF(15, 15);
- res << QPointF(20, 10);
- QTest::newRow("Two loops, closed a path (six unique points)") << path << res;
-
-#if QT_VERSION < QT_VERSION_CHECK(5, 1, 0)
- path.remove(path.size() - 1);
- res.remove(res.size() - 1);
-#else
- path.removeLast();
- res.removeLast();
-#endif
- QTest::newRow("Two loops, unclosed a path (six unique points)") << path << res;
-
- path.clear();
- path << QPointF(20, 10);
- path << QPointF(20, 20);
- path << QPointF(10, 10);
- path << QPointF(0, 10);
- path << QPointF(0, 20);
- path << QPointF(10, 20);
- path << QPointF(20, 10);
-
- res.clear();
- res << QPointF(20, 10);
- res << QPointF(20, 20);
- res << QPointF(15, 15);
- res << QPointF(20, 10);
- QTest::newRow("One loop, the first loop, closed a path (six unique points)") << path << res;
-
-#if QT_VERSION < QT_VERSION_CHECK(5, 1, 0)
- path.remove(path.size() - 1);
- res.remove(res.size() - 1);
-#else
- path.removeLast();
- res.removeLast();
-#endif
- QTest::newRow("One loop, the first loop, unclosed a path (six unique points)") << path << res;
-
- path.clear();
- path << QPointF(20, 10);
- path << QPointF(20, 20);
- path << QPointF(10, 20);
- path << QPointF(0, 10);
- path << QPointF(0, 20);
- path << QPointF(10, 10);
- path << QPointF(20, 10);
-
- res.clear();
- res << QPointF(20, 10);
- res << QPointF(20, 20);
- res << QPointF(10, 20);
- res << QPointF(5, 15);
- res << QPointF(10, 10);
- res << QPointF(20, 10);
- QTest::newRow("One loop, the second loop, closed a path (six unique points)") << path << res;
-
-#if QT_VERSION < QT_VERSION_CHECK(5, 1, 0)
- path.remove(path.size() - 1);
- res.remove(res.size() - 1);
-#else
- path.removeLast();
- res.removeLast();
-#endif
- QTest::newRow("One loop, the second loop, unclosed a path (six unique points)") << path << res;
-
- path.clear();
- path << QPointF(20, 10);
- path << QPointF(20, 20);
- path << QPointF(10, 20);
- path << QPointF(20, 15);
- path << QPointF(10, 10);
- path << QPointF(20, 10);
- QTest::newRow("Correct closed a path, point on line (four unique points)") << path << path;
-
-#if QT_VERSION < QT_VERSION_CHECK(5, 1, 0)
- path.remove(path.size() - 1);
-#else
- path.removeLast();
-#endif
- QTest::newRow("Corect unclosed a path, point on line (four unique points)") << path << path;
-
- path.clear();
- path << QPointF(20, 10);
- path << QPointF(10, 15);
- path << QPointF(20, 20);
- path << QPointF(10, 20);
- path << QPointF(0, 20);
- path << QPointF(10, 15);
- path << QPointF(0, 10);
- path << QPointF(10, 10);
- path << QPointF(20, 10);
-
- QTest::newRow("Correct closed a path, point on line (six unique points)") << path << path;
-
-#if QT_VERSION < QT_VERSION_CHECK(5, 1, 0)
- path.remove(path.size() - 1);
-#else
- path.removeLast();
-#endif
- QTest::newRow("Corect unclosed a path, point on line (six unique points)") << path << path;
-
- path.clear();
- path << QPointF(100.96979100571033, 1797.6153764073072);
- path << QPointF(168.3888427659865, 1807.2395034187866);
- path << QPointF(206.78076137364403, 1812.2910842036706);
- path << QPointF(239.1630793382262, 1815.951361623424);
- path << QPointF(267.5320085054171, 1818.4827543754482);
- path << QPointF(293.9502505847841, 1820.144031725603);
- path << QPointF(320.48133946750147, 1821.175819320443);
- path << QPointF(364.5960626489172, 1822.0507669842166);
- path << QPointF(400.66867742260206, 1822.488188976378);
- path << QPointF(623.3126833308274, 1822.488188976378);
- path << QPointF(653.5489038032683, 2162.6456692913384);
- path << QPointF(570.545584385708, 2162.6456692913384);
- path << QPointF(600.7818048581489, 1822.488188976378);
- path << QPointF(1001.3385826771654, 1822.488188976378);
- path << QPointF(1001.3385826771654, 2680.44094488189);
- path << QPointF(-22.11646613738226, 2680.44094488189);
- path << QPointF(100.96979100571033, 1797.6153764073072);
-
- res.clear();
- res << QPointF(100.96979100571033, 1797.6153764073072);
- res << QPointF(168.3888427659865, 1807.2395034187866);
- res << QPointF(206.78076137364403, 1812.2910842036706);
- res << QPointF(239.1630793382262, 1815.951361623424);
- res << QPointF(267.5320085054171, 1818.4827543754482);
- res << QPointF(293.9502505847841, 1820.144031725603);
- res << QPointF(320.48133946750147, 1821.175819320443);
- res << QPointF(364.5960626489172, 1822.0507669842166);
- res << QPointF(400.66867742260206, 1822.488188976378);
- res << QPointF(1001.3385826771654, 1822.488188976378);
- res << QPointF(1001.3385826771654, 2680.44094488189);
- res << QPointF(-22.11646613738226, 2680.44094488189);
- res << QPointF(100.96979100571033, 1797.6153764073072);
-
- // See the file "collection/bugs/Issue_#493.val"
- QTest::newRow("Test case issue #493") << path << res;
-
- path.clear();
- path << QPointF(-685.2149804319953, -3568.7982439212556);
- path << QPointF(-700.7415523087261, -3623.900571239949);
- path << QPointF(-675.4694480627154, -3639.3631430823175);
- path << QPointF(-684.7497934439581, -3631.3546395862268);
- path << QPointF(-683.1356602239256, -3633.2868478418427);
- path << QPointF(-686.8764821039574, -3627.927414863926);
- path << QPointF(-684.7670104817863, -3631.587853202178);
- path << QPointF(-682.2386030572435, -3636.8469922361573);
- path << QPointF(-676.4708011186385, -3650.307478525872);
- path << QPointF(-666.3050989871189, -3676.5286567894937);
- path << QPointF(-654.0449409043066, -3710.198553447806);
- path << QPointF(-640.1333287371614, -3750.0101920374505);
- path << QPointF(-617.0729873733014, -3818.3303697354913);
- path << QPointF(-583.8128392515604, -3920.9726624886944);
- path << QPointF(-550.5307668482033, -4027.6970214479597);
- path << QPointF(-527.4164674104215, -4104.7034088569535);
- path << QPointF(-513.4302533332675, -4152.73879565781);
- path << QPointF(-501.0373006826446, -4196.767296675345);
- path << QPointF(-490.59311078227046, -4235.660899517831);
- path << QPointF(-477.25724163384456, -4288.293444470835);
- path << QPointF(-405.3839593893572, -4272.013803282615);
- path << QPointF(-545.9786893428341, -3568.830152982464);
- path << QPointF(-685.2149804319953, -3568.7982439212556);
-
- res.clear();
- res << QPointF(-685.2149804319953, -3568.7982439212556);
- res << QPointF(-700.7415523087261, -3623.900571239949);
- res << QPointF(-683.3457668881176, -3634.5440688767967);
- res << QPointF(-682.2386030572435, -3636.8469922361573);
- res << QPointF(-676.4708011186385, -3650.307478525872);
- res << QPointF(-666.3050989871189, -3676.5286567894937);
- res << QPointF(-654.0449409043066, -3710.198553447806);
- res << QPointF(-640.1333287371614, -3750.0101920374505);
- res << QPointF(-617.0729873733014, -3818.3303697354913);
- res << QPointF(-583.8128392515604, -3920.9726624886944);
- res << QPointF(-550.5307668482033, -4027.6970214479597);
- res << QPointF(-527.4164674104215, -4104.7034088569535);
- res << QPointF(-513.4302533332675, -4152.73879565781);
- res << QPointF(-501.0373006826446, -4196.767296675345);
- res << QPointF(-490.59311078227046, -4235.660899517831);
- res << QPointF(-477.25724163384456, -4288.293444470835);
- res << QPointF(-405.3839593893572, -4272.013803282615);
- res << QPointF(-545.9786893428341, -3568.830152982464);
- res << QPointF(-685.2149804319953, -3568.7982439212556);
-
- // See the file "collection/bugs/Issue_#515.val"
- // Check a seam allowance path.
- // The curve that causes the issue is the first in the list.
- QTest::newRow("Test case issue #515. Big loop in seam allowance path.") << path << res;
-
- path.clear();
- path << QPointF(-449.6699112298347, -4243.2921010175705);
- path << QPointF(-576.966638263205, -3606.6183279948636);
- path << QPointF(-656.9465284876832, -3606.6183279948636);
- path << QPointF(-656.5996104603414, -3606.6000783462687);
- path << QPointF(-655.7439133016985, -3607.1236310612317);
- path << QPointF(-654.129780081666, -3609.0558393168476);
- path << QPointF(-651.3154902471701, -3613.939306009108);
- path << QPointF(-647.8207651830382, -3621.2084054506768);
- path << QPointF(-641.4701586077349, -3636.0289997859454);
- path << QPointF(-630.9244502073004, -3663.23035747934);
- path << QPointF(-618.4465305467888, -3697.4982896415795);
- path << QPointF(-604.3873016966293, -3737.732371148936);
- path << QPointF(-581.1891087215608, -3806.460957656939);
- path << QPointF(-547.7936207285052, -3909.520915257629);
- path << QPointF(-514.3891332445846, -4016.6378180116963);
- path << QPointF(-491.17181635142833, -4093.9874129706236);
- path << QPointF(-477.094588519539, -4142.335384784734);
- path << QPointF(-464.5941701318652, -4186.745679830414);
- path << QPointF(-454.0214632588362, -4226.117872983938);
-
- res.clear();
- res << QPointF(-449.6699112298347, -4243.2921010175705);
- res << QPointF(-576.966638263205, -3606.6183279948636);
- res << QPointF(-656.5697831440032, -3606.6183279948636);
- res << QPointF(-655.7439133016985, -3607.1236310612317);
- res << QPointF(-654.129780081666, -3609.0558393168476);
- res << QPointF(-651.3154902471701, -3613.939306009108);
- res << QPointF(-647.8207651830382, -3621.2084054506768);
- res << QPointF(-641.4701586077349, -3636.0289997859454);
- res << QPointF(-630.9244502073004, -3663.23035747934);
- res << QPointF(-618.4465305467888, -3697.4982896415795);
- res << QPointF(-604.3873016966293, -3737.732371148936);
- res << QPointF(-581.1891087215608, -3806.460957656939);
- res << QPointF(-547.7936207285052, -3909.520915257629);
- res << QPointF(-514.3891332445846, -4016.6378180116963);
- res << QPointF(-491.17181635142833, -4093.9874129706236);
- res << QPointF(-477.094588519539, -4142.335384784734);
- res << QPointF(-464.5941701318652, -4186.745679830414);
- res << QPointF(-454.0214632588362, -4226.117872983938);
-
- // See the file "collection/bugs/Issue_#515.val"
- // Check a seam allowance path.
- // The curve that causes the issue is the last in the list.
- QTest::newRow("Test case issue #515. Small loop in seam allowance path.") << path << res;
-
- path.clear();
- path << QPointF(1229.6503937007876, 937.6667716535435);
- path << QPointF(203.08931117793543, 937.6667716535435);
- path << QPointF(459.7677349767701, -2166.704563141019);
- path << QPointF(1229.6503937007876, -1990.077167189857);
- path << QPointF(1229.6503937007876, -555.2466141732282);
- path << QPointF(920.1053824527112, -555.2466141732282);
- path << QPointF(887.034516310979, -63.90803149606281);
- path << QPointF(816.3607592795726, -63.908031496062826);
- path << QPointF(780.7580397937137, -592.8627210002539);
- path << QPointF(816.0241340748559, -1202.917917917055);
- path << QPointF(887.3711415156957, -1202.917917917055);
- path << QPointF(920.4420076574283, -630.8371653543306);
- path << QPointF(1229.6503937007876, -630.8371653543306);
- path << QPointF(1229.6503937007876, 937.6667716535435);
-
- res.clear();
- res << QPointF(1229.6503937007876, 937.6667716535435);
- res << QPointF(203.08931117793543, 937.6667716535435);
- res << QPointF(459.7677349767702, -2166.704563141019);
- res << QPointF(1229.6503937007876, -1990.077167189857);
- res << QPointF(1229.6503937007876, 937.6667716535435);
-
- // See the file "collection/bugs/Issue_#603.val"
- // Point H1 is first in the list
- QTest::newRow("Test issue 603.") << path << res;
-}
-
-//---------------------------------------------------------------------------------------------------------------------
-void TST_VAbstractDetail::PathRemoveLoop() const
-{
- QFETCH(QVector<QPointF>, path);
- QFETCH(QVector<QPointF>, expect);
-
- QVector<QPointF> res = VAbstractDetail::CheckLoops(path);
- Comparison(res, expect);
-}
-
-//---------------------------------------------------------------------------------------------------------------------
-void TST_VAbstractDetail::PathLoopsCase_data() const
-{
- QTest::addColumn<QVector<QPointF>>("path");
- QTest::addColumn<QVector<QPointF>>("expect");
-
- QVector<QPointF> path;
- path << QPointF(61.86670866141733, 446.92270866141735);
- path << QPointF(650.6504606788366, 473.2192016666484);
- path << QPointF(649.4426552757304, 480.5376973511262);
- path << QPointF(646.5769170924987, 501.9977838630714);
- path << QPointF(644.6382908004568, 523.6358081043691);
- path << QPointF(643.4592698551749, 551.9888717674471);
- path << QPointF(642.9134698671897, 584.1776423714557);
- path << QPointF(643.1914832622404, 613.2382010061506);
- path << QPointF(644.2199668178571, 639.3780275889782);
- path << QPointF(645.9255773115714, 662.8046020373845);
- path << QPointF(648.2349715209137, 683.7254042688159);
- path << QPointF(651.0748062234152, 702.3479142007185);
- path << QPointF(654.3717381966065, 718.8796117505387);
- path << QPointF(658.0524242180187, 733.5279768357226);
- path << QPointF(662.0435210651824, 746.5004893737165);
- path << QPointF(666.2716855156286, 758.0046292819667);
- path << QPointF(670.6635743468883, 768.2478764779191);
- path << QPointF(677.400406718071, 781.7952098705392);
- path << QPointF(691.6740007010135, 806.2608114022295);
- path << QPointF(694.5877745571677, 810.2150054671212);
- path << QPointF(699.9560352035193, 816.1706553153153);
- path << QPointF(708.9007628091615, 824.0594196166176);
- path << QPointF(719.3794725391945, 831.7499791040799);
- path << QPointF(730.9568541500198, 839.0942359684872);
- path << QPointF(743.1975973980386, 845.9440924006244);
- path << QPointF(755.6663920396528, 852.1514505912763);
- path << QPointF(767.9279278312633, 857.568212731228);
- path << QPointF(779.5468945292718, 862.046281011264);
- path << QPointF(790.0879818900794, 865.4375576221694);
- path << QPointF(799.115879670088, 867.5939447547289);
- path << QPointF(804.5608128209333, 868.2650594004886);
- path << QPointF(807.5317661719646, 868.2782441618697);
- path << QPointF(809.8795601157717, 867.8994015359809);
- path << QPointF(811.5497808719051, 867.1100192966705);
- path << QPointF(812.4880146599148, 865.8915852177861);
- path << QPointF(812.6398476993509, 864.2255870731761);
- path << QPointF(811.9508662097637, 862.0935126366886);
- path << QPointF(810.3666564107034, 859.4768496821717);
- path << QPointF(806.3216663321919, 854.66911491981);
- path << QPointF(802.0871811023624, 850.6707401574804);
- path << QPointF(799.4598981526765, 850.6707401574804);
- path << QPointF(802.0871811023624, 1653.9337322834645);
- path << QPointF(61.86670866141733, 1653.9337322834645);
-
- QVector<QPointF> res;
- res << QPointF(61.86670866141733, 446.92270866141735);
- res << QPointF(650.6504606788366, 473.2192016666484);
- res << QPointF(649.4426552757304, 480.5376973511262);
- res << QPointF(646.5769170924987, 501.9977838630714);
- res << QPointF(644.6382908004568, 523.6358081043691);
- res << QPointF(643.4592698551749, 551.9888717674471);
- res << QPointF(642.9134698671897, 584.1776423714557);
- res << QPointF(643.1914832622404, 613.2382010061506);
- res << QPointF(644.2199668178571, 639.3780275889782);
- res << QPointF(645.9255773115714, 662.8046020373845);
- res << QPointF(648.2349715209137, 683.7254042688159);
- res << QPointF(651.0748062234152, 702.3479142007185);
- res << QPointF(654.3717381966065, 718.8796117505387);
- res << QPointF(658.0524242180187, 733.5279768357226);
- res << QPointF(662.0435210651824, 746.5004893737165);
- res << QPointF(666.2716855156286, 758.0046292819667);
- res << QPointF(670.6635743468883, 768.2478764779191);
- res << QPointF(677.400406718071, 781.7952098705392);
- res << QPointF(691.6740007010135, 806.2608114022295);
- res << QPointF(694.5877745571677, 810.2150054671212);
- res << QPointF(699.9560352035193, 816.1706553153153);
- res << QPointF(708.9007628091615, 824.0594196166176);
- res << QPointF(719.3794725391945, 831.7499791040799);
- res << QPointF(730.9568541500198, 839.0942359684872);
- res << QPointF(743.1975973980386, 845.9440924006244);
- res << QPointF(755.6663920396528, 852.1514505912763);
- res << QPointF(767.9279278312633, 857.568212731228);
- res << QPointF(779.5468945292718, 862.046281011264);
- res << QPointF(790.0879818900794, 865.4375576221694);
- res << QPointF(799.115879670088, 867.5939447547289);
- res << QPointF(799.5154110117976, 867.6431889469776);
- res << QPointF(802.0871811023624, 1653.9337322834645);
- res << QPointF(61.86670866141733, 1653.9337322834645);
-
- // See file "collection/bugs/Issue_#609_case1.val"
- // Clear a main path. Bound intersection. External loop. Outside a loop. Start point Ф1.
- QTest::newRow("Issue 609. Case1a") << path << res;
-
- path.clear();
- path << QPointF(-365.68188649000314, -2143.126579528016);
- path << QPointF(-195.75487873249062, -2116.7935769656237);
- path << QPointF(-195.75487873249062, -1836.0319480765759);
- path << QPointF(-233.39027086052477, -1838.4849618976993);
- path << QPointF(-231.15080237392075, -1855.5915146519483);
- path << QPointF(-225.84473077299972, -1889.4811404382626);
- path << QPointF(-219.39861487985402, -1922.986407729537);
- path << QPointF(-211.6695159016421, -1955.9990283342697);
- path << QPointF(-204.87723909172885, -1980.439660924953);
- path << QPointF(-199.87970909142098, -1996.6270828437923);
- path << QPointF(-194.48099536000245, -2012.6451713592935);
- path << QPointF(-188.65032933731845, -2028.5246588116781);
- path << QPointF(-182.36812965707693, -2044.2602109802488);
- path << QPointF(-175.61499879935675, -2059.8462252736344);
- path << QPointF(-168.3717693169516, -2075.2768492268588);
- path << QPointF(-160.6424572210866, -2090.5008865466684);
- path << QPointF(-150.22847685877994, -2109.7385074212525);
- path << QPointF(194.23861004296444, -2056.3576305273214);
- path << QPointF(302.4787663409577, -1301.003761061316);
- path << QPointF(279.86810151275455, -1288.330749878147);
- path << QPointF(-641.7062267185897, -2051.118466118487);
- path << QPointF(-365.68188649000314, -2143.126579528016);
-
- res.clear();
- res << QPointF(-365.68188649000314, -2143.126579528016);
- res << QPointF(-195.75487873249062, -2116.7935769656237);
- res << QPointF(-195.75487873249062, -2008.8655346469059);
- res << QPointF(-194.48099536000245, -2012.6451713592935);
- res << QPointF(-188.65032933731845, -2028.5246588116781);
- res << QPointF(-182.36812965707693, -2044.2602109802488);
- res << QPointF(-175.61499879935675, -2059.8462252736344);
- res << QPointF(-168.3717693169516, -2075.2768492268588);
- res << QPointF(-160.6424572210866, -2090.5008865466684);
- res << QPointF(-150.22847685877994, -2109.7385074212525);
- res << QPointF(194.23861004296444, -2056.3576305273214);
- res << QPointF(302.4787663409577, -1301.003761061316);
- res << QPointF(279.86810151275455, -1288.330749878147);
- res << QPointF(-641.7062267185897, -2051.118466118487);
- res << QPointF(-365.68188649000314, -2143.126579528016);
-
- // See file "collection/bugs/Issue_#609_case2.val"
- // Clear an equdistant. Bound intersection. Internal loop. Outside a loop. Start point А2.
- QTest::newRow("Issue 609. Case2b") << path << res;
-
- path.clear();
- path << QPointF(0, 10);
- path << QPointF(5, 10);
- path << QPointF(2.5, 15);
- path << QPointF(7.5, 15);
- path << QPointF(5, 10);
- path << QPointF(10, 10);
- path << QPointF(10, 20);
- path << QPointF(0, 20);
- path << QPointF(0, 10);
-
- QTest::newRow("Internal loop. Valid case.") << path << path;
-
- path.clear();
- path << QPointF(0, 10);
- path << QPointF(5, 10);
- path << QPointF(7.5, 15);
- path << QPointF(2.5, 15);
- path << QPointF(5, 10);
- path << QPointF(10, 10);
- path << QPointF(10, 20);
- path << QPointF(0, 20);
- path << QPointF(0, 10);
-
- res.clear();
- res << QPointF(0, 10);
- res << QPointF(10, 10);
- res << QPointF(10, 20);
- res << QPointF(0, 20);
- res << QPointF(0, 10);
-
- QTest::newRow("Internal loop. Invalid case.") << path << res;
-
- path.clear();
- path << QPointF(0, 10);
- path << QPointF(5, 10);
- path << QPointF(0, 0);
- path << QPointF(10, 0);
- path << QPointF(5, 10);
- path << QPointF(10, 10);
- path << QPointF(10, 20);
- path << QPointF(0, 20);
- path << QPointF(0, 10);
-
- QTest::newRow("External loop. Valid case.") << path << path;
-
- path.clear();
- path << QPointF(0, 10);
- path << QPointF(5, 10);
- path << QPointF(10, 0);
- path << QPointF(0, 0);
- path << QPointF(5, 10);
- path << QPointF(10, 10);
- path << QPointF(10, 20);
- path << QPointF(0, 20);
- path << QPointF(0, 10);
-
- res.clear();
- res << QPointF(0, 10);
- res << QPointF(10, 10);
- res << QPointF(10, 20);
- res << QPointF(0, 20);
- res << QPointF(0, 10);
-
- QTest::newRow("External loop. Invalid case.") << path << res;
-}
-
-//---------------------------------------------------------------------------------------------------------------------
-void TST_VAbstractDetail::PathLoopsCase() const
-{
- QFETCH(QVector<QPointF>, path);
- QFETCH(QVector<QPointF>, expect);
-
- const QVector<QPointF> res = VAbstractDetail::CheckLoops(path);
- Comparison(res, expect);
-}
-
-//---------------------------------------------------------------------------------------------------------------------
-void TST_VAbstractDetail::BrokenDetailEquidistant_data() const
-{
- QTest::addColumn<QVector<QPointF>>("points");
- QTest::addColumn<int>("eqv");
- QTest::addColumn<qreal>("width");
- QTest::addColumn<QVector<QPointF>>("ekvOrig");
-
- // For more details see the file "collection/bugs/GAVAUDAN Laure - corsage - figure 4.val".
- // We will test only one detail. The second require too accurate data that we cannot get from debuger.
- // The test check an open equdistant of correct detail.
- QVector<QPointF> points;// Input points.
- points.append(QPointF(787.5835464566929, 1701.3138897637796));
- points.append(QPointF(938.7646488188976, 1701.3138897637796));
- points.append(QPointF(928.6149958683911, 1732.4440719866434));
- points.append(QPointF(910.0209091217698, 1792.3369853889722));
- points.append(QPointF(893.3643262819251, 1849.7845131987456));
- points.append(QPointF(878.5244039283091, 1905.2261617043234));
- points.append(QPointF(865.3802986403739, 1959.101437194065));
- points.append(QPointF(863.9366982685195, 1965.6834024491068));
- points.append(QPointF(852.8936778444679, 1919.6965437838999));
- points.append(QPointF(837.0628180560684, 1860.2846653184251));
- points.append(QPointF(819.0677656132684, 1798.6758641921479));
- points.append(QPointF(798.7585839758027, 1734.54810216256));
- points.append(QPointF(787.5835464566929, 1701.3138897637796));
-
- EquidistantType eqv = EquidistantType::OpenEquidistant; // Open path
- qreal width = 37.795275590551185; // seam allowance width
-
- QVector<QPointF> ekvOrig;
- ekvOrig.append(QPointF(774.8748468280837, 1663.5186141732283));
- ekvOrig.append(QPointF(990.8407795072413, 1663.5186141732283));
- ekvOrig.append(QPointF(964.6314912875667, 1743.9055911653147));
- ekvOrig.append(QPointF(946.2221157804494, 1803.203536155223));
- ekvOrig.append(QPointF(929.7733291125676, 1859.9343877726233));
- ekvOrig.append(QPointF(915.1430746962241, 1914.5927211230298));
- ekvOrig.append(QPointF(902.2033544443959, 1967.630259856634));
- ekvOrig.append(QPointF(894.4064781634931, 2003.1794116713015));
- ekvOrig.append(QPointF(834.213891302752, 2003.7742535883901));
- ekvOrig.append(QPointF(816.2523103379473, 1928.9761772004185));
- ekvOrig.append(QPointF(800.6574884611877, 1870.4501290629887));
- ekvOrig.append(QPointF(782.9077417718742, 1809.6811695225983));
- ekvOrig.append(QPointF(786.7126382487066, 1698.723835966227));
-
- QTest::newRow("GAVAUDAN Laure.") << points << static_cast<int>(eqv) << width << ekvOrig;
-
- points.clear();
- points.append(QPointF(97.33089106412862, -223.03306117556497));
- points.append(QPointF(990.7494050554426, 2.819093995045));
- points.append(QPointF(908.3966357321774, 379.5839357215547));
- points.append(QPointF(-135.41154226686143, 697.6417881399819));
-
- eqv = EquidistantType::OpenEquidistant;
- width = 11.338582677165354;
-
- ekvOrig.clear();
- ekvOrig.append(QPointF(100.10981413873267, -234.02583351343978));
- ekvOrig.append(QPointF(1004.1704360325447, -5.483401649771952));
- ekvOrig.append(QPointF(918.0553412376563, 388.4941212347381));
- ekvOrig.append(QPointF(-138.65807550610091, 710.4843173601864));
-
- // See the file "collection/bugs/Issue_#604.val" (since 0.5.0)
- QTest::newRow("Issue #604.") << points << static_cast<int>(eqv) << width << ekvOrig;
-}
-
-//---------------------------------------------------------------------------------------------------------------------
-void TST_VAbstractDetail::BrokenDetailEquidistant() const
-{
- QFETCH(QVector<QPointF>, points);
- QFETCH(int, eqv);
- QFETCH(qreal, width);
- QFETCH(QVector<QPointF>, ekvOrig);
-
- const QVector<QPointF> ekv = VAbstractDetail::Equidistant(points, static_cast<EquidistantType>(eqv),
- width);// Take result
-
- // Begin comparison
- Comparison(ekv, ekvOrig);
-}
-
-//---------------------------------------------------------------------------------------------------------------------
-void TST_VAbstractDetail::CorrectEquidistantPoints_data() const
-{
- // See file zigzag.val
- QTest::addColumn<QVector<QPointF>>("points");
- QTest::addColumn<QVector<QPointF>>("expect");
- QTest::addColumn<bool>("removeFirstAndLast");
-
- QVector<QPointF> points;
- points.append(QPointF(-741.7894588053705, 1065.7336503858917));
- points.append(QPointF(-759.696551643576, -115.81420543069257));
- points.append(QPointF(-278.17249953019325, -217.1037453126913));
- points.append(QPointF(-244.64654130659474, 1077.9548221866635));
- points.append(QPointF(-741.7894588053705, 1065.7336503858917));
-
- QVector<QPointF> expect;
- expect.append(QPointF(-741.7894588053705, 1065.7336503858917));
- expect.append(QPointF(-759.696551643576, -115.81420543069257));
- expect.append(QPointF(-278.17249953019325, -217.1037453126913));
- expect.append(QPointF(-244.64654130659474, 1077.9548221866635));
- expect.append(QPointF(-741.7894588053705, 1065.7336503858917));
-
- QTest::newRow("Closed seam allowance. Last point equal first.") << points << expect << false;
-
- points.clear();
- points.append(QPointF(-704.5489521643801, 1028.8424328418016));
- points.append(QPointF(-721.4335720065426, -85.24049234531904));
- points.append(QPointF(-707.7852899705758, 755.7064514429209));
- points.append(QPointF(-721.4335720065426, -85.24049234531904));
- points.append(QPointF(-314.78124296268265, -170.7806167067443));
- points.append(QPointF(-283.4579031023758, 1039.1940357173805));
-
- expect.clear();
- expect.append(QPointF(-704.5489521643801, 1028.8424328418016));
- expect.append(QPointF(-721.4335720065426, -85.24049234531904));
- expect.append(QPointF(-314.78124296268265, -170.7806167067443));
- expect.append(QPointF(-283.4579031023758, 1039.1940357173805));
-
- QTest::newRow("Clearing bad main path.") << points << expect << true;
-}
-
-//---------------------------------------------------------------------------------------------------------------------
-void TST_VAbstractDetail::CorrectEquidistantPoints() const
-{
- QFETCH(QVector<QPointF>, points);
- QFETCH(QVector<QPointF>, expect);
- QFETCH(bool, removeFirstAndLast);
-
- const QVector<QPointF> res = VAbstractDetail::CorrectEquidistantPoints(points, removeFirstAndLast);
-
- // Begin comparison
- Comparison(res, expect);
-}
-
-//---------------------------------------------------------------------------------------------------------------------
-void TST_VAbstractDetail::TestCorrectEquidistantPoints_data()
-{
- QTest::addColumn<QVector<QPointF>>("before");
- QTest::addColumn<QVector<QPointF>>("expect");
-
- QVector<QPointF> before;
- before << QPointF(30.0, 39.999874015748034);
- before << QPointF(785.9055118110236, 39.999874015748034);
- before << QPointF(785.9055118110236, 3819.527433070866);
- before << QPointF(483.54330708661416, 3819.527433070866);
- before << QPointF(483.54330708661416, 1929.763653543307);
- before << QPointF(407.9527559055629, 984.8817637795973);
- before << QPointF(407.9527559055118, 1929.763653543307);
- before << QPointF(407.9527559055118, 3819.527433070866);
- before << QPointF(30.0, 3819.527433070866);
-
- QVector<QPointF> expect;
- expect << QPointF(30.0, 39.999874015748034);
- expect << QPointF(785.9055118110236, 39.999874015748034);
- expect << QPointF(785.9055118110236, 3819.527433070866);
- expect << QPointF(483.54330708661416, 3819.527433070866);
- expect << QPointF(483.54330708661416, 1929.763653543307);
- expect << QPointF(407.9527559055629, 984.8817637795973);
- expect << QPointF(407.9527559055118, 3819.527433070866);
- expect << QPointF(30.0, 3819.527433070866);
-
- QTest::newRow("Test case issue #548") << before << expect;
-}
-
-//---------------------------------------------------------------------------------------------------------------------
-void TST_VAbstractDetail::TestCorrectEquidistantPoints() const
-{
- QFETCH(QVector<QPointF>, before);
- QFETCH(QVector<QPointF>, expect);
-
- QVector<QPointF> after = VAbstractDetail::CorrectEquidistantPoints(before);
- Comparison(after, expect);
-}
-
-#ifndef Q_OS_WIN
-//---------------------------------------------------------------------------------------------------------------------
-void TST_VAbstractDetail::PossibleInfiniteClearLoops_data() const
-{
- QTest::addColumn<QVector<QPointF>>("path");
- QTest::addColumn<QVector<QPointF>>("expect");
-
- QVector<QPointF> path;
- path << QPointF(-670.6449010946802, 4046.36220472441);
- path << QPointF(-1025.9051277126944, 4046.36220472441);
- path << QPointF(-1026.4460203880594, 4010.5247429150854);
- path << QPointF(-1027.2972172274538, 3924.202328582098);
- path << QPointF(-1028.1383921346433, 3768.5948526129496);
- path << QPointF(-1028.5065585022217, 3521.575730066707);
- path << QPointF(-1028.2712136539103, 3252.2436039362233);
- path << QPointF(-1027.2910122410117, 2850.1024469719814);
- path << QPointF(-1025.9446023682538, 2439.350819630564);
- path << QPointF(-1025.8983315247287, 2338.629525677473);
- path << QPointF(-1025.3536572186458, 2309.970015878699);
- path << QPointF(-1024.2100836932389, 2281.714612342931);
- path << QPointF(-1022.5102766116828, 2253.846781520112);
- path << QPointF(-1020.2969016371525, 2226.349989860186);
- path << QPointF(-1017.6126244328227, 2199.207703813094);
- path << QPointF(-1014.5001106618688, 2172.403389828782);
- path << QPointF(-1011.0020259874652, 2145.9205143571917);
- path << QPointF(-1005.1601480132764, 2106.7277181407126);
- path << QPointF(-996.3625412018714, 2055.4921956731814);
- path << QPointF(-986.7906327138169, 2005.2448233555149);
- path << QPointF(-976.785747854512, 1955.8533327872588);
- path << QPointF(-961.6606968634906, 1883.0158867454916);
- path << QPointF(-947.5864881030896, 1811.4914675744105);
- path << QPointF(-939.2629508127773, 1764.2008199992524);
- path << QPointF(-933.8852659113251, 1728.8707137815559);
- path << QPointF(-930.742733377741, 1705.3464944792456);
- path << QPointF(-928.0252775410311, 1681.829576238578);
- path << QPointF(-925.7755640643697, 1658.3034255094963);
- path << QPointF(-924.036258610932, 1634.7515087419433);
- path << QPointF(-922.850026843893, 1611.1572923858625);
- path << QPointF(-922.2595344264276, 1587.504242891197);
- path << QPointF(-922.3074470217107, 1563.7758267078902);
- path << QPointF(-922.613405031688, 1551.8740157480315);
- path << QPointF(-960.4086806222392, 841.3228346456693);
- path << QPointF(-954.9336313684444, 841.5464781141166);
- path << QPointF(-944.0363771538431, 841.3102753632543);
- path << QPointF(-933.2160856340209, 840.291423017261);
- path << QPointF(-922.4878118569704, 838.5316299985567);
- path << QPointF(-911.8666108706839, 836.0726052295611);
- path << QPointF(-901.3675377231535, 832.9560576326933);
- path << QPointF(-891.005647462372, 829.2236961303737);
- path << QPointF(-880.7959951363317, 824.9172296450213);
- path << QPointF(-870.7536357930251, 820.0783670990559);
- path << QPointF(-860.893624480444, 814.7488174148973);
- path << QPointF(-851.2310162465817, 808.9702895149649);
- path << QPointF(-841.7808661394299, 802.7844923216785);
- path << QPointF(-832.5582292069812, 796.2331347574575);
- path << QPointF(-823.578160497228, 789.3579257447218);
- path << QPointF(-810.5607800373014, 778.5565764202543);
- path << QPointF(-794.2367125298769, 763.3635567727296);
- path << QPointF(-779.1539087770976, 747.6258919346988);
- path << QPointF(-765.4328091629026, 731.6772532855191);
- path << QPointF(-753.193854071231, 715.8513122045474);
- path << QPointF(-742.557483886022, 700.4817400711408);
- path << QPointF(-733.644138991215, 685.9022082646563);
- path << QPointF(-726.5742597707488, 672.446388164451);
- path << QPointF(-721.4682866085625, 660.447951149882);
- path << QPointF(-718.6229063234249, 651.1532303788147);
- path << QPointF(-716.6036430255488, 642.9038041285014);
- path << QPointF(-714.137568179324, 630.1235656609365);
- path << QPointF(-711.8605525364693, 612.2344502588126);
- path << QPointF(-710.4560555432737, 593.4222205889721);
- path << QPointF(-709.4234847119759, 563.5940176156308);
- path << QPointF(-708.952111561728, 520.4666582691573);
- path << QPointF(-708.4401766852314, 497.3858267716535);
- path << QPointF(-400.92922424489655, 469.03937007874015);
- path << QPointF(-708.4401766852314, 440.6929133858268);
- path << QPointF(-708.7078446526739, 341.66122584661264);
- path << QPointF(-709.3427685457568, 299.60322373665383);
- path << QPointF(-710.6909230403871, 257.048095841136);
- path << QPointF(-713.0251717477311, 214.57984397612822);
- path << QPointF(-715.632864794307, 183.1716335401434);
- path << QPointF(-717.7953694429818, 162.55016633308693);
- path << QPointF(-720.3578834261159, 142.27891915519677);
- path << QPointF(-723.3545146951046, 122.43089223348173);
- path << QPointF(-725.0465030138121, 112.71059563115871);
- path << QPointF(-219.59055118110237, -35.52755905511811);
- path << QPointF(-218.99352387527398, -33.21125072212394);
- path << QPointF(-217.35724543521775, -28.699086141666157);
- path << QPointF(-215.20035586903225, -24.33136255454731);
- path << QPointF(-212.53403014110648, -20.10796717265881);
- path << QPointF(-209.36944321582945, -16.02878720789205);
- path << QPointF(-205.71777005759026, -12.093709872138447);
- path << QPointF(-201.59018563077785, -8.302622377289406);
- path << QPointF(-196.99786489978123, -4.65541193523633);
- path << QPointF(-189.3170483291933, 0.5638303631539586);
- path << QPointF(-177.47808861476295, 6.996342387787443);
- path << QPointF(-163.981333042598, 12.855376387191757);
- path << QPointF(-148.91618132781048, 18.141834666235646);
- path << QPointF(-132.37203318551252, 22.856619529787864);
- path << QPointF(-114.43828833081622, 27.00063328271716);
- path << QPointF(-95.20434647883366, 30.574778229892296);
- path << QPointF(-74.75960734467688, 33.57995667618201);
- path << QPointF(-53.193470643458, 36.01707092645505);
- path << QPointF(-30.595336090289106, 37.887023285580185);
- path << QPointF(-7.0546034002822875, 39.19071605842615);
- path << QPointF(17.339327711450373, 39.929051549861704);
- path << QPointF(29.858267716535437, 40.06299212598426);
- path << QPointF(-45.73228346456693, 1589.6692913385828);
- path << QPointF(-45.73228346456693, 4046.36220472441);
- path << QPointF(-297.70078740157487, 4046.36220472441);
- path << QPointF(-297.70078740157487, 2118.8031496062995);
- path << QPointF(-222.1102362204725, 1589.6692913385828);
- path << QPointF(-297.70078740157487, 1060.535433070866);
- path << QPointF(-373.2913385826772, 1589.6692913385828);
- path << QPointF(-297.70078740157487, 2118.8031496062995);
- path << QPointF(-297.70078740157487, 4046.36220472441);
- path << QPointF(-670.6449010946802, 4046.36220472441);
- path << QPointF(-670.6449010946802, 2024.3149606299214);
- path << QPointF(-622.7555214134819, 1570.7716535433071);
- path << QPointF(-670.6449010946802, 1117.2283464566929);
- path << QPointF(-718.5342807758785, 1570.7716535433071);
- path << QPointF(-670.6449010946802, 2024.3149606299214);
-
- QVector<QPointF> expect;
- expect << QPointF(-670.6449010946802, 4046.36220472441);
- expect << QPointF(-670.6449010946802, 4046.36220472441);
- expect << QPointF(-670.6449010946802, 2024.3149606299214);
- expect << QPointF(-670.6449010946802, 2024.3149606299214);
- expect << QPointF(-670.6449010946802, 2024.3149606299214);
-
- // See the file "collection/bugs/possible_inf_loop.val"
- QTest::newRow("Possible infinite loop") << path << expect;
-}
-
-//---------------------------------------------------------------------------------------------------------------------
-void TST_VAbstractDetail::PossibleInfiniteClearLoops() const
-{
- QFETCH(QVector<QPointF>, path);
- QFETCH(QVector<QPointF>, expect);
-
- QVector<QPointF> res = VAbstractDetail::CheckLoops(path);
- Comparison(res, expect);
-}
-#endif //#ifndef Q_OS_WIN
-
-//---------------------------------------------------------------------------------------------------------------------
-void TST_VAbstractDetail::Case3() const
-{
- const QVector<QPointF> points = InputPointsCase3(); // Input points.
-
- const qreal result = VAbstractDetail::SumTrapezoids(points);
- QVERIFY(result < 0);
-}
-
-//---------------------------------------------------------------------------------------------------------------------
-void TST_VAbstractDetail::Case4() const
-{
- const QVector<QPointF> points = InputPointsCase4(); // Input points.
-
- const qreal result = VAbstractDetail::SumTrapezoids(points);
- QVERIFY(result > 0);
-}
-
-//---------------------------------------------------------------------------------------------------------------------
-void TST_VAbstractDetail::Case5() const
-{
- const QVector<QPointF> points = InputPointsCase5(); // Input points.
-
- const qreal result = VAbstractDetail::SumTrapezoids(points);
- QVERIFY(qFuzzyIsNull(result));
-}
-
-//---------------------------------------------------------------------------------------------------------------------
-QVector<QPointF> TST_VAbstractDetail::InputPointsIssue298Case1() const
-{
- QVector<QPointF> points;
-
- points += QPointF(35, 39.9999);
- points += QPointF(412.953, 39.9999);
- points += QPointF(417.135, 417.929);
- points += QPointF(417.135, 417.929);
- points += QPointF(408.797, 405.589);
- points += QPointF(390.909, 377.669);
- points += QPointF(362.315, 330.86);
- points += QPointF(323.075, 264.247);
- points += QPointF(286.15, 201.448);
- points += QPointF(262.477, 162.745);
- points += QPointF(249.22, 142.455);
- points += QPointF(241.092, 131.261);
- points += QPointF(236.545, 125.75);
- points += QPointF(232.808, 122.058);
- points += QPointF(230.6, 120.629);
- points += QPointF(229.393, 120.277);
- points += QPointF(228.421, 120.456);
- points += QPointF(227.69, 121.185);
- points += QPointF(227.033, 123.272);
- points += QPointF(227.112, 128.232);
- points += QPointF(228.29, 135.699);
- points += QPointF(230.625, 145.81);
- points += QPointF(234.173, 158.703);
- points += QPointF(241.73, 183.168);
- points += QPointF(248.796, 204.144);
- points += QPointF(248.796, 204.144);
- points += QPointF(251.528, 212.406);
- points += QPointF(255.482, 227.075);
- points += QPointF(257.717, 239.591);
- points += QPointF(258.279, 247.554);
- points += QPointF(258.203, 252.278);
- points += QPointF(257.756, 256.51);
- points += QPointF(256.949, 260.264);
- points += QPointF(255.795, 263.547);
- points += QPointF(254.308, 266.372);
- points += QPointF(252.501, 268.749);
- points += QPointF(250.385, 270.688);
- points += QPointF(247.974, 272.201);
- points += QPointF(245.281, 273.296);
- points += QPointF(242.319, 273.986);
- points += QPointF(239.1, 274.28);
- points += QPointF(233.846, 274.05);
- points += QPointF(226.022, 272.393);
- points += QPointF(217.402, 269.345);
- points += QPointF(208.09, 264.991);
- points += QPointF(198.186, 259.414);
- points += QPointF(187.795, 252.7);
- points += QPointF(177.019, 244.933);
- points += QPointF(165.96, 236.197);
- points += QPointF(154.721, 226.576);
- points += QPointF(143.405, 216.157);
- points += QPointF(132.113, 205.022);
- points += QPointF(120.95, 193.257);
- points += QPointF(110.017, 180.946);
- points += QPointF(99.4167, 168.174);
- points += QPointF(89.2522, 155.024);
- points += QPointF(79.626, 141.582);
- points += QPointF(70.6405, 127.933);
- points += QPointF(62.3985, 114.16);
- points += QPointF(55.0025, 100.348);
- points += QPointF(48.5551, 86.5823);
- points += QPointF(43.159, 72.9466);
- points += QPointF(38.9167, 59.5258);
- points += QPointF(35.9309, 46.4042);
- points += QPointF(35, 39.9999);
-
- return points;
-}
-
-//---------------------------------------------------------------------------------------------------------------------
-QVector<QPointF> TST_VAbstractDetail::OutputPointsIssue298Case1() const
-{
- QVector<QPointF> points;
- points += QPointF(-52.3724798442221, -35.5907);
- points += QPointF(487.7117748779425, -35.5907);
- points += QPointF(493.3432017362585, 473.32371517914754);
- points += QPointF(385.98559977345093, 506.8445742667132);
- points += QPointF(345.64704646524604, 447.1446764706891);
- points += QPointF(326.82411403464874, 417.76541252489994);
- points += QPointF(297.4844355409708, 369.73572061014266);
- points += QPointF(280.35686644039447, 340.63425704493835);
- points += QPointF(268.2336759982877, 345.56366422433183);
- points += QPointF(254.38869069377708, 348.78886336684104);
- points += QPointF(240.8928242225697, 350.0214774527481);
- points += QPointF(224.29748398011193, 349.2949970081793);
- points += QPointF(205.50330859478322, 345.31468660256957);
- points += QPointF(188.72568121178054, 339.38217984347546);
- points += QPointF(173.487571907339, 332.2573164509149);
- points += QPointF(159.09346043909582, 324.15190856941325);
- points += QPointF(145.1562378134811, 315.1465661857729);
- points += QPointF(131.46917217609203, 305.28136213922494);
- points += QPointF(117.9345600633141, 294.589765121662);
- points += QPointF(104.5254725457231, 283.11108988305153);
- points += QPointF(91.25156649455745, 270.88938370179534);
- points += QPointF(78.14294517511125, 257.9630200468154);
- points += QPointF(65.25722328495372, 244.3823949426573);
- points += QPointF(52.65759889494496, 230.19470850111355);
- points += QPointF(40.412239584772514, 215.4406233233806);
- points += QPointF(28.600027181043494, 200.15894757848054);
- points += QPointF(17.304913602921047, 184.38648111018338);
- points += QPointF(6.6105681133211736, 168.14173996194046);
- points += QPointF(-3.3897319816688407, 151.43048866270516);
- points += QPointF(-12.592267484961765, 134.24479093805914);
- points += QPointF(-20.880547263016442, 116.54866956498358);
- points += QPointF(-28.111192294561146, 98.27715746242171);
- points += QPointF(-34.098213657706594, 79.33681465062016);
- points += QPointF(-38.441724866417594, 60.24852451858777);
- points += QPointF(-52.3724798442221, -35.5907);
-
- return points;
-}
-
-//---------------------------------------------------------------------------------------------------------------------
-QVector<QPointF> TST_VAbstractDetail::InputPointsIssue298Case2() const
-{
- QVector<QPointF> points;
-
- points += QPointF(35, 39.9999);
- points += QPointF(35, 39.9999);
- points += QPointF(35.9309, 46.4042);
- points += QPointF(38.9167, 59.5258);
- points += QPointF(43.159, 72.9466);
- points += QPointF(48.5551, 86.5823);
- points += QPointF(55.0025, 100.348);
- points += QPointF(62.3985, 114.16);
- points += QPointF(70.6405, 127.933);
- points += QPointF(79.626, 141.582);
- points += QPointF(89.2522, 155.024);
- points += QPointF(99.4167, 168.174);
- points += QPointF(110.017, 180.946);
- points += QPointF(120.95, 193.257);
- points += QPointF(132.113, 205.022);
- points += QPointF(143.405, 216.157);
- points += QPointF(154.721, 226.576);
- points += QPointF(165.96, 236.197);
- points += QPointF(177.019, 244.933);
- points += QPointF(187.795, 252.7);
- points += QPointF(198.186, 259.414);
- points += QPointF(208.09, 264.991);
- points += QPointF(217.402, 269.345);
- points += QPointF(226.022, 272.393);
- points += QPointF(233.846, 274.05);
- points += QPointF(239.1, 274.28);
- points += QPointF(242.319, 273.986);
- points += QPointF(245.281, 273.296);
- points += QPointF(247.974, 272.201);
- points += QPointF(250.385, 270.688);
- points += QPointF(252.501, 268.749);
- points += QPointF(254.308, 266.372);
- points += QPointF(255.795, 263.547);
- points += QPointF(256.949, 260.264);
- points += QPointF(257.756, 256.51);
- points += QPointF(258.203, 252.278);
- points += QPointF(258.279, 247.554);
- points += QPointF(257.717, 239.591);
- points += QPointF(255.482, 227.075);
- points += QPointF(251.528, 212.406);
- points += QPointF(248.796, 204.144);
- points += QPointF(248.796, 204.144);
- points += QPointF(241.73, 183.168);
- points += QPointF(234.173, 158.703);
- points += QPointF(230.625, 145.81);
- points += QPointF(228.29, 135.699);
- points += QPointF(227.112, 128.232);
- points += QPointF(227.033, 123.272);
- points += QPointF(227.69, 121.185);
- points += QPointF(228.421, 120.456);
- points += QPointF(229.393, 120.277);
- points += QPointF(230.6, 120.629);
- points += QPointF(232.808, 122.058);
- points += QPointF(236.545, 125.75);
- points += QPointF(241.092, 131.261);
- points += QPointF(249.22, 142.455);
- points += QPointF(262.477, 162.745);
- points += QPointF(286.15, 201.448);
- points += QPointF(323.075, 264.247);
- points += QPointF(362.315, 330.86);
- points += QPointF(390.909, 377.669);
- points += QPointF(408.797, 405.589);
- points += QPointF(417.135, 417.929);
- points += QPointF(417.135, 417.929);
- points += QPointF(35, 417.953);
-
- return points;
-}
-
-//---------------------------------------------------------------------------------------------------------------------
-QVector<QPointF> TST_VAbstractDetail::OutputPointsIssue298Case2() const
-{
- QVector<QPointF> points;
-
- points += QPointF(-2.7952999999999975, 4.8384699505981095);
- points += QPointF(67.34448942068963, -0.23248582689164274);
- points += QPointF(73.11721243320879, 39.48203774070609);
- points += QPointF(75.42415682885321, 49.62029267468959);
- points += QPointF(78.79409614728041, 60.281321268788744);
- points += QPointF(83.27292363150828, 71.59911521750833);
- points += QPointF(88.79988374248082, 83.39960453097031);
- points += QPointF(95.2926159908344, 95.5247556686474);
- points += QPointF(102.65546594334339, 107.82863001903641);
- points += QPointF(110.78654319853989, 120.17975944490887);
- points += QPointF(119.5782864094781, 132.4565262107595);
- points += QPointF(128.91893020761376, 144.54068833830968);
- points += QPointF(138.69670055252752, 156.3216457494432);
- points += QPointF(148.79638835752286, 167.69430252867102);
- points += QPointF(159.09802741244354, 178.55148997659143);
- points += QPointF(169.48171675272164, 188.79080814910267);
- points += QPointF(179.81876372713828, 198.30845505847407);
- points += QPointF(189.9727199683426, 207.00061743916868);
- points += QPointF(199.7939139119543, 214.75881893038778);
- points += QPointF(209.1143810932559, 221.476716907111);
- points += QPointF(216.03386663545683, 225.9476461661168);
- points += QPointF(215.3306509043856, 223.3387762725701);
- points += QPointF(205.75073516810195, 194.75155680967347);
- points += QPointF(197.88802785264718, 169.29686123304236);
- points += QPointF(193.97579117825833, 155.08026950731082);
- points += QPointF(191.1640933645057, 142.90507610480435);
- points += QPointF(189.3638602852325, 131.49392126360493);
- points += QPointF(189.14507682295456, 117.75764312564759);
- points += QPointF(194.42693552963567, 100.97950138920423);
- points += QPointF(210.03879336533757, 85.41035725481989);
- points += QPointF(231.36634627769158, 81.48275234606332);
- points += QPointF(246.4916615881645, 85.89378050620131);
- points += QPointF(256.60614755001956, 92.43979519799973);
- points += QPointF(264.4750900046005, 100.21398185636762);
- points += QPointF(270.9888544453203, 108.1087159300009);
- points += QPointF(280.35077918473866, 121.00209505562212);
- points += QPointF(294.42535276480356, 142.5434013797918);
- points += QPointF(318.5597512322288, 182.00074197391842);
- points += QPointF(394.73028222951507, 311.42213969492946);
- points += QPointF(422.9514429826756, 357.62079373755);
- points += QPointF(440.37197676737753, 384.8111617646563);
- points += QPointF(488.2841719585649, 455.71983154868764);
- points += QPointF(-2.795300000000013, 455.7506738094777);
- points += QPointF(-2.7952999999999975, 4.8384699505981095);
-
- return points;
-}
-
-//---------------------------------------------------------------------------------------------------------------------
-QVector<QPointF> TST_VAbstractDetail::InputPointsIssue548Case1() const
-{
- QVector<QPointF> points;
-
- points += QPointF(236.97989607468364, 65.89325192030674);
- points += QPointF(198.93409106041895, 172.04876297154925);
- points += QPointF(260.32251114299453, 75.38027418944861);
- points += QPointF(324.54110236213444, 101.48031496062993);
- points += QPointF(29.858267716535437, 300.85039370078744);
- points += QPointF(99.86433649395013, 10.166060970128015);
-
- return points;
-}
-
-//---------------------------------------------------------------------------------------------------------------------
-QVector<QPointF> TST_VAbstractDetail::OutputPointsIssue548Case1() const
-{
- QVector<QPointF> points;
-
- points += QPointF(251.32210577118798, 59.48301432799721);
- points += QPointF(243.9841262159756, 79.95746530820585);
- points += QPointF(255.82424817748586, 61.31279754390509);
- points += QPointF(348.48337789725855, 98.9717841021069);
- points += QPointF(29.780382054543473, 314.59289909613994);
- points += QPointF(17.01672179602679, 305.7450049304056);
- points += QPointF(91.92616539550944, -5.299480329501037);
- points += QPointF(251.32210577118798, 59.48301432799721);
-
- return points;
-}
-
-//---------------------------------------------------------------------------------------------------------------------
-QVector<QPointF> TST_VAbstractDetail::InputPointsIssue548Case2() const
-{
- QVector<QPointF> points;
- points << QPointF(99.86433649395013, 10.166060970128015);
- points << QPointF(236.97989607468364, 65.89325192030674);
- points << QPointF(198.93409106041895, 172.04876297154925);
- points << QPointF(260.32251114299453, 75.38027418944861);
- points << QPointF(324.54110236213444, 101.48031496062993);
- points << QPointF(29.858267716535437, 300.85039370078744);
-
- return points;
-}
-
-//---------------------------------------------------------------------------------------------------------------------
-QVector<QPointF> TST_VAbstractDetail::OutputPointsIssue548Case2() const
-{
- QVector<QPointF> points;
- points << QPointF(73.40376616581447, -41.38574336196901);
- points << QPointF(245.32830125796568, 28.488685370970344);
- points << QPointF(245.32830125796573, 28.488685370970277);
- points << QPointF(404.3486874792147, 93.11854543221973);
- points << QPointF(29.598648843228922, 346.6587450186291);
- points << QPointF(-12.946885351826726, 317.1657644661815);
- points << QPointF(73.40376616581447, -41.38574336196901);
-
- return points;
-}
-
-//---------------------------------------------------------------------------------------------------------------------
-QVector<QPointF> TST_VAbstractDetail::InputPointsIssue548Case3() const
-{
- QVector<QPointF> points;
-
- points += QPointF(99.86433649395013, 10.166060970128015);
- points += QPointF(236.97989607468364, 65.89325192030674);
- points += QPointF(198.93409106041895, 172.04876297154925);
- points += QPointF(260.32251114299453, 75.38027418944861);
- points += QPointF(324.54110236213444, 101.48031496062993);
- points += QPointF(29.858267716535437, 300.85039370078744);
-
- return points;
-}
-
-//---------------------------------------------------------------------------------------------------------------------
-QVector<QPointF> TST_VAbstractDetail::OutputPointsIssue548Case3() const
-{
- QVector<QPointF> points;
-
- points += QPointF(46.94319583767885, -92.9375476940661);
-#if QT_VERSION < QT_VERSION_CHECK(5, 3, 0)
- points += QPointF(234.2633962639462, -16.805935717278903);
-#else
- points += QPointF(238.798634936, -14.9627013515);
-#endif
- points += QPointF(484.15627259629446, 84.75677590380938);
- points += QPointF(29.339029969922702, 392.46709633647066);
- points += QPointF(-55.75203842018885, 333.48113523157537);
- points += QPointF(46.94319583767885, -92.9375476940661);
-
- return points;
-}
-
-//---------------------------------------------------------------------------------------------------------------------
-QVector<QPointF> TST_VAbstractDetail::InputPointsCase3() const
-{
- QVector<QPointF> points;
-
- points += QPointF(35, 35);
- points += QPointF(50, 50);
- points += QPointF(15, 50);
-
- return points;
-}
-
-//---------------------------------------------------------------------------------------------------------------------
-QVector<QPointF> TST_VAbstractDetail::InputPointsCase4() const
-{
- QVector<QPointF> points;
-
- points += QPointF(15, 15);
- points += QPointF(15, 50);
- points += QPointF(50, 50);
-
- return points;
-}
-
-//---------------------------------------------------------------------------------------------------------------------
-QVector<QPointF> TST_VAbstractDetail::InputPointsCase5() const
-{
- QVector<QPointF> points;
-
- points += QPointF(35, 35);
-
- return points;
-}
diff --git a/src/test/ValentinaTest/tst_vabstractdetail.h b/src/test/ValentinaTest/tst_vabstractdetail.h
deleted file mode 100644
index 3ae4094dd..000000000
--- a/src/test/ValentinaTest/tst_vabstractdetail.h
+++ /dev/null
@@ -1,87 +0,0 @@
-/************************************************************************
- **
- ** @file tst_vabstractdetail.h
- ** @author Roman Telezhynskyi <dismine(at)gmail.com>
- ** @date 16 4, 2015
- **
- ** @brief
- ** @copyright
- ** This source code is part of the Valentine project, a pattern making
- ** program, whose allow create and modeling patterns of clothing.
- ** Copyright (C) 2015 Valentina project
- ** <https://bitbucket.org/dismine/valentina> All Rights Reserved.
- **
- ** Valentina is free software: you can redistribute it and/or modify
- ** it under the terms of the GNU General Public License as published by
- ** the Free Software Foundation, either version 3 of the License, or
- ** (at your option) any later version.
- **
- ** Valentina is distributed in the hope that it will be useful,
- ** but WITHOUT ANY WARRANTY; without even the implied warranty of
- ** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- ** GNU General Public License for more details.
- **
- ** You should have received a copy of the GNU General Public License
- ** along with Valentina. If not, see <http://www.gnu.org/licenses/>.
- **
- *************************************************************************/
-
-#ifndef TST_VABSTRACTDETAIL_H
-#define TST_VABSTRACTDETAIL_H
-
-#include "../vmisc/abstracttest.h"
-
-class TST_VAbstractDetail : public AbstractTest
-{
- Q_OBJECT
-public:
- explicit TST_VAbstractDetail(QObject *parent = nullptr);
-
-signals:
-
-private slots:
- void EquidistantRemoveLoop_data();
- void EquidistantRemoveLoop() const;
- void SumTrapezoids() const;
- void PathRemoveLoop_data() const;
- void PathRemoveLoop() const;
- void PathLoopsCase_data() const;
- void PathLoopsCase() const;
- void BrokenDetailEquidistant_data() const;
- void BrokenDetailEquidistant() const;
- void CorrectEquidistantPoints_data() const;
- void CorrectEquidistantPoints() const;
- void TestCorrectEquidistantPoints_data();
- void TestCorrectEquidistantPoints() const;
-#ifndef Q_OS_WIN
- void PossibleInfiniteClearLoops_data() const;
- void PossibleInfiniteClearLoops() const;
-#endif
-
-private:
- void Case3() const;
- void Case4() const;
- void Case5() const;
-
- QVector<QPointF> InputPointsIssue298Case1() const;
- QVector<QPointF> OutputPointsIssue298Case1() const;
-
- QVector<QPointF> InputPointsIssue298Case2() const;
- QVector<QPointF> OutputPointsIssue298Case2() const;
-
- QVector<QPointF> InputPointsIssue548Case1() const;
- QVector<QPointF> OutputPointsIssue548Case1() const;
-
- QVector<QPointF> InputPointsIssue548Case2() const;
- QVector<QPointF> OutputPointsIssue548Case2() const;
-
- QVector<QPointF> InputPointsIssue548Case3() const;
- QVector<QPointF> OutputPointsIssue548Case3() const;
-
- QVector<QPointF> InputPointsCase3() const;
- QVector<QPointF> InputPointsCase4() const;
- QVector<QPointF> InputPointsCase5() const;
-
-};
-
-#endif // TST_VABSTRACTDETAIL_H
diff --git a/src/test/ValentinaTest/tst_vabstractpiece.cpp b/src/test/ValentinaTest/tst_vabstractpiece.cpp
index fc8f67453..553771c60 100644
--- a/src/test/ValentinaTest/tst_vabstractpiece.cpp
+++ b/src/test/ValentinaTest/tst_vabstractpiece.cpp
@@ -60,6 +60,35 @@ void TST_VAbstractPiece::EquidistantRemoveLoop_data()
QTest::newRow("Seam test 3") << InputPointsCase3()
<< 37.795275590551185 // seam allowance width
<< OutputPointsCase3();
+
+ // These are two real cases where equdistant has loop.
+ // See issue #298. Segmented Curve isn't selected in Seam Allowance tool.
+ // https://bitbucket.org/dismine/valentina/issue/298/segmented-curve-isnt-selected-in-seam
+ // Code should clean loops in path.
+ QTest::newRow("Issue 298. Case1") << InputPointsIssue298Case1()
+ << 75.5906 // seam allowance width
+ << OutputPointsIssue298Case1();
+
+ QTest::newRow("Issue 298. Case2") << InputPointsIssue298Case2()
+ << 37.7953 // seam allowance width
+ << OutputPointsIssue298Case2();
+
+ // See issue #548. Bug Detail tool. Case when seam allowance is wrong.
+ // https://bitbucket.org/dismine/valentina/issues/548/bug-detail-tool-case-when-seam-allowance
+ // Files: Steampunk_trousers.val and marie.vit
+ // Actually buggy detail see in file src/app/share/collection/bugs/Steampunk_trousers_issue_#548.val
+ // Code should clean loops in path.
+ QTest::newRow("Issue 548. Case1") << InputPointsIssue548Case1()
+ << 11.338582677165354 // seam allowance width (0.3 cm)
+ << OutputPointsIssue548Case1();
+
+ QTest::newRow("Issue 548. Case2") << InputPointsIssue548Case2()
+ << 37.795275590551185 // seam allowance width (1.0 cm)
+ << OutputPointsIssue548Case2();
+
+ QTest::newRow("Issue 548. Case3") << InputPointsIssue548Case3()
+ << 75.59055118110237 // seam allowance width (2.0 cm)
+ << OutputPointsIssue548Case3();
}
//---------------------------------------------------------------------------------------------------------------------
@@ -1663,3 +1692,1285 @@ QVector<QPointF> TST_VAbstractPiece::OutputPointsCase3() const
return points;
}
+
+//---------------------------------------------------------------------------------------------------------------------
+void TST_VAbstractPiece::SumTrapezoids() const
+{
+ // Case3 checks that the method 'SumTrapezoids' returns negative value for three clockwise allocated points
+ // Case4 checks that the method 'SumTrapezoids' returns positive value for three counterclock-wise allocated points
+ // Case5 checks that the method 'SumTrapezoids' returns 0 for one point
+ Case3();
+ Case4();
+ Case5();
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+void TST_VAbstractPiece::PathRemoveLoop_data() const
+{
+ QTest::addColumn<QVector<QPointF>>("path");
+ QTest::addColumn<QVector<QPointF>>("expect");
+
+ QVector<QPointF> path;
+ path << QPointF(10, 10);
+ path << QPointF(20, 10);
+ path << QPointF(20, 20);
+ path << QPointF(10, 20);
+ path << QPointF(10, 10);
+ QTest::newRow("Correct closed a path (four unique points)") << path << path;
+
+#if QT_VERSION < QT_VERSION_CHECK(5, 1, 0)
+ path.remove(path.size() - 1);
+#else
+ path.removeLast();
+#endif
+ QTest::newRow("Correct unclosed a path (four unique points)") << path << path;
+
+ path.clear();
+ path << QPointF(0, 10);
+ path << QPointF(10, 10);
+ path << QPointF(20, 10);
+ path << QPointF(20, 20);
+ path << QPointF(10, 20);
+ path << QPointF(0, 20);
+ path << QPointF(0, 10);
+ QTest::newRow("Correct closed a path (six unique points)") << path << path;
+
+#if QT_VERSION < QT_VERSION_CHECK(5, 1, 0)
+ path.remove(path.size() - 1);
+#else
+ path.removeLast();
+#endif
+ QTest::newRow("Correct unclosed a path (six unique points)") << path << path;
+
+ path.clear();
+ path << QPointF(20, 10);
+ path << QPointF(20, 20);
+ path << QPointF(10, 10);
+ path << QPointF(10, 20);
+ path << QPointF(20, 10);
+
+ QVector<QPointF> res;
+ res << QPointF(20, 10);
+ res << QPointF(20, 20);
+ res << QPointF(15, 15);
+ res << QPointF(20, 10);
+ QTest::newRow("One loop, closed a path (four unique points)") << path << res;
+
+#if QT_VERSION < QT_VERSION_CHECK(5, 1, 0)
+ path.remove(path.size() - 1);
+ res.remove(res.size() - 1);
+#else
+ path.removeLast();
+ res.removeLast();
+#endif
+ QTest::newRow("One loop, unclosed a path (four unique points)") << path << res;
+
+ path.clear();
+ path << QPointF(20, 10);
+ path << QPointF(20, 20);
+ path << QPointF(10, 10);
+ path << QPointF(0, 20);
+ path << QPointF(0, 10);
+ path << QPointF(10, 20);
+ path << QPointF(20, 10);
+
+ res.clear();
+ res << QPointF(20, 10);
+ res << QPointF(20, 20);
+ res << QPointF(15, 15);
+ res << QPointF(20, 10);
+ QTest::newRow("Two loops, closed a path (six unique points)") << path << res;
+
+#if QT_VERSION < QT_VERSION_CHECK(5, 1, 0)
+ path.remove(path.size() - 1);
+ res.remove(res.size() - 1);
+#else
+ path.removeLast();
+ res.removeLast();
+#endif
+ QTest::newRow("Two loops, unclosed a path (six unique points)") << path << res;
+
+ path.clear();
+ path << QPointF(20, 10);
+ path << QPointF(20, 20);
+ path << QPointF(10, 10);
+ path << QPointF(0, 10);
+ path << QPointF(0, 20);
+ path << QPointF(10, 20);
+ path << QPointF(20, 10);
+
+ res.clear();
+ res << QPointF(20, 10);
+ res << QPointF(20, 20);
+ res << QPointF(15, 15);
+ res << QPointF(20, 10);
+ QTest::newRow("One loop, the first loop, closed a path (six unique points)") << path << res;
+
+#if QT_VERSION < QT_VERSION_CHECK(5, 1, 0)
+ path.remove(path.size() - 1);
+ res.remove(res.size() - 1);
+#else
+ path.removeLast();
+ res.removeLast();
+#endif
+ QTest::newRow("One loop, the first loop, unclosed a path (six unique points)") << path << res;
+
+ path.clear();
+ path << QPointF(20, 10);
+ path << QPointF(20, 20);
+ path << QPointF(10, 20);
+ path << QPointF(0, 10);
+ path << QPointF(0, 20);
+ path << QPointF(10, 10);
+ path << QPointF(20, 10);
+
+ res.clear();
+ res << QPointF(20, 10);
+ res << QPointF(20, 20);
+ res << QPointF(10, 20);
+ res << QPointF(5, 15);
+ res << QPointF(10, 10);
+ res << QPointF(20, 10);
+ QTest::newRow("One loop, the second loop, closed a path (six unique points)") << path << res;
+
+#if QT_VERSION < QT_VERSION_CHECK(5, 1, 0)
+ path.remove(path.size() - 1);
+ res.remove(res.size() - 1);
+#else
+ path.removeLast();
+ res.removeLast();
+#endif
+ QTest::newRow("One loop, the second loop, unclosed a path (six unique points)") << path << res;
+
+ path.clear();
+ path << QPointF(20, 10);
+ path << QPointF(20, 20);
+ path << QPointF(10, 20);
+ path << QPointF(20, 15);
+ path << QPointF(10, 10);
+ path << QPointF(20, 10);
+ QTest::newRow("Correct closed a path, point on line (four unique points)") << path << path;
+
+#if QT_VERSION < QT_VERSION_CHECK(5, 1, 0)
+ path.remove(path.size() - 1);
+#else
+ path.removeLast();
+#endif
+ QTest::newRow("Corect unclosed a path, point on line (four unique points)") << path << path;
+
+ path.clear();
+ path << QPointF(20, 10);
+ path << QPointF(10, 15);
+ path << QPointF(20, 20);
+ path << QPointF(10, 20);
+ path << QPointF(0, 20);
+ path << QPointF(10, 15);
+ path << QPointF(0, 10);
+ path << QPointF(10, 10);
+ path << QPointF(20, 10);
+
+ QTest::newRow("Correct closed a path, point on line (six unique points)") << path << path;
+
+#if QT_VERSION < QT_VERSION_CHECK(5, 1, 0)
+ path.remove(path.size() - 1);
+#else
+ path.removeLast();
+#endif
+ QTest::newRow("Corect unclosed a path, point on line (six unique points)") << path << path;
+
+ path.clear();
+ path << QPointF(100.96979100571033, 1797.6153764073072);
+ path << QPointF(168.3888427659865, 1807.2395034187866);
+ path << QPointF(206.78076137364403, 1812.2910842036706);
+ path << QPointF(239.1630793382262, 1815.951361623424);
+ path << QPointF(267.5320085054171, 1818.4827543754482);
+ path << QPointF(293.9502505847841, 1820.144031725603);
+ path << QPointF(320.48133946750147, 1821.175819320443);
+ path << QPointF(364.5960626489172, 1822.0507669842166);
+ path << QPointF(400.66867742260206, 1822.488188976378);
+ path << QPointF(623.3126833308274, 1822.488188976378);
+ path << QPointF(653.5489038032683, 2162.6456692913384);
+ path << QPointF(570.545584385708, 2162.6456692913384);
+ path << QPointF(600.7818048581489, 1822.488188976378);
+ path << QPointF(1001.3385826771654, 1822.488188976378);
+ path << QPointF(1001.3385826771654, 2680.44094488189);
+ path << QPointF(-22.11646613738226, 2680.44094488189);
+ path << QPointF(100.96979100571033, 1797.6153764073072);
+
+ res.clear();
+ res << QPointF(100.96979100571033, 1797.6153764073072);
+ res << QPointF(168.3888427659865, 1807.2395034187866);
+ res << QPointF(206.78076137364403, 1812.2910842036706);
+ res << QPointF(239.1630793382262, 1815.951361623424);
+ res << QPointF(267.5320085054171, 1818.4827543754482);
+ res << QPointF(293.9502505847841, 1820.144031725603);
+ res << QPointF(320.48133946750147, 1821.175819320443);
+ res << QPointF(364.5960626489172, 1822.0507669842166);
+ res << QPointF(400.66867742260206, 1822.488188976378);
+ res << QPointF(1001.3385826771654, 1822.488188976378);
+ res << QPointF(1001.3385826771654, 2680.44094488189);
+ res << QPointF(-22.11646613738226, 2680.44094488189);
+ res << QPointF(100.96979100571033, 1797.6153764073072);
+
+ // See the file "collection/bugs/Issue_#493.val"
+ QTest::newRow("Test case issue #493") << path << res;
+
+ path.clear();
+ path << QPointF(-685.2149804319953, -3568.7982439212556);
+ path << QPointF(-700.7415523087261, -3623.900571239949);
+ path << QPointF(-675.4694480627154, -3639.3631430823175);
+ path << QPointF(-684.7497934439581, -3631.3546395862268);
+ path << QPointF(-683.1356602239256, -3633.2868478418427);
+ path << QPointF(-686.8764821039574, -3627.927414863926);
+ path << QPointF(-684.7670104817863, -3631.587853202178);
+ path << QPointF(-682.2386030572435, -3636.8469922361573);
+ path << QPointF(-676.4708011186385, -3650.307478525872);
+ path << QPointF(-666.3050989871189, -3676.5286567894937);
+ path << QPointF(-654.0449409043066, -3710.198553447806);
+ path << QPointF(-640.1333287371614, -3750.0101920374505);
+ path << QPointF(-617.0729873733014, -3818.3303697354913);
+ path << QPointF(-583.8128392515604, -3920.9726624886944);
+ path << QPointF(-550.5307668482033, -4027.6970214479597);
+ path << QPointF(-527.4164674104215, -4104.7034088569535);
+ path << QPointF(-513.4302533332675, -4152.73879565781);
+ path << QPointF(-501.0373006826446, -4196.767296675345);
+ path << QPointF(-490.59311078227046, -4235.660899517831);
+ path << QPointF(-477.25724163384456, -4288.293444470835);
+ path << QPointF(-405.3839593893572, -4272.013803282615);
+ path << QPointF(-545.9786893428341, -3568.830152982464);
+ path << QPointF(-685.2149804319953, -3568.7982439212556);
+
+ res.clear();
+ res << QPointF(-685.2149804319953, -3568.7982439212556);
+ res << QPointF(-700.7415523087261, -3623.900571239949);
+ res << QPointF(-683.3457668881176, -3634.5440688767967);
+ res << QPointF(-682.2386030572435, -3636.8469922361573);
+ res << QPointF(-676.4708011186385, -3650.307478525872);
+ res << QPointF(-666.3050989871189, -3676.5286567894937);
+ res << QPointF(-654.0449409043066, -3710.198553447806);
+ res << QPointF(-640.1333287371614, -3750.0101920374505);
+ res << QPointF(-617.0729873733014, -3818.3303697354913);
+ res << QPointF(-583.8128392515604, -3920.9726624886944);
+ res << QPointF(-550.5307668482033, -4027.6970214479597);
+ res << QPointF(-527.4164674104215, -4104.7034088569535);
+ res << QPointF(-513.4302533332675, -4152.73879565781);
+ res << QPointF(-501.0373006826446, -4196.767296675345);
+ res << QPointF(-490.59311078227046, -4235.660899517831);
+ res << QPointF(-477.25724163384456, -4288.293444470835);
+ res << QPointF(-405.3839593893572, -4272.013803282615);
+ res << QPointF(-545.9786893428341, -3568.830152982464);
+ res << QPointF(-685.2149804319953, -3568.7982439212556);
+
+ // See the file "collection/bugs/Issue_#515.val"
+ // Check a seam allowance path.
+ // The curve that causes the issue is the first in the list.
+ QTest::newRow("Test case issue #515. Big loop in seam allowance path.") << path << res;
+
+ path.clear();
+ path << QPointF(-449.6699112298347, -4243.2921010175705);
+ path << QPointF(-576.966638263205, -3606.6183279948636);
+ path << QPointF(-656.9465284876832, -3606.6183279948636);
+ path << QPointF(-656.5996104603414, -3606.6000783462687);
+ path << QPointF(-655.7439133016985, -3607.1236310612317);
+ path << QPointF(-654.129780081666, -3609.0558393168476);
+ path << QPointF(-651.3154902471701, -3613.939306009108);
+ path << QPointF(-647.8207651830382, -3621.2084054506768);
+ path << QPointF(-641.4701586077349, -3636.0289997859454);
+ path << QPointF(-630.9244502073004, -3663.23035747934);
+ path << QPointF(-618.4465305467888, -3697.4982896415795);
+ path << QPointF(-604.3873016966293, -3737.732371148936);
+ path << QPointF(-581.1891087215608, -3806.460957656939);
+ path << QPointF(-547.7936207285052, -3909.520915257629);
+ path << QPointF(-514.3891332445846, -4016.6378180116963);
+ path << QPointF(-491.17181635142833, -4093.9874129706236);
+ path << QPointF(-477.094588519539, -4142.335384784734);
+ path << QPointF(-464.5941701318652, -4186.745679830414);
+ path << QPointF(-454.0214632588362, -4226.117872983938);
+
+ res.clear();
+ res << QPointF(-449.6699112298347, -4243.2921010175705);
+ res << QPointF(-576.966638263205, -3606.6183279948636);
+ res << QPointF(-656.5697831440032, -3606.6183279948636);
+ res << QPointF(-655.7439133016985, -3607.1236310612317);
+ res << QPointF(-654.129780081666, -3609.0558393168476);
+ res << QPointF(-651.3154902471701, -3613.939306009108);
+ res << QPointF(-647.8207651830382, -3621.2084054506768);
+ res << QPointF(-641.4701586077349, -3636.0289997859454);
+ res << QPointF(-630.9244502073004, -3663.23035747934);
+ res << QPointF(-618.4465305467888, -3697.4982896415795);
+ res << QPointF(-604.3873016966293, -3737.732371148936);
+ res << QPointF(-581.1891087215608, -3806.460957656939);
+ res << QPointF(-547.7936207285052, -3909.520915257629);
+ res << QPointF(-514.3891332445846, -4016.6378180116963);
+ res << QPointF(-491.17181635142833, -4093.9874129706236);
+ res << QPointF(-477.094588519539, -4142.335384784734);
+ res << QPointF(-464.5941701318652, -4186.745679830414);
+ res << QPointF(-454.0214632588362, -4226.117872983938);
+
+ // See the file "collection/bugs/Issue_#515.val"
+ // Check a seam allowance path.
+ // The curve that causes the issue is the last in the list.
+ QTest::newRow("Test case issue #515. Small loop in seam allowance path.") << path << res;
+
+ path.clear();
+ path << QPointF(1229.6503937007876, 937.6667716535435);
+ path << QPointF(203.08931117793543, 937.6667716535435);
+ path << QPointF(459.7677349767701, -2166.704563141019);
+ path << QPointF(1229.6503937007876, -1990.077167189857);
+ path << QPointF(1229.6503937007876, -555.2466141732282);
+ path << QPointF(920.1053824527112, -555.2466141732282);
+ path << QPointF(887.034516310979, -63.90803149606281);
+ path << QPointF(816.3607592795726, -63.908031496062826);
+ path << QPointF(780.7580397937137, -592.8627210002539);
+ path << QPointF(816.0241340748559, -1202.917917917055);
+ path << QPointF(887.3711415156957, -1202.917917917055);
+ path << QPointF(920.4420076574283, -630.8371653543306);
+ path << QPointF(1229.6503937007876, -630.8371653543306);
+ path << QPointF(1229.6503937007876, 937.6667716535435);
+
+ res.clear();
+ res << QPointF(1229.6503937007876, 937.6667716535435);
+ res << QPointF(203.08931117793543, 937.6667716535435);
+ res << QPointF(459.7677349767702, -2166.704563141019);
+ res << QPointF(1229.6503937007876, -1990.077167189857);
+ res << QPointF(1229.6503937007876, 937.6667716535435);
+
+ // See the file "collection/bugs/Issue_#603.val"
+ // Point H1 is first in the list
+ QTest::newRow("Test issue 603.") << path << res;
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+void TST_VAbstractPiece::PathRemoveLoop() const
+{
+ QFETCH(QVector<QPointF>, path);
+ QFETCH(QVector<QPointF>, expect);
+
+ QVector<QPointF> res = VAbstractPiece::CheckLoops(path);
+ Comparison(res, expect);
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+void TST_VAbstractPiece::PathLoopsCase_data() const
+{
+ QTest::addColumn<QVector<QPointF>>("path");
+ QTest::addColumn<QVector<QPointF>>("expect");
+
+ QVector<QPointF> path;
+ path << QPointF(61.86670866141733, 446.92270866141735);
+ path << QPointF(650.6504606788366, 473.2192016666484);
+ path << QPointF(649.4426552757304, 480.5376973511262);
+ path << QPointF(646.5769170924987, 501.9977838630714);
+ path << QPointF(644.6382908004568, 523.6358081043691);
+ path << QPointF(643.4592698551749, 551.9888717674471);
+ path << QPointF(642.9134698671897, 584.1776423714557);
+ path << QPointF(643.1914832622404, 613.2382010061506);
+ path << QPointF(644.2199668178571, 639.3780275889782);
+ path << QPointF(645.9255773115714, 662.8046020373845);
+ path << QPointF(648.2349715209137, 683.7254042688159);
+ path << QPointF(651.0748062234152, 702.3479142007185);
+ path << QPointF(654.3717381966065, 718.8796117505387);
+ path << QPointF(658.0524242180187, 733.5279768357226);
+ path << QPointF(662.0435210651824, 746.5004893737165);
+ path << QPointF(666.2716855156286, 758.0046292819667);
+ path << QPointF(670.6635743468883, 768.2478764779191);
+ path << QPointF(677.400406718071, 781.7952098705392);
+ path << QPointF(691.6740007010135, 806.2608114022295);
+ path << QPointF(694.5877745571677, 810.2150054671212);
+ path << QPointF(699.9560352035193, 816.1706553153153);
+ path << QPointF(708.9007628091615, 824.0594196166176);
+ path << QPointF(719.3794725391945, 831.7499791040799);
+ path << QPointF(730.9568541500198, 839.0942359684872);
+ path << QPointF(743.1975973980386, 845.9440924006244);
+ path << QPointF(755.6663920396528, 852.1514505912763);
+ path << QPointF(767.9279278312633, 857.568212731228);
+ path << QPointF(779.5468945292718, 862.046281011264);
+ path << QPointF(790.0879818900794, 865.4375576221694);
+ path << QPointF(799.115879670088, 867.5939447547289);
+ path << QPointF(804.5608128209333, 868.2650594004886);
+ path << QPointF(807.5317661719646, 868.2782441618697);
+ path << QPointF(809.8795601157717, 867.8994015359809);
+ path << QPointF(811.5497808719051, 867.1100192966705);
+ path << QPointF(812.4880146599148, 865.8915852177861);
+ path << QPointF(812.6398476993509, 864.2255870731761);
+ path << QPointF(811.9508662097637, 862.0935126366886);
+ path << QPointF(810.3666564107034, 859.4768496821717);
+ path << QPointF(806.3216663321919, 854.66911491981);
+ path << QPointF(802.0871811023624, 850.6707401574804);
+ path << QPointF(799.4598981526765, 850.6707401574804);
+ path << QPointF(802.0871811023624, 1653.9337322834645);
+ path << QPointF(61.86670866141733, 1653.9337322834645);
+
+ QVector<QPointF> res;
+ res << QPointF(61.86670866141733, 446.92270866141735);
+ res << QPointF(650.6504606788366, 473.2192016666484);
+ res << QPointF(649.4426552757304, 480.5376973511262);
+ res << QPointF(646.5769170924987, 501.9977838630714);
+ res << QPointF(644.6382908004568, 523.6358081043691);
+ res << QPointF(643.4592698551749, 551.9888717674471);
+ res << QPointF(642.9134698671897, 584.1776423714557);
+ res << QPointF(643.1914832622404, 613.2382010061506);
+ res << QPointF(644.2199668178571, 639.3780275889782);
+ res << QPointF(645.9255773115714, 662.8046020373845);
+ res << QPointF(648.2349715209137, 683.7254042688159);
+ res << QPointF(651.0748062234152, 702.3479142007185);
+ res << QPointF(654.3717381966065, 718.8796117505387);
+ res << QPointF(658.0524242180187, 733.5279768357226);
+ res << QPointF(662.0435210651824, 746.5004893737165);
+ res << QPointF(666.2716855156286, 758.0046292819667);
+ res << QPointF(670.6635743468883, 768.2478764779191);
+ res << QPointF(677.400406718071, 781.7952098705392);
+ res << QPointF(691.6740007010135, 806.2608114022295);
+ res << QPointF(694.5877745571677, 810.2150054671212);
+ res << QPointF(699.9560352035193, 816.1706553153153);
+ res << QPointF(708.9007628091615, 824.0594196166176);
+ res << QPointF(719.3794725391945, 831.7499791040799);
+ res << QPointF(730.9568541500198, 839.0942359684872);
+ res << QPointF(743.1975973980386, 845.9440924006244);
+ res << QPointF(755.6663920396528, 852.1514505912763);
+ res << QPointF(767.9279278312633, 857.568212731228);
+ res << QPointF(779.5468945292718, 862.046281011264);
+ res << QPointF(790.0879818900794, 865.4375576221694);
+ res << QPointF(799.115879670088, 867.5939447547289);
+ res << QPointF(799.5154110117976, 867.6431889469776);
+ res << QPointF(802.0871811023624, 1653.9337322834645);
+ res << QPointF(61.86670866141733, 1653.9337322834645);
+
+ // See file "collection/bugs/Issue_#609_case1.val"
+ // Clear a main path. Bound intersection. External loop. Outside a loop. Start point Ф1.
+ QTest::newRow("Issue 609. Case1a") << path << res;
+
+ path.clear();
+ path << QPointF(-365.68188649000314, -2143.126579528016);
+ path << QPointF(-195.75487873249062, -2116.7935769656237);
+ path << QPointF(-195.75487873249062, -1836.0319480765759);
+ path << QPointF(-233.39027086052477, -1838.4849618976993);
+ path << QPointF(-231.15080237392075, -1855.5915146519483);
+ path << QPointF(-225.84473077299972, -1889.4811404382626);
+ path << QPointF(-219.39861487985402, -1922.986407729537);
+ path << QPointF(-211.6695159016421, -1955.9990283342697);
+ path << QPointF(-204.87723909172885, -1980.439660924953);
+ path << QPointF(-199.87970909142098, -1996.6270828437923);
+ path << QPointF(-194.48099536000245, -2012.6451713592935);
+ path << QPointF(-188.65032933731845, -2028.5246588116781);
+ path << QPointF(-182.36812965707693, -2044.2602109802488);
+ path << QPointF(-175.61499879935675, -2059.8462252736344);
+ path << QPointF(-168.3717693169516, -2075.2768492268588);
+ path << QPointF(-160.6424572210866, -2090.5008865466684);
+ path << QPointF(-150.22847685877994, -2109.7385074212525);
+ path << QPointF(194.23861004296444, -2056.3576305273214);
+ path << QPointF(302.4787663409577, -1301.003761061316);
+ path << QPointF(279.86810151275455, -1288.330749878147);
+ path << QPointF(-641.7062267185897, -2051.118466118487);
+ path << QPointF(-365.68188649000314, -2143.126579528016);
+
+ res.clear();
+ res << QPointF(-365.68188649000314, -2143.126579528016);
+ res << QPointF(-195.75487873249062, -2116.7935769656237);
+ res << QPointF(-195.75487873249062, -2008.8655346469059);
+ res << QPointF(-194.48099536000245, -2012.6451713592935);
+ res << QPointF(-188.65032933731845, -2028.5246588116781);
+ res << QPointF(-182.36812965707693, -2044.2602109802488);
+ res << QPointF(-175.61499879935675, -2059.8462252736344);
+ res << QPointF(-168.3717693169516, -2075.2768492268588);
+ res << QPointF(-160.6424572210866, -2090.5008865466684);
+ res << QPointF(-150.22847685877994, -2109.7385074212525);
+ res << QPointF(194.23861004296444, -2056.3576305273214);
+ res << QPointF(302.4787663409577, -1301.003761061316);
+ res << QPointF(279.86810151275455, -1288.330749878147);
+ res << QPointF(-641.7062267185897, -2051.118466118487);
+ res << QPointF(-365.68188649000314, -2143.126579528016);
+
+ // See file "collection/bugs/Issue_#609_case2.val"
+ // Clear an equdistant. Bound intersection. Internal loop. Outside a loop. Start point А2.
+ QTest::newRow("Issue 609. Case2b") << path << res;
+
+ path.clear();
+ path << QPointF(0, 10);
+ path << QPointF(5, 10);
+ path << QPointF(2.5, 15);
+ path << QPointF(7.5, 15);
+ path << QPointF(5, 10);
+ path << QPointF(10, 10);
+ path << QPointF(10, 20);
+ path << QPointF(0, 20);
+ path << QPointF(0, 10);
+
+ QTest::newRow("Internal loop. Valid case.") << path << path;
+
+ path.clear();
+ path << QPointF(0, 10);
+ path << QPointF(5, 10);
+ path << QPointF(7.5, 15);
+ path << QPointF(2.5, 15);
+ path << QPointF(5, 10);
+ path << QPointF(10, 10);
+ path << QPointF(10, 20);
+ path << QPointF(0, 20);
+ path << QPointF(0, 10);
+
+ res.clear();
+ res << QPointF(0, 10);
+ res << QPointF(10, 10);
+ res << QPointF(10, 20);
+ res << QPointF(0, 20);
+ res << QPointF(0, 10);
+
+ QTest::newRow("Internal loop. Invalid case.") << path << res;
+
+ path.clear();
+ path << QPointF(0, 10);
+ path << QPointF(5, 10);
+ path << QPointF(0, 0);
+ path << QPointF(10, 0);
+ path << QPointF(5, 10);
+ path << QPointF(10, 10);
+ path << QPointF(10, 20);
+ path << QPointF(0, 20);
+ path << QPointF(0, 10);
+
+ QTest::newRow("External loop. Valid case.") << path << path;
+
+ path.clear();
+ path << QPointF(0, 10);
+ path << QPointF(5, 10);
+ path << QPointF(10, 0);
+ path << QPointF(0, 0);
+ path << QPointF(5, 10);
+ path << QPointF(10, 10);
+ path << QPointF(10, 20);
+ path << QPointF(0, 20);
+ path << QPointF(0, 10);
+
+ res.clear();
+ res << QPointF(0, 10);
+ res << QPointF(10, 10);
+ res << QPointF(10, 20);
+ res << QPointF(0, 20);
+ res << QPointF(0, 10);
+
+ QTest::newRow("External loop. Invalid case.") << path << res;
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+void TST_VAbstractPiece::PathLoopsCase() const
+{
+ QFETCH(QVector<QPointF>, path);
+ QFETCH(QVector<QPointF>, expect);
+
+ const QVector<QPointF> res = VAbstractPiece::CheckLoops(path);
+ Comparison(res, expect);
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+void TST_VAbstractPiece::BrokenDetailEquidistant_data() const
+{
+ QTest::addColumn<QVector<VSAPoint>>("points");
+ QTest::addColumn<qreal>("width");
+ QTest::addColumn<QVector<QPointF>>("ekvOrig");
+
+ // For more details see the file "collection/bugs/GAVAUDAN Laure - corsage - figure 4.val".
+ // We will test only one detail. The second require too accurate data that we cannot get from debuger.
+ // The test check an open equdistant of correct detail.
+ QVector<VSAPoint> points;// Input points.
+ points.append(VSAPoint(787.5835464566929, 1701.3138897637796));
+ points.append(VSAPoint(938.7646488188976, 1701.3138897637796));
+ points.append(VSAPoint(928.6149958683911, 1732.4440719866434));
+ points.append(VSAPoint(910.0209091217698, 1792.3369853889722));
+ points.append(VSAPoint(893.3643262819251, 1849.7845131987456));
+ points.append(VSAPoint(878.5244039283091, 1905.2261617043234));
+ points.append(VSAPoint(865.3802986403739, 1959.101437194065));
+ points.append(VSAPoint(863.9366982685195, 1965.6834024491068));
+ points.append(VSAPoint(852.8936778444679, 1919.6965437838999));
+ points.append(VSAPoint(837.0628180560684, 1860.2846653184251));
+ points.append(VSAPoint(819.0677656132684, 1798.6758641921479));
+ points.append(VSAPoint(798.7585839758027, 1734.54810216256));
+ points.append(VSAPoint(787.5835464566929, 1701.3138897637796));
+
+ qreal width = 37.795275590551185; // seam allowance width
+
+ QVector<QPointF> ekvOrig;
+ ekvOrig.append(QPointF(774.8748468280837, 1663.5186141732283));
+ ekvOrig.append(QPointF(990.8407795072413, 1663.5186141732283));
+ ekvOrig.append(QPointF(964.6314912875667, 1743.9055911653147));
+ ekvOrig.append(QPointF(946.2221157804494, 1803.203536155223));
+ ekvOrig.append(QPointF(929.7733291125676, 1859.9343877726233));
+ ekvOrig.append(QPointF(915.1430746962241, 1914.5927211230298));
+ ekvOrig.append(QPointF(902.2033544443959, 1967.630259856634));
+ ekvOrig.append(QPointF(894.4064781634931, 2003.1794116713015));
+ ekvOrig.append(QPointF(834.213891302752, 2003.7742535883901));
+ ekvOrig.append(QPointF(816.2523103379473, 1928.9761772004185));
+ ekvOrig.append(QPointF(800.6574884611877, 1870.4501290629887));
+ ekvOrig.append(QPointF(782.9077417718742, 1809.6811695225983));
+ ekvOrig.append(QPointF(786.7126382487066, 1698.723835966227));
+
+ QTest::newRow("GAVAUDAN Laure.") << points << width << ekvOrig;
+
+ points.clear();
+ points.append(VSAPoint(97.33089106412862, -223.03306117556497));
+ points.append(VSAPoint(990.7494050554426, 2.819093995045));
+ points.append(VSAPoint(908.3966357321774, 379.5839357215547));
+ points.append(VSAPoint(-135.41154226686143, 697.6417881399819));
+
+ width = 11.338582677165354;
+
+ ekvOrig.clear();
+ ekvOrig.append(VSAPoint(100.10981413873267, -234.02583351343978));
+ ekvOrig.append(VSAPoint(1004.1704360325447, -5.483401649771952));
+ ekvOrig.append(VSAPoint(918.0553412376563, 388.4941212347381));
+ ekvOrig.append(VSAPoint(-138.65807550610091, 710.4843173601864));
+
+ // See the file "collection/bugs/Issue_#604.val" (since 0.5.0)
+ QTest::newRow("Issue #604.") << points << width << ekvOrig;
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+void TST_VAbstractPiece::BrokenDetailEquidistant() const
+{
+ QFETCH(QVector<VSAPoint>, points);
+ QFETCH(qreal, width);
+ QFETCH(QVector<QPointF>, ekvOrig);
+
+ const QVector<QPointF> ekv = VAbstractPiece::Equidistant(points, width);// Take result
+
+ // Begin comparison
+ Comparison(ekv, ekvOrig);
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+void TST_VAbstractPiece::CorrectEquidistantPoints_data() const
+{
+ // See file zigzag.val
+ QTest::addColumn<QVector<QPointF>>("points");
+ QTest::addColumn<QVector<QPointF>>("expect");
+ QTest::addColumn<bool>("removeFirstAndLast");
+
+ QVector<QPointF> points;
+ points.append(QPointF(-741.7894588053705, 1065.7336503858917));
+ points.append(QPointF(-759.696551643576, -115.81420543069257));
+ points.append(QPointF(-278.17249953019325, -217.1037453126913));
+ points.append(QPointF(-244.64654130659474, 1077.9548221866635));
+ points.append(QPointF(-741.7894588053705, 1065.7336503858917));
+
+ QVector<QPointF> expect;
+ expect.append(QPointF(-741.7894588053705, 1065.7336503858917));
+ expect.append(QPointF(-759.696551643576, -115.81420543069257));
+ expect.append(QPointF(-278.17249953019325, -217.1037453126913));
+ expect.append(QPointF(-244.64654130659474, 1077.9548221866635));
+ expect.append(QPointF(-741.7894588053705, 1065.7336503858917));
+
+ QTest::newRow("Closed seam allowance. Last point equal first.") << points << expect << false;
+
+ points.clear();
+ points.append(QPointF(-704.5489521643801, 1028.8424328418016));
+ points.append(QPointF(-721.4335720065426, -85.24049234531904));
+ points.append(QPointF(-707.7852899705758, 755.7064514429209));
+ points.append(QPointF(-721.4335720065426, -85.24049234531904));
+ points.append(QPointF(-314.78124296268265, -170.7806167067443));
+ points.append(QPointF(-283.4579031023758, 1039.1940357173805));
+
+ expect.clear();
+ expect.append(QPointF(-704.5489521643801, 1028.8424328418016));
+ expect.append(QPointF(-721.4335720065426, -85.24049234531904));
+ expect.append(QPointF(-314.78124296268265, -170.7806167067443));
+ expect.append(QPointF(-283.4579031023758, 1039.1940357173805));
+
+ QTest::newRow("Clearing bad main path.") << points << expect << true;
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+void TST_VAbstractPiece::CorrectEquidistantPoints() const
+{
+ QFETCH(QVector<QPointF>, points);
+ QFETCH(QVector<QPointF>, expect);
+ QFETCH(bool, removeFirstAndLast);
+
+ const QVector<QPointF> res = VAbstractPiece::CorrectEquidistantPoints(points, removeFirstAndLast);
+
+ // Begin comparison
+ Comparison(res, expect);
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+void TST_VAbstractPiece::TestCorrectEquidistantPoints_data()
+{
+ QTest::addColumn<QVector<QPointF>>("before");
+ QTest::addColumn<QVector<QPointF>>("expect");
+
+ QVector<QPointF> before;
+ before << QPointF(30.0, 39.999874015748034);
+ before << QPointF(785.9055118110236, 39.999874015748034);
+ before << QPointF(785.9055118110236, 3819.527433070866);
+ before << QPointF(483.54330708661416, 3819.527433070866);
+ before << QPointF(483.54330708661416, 1929.763653543307);
+ before << QPointF(407.9527559055629, 984.8817637795973);
+ before << QPointF(407.9527559055118, 1929.763653543307);
+ before << QPointF(407.9527559055118, 3819.527433070866);
+ before << QPointF(30.0, 3819.527433070866);
+
+ QVector<QPointF> expect;
+ expect << QPointF(30.0, 39.999874015748034);
+ expect << QPointF(785.9055118110236, 39.999874015748034);
+ expect << QPointF(785.9055118110236, 3819.527433070866);
+ expect << QPointF(483.54330708661416, 3819.527433070866);
+ expect << QPointF(483.54330708661416, 1929.763653543307);
+ expect << QPointF(407.9527559055629, 984.8817637795973);
+ expect << QPointF(407.9527559055118, 3819.527433070866);
+ expect << QPointF(30.0, 3819.527433070866);
+
+ QTest::newRow("Test case issue #548") << before << expect;
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+void TST_VAbstractPiece::TestCorrectEquidistantPoints() const
+{
+ QFETCH(QVector<QPointF>, before);
+ QFETCH(QVector<QPointF>, expect);
+
+ QVector<QPointF> after = VAbstractPiece::CorrectEquidistantPoints(before);
+ Comparison(after, expect);
+}
+
+#ifndef Q_OS_WIN
+//---------------------------------------------------------------------------------------------------------------------
+void TST_VAbstractPiece::PossibleInfiniteClearLoops_data() const
+{
+ QTest::addColumn<QVector<QPointF>>("path");
+ QTest::addColumn<QVector<QPointF>>("expect");
+
+ QVector<QPointF> path;
+ path << QPointF(-670.6449010946802, 4046.36220472441);
+ path << QPointF(-1025.9051277126944, 4046.36220472441);
+ path << QPointF(-1026.4460203880594, 4010.5247429150854);
+ path << QPointF(-1027.2972172274538, 3924.202328582098);
+ path << QPointF(-1028.1383921346433, 3768.5948526129496);
+ path << QPointF(-1028.5065585022217, 3521.575730066707);
+ path << QPointF(-1028.2712136539103, 3252.2436039362233);
+ path << QPointF(-1027.2910122410117, 2850.1024469719814);
+ path << QPointF(-1025.9446023682538, 2439.350819630564);
+ path << QPointF(-1025.8983315247287, 2338.629525677473);
+ path << QPointF(-1025.3536572186458, 2309.970015878699);
+ path << QPointF(-1024.2100836932389, 2281.714612342931);
+ path << QPointF(-1022.5102766116828, 2253.846781520112);
+ path << QPointF(-1020.2969016371525, 2226.349989860186);
+ path << QPointF(-1017.6126244328227, 2199.207703813094);
+ path << QPointF(-1014.5001106618688, 2172.403389828782);
+ path << QPointF(-1011.0020259874652, 2145.9205143571917);
+ path << QPointF(-1005.1601480132764, 2106.7277181407126);
+ path << QPointF(-996.3625412018714, 2055.4921956731814);
+ path << QPointF(-986.7906327138169, 2005.2448233555149);
+ path << QPointF(-976.785747854512, 1955.8533327872588);
+ path << QPointF(-961.6606968634906, 1883.0158867454916);
+ path << QPointF(-947.5864881030896, 1811.4914675744105);
+ path << QPointF(-939.2629508127773, 1764.2008199992524);
+ path << QPointF(-933.8852659113251, 1728.8707137815559);
+ path << QPointF(-930.742733377741, 1705.3464944792456);
+ path << QPointF(-928.0252775410311, 1681.829576238578);
+ path << QPointF(-925.7755640643697, 1658.3034255094963);
+ path << QPointF(-924.036258610932, 1634.7515087419433);
+ path << QPointF(-922.850026843893, 1611.1572923858625);
+ path << QPointF(-922.2595344264276, 1587.504242891197);
+ path << QPointF(-922.3074470217107, 1563.7758267078902);
+ path << QPointF(-922.613405031688, 1551.8740157480315);
+ path << QPointF(-960.4086806222392, 841.3228346456693);
+ path << QPointF(-954.9336313684444, 841.5464781141166);
+ path << QPointF(-944.0363771538431, 841.3102753632543);
+ path << QPointF(-933.2160856340209, 840.291423017261);
+ path << QPointF(-922.4878118569704, 838.5316299985567);
+ path << QPointF(-911.8666108706839, 836.0726052295611);
+ path << QPointF(-901.3675377231535, 832.9560576326933);
+ path << QPointF(-891.005647462372, 829.2236961303737);
+ path << QPointF(-880.7959951363317, 824.9172296450213);
+ path << QPointF(-870.7536357930251, 820.0783670990559);
+ path << QPointF(-860.893624480444, 814.7488174148973);
+ path << QPointF(-851.2310162465817, 808.9702895149649);
+ path << QPointF(-841.7808661394299, 802.7844923216785);
+ path << QPointF(-832.5582292069812, 796.2331347574575);
+ path << QPointF(-823.578160497228, 789.3579257447218);
+ path << QPointF(-810.5607800373014, 778.5565764202543);
+ path << QPointF(-794.2367125298769, 763.3635567727296);
+ path << QPointF(-779.1539087770976, 747.6258919346988);
+ path << QPointF(-765.4328091629026, 731.6772532855191);
+ path << QPointF(-753.193854071231, 715.8513122045474);
+ path << QPointF(-742.557483886022, 700.4817400711408);
+ path << QPointF(-733.644138991215, 685.9022082646563);
+ path << QPointF(-726.5742597707488, 672.446388164451);
+ path << QPointF(-721.4682866085625, 660.447951149882);
+ path << QPointF(-718.6229063234249, 651.1532303788147);
+ path << QPointF(-716.6036430255488, 642.9038041285014);
+ path << QPointF(-714.137568179324, 630.1235656609365);
+ path << QPointF(-711.8605525364693, 612.2344502588126);
+ path << QPointF(-710.4560555432737, 593.4222205889721);
+ path << QPointF(-709.4234847119759, 563.5940176156308);
+ path << QPointF(-708.952111561728, 520.4666582691573);
+ path << QPointF(-708.4401766852314, 497.3858267716535);
+ path << QPointF(-400.92922424489655, 469.03937007874015);
+ path << QPointF(-708.4401766852314, 440.6929133858268);
+ path << QPointF(-708.7078446526739, 341.66122584661264);
+ path << QPointF(-709.3427685457568, 299.60322373665383);
+ path << QPointF(-710.6909230403871, 257.048095841136);
+ path << QPointF(-713.0251717477311, 214.57984397612822);
+ path << QPointF(-715.632864794307, 183.1716335401434);
+ path << QPointF(-717.7953694429818, 162.55016633308693);
+ path << QPointF(-720.3578834261159, 142.27891915519677);
+ path << QPointF(-723.3545146951046, 122.43089223348173);
+ path << QPointF(-725.0465030138121, 112.71059563115871);
+ path << QPointF(-219.59055118110237, -35.52755905511811);
+ path << QPointF(-218.99352387527398, -33.21125072212394);
+ path << QPointF(-217.35724543521775, -28.699086141666157);
+ path << QPointF(-215.20035586903225, -24.33136255454731);
+ path << QPointF(-212.53403014110648, -20.10796717265881);
+ path << QPointF(-209.36944321582945, -16.02878720789205);
+ path << QPointF(-205.71777005759026, -12.093709872138447);
+ path << QPointF(-201.59018563077785, -8.302622377289406);
+ path << QPointF(-196.99786489978123, -4.65541193523633);
+ path << QPointF(-189.3170483291933, 0.5638303631539586);
+ path << QPointF(-177.47808861476295, 6.996342387787443);
+ path << QPointF(-163.981333042598, 12.855376387191757);
+ path << QPointF(-148.91618132781048, 18.141834666235646);
+ path << QPointF(-132.37203318551252, 22.856619529787864);
+ path << QPointF(-114.43828833081622, 27.00063328271716);
+ path << QPointF(-95.20434647883366, 30.574778229892296);
+ path << QPointF(-74.75960734467688, 33.57995667618201);
+ path << QPointF(-53.193470643458, 36.01707092645505);
+ path << QPointF(-30.595336090289106, 37.887023285580185);
+ path << QPointF(-7.0546034002822875, 39.19071605842615);
+ path << QPointF(17.339327711450373, 39.929051549861704);
+ path << QPointF(29.858267716535437, 40.06299212598426);
+ path << QPointF(-45.73228346456693, 1589.6692913385828);
+ path << QPointF(-45.73228346456693, 4046.36220472441);
+ path << QPointF(-297.70078740157487, 4046.36220472441);
+ path << QPointF(-297.70078740157487, 2118.8031496062995);
+ path << QPointF(-222.1102362204725, 1589.6692913385828);
+ path << QPointF(-297.70078740157487, 1060.535433070866);
+ path << QPointF(-373.2913385826772, 1589.6692913385828);
+ path << QPointF(-297.70078740157487, 2118.8031496062995);
+ path << QPointF(-297.70078740157487, 4046.36220472441);
+ path << QPointF(-670.6449010946802, 4046.36220472441);
+ path << QPointF(-670.6449010946802, 2024.3149606299214);
+ path << QPointF(-622.7555214134819, 1570.7716535433071);
+ path << QPointF(-670.6449010946802, 1117.2283464566929);
+ path << QPointF(-718.5342807758785, 1570.7716535433071);
+ path << QPointF(-670.6449010946802, 2024.3149606299214);
+
+ QVector<QPointF> expect;
+ expect << QPointF(-670.6449010946802, 4046.36220472441);
+ expect << QPointF(-670.6449010946802, 4046.36220472441);
+ expect << QPointF(-670.6449010946802, 2024.3149606299214);
+ expect << QPointF(-670.6449010946802, 2024.3149606299214);
+ expect << QPointF(-670.6449010946802, 2024.3149606299214);
+
+ // See the file "collection/bugs/possible_inf_loop.val"
+ QTest::newRow("Possible infinite loop") << path << expect;
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+void TST_VAbstractPiece::PossibleInfiniteClearLoops() const
+{
+ QFETCH(QVector<QPointF>, path);
+ QFETCH(QVector<QPointF>, expect);
+
+ QVector<QPointF> res = VAbstractPiece::CheckLoops(path);
+ Comparison(res, expect);
+}
+#endif //#ifndef Q_OS_WIN
+
+//---------------------------------------------------------------------------------------------------------------------
+void TST_VAbstractPiece::Case3() const
+{
+ const QVector<QPointF> points = InputPointsCase3a(); // Input points.
+
+ const qreal result = VAbstractPiece::SumTrapezoids(points);
+ QVERIFY(result < 0);
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+void TST_VAbstractPiece::Case4() const
+{
+ const QVector<QPointF> points = InputPointsCase4a(); // Input points.
+
+ const qreal result = VAbstractPiece::SumTrapezoids(points);
+ QVERIFY(result > 0);
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+void TST_VAbstractPiece::Case5() const
+{
+ const QVector<QPointF> points = InputPointsCase5a(); // Input points.
+
+ const qreal result = VAbstractPiece::SumTrapezoids(points);
+ QVERIFY(qFuzzyIsNull(result));
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+QVector<QPointF> TST_VAbstractPiece::InputPointsIssue298Case1() const
+{
+ QVector<QPointF> points;
+
+ points += QPointF(35, 39.9999);
+ points += QPointF(412.953, 39.9999);
+ points += QPointF(417.135, 417.929);
+ points += QPointF(417.135, 417.929);
+ points += QPointF(408.797, 405.589);
+ points += QPointF(390.909, 377.669);
+ points += QPointF(362.315, 330.86);
+ points += QPointF(323.075, 264.247);
+ points += QPointF(286.15, 201.448);
+ points += QPointF(262.477, 162.745);
+ points += QPointF(249.22, 142.455);
+ points += QPointF(241.092, 131.261);
+ points += QPointF(236.545, 125.75);
+ points += QPointF(232.808, 122.058);
+ points += QPointF(230.6, 120.629);
+ points += QPointF(229.393, 120.277);
+ points += QPointF(228.421, 120.456);
+ points += QPointF(227.69, 121.185);
+ points += QPointF(227.033, 123.272);
+ points += QPointF(227.112, 128.232);
+ points += QPointF(228.29, 135.699);
+ points += QPointF(230.625, 145.81);
+ points += QPointF(234.173, 158.703);
+ points += QPointF(241.73, 183.168);
+ points += QPointF(248.796, 204.144);
+ points += QPointF(248.796, 204.144);
+ points += QPointF(251.528, 212.406);
+ points += QPointF(255.482, 227.075);
+ points += QPointF(257.717, 239.591);
+ points += QPointF(258.279, 247.554);
+ points += QPointF(258.203, 252.278);
+ points += QPointF(257.756, 256.51);
+ points += QPointF(256.949, 260.264);
+ points += QPointF(255.795, 263.547);
+ points += QPointF(254.308, 266.372);
+ points += QPointF(252.501, 268.749);
+ points += QPointF(250.385, 270.688);
+ points += QPointF(247.974, 272.201);
+ points += QPointF(245.281, 273.296);
+ points += QPointF(242.319, 273.986);
+ points += QPointF(239.1, 274.28);
+ points += QPointF(233.846, 274.05);
+ points += QPointF(226.022, 272.393);
+ points += QPointF(217.402, 269.345);
+ points += QPointF(208.09, 264.991);
+ points += QPointF(198.186, 259.414);
+ points += QPointF(187.795, 252.7);
+ points += QPointF(177.019, 244.933);
+ points += QPointF(165.96, 236.197);
+ points += QPointF(154.721, 226.576);
+ points += QPointF(143.405, 216.157);
+ points += QPointF(132.113, 205.022);
+ points += QPointF(120.95, 193.257);
+ points += QPointF(110.017, 180.946);
+ points += QPointF(99.4167, 168.174);
+ points += QPointF(89.2522, 155.024);
+ points += QPointF(79.626, 141.582);
+ points += QPointF(70.6405, 127.933);
+ points += QPointF(62.3985, 114.16);
+ points += QPointF(55.0025, 100.348);
+ points += QPointF(48.5551, 86.5823);
+ points += QPointF(43.159, 72.9466);
+ points += QPointF(38.9167, 59.5258);
+ points += QPointF(35.9309, 46.4042);
+ points += QPointF(35, 39.9999);
+
+ return points;
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+QVector<QPointF> TST_VAbstractPiece::OutputPointsIssue298Case1() const
+{
+ QVector<QPointF> points;
+ points += QPointF(-52.3724798442221, -35.5907);
+ points += QPointF(487.7117748779425, -35.5907);
+ points += QPointF(493.3432017362585, 473.32371517914754);
+ points += QPointF(385.98559977345093, 506.8445742667132);
+ points += QPointF(345.64704646524604, 447.1446764706891);
+ points += QPointF(326.82411403464874, 417.76541252489994);
+ points += QPointF(297.4844355409708, 369.73572061014266);
+ points += QPointF(280.35686644039447, 340.63425704493835);
+ points += QPointF(268.2336759982877, 345.56366422433183);
+ points += QPointF(254.38869069377708, 348.78886336684104);
+ points += QPointF(240.8928242225697, 350.0214774527481);
+ points += QPointF(224.29748398011193, 349.2949970081793);
+ points += QPointF(205.50330859478322, 345.31468660256957);
+ points += QPointF(188.72568121178054, 339.38217984347546);
+ points += QPointF(173.487571907339, 332.2573164509149);
+ points += QPointF(159.09346043909582, 324.15190856941325);
+ points += QPointF(145.1562378134811, 315.1465661857729);
+ points += QPointF(131.46917217609203, 305.28136213922494);
+ points += QPointF(117.9345600633141, 294.589765121662);
+ points += QPointF(104.5254725457231, 283.11108988305153);
+ points += QPointF(91.25156649455745, 270.88938370179534);
+ points += QPointF(78.14294517511125, 257.9630200468154);
+ points += QPointF(65.25722328495372, 244.3823949426573);
+ points += QPointF(52.65759889494496, 230.19470850111355);
+ points += QPointF(40.412239584772514, 215.4406233233806);
+ points += QPointF(28.600027181043494, 200.15894757848054);
+ points += QPointF(17.304913602921047, 184.38648111018338);
+ points += QPointF(6.6105681133211736, 168.14173996194046);
+ points += QPointF(-3.3897319816688407, 151.43048866270516);
+ points += QPointF(-12.592267484961765, 134.24479093805914);
+ points += QPointF(-20.880547263016442, 116.54866956498358);
+ points += QPointF(-28.111192294561146, 98.27715746242171);
+ points += QPointF(-34.098213657706594, 79.33681465062016);
+ points += QPointF(-38.441724866417594, 60.24852451858777);
+ points += QPointF(-52.3724798442221, -35.5907);
+
+ return points;
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+QVector<QPointF> TST_VAbstractPiece::InputPointsIssue298Case2() const
+{
+ QVector<QPointF> points;
+
+ points += QPointF(35, 39.9999);
+ points += QPointF(35, 39.9999);
+ points += QPointF(35.9309, 46.4042);
+ points += QPointF(38.9167, 59.5258);
+ points += QPointF(43.159, 72.9466);
+ points += QPointF(48.5551, 86.5823);
+ points += QPointF(55.0025, 100.348);
+ points += QPointF(62.3985, 114.16);
+ points += QPointF(70.6405, 127.933);
+ points += QPointF(79.626, 141.582);
+ points += QPointF(89.2522, 155.024);
+ points += QPointF(99.4167, 168.174);
+ points += QPointF(110.017, 180.946);
+ points += QPointF(120.95, 193.257);
+ points += QPointF(132.113, 205.022);
+ points += QPointF(143.405, 216.157);
+ points += QPointF(154.721, 226.576);
+ points += QPointF(165.96, 236.197);
+ points += QPointF(177.019, 244.933);
+ points += QPointF(187.795, 252.7);
+ points += QPointF(198.186, 259.414);
+ points += QPointF(208.09, 264.991);
+ points += QPointF(217.402, 269.345);
+ points += QPointF(226.022, 272.393);
+ points += QPointF(233.846, 274.05);
+ points += QPointF(239.1, 274.28);
+ points += QPointF(242.319, 273.986);
+ points += QPointF(245.281, 273.296);
+ points += QPointF(247.974, 272.201);
+ points += QPointF(250.385, 270.688);
+ points += QPointF(252.501, 268.749);
+ points += QPointF(254.308, 266.372);
+ points += QPointF(255.795, 263.547);
+ points += QPointF(256.949, 260.264);
+ points += QPointF(257.756, 256.51);
+ points += QPointF(258.203, 252.278);
+ points += QPointF(258.279, 247.554);
+ points += QPointF(257.717, 239.591);
+ points += QPointF(255.482, 227.075);
+ points += QPointF(251.528, 212.406);
+ points += QPointF(248.796, 204.144);
+ points += QPointF(248.796, 204.144);
+ points += QPointF(241.73, 183.168);
+ points += QPointF(234.173, 158.703);
+ points += QPointF(230.625, 145.81);
+ points += QPointF(228.29, 135.699);
+ points += QPointF(227.112, 128.232);
+ points += QPointF(227.033, 123.272);
+ points += QPointF(227.69, 121.185);
+ points += QPointF(228.421, 120.456);
+ points += QPointF(229.393, 120.277);
+ points += QPointF(230.6, 120.629);
+ points += QPointF(232.808, 122.058);
+ points += QPointF(236.545, 125.75);
+ points += QPointF(241.092, 131.261);
+ points += QPointF(249.22, 142.455);
+ points += QPointF(262.477, 162.745);
+ points += QPointF(286.15, 201.448);
+ points += QPointF(323.075, 264.247);
+ points += QPointF(362.315, 330.86);
+ points += QPointF(390.909, 377.669);
+ points += QPointF(408.797, 405.589);
+ points += QPointF(417.135, 417.929);
+ points += QPointF(417.135, 417.929);
+ points += QPointF(35, 417.953);
+
+ return points;
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+QVector<QPointF> TST_VAbstractPiece::OutputPointsIssue298Case2() const
+{
+ QVector<QPointF> points;
+
+ points += QPointF(-2.7952999999999975, 4.8384699505981095);
+ points += QPointF(67.34448942068963, -0.23248582689164274);
+ points += QPointF(73.11721243320879, 39.48203774070609);
+ points += QPointF(75.42415682885321, 49.62029267468959);
+ points += QPointF(78.79409614728041, 60.281321268788744);
+ points += QPointF(83.27292363150828, 71.59911521750833);
+ points += QPointF(88.79988374248082, 83.39960453097031);
+ points += QPointF(95.2926159908344, 95.5247556686474);
+ points += QPointF(102.65546594334339, 107.82863001903641);
+ points += QPointF(110.78654319853989, 120.17975944490887);
+ points += QPointF(119.5782864094781, 132.4565262107595);
+ points += QPointF(128.91893020761376, 144.54068833830968);
+ points += QPointF(138.69670055252752, 156.3216457494432);
+ points += QPointF(148.79638835752286, 167.69430252867102);
+ points += QPointF(159.09802741244354, 178.55148997659143);
+ points += QPointF(169.48171675272164, 188.79080814910267);
+ points += QPointF(179.81876372713828, 198.30845505847407);
+ points += QPointF(189.9727199683426, 207.00061743916868);
+ points += QPointF(199.7939139119543, 214.75881893038778);
+ points += QPointF(209.1143810932559, 221.476716907111);
+ points += QPointF(216.03386663545683, 225.9476461661168);
+ points += QPointF(215.3306509043856, 223.3387762725701);
+ points += QPointF(205.75073516810195, 194.75155680967347);
+ points += QPointF(197.88802785264718, 169.29686123304236);
+ points += QPointF(193.97579117825833, 155.08026950731082);
+ points += QPointF(191.1640933645057, 142.90507610480435);
+ points += QPointF(189.3638602852325, 131.49392126360493);
+ points += QPointF(189.14507682295456, 117.75764312564759);
+ points += QPointF(194.42693552963567, 100.97950138920423);
+ points += QPointF(210.03879336533757, 85.41035725481989);
+ points += QPointF(231.36634627769158, 81.48275234606332);
+ points += QPointF(246.4916615881645, 85.89378050620131);
+ points += QPointF(256.60614755001956, 92.43979519799973);
+ points += QPointF(264.4750900046005, 100.21398185636762);
+ points += QPointF(270.9888544453203, 108.1087159300009);
+ points += QPointF(280.35077918473866, 121.00209505562212);
+ points += QPointF(294.42535276480356, 142.5434013797918);
+ points += QPointF(318.5597512322288, 182.00074197391842);
+ points += QPointF(394.73028222951507, 311.42213969492946);
+ points += QPointF(422.9514429826756, 357.62079373755);
+ points += QPointF(440.37197676737753, 384.8111617646563);
+ points += QPointF(488.2841719585649, 455.71983154868764);
+ points += QPointF(-2.795300000000013, 455.7506738094777);
+ points += QPointF(-2.7952999999999975, 4.8384699505981095);
+
+ return points;
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+QVector<QPointF> TST_VAbstractPiece::InputPointsIssue548Case1() const
+{
+ QVector<QPointF> points;
+
+ points += QPointF(236.97989607468364, 65.89325192030674);
+ points += QPointF(198.93409106041895, 172.04876297154925);
+ points += QPointF(260.32251114299453, 75.38027418944861);
+ points += QPointF(324.54110236213444, 101.48031496062993);
+ points += QPointF(29.858267716535437, 300.85039370078744);
+ points += QPointF(99.86433649395013, 10.166060970128015);
+
+ return points;
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+QVector<QPointF> TST_VAbstractPiece::OutputPointsIssue548Case1() const
+{
+ QVector<QPointF> points;
+
+ points += QPointF(251.32210577118798, 59.48301432799721);
+ points += QPointF(243.9841262159756, 79.95746530820585);
+ points += QPointF(255.82424817748586, 61.31279754390509);
+ points += QPointF(348.48337789725855, 98.9717841021069);
+ points += QPointF(29.780382054543473, 314.59289909613994);
+ points += QPointF(17.01672179602679, 305.7450049304056);
+ points += QPointF(91.92616539550944, -5.299480329501037);
+ points += QPointF(251.32210577118798, 59.48301432799721);
+
+ return points;
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+QVector<QPointF> TST_VAbstractPiece::InputPointsIssue548Case2() const
+{
+ QVector<QPointF> points;
+ points << QPointF(99.86433649395013, 10.166060970128015);
+ points << QPointF(236.97989607468364, 65.89325192030674);
+ points << QPointF(198.93409106041895, 172.04876297154925);
+ points << QPointF(260.32251114299453, 75.38027418944861);
+ points << QPointF(324.54110236213444, 101.48031496062993);
+ points << QPointF(29.858267716535437, 300.85039370078744);
+
+ return points;
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+QVector<QPointF> TST_VAbstractPiece::OutputPointsIssue548Case2() const
+{
+ QVector<QPointF> points;
+ points << QPointF(73.40376616581447, -41.38574336196901);
+ points << QPointF(245.32830125796568, 28.488685370970344);
+ points << QPointF(245.32830125796573, 28.488685370970277);
+ points << QPointF(404.3486874792147, 93.11854543221973);
+ points << QPointF(29.598648843228922, 346.6587450186291);
+ points << QPointF(-12.946885351826726, 317.1657644661815);
+ points << QPointF(73.40376616581447, -41.38574336196901);
+
+ return points;
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+QVector<QPointF> TST_VAbstractPiece::InputPointsIssue548Case3() const
+{
+ QVector<QPointF> points;
+
+ points += QPointF(99.86433649395013, 10.166060970128015);
+ points += QPointF(236.97989607468364, 65.89325192030674);
+ points += QPointF(198.93409106041895, 172.04876297154925);
+ points += QPointF(260.32251114299453, 75.38027418944861);
+ points += QPointF(324.54110236213444, 101.48031496062993);
+ points += QPointF(29.858267716535437, 300.85039370078744);
+
+ return points;
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+QVector<QPointF> TST_VAbstractPiece::OutputPointsIssue548Case3() const
+{
+ QVector<QPointF> points;
+
+ points += QPointF(46.94319583767885, -92.9375476940661);
+#if QT_VERSION < QT_VERSION_CHECK(5, 3, 0)
+ points += QPointF(234.2633962639462, -16.805935717278903);
+#else
+ points += QPointF(238.798634936, -14.9627013515);
+#endif
+ points += QPointF(484.15627259629446, 84.75677590380938);
+ points += QPointF(29.339029969922702, 392.46709633647066);
+ points += QPointF(-55.75203842018885, 333.48113523157537);
+ points += QPointF(46.94319583767885, -92.9375476940661);
+
+ return points;
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+QVector<QPointF> TST_VAbstractPiece::InputPointsCase3a() const
+{
+ QVector<QPointF> points;
+
+ points += QPointF(35, 35);
+ points += QPointF(50, 50);
+ points += QPointF(15, 50);
+
+ return points;
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+QVector<QPointF> TST_VAbstractPiece::InputPointsCase4a() const
+{
+ QVector<QPointF> points;
+
+ points += QPointF(15, 15);
+ points += QPointF(15, 50);
+ points += QPointF(50, 50);
+
+ return points;
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+QVector<QPointF> TST_VAbstractPiece::InputPointsCase5a() const
+{
+ QVector<QPointF> points;
+
+ points += QPointF(35, 35);
+
+ return points;
+}
diff --git a/src/test/ValentinaTest/tst_vabstractpiece.h b/src/test/ValentinaTest/tst_vabstractpiece.h
index cd2b37eed..af965d1a4 100644
--- a/src/test/ValentinaTest/tst_vabstractpiece.h
+++ b/src/test/ValentinaTest/tst_vabstractpiece.h
@@ -42,6 +42,22 @@ public:
private slots:
void EquidistantRemoveLoop_data();
void EquidistantRemoveLoop() const;
+ void SumTrapezoids() const;
+ void PathRemoveLoop_data() const;
+ void PathRemoveLoop() const;
+ void PathLoopsCase_data() const;
+ void PathLoopsCase() const;
+ void BrokenDetailEquidistant_data() const;
+ void BrokenDetailEquidistant() const;
+ void CorrectEquidistantPoints_data() const;
+ void CorrectEquidistantPoints() const;
+ void TestCorrectEquidistantPoints_data();
+ void TestCorrectEquidistantPoints() const;
+#ifndef Q_OS_WIN
+ void PossibleInfiniteClearLoops_data() const;
+ void PossibleInfiniteClearLoops() const;
+#endif
+
private:
QVector<VSAPoint> InputPointsCase1() const;
QVector<QPointF> OutputPointsCase1() const;
@@ -51,6 +67,29 @@ private:
QVector<VSAPoint> InputPointsCase3() const;
QVector<QPointF> OutputPointsCase3() const;
+
+ void Case3() const;
+ void Case4() const;
+ void Case5() const;
+
+ QVector<QPointF> InputPointsIssue298Case1() const;
+ QVector<QPointF> OutputPointsIssue298Case1() const;
+
+ QVector<QPointF> InputPointsIssue298Case2() const;
+ QVector<QPointF> OutputPointsIssue298Case2() const;
+
+ QVector<QPointF> InputPointsIssue548Case1() const;
+ QVector<QPointF> OutputPointsIssue548Case1() const;
+
+ QVector<QPointF> InputPointsIssue548Case2() const;
+ QVector<QPointF> OutputPointsIssue548Case2() const;
+
+ QVector<QPointF> InputPointsIssue548Case3() const;
+ QVector<QPointF> OutputPointsIssue548Case3() const;
+
+ QVector<QPointF> InputPointsCase3a() const;
+ QVector<QPointF> InputPointsCase4a() const;
+ QVector<QPointF> InputPointsCase5a() const;
};
#endif // TST_VABSTRACTPIECE_H
diff --git a/src/test/ValentinaTest/tst_varc.cpp b/src/test/ValentinaTest/tst_varc.cpp
index 207050c34..20d35574b 100644
--- a/src/test/ValentinaTest/tst_varc.cpp
+++ b/src/test/ValentinaTest/tst_varc.cpp
@@ -28,7 +28,7 @@
#include "tst_varc.h"
#include "../vgeometry/varc.h"
-#include "../vlayout/vabstractdetail.h"
+#include "../vlayout/vabstractpiece.h"
#include "../vmisc/logging.h"
#include <QtTest>
@@ -203,7 +203,7 @@ void TST_VArc::TestGetPoints()
}
// calculated square
- const qreal cSquare = qAbs(VAbstractDetail::SumTrapezoids(points)/2.0);
+ const qreal cSquare = qAbs(VAbstractPiece::SumTrapezoids(points)/2.0);
const qreal value = qAbs(gSquere - cSquare);
const QString errorMsg =
QString("Broken the second rule. Interpolation has too big computing error. Error ='%1'.").arg(value);
diff --git a/src/test/ValentinaTest/tst_vellipticalarc.cpp b/src/test/ValentinaTest/tst_vellipticalarc.cpp
index 5abd8b583..794af45ef 100644
--- a/src/test/ValentinaTest/tst_vellipticalarc.cpp
+++ b/src/test/ValentinaTest/tst_vellipticalarc.cpp
@@ -28,7 +28,7 @@
#include "tst_vellipticalarc.h"
#include "../vgeometry/vellipticalarc.h"
-#include "../vlayout/vabstractdetail.h"
+#include "../vlayout/vabstractpiece.h"
#include "../vmisc/logging.h"
#include <QtGlobal>
@@ -372,7 +372,7 @@ void TST_VEllipticalArc::TestGetPoints3()
{// calculated full ellipse square
const qreal ellipseSquare = M_PI * radius1 * radius2;
const qreal epsSquare = ellipseSquare * 0.5 / 100; // computing error 0.5 % from origin squere
- const qreal arcSquare = qAbs(VAbstractDetail::SumTrapezoids(points)/2.0);
+ const qreal arcSquare = qAbs(VAbstractPiece::SumTrapezoids(points)/2.0);
const qreal diffSquare = qAbs(ellipseSquare - arcSquare);
const QString errorMsg1 = QString("Broken the second rule. Interpolation has too big computing error. "
"Difference ='%1' bigger than eps = '%2'.").arg(diffSquare).arg(epsSquare);