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

Length to control point can be 0.

Browse Source 
--HG--
branch : develop
This commit is contained in:
Roman Telezhynskyi 2016-08-26 19:33:54 +03:00
parent c2b7ead2ce
commit 8cf52dc674
2 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/libs/vtools/dialogs/tools/dialogspline.cpp
View File

@ -405,7 +405,8 @@ void DialogSpline::EvalLength1()
{ {
labelEditFormula = ui->labelEditLength1; labelEditFormula = ui->labelEditLength1;
const QString postfix = VDomDocument::UnitsToStr(qApp->patternUnit(), true); const QString postfix = VDomDocument::UnitsToStr(qApp->patternUnit(), true);
const qreal length1 = Eval(ui->plainTextEditLength1F->toPlainText(), flagLength1, ui->labelResultLength1, postfix); const qreal length1 = Eval(ui->plainTextEditLength1F->toPlainText(), flagLength1, ui->labelResultLength1, postfix,
false);
if (length1 < 0) if (length1 < 0)
{ {
@ -423,7 +424,8 @@ void DialogSpline::EvalLength2()
{ {
labelEditFormula = ui->labelEditLength2; labelEditFormula = ui->labelEditLength2;
const QString postfix = VDomDocument::UnitsToStr(qApp->patternUnit(), true); const QString postfix = VDomDocument::UnitsToStr(qApp->patternUnit(), true);
const qreal length2 = Eval(ui->plainTextEditLength2F->toPlainText(), flagLength2, ui->labelResultLength2, postfix); const qreal length2 = Eval(ui->plainTextEditLength2F->toPlainText(), flagLength2, ui->labelResultLength2, postfix,
false);
if (length2 < 0) if (length2 < 0)
{ {

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

@ -602,13 +602,13 @@ void DialogSplinePath::EvalLength1()
labelEditFormula = ui->labelEditLength1; labelEditFormula = ui->labelEditLength1;
const QString postfix = VDomDocument::UnitsToStr(qApp->patternUnit(), true); const QString postfix = VDomDocument::UnitsToStr(qApp->patternUnit(), true);
const qreal length1 = Eval(ui->plainTextEditLength1F->toPlainText(), flagLength1[row], ui->labelResultLength1, const qreal length1 = Eval(ui->plainTextEditLength1F->toPlainText(), flagLength1[row], ui->labelResultLength1,
postfix); postfix, false);
if (length1 < 0) if (length1 < 0)
{ {
flagLength1[row] = false; flagLength1[row] = false;
ChangeColor(labelEditFormula, Qt::red); ChangeColor(labelEditFormula, Qt::red);
ui->labelResultLength1->setText(tr("Error") + " (" + postfix + ")"); ui->labelResultLength1->setText(tr("Error") + QLatin1String(" (") + postfix + QLatin1String(")"));
ui->labelResultLength1->setToolTip(tr("Length can't be negative")); ui->labelResultLength1->setToolTip(tr("Length can't be negative"));
CheckState(); CheckState();
@ -633,13 +633,13 @@ void DialogSplinePath::EvalLength2()
labelEditFormula = ui->labelEditLength2; labelEditFormula = ui->labelEditLength2;
const QString postfix = VDomDocument::UnitsToStr(qApp->patternUnit(), true); const QString postfix = VDomDocument::UnitsToStr(qApp->patternUnit(), true);
const qreal length2 = Eval(ui->plainTextEditLength2F->toPlainText(), flagLength2[row], ui->labelResultLength2, const qreal length2 = Eval(ui->plainTextEditLength2F->toPlainText(), flagLength2[row], ui->labelResultLength2,
postfix); postfix, false);
if (length2 < 0) if (length2 < 0)
{ {
flagLength2[row] = false; flagLength2[row] = false;
ChangeColor(labelEditFormula, Qt::red); ChangeColor(labelEditFormula, Qt::red);
ui->labelResultLength2->setText(tr("Error") + " (" + postfix + ")"); ui->labelResultLength2->setText(tr("Error") + QLatin1String(" (") + postfix + QLatin1String(")"));
ui->labelResultLength2->setToolTip(tr("Length can't be negative")); ui->labelResultLength2->setToolTip(tr("Length can't be negative"));
CheckState(); CheckState();