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

Fixed issue #625. Seam allowance tool does not take decimals with locale

Browse Source 
de_DE.utf8.

--HG--
branch : develop
This commit is contained in:
Roman Telezhynskyi 2017-02-10 15:02:03 +02:00
parent d7f9898edc
commit ddd2e3054f
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/libs/vtools/dialogs/tools/dialogseamallowance.cpp
View File

@ -152,7 +152,8 @@ void DialogSeamAllowance::SetPiece(const VPiece &piece)
ui->checkBoxSeams->setChecked(piece.IsSeamAllowance()); ui->checkBoxSeams->setChecked(piece.IsSeamAllowance());
ui->lineEditName->setText(piece.GetName()); ui->lineEditName->setText(piece.GetName());
ui->plainTextEditFormulaWidth->setPlainText(piece.GetFormulaSAWidth()); const QString width = qApp->TrVars()->FormulaToUser(piece.GetFormulaSAWidth(), qApp->Settings()->GetOsSeparator());
ui->plainTextEditFormulaWidth->setPlainText(width);
m_saWidth = piece.GetSAWidth(); m_saWidth = piece.GetSAWidth();
m_mx = piece.GetMx(); m_mx = piece.GetMx();
@ -635,11 +636,11 @@ void DialogSeamAllowance::NodeChanged(int index)
{ {
ui->pushButtonDefBefore->setEnabled(true); ui->pushButtonDefBefore->setEnabled(true);
} }
w1Formula = qApp->TrVars()->FormulaToUser(w1Formula, qApp->Settings()->GetOsSeparator());
if (w1Formula.length() > 80)// increase height if needed. if (w1Formula.length() > 80)// increase height if needed.
{ {
this->DeployWidthBeforeFormulaTextEdit(); this->DeployWidthBeforeFormulaTextEdit();
} }
w1Formula = qApp->TrVars()->FormulaToUser(w1Formula, qApp->Settings()->GetOsSeparator());
ui->plainTextEditFormulaWidthBefore->setPlainText(w1Formula); ui->plainTextEditFormulaWidthBefore->setPlainText(w1Formula);
MoveCursorToEnd(ui->plainTextEditFormulaWidthBefore); MoveCursorToEnd(ui->plainTextEditFormulaWidthBefore);
@ -652,11 +653,11 @@ void DialogSeamAllowance::NodeChanged(int index)
{ {
ui->pushButtonDefAfter->setEnabled(true); ui->pushButtonDefAfter->setEnabled(true);
} }
w2Formula = qApp->TrVars()->FormulaToUser(w2Formula, qApp->Settings()->GetOsSeparator());
if (w2Formula.length() > 80)// increase height if needed. if (w2Formula.length() > 80)// increase height if needed.
{ {
this->DeployWidthAfterFormulaTextEdit(); this->DeployWidthAfterFormulaTextEdit();
} }
w2Formula = qApp->TrVars()->FormulaToUser(w2Formula, qApp->Settings()->GetOsSeparator());
ui->plainTextEditFormulaWidthAfter->setPlainText(w2Formula); ui->plainTextEditFormulaWidthAfter->setPlainText(w2Formula);
MoveCursorToEnd(ui->plainTextEditFormulaWidthAfter); MoveCursorToEnd(ui->plainTextEditFormulaWidthAfter);
@ -1248,6 +1249,7 @@ VPiece DialogSeamAllowance::CreatePiece() const
QString width = ui->plainTextEditFormulaWidth->toPlainText(); QString width = ui->plainTextEditFormulaWidth->toPlainText();
width.replace("\n", " "); width.replace("\n", " ");
width = qApp->TrVars()->TryFormulaFromUser(width, qApp->Settings()->GetOsSeparator());
piece.SetFormulaSAWidth(width, m_saWidth); piece.SetFormulaSAWidth(width, m_saWidth);
piece.GetPatternPieceData().SetLetter(ui->lineEditLetter->text()); piece.GetPatternPieceData().SetLetter(ui->lineEditLetter->text());