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

Fix regression. Set default value for detail labels size and grainline length to 10 cm.

Browse Source
This commit is contained in:
Roman Telezhynskyi 2021-07-20 16:14:13 +03:00
parent af3ce8abfe
commit 5d84aa6dc1
3 changed files with 17 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ChangeLog.txt
View File

@ -2,6 +2,7 @@
- Fix regression. Minimal seam allowance width is less than the point accuracy values. - Fix regression. Minimal seam allowance width is less than the point accuracy values.
- Call autosave only in GUI mode. - Call autosave only in GUI mode.
- Warn about stale layout only in GUI mode. - Warn about stale layout only in GUI mode.
- Fix regression. Set default value for detail labels size and grainline length to 10 cm.
# Valentina 0.7.49 July 1, 2021 # Valentina 0.7.49 July 1, 2021
- Fix crash. - Fix crash.

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

@ -131,9 +131,9 @@ DialogSeamAllowance::DialogSeamAllowance(const VContainer *data, quint32 toolId,
m_tabPlaceLabels(new QWidget), m_tabPlaceLabels(new QWidget),
m_ftb(new FancyTabBar(FancyTabBar::Left, this)), m_ftb(new FancyTabBar(FancyTabBar::Left, this)),
applyAllowed(false),// By default disabled applyAllowed(false),// By default disabled
flagGPin(true), flagGPin(false),
flagDPin(true), flagDPin(false),
flagPPin(true), flagPPin(false),
flagGFormulas(true), flagGFormulas(true),
flagDLAngle(true), flagDLAngle(true),
flagDLFormulas(true), flagDLFormulas(true),
@ -170,6 +170,8 @@ DialogSeamAllowance::DialogSeamAllowance(const VContainer *data, quint32 toolId,
{ {
ui->setupUi(this); ui->setupUi(this);
m_defLabelValue = QString().setNum(UnitConvertor(10, Unit::Cm, *data->GetPatternUnit()));
InitOkCancelApply(ui); InitOkCancelApply(ui);
InitFancyTabBar(); InitFancyTabBar();
EnableApply(applyAllowed); EnableApply(applyAllowed);
@ -2558,8 +2560,8 @@ VPiece DialogSeamAllowance::CreatePiece() const
} }
else else
{ {
piece.GetPatternPieceData().SetLabelWidth(QString::number(1)); piece.GetPatternPieceData().SetLabelWidth(m_defLabelValue);
piece.GetPatternPieceData().SetLabelHeight(QString::number(1)); piece.GetPatternPieceData().SetLabelHeight(m_defLabelValue);
piece.GetPatternPieceData().SetCenterPin(NULL_ID); piece.GetPatternPieceData().SetCenterPin(NULL_ID);
piece.GetPatternPieceData().SetTopLeftPin(getCurrentObjectId(uiTabLabels->comboBoxDLTopLeftPin)); piece.GetPatternPieceData().SetTopLeftPin(getCurrentObjectId(uiTabLabels->comboBoxDLTopLeftPin));
piece.GetPatternPieceData().SetBottomRightPin(getCurrentObjectId(uiTabLabels->comboBoxDLBottomRightPin)); piece.GetPatternPieceData().SetBottomRightPin(getCurrentObjectId(uiTabLabels->comboBoxDLBottomRightPin));
@ -2581,8 +2583,8 @@ VPiece DialogSeamAllowance::CreatePiece() const
piece.GetPatternInfo().SetCenterPin(NULL_ID); piece.GetPatternInfo().SetCenterPin(NULL_ID);
piece.GetPatternInfo().SetTopLeftPin(getCurrentObjectId(uiTabLabels->comboBoxPLTopLeftPin)); piece.GetPatternInfo().SetTopLeftPin(getCurrentObjectId(uiTabLabels->comboBoxPLTopLeftPin));
piece.GetPatternInfo().SetBottomRightPin(getCurrentObjectId(uiTabLabels->comboBoxPLBottomRightPin)); piece.GetPatternInfo().SetBottomRightPin(getCurrentObjectId(uiTabLabels->comboBoxPLBottomRightPin));
piece.GetPatternInfo().SetLabelWidth(QString::number(1)); piece.GetPatternInfo().SetLabelWidth(m_defLabelValue);
piece.GetPatternInfo().SetLabelHeight(QString::number(1)); piece.GetPatternInfo().SetLabelHeight(m_defLabelValue);
} }
piece.GetGrainlineGeometry().SetVisible(uiTabGrainline->groupBoxGrainline->isChecked()); piece.GetGrainlineGeometry().SetVisible(uiTabGrainline->groupBoxGrainline->isChecked());
@ -2600,7 +2602,7 @@ VPiece DialogSeamAllowance::CreatePiece() const
else else
{ {
piece.GetGrainlineGeometry().SetRotation(QString::number(90)); piece.GetGrainlineGeometry().SetRotation(QString::number(90));
piece.GetGrainlineGeometry().SetLength(QChar('1')); piece.GetGrainlineGeometry().SetLength(m_defLabelValue);
piece.GetGrainlineGeometry().SetCenterPin(NULL_ID); piece.GetGrainlineGeometry().SetCenterPin(NULL_ID);
piece.GetGrainlineGeometry().SetTopPin(getCurrentObjectId(uiTabGrainline->comboBoxGrainlineTopPin)); piece.GetGrainlineGeometry().SetTopPin(getCurrentObjectId(uiTabGrainline->comboBoxGrainlineTopPin));
piece.GetGrainlineGeometry().SetBottomPin(getCurrentObjectId(uiTabGrainline->comboBoxGrainlineBottomPin)); piece.GetGrainlineGeometry().SetBottomPin(getCurrentObjectId(uiTabGrainline->comboBoxGrainlineBottomPin));
@ -3142,11 +3144,10 @@ void DialogSeamAllowance::InitPatternPieceDataTab()
//--------------------------------------------------------------------------------------------------------------------- //---------------------------------------------------------------------------------------------------------------------
void DialogSeamAllowance::InitLabelsTab() void DialogSeamAllowance::InitLabelsTab()
{ {
QString labelValue = QString().setNum(UnitConvertor(10, Unit::Cm, *data->GetPatternUnit())); uiTabLabels->lineEditDLWidthFormula->setPlainText(m_defLabelValue);
uiTabLabels->lineEditDLWidthFormula->setPlainText(labelValue); uiTabLabels->lineEditDLHeightFormula->setPlainText(m_defLabelValue);
uiTabLabels->lineEditDLHeightFormula->setPlainText(labelValue); uiTabLabels->lineEditPLWidthFormula->setPlainText(m_defLabelValue);
uiTabLabels->lineEditPLWidthFormula->setPlainText(labelValue); uiTabLabels->lineEditPLHeightFormula->setPlainText(m_defLabelValue);
uiTabLabels->lineEditPLHeightFormula->setPlainText(labelValue);
m_DLWidthBaseHeight = uiTabLabels->lineEditDLWidthFormula->height(); m_DLWidthBaseHeight = uiTabLabels->lineEditDLWidthFormula->height();
m_DLHeightBaseHeight = uiTabLabels->lineEditDLHeightFormula->height(); m_DLHeightBaseHeight = uiTabLabels->lineEditDLHeightFormula->height();

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

@ -238,6 +238,8 @@ private:
VAbstractPattern *m_doc{nullptr}; VAbstractPattern *m_doc{nullptr};
QString m_defLabelValue{};
VPiece CreatePiece() const; VPiece CreatePiece() const;
void NewMainPathItem(const VPieceNode &node); void NewMainPathItem(const VPieceNode &node);