aw/valentina_old
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Forbid a user to have in piece's main path two neighbor points with identical

Browse Source 
coordinates.

--HG--
branch : develop
This commit is contained in:
Roman Telezhynskyi 2018-01-20 11:47:01 +02:00
parent 751820a39b
commit 64e2341f10
4 changed files with 45 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
src/libs/vtools/dialogs/tools/dialogtool.cpp
View File

@ -82,19 +82,18 @@ Q_LOGGING_CATEGORY(vDialog, "v.dialog")
namespace namespace
{ {
//--------------------------------------------------------------------------------------------------------------------- //---------------------------------------------------------------------------------------------------------------------
quint32 RowId(QListWidget *listWidget, int i) VPieceNode RowNode(QListWidget *listWidget, int i)
{ {
SCASSERT(listWidget != nullptr); SCASSERT(listWidget != nullptr);
if (i < 0 || i >= listWidget->count()) if (i < 0 || i >= listWidget->count())
{ {
return NULL_ID; return VPieceNode();
} }
const QListWidgetItem *rowItem = listWidget->item(i); const QListWidgetItem *rowItem = listWidget->item(i);
SCASSERT(rowItem != nullptr); SCASSERT(rowItem != nullptr);
const VPieceNode rowNode = qvariant_cast<VPieceNode>(rowItem->data(Qt::UserRole)); return qvariant_cast<VPieceNode>(rowItem->data(Qt::UserRole));
return rowNode.GetId();
} }
} }
@ -506,29 +505,56 @@ int DialogTool::FindNotExcludedNodeUp(QListWidget *listWidget, int candidate)
} }
//--------------------------------------------------------------------------------------------------------------------- //---------------------------------------------------------------------------------------------------------------------
bool DialogTool::FirstPointEqualLast(QListWidget *listWidget) bool DialogTool::FirstPointEqualLast(QListWidget *listWidget, const VContainer *data)
{ {
SCASSERT(listWidget != nullptr); SCASSERT(listWidget != nullptr);
if (listWidget->count() > 1) if (listWidget->count() > 1)
{ {
const quint32 topId = RowId(listWidget, FindNotExcludedNodeDown(listWidget, 0)); const VPieceNode topNode = RowNode(listWidget, FindNotExcludedNodeDown(listWidget, 0));
const quint32 bottomId = RowId(listWidget, FindNotExcludedNodeUp(listWidget, listWidget->count()-1)); const VPieceNode bottomNode = RowNode(listWidget, FindNotExcludedNodeUp(listWidget, listWidget->count()-1));
return topId == bottomId;
QSharedPointer<VPointF> firstPoint;
if (topNode.GetTypeTool() == Tool::NodePoint)
{
firstPoint = data->GeometricObject<VPointF>(topNode.GetId());
}
QSharedPointer<VPointF> secondPoint;
if (bottomNode.GetTypeTool() == Tool::NodePoint)
{
secondPoint = data->GeometricObject<VPointF>(bottomNode.GetId());
}
return topNode.GetId() == bottomNode.GetId() || (not firstPoint.isNull() && not secondPoint.isNull()
&& firstPoint->toQPointF() == secondPoint->toQPointF());
} }
return false; return false;
} }
//--------------------------------------------------------------------------------------------------------------------- //---------------------------------------------------------------------------------------------------------------------
bool DialogTool::DoublePoints(QListWidget *listWidget) bool DialogTool::DoublePoints(QListWidget *listWidget, const VContainer *data)
{ {
SCASSERT(listWidget != nullptr); SCASSERT(listWidget != nullptr);
for (int i=0, sz = listWidget->count()-1; i<sz; ++i) for (int i=0, sz = listWidget->count()-1; i<sz; ++i)
{ {
const int firstIndex = FindNotExcludedNodeDown(listWidget, i); const int firstIndex = FindNotExcludedNodeDown(listWidget, i);
const quint32 firstId = RowId(listWidget, firstIndex); const VPieceNode firstNode = RowNode(listWidget, firstIndex);
const quint32 secondId = RowId(listWidget, FindNotExcludedNodeDown(listWidget, firstIndex+1)); const VPieceNode secondNode = RowNode(listWidget, FindNotExcludedNodeDown(listWidget, firstIndex+1));
if (firstId == secondId) QSharedPointer<VPointF> firstPoint;
if (firstNode.GetTypeTool() == Tool::NodePoint)
{
firstPoint = data->GeometricObject<VPointF>(firstNode.GetId());
}
QSharedPointer<VPointF> secondPoint;
if (secondNode.GetTypeTool() == Tool::NodePoint)
{
secondPoint = data->GeometricObject<VPointF>(secondNode.GetId());
}
if (firstNode.GetId() == secondNode.GetId() || (not firstPoint.isNull() && not secondPoint.isNull()
&& firstPoint->toQPointF() == secondPoint->toQPointF()))
{ {
return true; return true;
} }
@ -650,7 +676,7 @@ void DialogTool::NewNodeItem(QListWidget *listWidget, const VPieceNode &node)
} }
else else
{ {
if(RowId(listWidget, listWidget->count()-1) != node.GetId()) if(RowNode(listWidget, listWidget->count()-1).GetId() != node.GetId())
{ {
canAddNewPoint = true; canAddNewPoint = true;
} }

4
src/libs/vtools/dialogs/tools/dialogtool.h
View File

@ -272,8 +272,8 @@ protected:
static int FindNotExcludedNodeDown(QListWidget *listWidget, int candidate); static int FindNotExcludedNodeDown(QListWidget *listWidget, int candidate);
static int FindNotExcludedNodeUp(QListWidget *listWidget, int candidate); static int FindNotExcludedNodeUp(QListWidget *listWidget, int candidate);
static bool FirstPointEqualLast(QListWidget *listWidget); static bool FirstPointEqualLast(QListWidget *listWidget, const VContainer *data);
static bool DoublePoints(QListWidget *listWidget); static bool DoublePoints(QListWidget *listWidget, const VContainer *data);
static bool EachPointLabelIsUnique(QListWidget *listWidget); static bool EachPointLabelIsUnique(QListWidget *listWidget);
static QString DialogWarningIcon(); static QString DialogWarningIcon();
static QFont NodeFont(bool nodeExcluded); static QFont NodeFont(bool nodeExcluded);

4
src/libs/vtools/dialogs/tools/piece/dialogpiecepath.cpp
View File

@ -1251,13 +1251,13 @@ bool DialogPiecePath::PathIsValid() const
} }
else else
{ {
if (GetType() == PiecePathType::CustomSeamAllowance && FirstPointEqualLast(ui->listWidget)) if (GetType() == PiecePathType::CustomSeamAllowance && FirstPointEqualLast(ui->listWidget, data))
{ {
url += tr("First point of <b>custom seam allowance</b> cannot be equal to the last point!"); url += tr("First point of <b>custom seam allowance</b> cannot be equal to the last point!");
ui->helpLabel->setText(url); ui->helpLabel->setText(url);
return false; return false;
} }
else if (DoublePoints(ui->listWidget)) else if (DoublePoints(ui->listWidget, data))
{ {
url += tr("You have double points!"); url += tr("You have double points!");
ui->helpLabel->setText(url); ui->helpLabel->setText(url);

4
src/libs/vtools/dialogs/tools/piece/dialogseamallowance.cpp
View File

@ -2381,13 +2381,13 @@ bool DialogSeamAllowance::MainPathIsValid() const
uiTabPaths->helpLabel->setText(url); uiTabPaths->helpLabel->setText(url);
valid = false; valid = false;
} }
if (FirstPointEqualLast(uiTabPaths->listWidgetMainPath)) if (FirstPointEqualLast(uiTabPaths->listWidgetMainPath, data))
{ {
url += tr("First point cannot be equal to the last point!"); url += tr("First point cannot be equal to the last point!");
uiTabPaths->helpLabel->setText(url); uiTabPaths->helpLabel->setText(url);
valid = false; valid = false;
} }
else if (DoublePoints(uiTabPaths->listWidgetMainPath)) else if (DoublePoints(uiTabPaths->listWidgetMainPath, data))
{ {
url += tr("You have double points!"); url += tr("You have double points!");
uiTabPaths->helpLabel->setText(url); uiTabPaths->helpLabel->setText(url);