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

Change default values for grainline length and pattern label size to 10 cm.

Browse Source
This commit is contained in:
Roman Telezhynskyi 2020-03-12 10:49:12 +02:00
parent d1c858fc33
commit f4908dafd4
2 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ChangeLog.txt
View File

@ -40,6 +40,7 @@
- Tracking changes/prevent "OK" recalculation after "Apply". - Tracking changes/prevent "OK" recalculation after "Apply".
- Change behavior for menu Pattern piece -> Show main path. Now it has an influence on export as well. - Change behavior for menu Pattern piece -> Show main path. Now it has an influence on export as well.
- Call Piece Options and Delete Piece from the piece list context menu. - Call Piece Options and Delete Piece from the piece list context menu.
- Change default values for grainline length and pattern label size to 10 cm.
# Version 0.6.2 (unreleased) # Version 0.6.2 (unreleased)
- [#903] Bug in tool Cut Spline path. - [#903] Bug in tool Cut Spline path.

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

@ -3059,6 +3059,12 @@ void DialogSeamAllowance::InitPatternPieceDataTab()
//--------------------------------------------------------------------------------------------------------------------- //---------------------------------------------------------------------------------------------------------------------
void DialogSeamAllowance::InitLabelsTab() void DialogSeamAllowance::InitLabelsTab()
{ {
QString labelValue = QString().setNum(UnitConvertor(10, Unit::Cm, *data->GetPatternUnit()));
uiTabLabels->lineEditDLWidthFormula->setPlainText(labelValue);
uiTabLabels->lineEditDLHeightFormula->setPlainText(labelValue);
uiTabLabels->lineEditPLWidthFormula->setPlainText(labelValue);
uiTabLabels->lineEditPLHeightFormula->setPlainText(labelValue);
m_DLWidthBaseHeight = uiTabLabels->lineEditDLWidthFormula->height(); m_DLWidthBaseHeight = uiTabLabels->lineEditDLWidthFormula->height();
m_DLHeightBaseHeight = uiTabLabels->lineEditDLHeightFormula->height(); m_DLHeightBaseHeight = uiTabLabels->lineEditDLHeightFormula->height();
m_DLAngleBaseHeight = uiTabLabels->lineEditDLAngleFormula->height(); m_DLAngleBaseHeight = uiTabLabels->lineEditDLAngleFormula->height();
@ -3125,6 +3131,9 @@ void DialogSeamAllowance::InitLabelsTab()
//--------------------------------------------------------------------------------------------------------------------- //---------------------------------------------------------------------------------------------------------------------
void DialogSeamAllowance::InitGrainlineTab() void DialogSeamAllowance::InitGrainlineTab()
{ {
uiTabGrainline->lineEditLenFormula->setPlainText(
QString().setNum(UnitConvertor(10, Unit::Cm, *data->GetPatternUnit())));
connect(uiTabGrainline->groupBoxGrainline, &QGroupBox::toggled, this, &DialogSeamAllowance::EnabledGrainline); connect(uiTabGrainline->groupBoxGrainline, &QGroupBox::toggled, this, &DialogSeamAllowance::EnabledGrainline);
connect(uiTabGrainline->pushButtonRot, &QPushButton::clicked, this, &DialogSeamAllowance::EditGrainlineFormula); connect(uiTabGrainline->pushButtonRot, &QPushButton::clicked, this, &DialogSeamAllowance::EditGrainlineFormula);
connect(uiTabGrainline->pushButtonLen, &QPushButton::clicked, this, &DialogSeamAllowance::EditGrainlineFormula); connect(uiTabGrainline->pushButtonLen, &QPushButton::clicked, this, &DialogSeamAllowance::EditGrainlineFormula);
@ -3349,7 +3358,7 @@ void DialogSeamAllowance::SetGrainlineLength(QString lengthFormula)
{ {
if (lengthFormula.isEmpty()) if (lengthFormula.isEmpty())
{ {
lengthFormula = QString().setNum(UnitConvertor(1, Unit::Cm, *data->GetPatternUnit())); lengthFormula = QString().setNum(UnitConvertor(10, Unit::Cm, *data->GetPatternUnit()));
} }
const QString formula = qApp->TrVars()->FormulaToUser(lengthFormula, qApp->Settings()->GetOsSeparator()); const QString formula = qApp->TrVars()->FormulaToUser(lengthFormula, qApp->Settings()->GetOsSeparator());
@ -3369,7 +3378,7 @@ void DialogSeamAllowance::SetDLWidth(QString widthFormula)
{ {
if (widthFormula.isEmpty()) if (widthFormula.isEmpty())
{ {
widthFormula = QString().setNum(UnitConvertor(1, Unit::Cm, *data->GetPatternUnit())); widthFormula = QString().setNum(UnitConvertor(10, Unit::Cm, *data->GetPatternUnit()));
} }
const QString formula = qApp->TrVars()->FormulaToUser(widthFormula, qApp->Settings()->GetOsSeparator()); const QString formula = qApp->TrVars()->FormulaToUser(widthFormula, qApp->Settings()->GetOsSeparator());
@ -3389,7 +3398,7 @@ void DialogSeamAllowance::SetDLHeight(QString heightFormula)
{ {
if (heightFormula.isEmpty()) if (heightFormula.isEmpty())
{ {
heightFormula = QString().setNum(UnitConvertor(1, Unit::Cm, *data->GetPatternUnit())); heightFormula = QString().setNum(UnitConvertor(10, Unit::Cm, *data->GetPatternUnit()));
} }
const QString formula = qApp->TrVars()->FormulaToUser(heightFormula, qApp->Settings()->GetOsSeparator()); const QString formula = qApp->TrVars()->FormulaToUser(heightFormula, qApp->Settings()->GetOsSeparator());
@ -3429,7 +3438,7 @@ void DialogSeamAllowance::SetPLWidth(QString widthFormula)
{ {
if (widthFormula.isEmpty()) if (widthFormula.isEmpty())
{ {
widthFormula = QString().setNum(UnitConvertor(1, Unit::Cm, *data->GetPatternUnit())); widthFormula = QString().setNum(UnitConvertor(10, Unit::Cm, *data->GetPatternUnit()));
} }
const QString formula = qApp->TrVars()->FormulaToUser(widthFormula, qApp->Settings()->GetOsSeparator()); const QString formula = qApp->TrVars()->FormulaToUser(widthFormula, qApp->Settings()->GetOsSeparator());
@ -3449,7 +3458,7 @@ void DialogSeamAllowance::SetPLHeight(QString heightFormula)
{ {
if (heightFormula.isEmpty()) if (heightFormula.isEmpty())
{ {
heightFormula = QString().setNum(UnitConvertor(1, Unit::Cm, *data->GetPatternUnit())); heightFormula = QString().setNum(UnitConvertor(10, Unit::Cm, *data->GetPatternUnit()));
} }
const QString formula = qApp->TrVars()->FormulaToUser(heightFormula, qApp->Settings()->GetOsSeparator()); const QString formula = qApp->TrVars()->FormulaToUser(heightFormula, qApp->Settings()->GetOsSeparator());