palo/valentina
1
0
Fork 0
mirror of https://gitlab.com/smart-pattern/valentina.git synced 2024-10-01 04:41:40 +02:00
Code Issues Projects Releases Wiki Activity

Delete the last point from detail when the first point equals the last point

Browse source 
--HG--
branch : feature
This commit is contained in:
Valentina Zhuravska 2015-11-10 11:58:33 +02:00
parent 4c41e04d49
commit d27a64b819
2 changed files with 65 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

65
src/libs/vtools/dialogs/tools/dialogdetail.cpp
View file

@ -78,6 +78,7 @@ DialogDetail::DialogDetail(const VContainer *data, const quint32 &toolId, QWidge
connect(ui.lineEditNameDetail, &QLineEdit::textChanged, this, &DialogDetail::NamePointChanged);
connect(ui.toolButtonDelete, &QToolButton::clicked, this, &DialogDetail::DeleteItem);
connect(ui.buttonBox, &QDialogButtonBox::accepted, this, &DialogDetail::DeleteLastPoint);
}
//---------------------------------------------------------------------------------------------------------------------
@ -117,7 +118,7 @@ void DialogDetail::ChosenObject(quint32 id, const SceneObject &type)
EnableObjectGUI(true);
}
if (CreateDetail().ContourPoints(data).size() < 3)
if (not DetailIsValid())
{
ValidObjects(false);
}
@ -420,9 +421,67 @@ void DialogDetail::DeleteItem()
EnableObjectGUI(false);
}
delete ui.listWidget->item( ui.listWidget->currentRow() );
if (CreateDetail().ContourPoints(data).size() < 3 )
int rowNumber = ui.listWidget->currentRow();
if (rowNumber != 0 && rowNumber != ui.listWidget->count()-1)
{
QString previousRow = ui.listWidget->item(rowNumber-1)->text();
QString nextRow = ui.listWidget->item(rowNumber+1)->text();
if (QString::compare(previousRow, nextRow) == 0)
{
ValidObjects(false);
}
}
delete ui.listWidget->item(rowNumber);
if (not DetailIsValid())
{
ValidObjects(false);
}
}
//---------------------------------------------------------------------------------------------------------------------
bool DialogDetail::DetailIsValid()
{
if (ui.listWidget->count() < 3)
{
return false;
}
else if (ui.listWidget->count() == 3)
{
if (FirstPointEqualLast())
{
return false;
}
}
return true;
}
//---------------------------------------------------------------------------------------------------------------------
bool DialogDetail::FirstPointEqualLast()
{
QString firstDetailPoint = ui.listWidget->item(0)->text();
QString lastDetailPoint = ui.listWidget->item(ui.listWidget->count()-1)->text();
if (QString::compare(firstDetailPoint, lastDetailPoint) == 0)
{
return true;
}
else
{
return false;
}
}
//---------------------------------------------------------------------------------------------------------------------
void DialogDetail::DeleteLastPoint()
{
if (ui.listWidget->count() > 3)
{
if (FirstPointEqualLast())
{
delete ui.listWidget->item(ui.listWidget->count()-1);
}
}
}

3
src/libs/vtools/dialogs/tools/dialogdetail.h
View file

@ -54,6 +54,7 @@ public slots:
void ClickedReverse(bool checked);
void ObjectChanged(int row);
void DeleteItem();
void DeleteLastPoint();
protected:
/**
* @brief SaveData Put dialog data in local variables
@ -74,6 +75,8 @@ private:
/** @brief closed keep option about equdistant (closed or not) */
bool closed;
bool flagWidth;
bool DetailIsValid();
bool FirstPointEqualLast();
void NewItem(quint32 id, const Tool &typeTool, const NodeDetail &typeNode,
qreal mx = 0, qreal my = 0, bool reverse = false);