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

Calculate a formula immediately.

Browse Source 
--HG--
branch : feature
This commit is contained in:
Roman Telezhynskyi 2016-03-05 15:22:24 +02:00
parent e948a0ba27
commit e120fc1d0a
2 changed files with 26 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -51,10 +51,6 @@ DialogSplinePath::DialogSplinePath(const VContainer *data, const quint32 &toolId
formulaBaseHeightAngle2(0), formulaBaseHeightAngle2(0),
formulaBaseHeightLength1(0), formulaBaseHeightLength1(0),
formulaBaseHeightLength2(0), formulaBaseHeightLength2(0),
timerAngle1(new QTimer(this)),
timerAngle2(new QTimer(this)),
timerLength1(new QTimer(this)),
timerLength2(new QTimer(this)),
flagAngle1(), flagAngle1(),
flagAngle2(), flagAngle2(),
flagLength1(), flagLength1(),
@ -74,11 +70,6 @@ DialogSplinePath::DialogSplinePath(const VContainer *data, const quint32 &toolId
ui->plainTextEditLength1F->installEventFilter(this); ui->plainTextEditLength1F->installEventFilter(this);
ui->plainTextEditLength2F->installEventFilter(this); ui->plainTextEditLength2F->installEventFilter(this);
connect(timerAngle1, &QTimer::timeout, this, &DialogSplinePath::EvalAngle1);
connect(timerAngle2, &QTimer::timeout, this, &DialogSplinePath::EvalAngle2);
connect(timerLength1, &QTimer::timeout, this, &DialogSplinePath::EvalLength1);
connect(timerLength2, &QTimer::timeout, this, &DialogSplinePath::EvalLength2);
InitOkCancelApply(ui); InitOkCancelApply(ui);
bOk->setEnabled(false); bOk->setEnabled(false);
@ -286,10 +277,6 @@ void DialogSplinePath::Angle1Changed()
if (row != 0) if (row != 0)
{ {
labelEditFormula = ui->labelEditAngle1;
labelResultCalculation = ui->labelResultAngle1;
ValFormulaChanged(flagAngle1[row], ui->plainTextEditAngle1F, timerAngle1, degreeSymbol);
QListWidgetItem *item = ui->listWidget->item(row); QListWidgetItem *item = ui->listWidget->item(row);
SCASSERT(item != nullptr); SCASSERT(item != nullptr);
VSplinePoint p = qvariant_cast<VSplinePoint>(item->data(Qt::UserRole)); VSplinePoint p = qvariant_cast<VSplinePoint>(item->data(Qt::UserRole));
@ -309,7 +296,7 @@ void DialogSplinePath::Angle1Changed()
item->setData(Qt::UserRole, QVariant::fromValue(p)); item->setData(Qt::UserRole, QVariant::fromValue(p));
ShowPointIssue(p.P().name()); EvalAngle1();
if (row != ui->listWidget->count()-1) if (row != ui->listWidget->count()-1)
{ {
@ -332,10 +319,6 @@ void DialogSplinePath::Angle2Changed()
if (row != ui->listWidget->count()-1) if (row != ui->listWidget->count()-1)
{ {
labelEditFormula = ui->labelEditAngle2;
labelResultCalculation = ui->labelResultAngle2;
ValFormulaChanged(flagAngle2[row], ui->plainTextEditAngle2F, timerAngle2, degreeSymbol);
QListWidgetItem *item = ui->listWidget->item(row); QListWidgetItem *item = ui->listWidget->item(row);
SCASSERT(item != nullptr); SCASSERT(item != nullptr);
VSplinePoint p = qvariant_cast<VSplinePoint>(item->data(Qt::UserRole)); VSplinePoint p = qvariant_cast<VSplinePoint>(item->data(Qt::UserRole));
@ -355,7 +338,7 @@ void DialogSplinePath::Angle2Changed()
item->setData(Qt::UserRole, QVariant::fromValue(p)); item->setData(Qt::UserRole, QVariant::fromValue(p));
ShowPointIssue(p.P().name()); EvalAngle2();
if (row != 0) if (row != 0)
{ {
@ -378,11 +361,6 @@ void DialogSplinePath::Length1Changed()
if (row != 0) if (row != 0)
{ {
labelEditFormula = ui->labelEditLength1;
labelResultCalculation = ui->labelResultLength1;
const QString postfix = VDomDocument::UnitsToStr(qApp->patternUnit(), true);
ValFormulaChanged(flagLength1[row], ui->plainTextEditLength1F, timerLength1, postfix);
QListWidgetItem *item = ui->listWidget->item(row); QListWidgetItem *item = ui->listWidget->item(row);
SCASSERT(item != nullptr); SCASSERT(item != nullptr);
VSplinePoint p = qvariant_cast<VSplinePoint>(item->data(Qt::UserRole)); VSplinePoint p = qvariant_cast<VSplinePoint>(item->data(Qt::UserRole));
@ -402,7 +380,7 @@ void DialogSplinePath::Length1Changed()
item->setData(Qt::UserRole, QVariant::fromValue(p)); item->setData(Qt::UserRole, QVariant::fromValue(p));
ShowPointIssue(p.P().name()); EvalLength1();
} }
} }
@ -417,11 +395,6 @@ void DialogSplinePath::Length2Changed()
if (row != ui->listWidget->count()-1) if (row != ui->listWidget->count()-1)
{ {
labelEditFormula = ui->labelEditLength2;
labelResultCalculation = ui->labelResultLength2;
const QString postfix = VDomDocument::UnitsToStr(qApp->patternUnit(), true);
ValFormulaChanged(flagLength2[row], ui->plainTextEditLength2F, timerLength2, postfix);
QListWidgetItem *item = ui->listWidget->item(row); QListWidgetItem *item = ui->listWidget->item(row);
SCASSERT(item != nullptr); SCASSERT(item != nullptr);
VSplinePoint p = qvariant_cast<VSplinePoint>(item->data(Qt::UserRole)); VSplinePoint p = qvariant_cast<VSplinePoint>(item->data(Qt::UserRole));
@ -441,7 +414,7 @@ void DialogSplinePath::Length2Changed()
item->setData(Qt::UserRole, QVariant::fromValue(p)); item->setData(Qt::UserRole, QVariant::fromValue(p));
ShowPointIssue(p.P().name()); EvalLength2();
} }
} }
@ -802,10 +775,28 @@ void DialogSplinePath::NewItem(const VSplinePoint &point)
bOk->setEnabled(true); bOk->setEnabled(true);
} }
const int row = ui->listWidget->currentRow();
if (row == 0)
{
flagAngle1.append(true); flagAngle1.append(true);
flagLength1.append(true); flagLength1.append(true);
flagAngle2.append(false);
flagLength2.append(false);
}
else if (row == ui->listWidget->count()-1)
{
flagAngle1.append(false);
flagLength1.append(false);
flagAngle2.append(true); flagAngle2.append(true);
flagLength2.append(true); flagLength2.append(true);
}
else
{
flagAngle1.append(false);
flagLength1.append(false);
flagAngle2.append(false);
flagLength2.append(false);
}
DataPoint(point); DataPoint(point);
} }

6
src/libs/vtools/dialogs/tools/dialogsplinepath.h
View File

@ -96,12 +96,6 @@ private:
int formulaBaseHeightLength1; int formulaBaseHeightLength1;
int formulaBaseHeightLength2; int formulaBaseHeightLength2;
/** @brief timerAngle1 timer of check first angle formula */
QTimer *timerAngle1;
QTimer *timerAngle2;
QTimer *timerLength1;
QTimer *timerLength2;
/** @brief flagAngle1 true if value of first angle is correct */ /** @brief flagAngle1 true if value of first angle is correct */
QVector<bool> flagAngle1; QVector<bool> flagAngle1;
QVector<bool> flagAngle2; QVector<bool> flagAngle2;