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

Fixed bug. Grainline's formulas were not converted to internal look.

Browse Source 
--HG--
branch : develop
This commit is contained in:
Roman Telezhynskyi 2017-02-13 08:30:34 +02:00
parent b4e1a19b4f
commit 8814c07d14
2 changed files with 18 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -52,6 +52,16 @@ void EnableDefButton(QPushButton *defButton, const QString &formula)
defButton->setEnabled(true); defButton->setEnabled(true);
} }
} }
//---------------------------------------------------------------------------------------------------------------------
QString GetFormulaFromUser(QPlainTextEdit *textEdit)
{
SCASSERT(textEdit != nullptr)
QString formula = textEdit->toPlainText();
formula.replace("\n", " ");
return qApp->TrVars()->TryFormulaFromUser(formula, qApp->Settings()->GetOsSeparator());
}
} }
//--------------------------------------------------------------------------------------------------------------------- //---------------------------------------------------------------------------------------------------------------------
@ -926,14 +936,13 @@ void DialogSeamAllowance::UpdateValues()
plbVal->setToolTip(tr("Value")); plbVal->setToolTip(tr("Value"));
QString qsFormula = apleSender[i]->toPlainText().simplified(); QString qsFormula = apleSender[i]->toPlainText().simplified();
Calculator cal;
QString qsVal; QString qsVal;
try try
{ {
qsFormula.replace("\n", " "); qsFormula.replace("\n", " ");
qsFormula = qApp->TrVars()->FormulaFromUser(qsFormula, qApp->Settings()->GetOsSeparator()); qsFormula = qApp->TrVars()->FormulaFromUser(qsFormula, qApp->Settings()->GetOsSeparator());
qreal dVal; Calculator cal;
dVal = cal.EvalFormula(data->PlainVariables(), qsFormula); qreal dVal = cal.EvalFormula(data->PlainVariables(), qsFormula);
if (qIsInf(dVal) == true || qIsNaN(dVal) == true) if (qIsInf(dVal) == true || qIsNaN(dVal) == true)
{ {
throw qmu::QmuParserError(tr("Infinite/undefined result")); throw qmu::QmuParserError(tr("Infinite/undefined result"));
@ -1127,7 +1136,7 @@ void DialogSeamAllowance::EvalWidthBefore()
bool flagFormula = false; // fake flag bool flagFormula = false; // fake flag
Eval(formula, flagFormula, ui->labelResultBefore, postfix, false, true); Eval(formula, flagFormula, ui->labelResultBefore, postfix, false, true);
const QString formulaSABefore = GetFormulaSAWidthBefore(); const QString formulaSABefore = GetFormulaFromUser(ui->plainTextEditFormulaWidthBefore);
UpdateNodeSABefore(formulaSABefore); UpdateNodeSABefore(formulaSABefore);
EnableDefButton(ui->pushButtonDefBefore, formulaSABefore); EnableDefButton(ui->pushButtonDefBefore, formulaSABefore);
} }
@ -1141,7 +1150,7 @@ void DialogSeamAllowance::EvalWidthAfter()
bool flagFormula = false; // fake flag bool flagFormula = false; // fake flag
Eval(formula, flagFormula, ui->labelResultAfter, postfix, false, true); Eval(formula, flagFormula, ui->labelResultAfter, postfix, false, true);
const QString formulaSAAfter = GetFormulaSAWidthAfter(); const QString formulaSAAfter = GetFormulaFromUser(ui->plainTextEditFormulaWidthAfter);
UpdateNodeSAAfter(formulaSAAfter); UpdateNodeSAAfter(formulaSAAfter);
EnableDefButton(ui->pushButtonDefAfter, formulaSAAfter); EnableDefButton(ui->pushButtonDefAfter, formulaSAAfter);
} }
@ -1166,7 +1175,7 @@ void DialogSeamAllowance::FXWidthBefore()
{ {
DialogEditWrongFormula *dialog = new DialogEditWrongFormula(data, toolId, this); DialogEditWrongFormula *dialog = new DialogEditWrongFormula(data, toolId, this);
dialog->setWindowTitle(tr("Edit seam allowance width before")); dialog->setWindowTitle(tr("Edit seam allowance width before"));
dialog->SetFormula(GetFormulaSAWidthBefore()); dialog->SetFormula(GetFormulaFromUser(ui->plainTextEditFormulaWidthBefore));
dialog->setCheckLessThanZero(true); dialog->setCheckLessThanZero(true);
dialog->setPostfix(VDomDocument::UnitsToStr(qApp->patternUnit(), true)); dialog->setPostfix(VDomDocument::UnitsToStr(qApp->patternUnit(), true));
if (dialog->exec() == QDialog::Accepted) if (dialog->exec() == QDialog::Accepted)
@ -1181,7 +1190,7 @@ void DialogSeamAllowance::FXWidthAfter()
{ {
DialogEditWrongFormula *dialog = new DialogEditWrongFormula(data, toolId, this); DialogEditWrongFormula *dialog = new DialogEditWrongFormula(data, toolId, this);
dialog->setWindowTitle(tr("Edit seam allowance width after")); dialog->setWindowTitle(tr("Edit seam allowance width after"));
dialog->SetFormula(GetFormulaSAWidthAfter()); dialog->SetFormula(GetFormulaFromUser(ui->plainTextEditFormulaWidthAfter));
dialog->setCheckLessThanZero(true); dialog->setCheckLessThanZero(true);
dialog->setPostfix(VDomDocument::UnitsToStr(qApp->patternUnit(), true)); dialog->setPostfix(VDomDocument::UnitsToStr(qApp->patternUnit(), true));
if (dialog->exec() == QDialog::Accepted) if (dialog->exec() == QDialog::Accepted)
@ -1294,8 +1303,8 @@ VPiece DialogSeamAllowance::CreatePiece() const
piece.GetGrainlineGeometry() = m_oldGrainline; piece.GetGrainlineGeometry() = m_oldGrainline;
piece.GetGrainlineGeometry().SetVisible(ui->checkBoxGrainline->isChecked()); piece.GetGrainlineGeometry().SetVisible(ui->checkBoxGrainline->isChecked());
piece.GetGrainlineGeometry().SetRotation(ui->lineEditRotFormula->toPlainText()); piece.GetGrainlineGeometry().SetRotation(GetFormulaFromUser(ui->lineEditRotFormula));
piece.GetGrainlineGeometry().SetLength(ui->lineEditLenFormula->toPlainText()); piece.GetGrainlineGeometry().SetLength(GetFormulaFromUser(ui->lineEditLenFormula));
piece.GetGrainlineGeometry().SetArrowType(VGrainlineGeometry::ArrowType(ui->comboBoxArrow->currentIndex())); piece.GetGrainlineGeometry().SetArrowType(VGrainlineGeometry::ArrowType(ui->comboBoxArrow->currentIndex()));
return piece; return piece;
@ -1747,22 +1756,6 @@ void DialogSeamAllowance::SetFormulaSAWidth(const QString &formula)
MoveCursorToEnd(ui->plainTextEditFormulaWidth); MoveCursorToEnd(ui->plainTextEditFormulaWidth);
} }
//---------------------------------------------------------------------------------------------------------------------
QString DialogSeamAllowance::GetFormulaSAWidthBefore() const
{
QString width = ui->plainTextEditFormulaWidthBefore->toPlainText();
width.replace("\n", " ");
return qApp->TrVars()->TryFormulaFromUser(width, qApp->Settings()->GetOsSeparator());
}
//---------------------------------------------------------------------------------------------------------------------
QString DialogSeamAllowance::GetFormulaSAWidthAfter() const
{
QString width = ui->plainTextEditFormulaWidthAfter->toPlainText();
width.replace("\n", " ");
return qApp->TrVars()->TryFormulaFromUser(width, qApp->Settings()->GetOsSeparator());
}
//--------------------------------------------------------------------------------------------------------------------- //---------------------------------------------------------------------------------------------------------------------
void DialogSeamAllowance::UpdateCurrentCustomSARecord() void DialogSeamAllowance::UpdateCurrentCustomSARecord()
{ {

3
src/libs/vtools/dialogs/tools/dialogseamallowance.h
View File

@ -178,9 +178,6 @@ private:
void InitGrainlineTab(); void InitGrainlineTab();
void SetFormulaSAWidth(const QString &formula); void SetFormulaSAWidth(const QString &formula);
QString GetFormulaSAWidthBefore() const;
QString GetFormulaSAWidthAfter() const;
}; };
#endif // DIALOGSEAMALLOWANCE_H #endif // DIALOGSEAMALLOWANCE_H