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

Fix regression. Valentina doesn't show a notch mark in a custom seam allowance

Browse Source 
list.

--HG--
branch : develop
This commit is contained in:
Roman Telezhynskyi 2018-07-24 15:29:53 +03:00
parent a0e09d3fe7
commit d35684a44a
2 changed files with 18 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -92,6 +92,7 @@ void DialogPiecePath::EnbleShowMode(bool disable)
m_showMode = disable; m_showMode = disable;
ui->comboBoxType->setDisabled(m_showMode); ui->comboBoxType->setDisabled(m_showMode);
ui->comboBoxPiece->setDisabled(m_showMode); ui->comboBoxPiece->setDisabled(m_showMode);
RefreshPathList(GetPiecePath());
ValidObjects(PathIsValid()); ValidObjects(PathIsValid());
} }
@ -1078,13 +1079,14 @@ VPiecePath DialogPiecePath::GetPiecePath() const
//--------------------------------------------------------------------------------------------------------------------- //---------------------------------------------------------------------------------------------------------------------
void DialogPiecePath::SetPiecePath(const VPiecePath &path) void DialogPiecePath::SetPiecePath(const VPiecePath &path)
{ {
SetType(path.GetType()); // Set first to know path type
ui->listWidget->clear(); ui->listWidget->clear();
for (int i = 0; i < path.CountNodes(); ++i) for (int i = 0; i < path.CountNodes(); ++i)
{ {
NewItem(path.at(i)); NewItem(path.at(i));
} }
SetType(path.GetType());
ui->lineEditName->setText(path.GetName()); ui->lineEditName->setText(path.GetName());
VisToolPiecePath *visPath = qobject_cast<VisToolPiecePath *>(vis); VisToolPiecePath *visPath = qobject_cast<VisToolPiecePath *>(vis);
@ -1389,7 +1391,7 @@ void DialogPiecePath::ValidObjects(bool value)
//--------------------------------------------------------------------------------------------------------------------- //---------------------------------------------------------------------------------------------------------------------
void DialogPiecePath::NewItem(const VPieceNode &node) void DialogPiecePath::NewItem(const VPieceNode &node)
{ {
NewNodeItem(ui->listWidget, node, GetType() == PiecePathType::CustomSeamAllowance); NewNodeItem(ui->listWidget, node, IsShowNotch());
} }
//--------------------------------------------------------------------------------------------------------------------- //---------------------------------------------------------------------------------------------------------------------
@ -1425,3 +1427,15 @@ void DialogPiecePath::SetFormulaVisible(const QString &formula)
ui->plainTextEditFormulaVisible->setPlainText(f); ui->plainTextEditFormulaVisible->setPlainText(f);
MoveCursorToEnd(ui->plainTextEditFormulaVisible); MoveCursorToEnd(ui->plainTextEditFormulaVisible);
} }
//---------------------------------------------------------------------------------------------------------------------
void DialogPiecePath::RefreshPathList(const VPiecePath &path)
{
ui->listWidget->blockSignals(true);
ui->listWidget->clear();
for (int i = 0; i < path.CountNodes(); ++i)
{
NewItem(path.at(i));
}
ui->listWidget->blockSignals(false);
}

2
src/libs/vtools/dialogs/tools/piece/dialogpiecepath.h
View File

@ -160,6 +160,8 @@ private:
void SetFormulaVisible(const QString &formula); void SetFormulaVisible(const QString &formula);
bool IsShowNotch() const; bool IsShowNotch() const;
void RefreshPathList(const VPiecePath &path);
}; };
inline bool DialogPiecePath::IsShowNotch() const inline bool DialogPiecePath::IsShowNotch() const