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

Formula that calculate angle can be equal zero.

Browse Source 
--HG--
branch : develop
This commit is contained in:
dismine 2014-08-11 11:56:50 +03:00
parent 318517d3d7
commit 3af2859980
4 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/app/dialogs/tools/dialogarc.cpp
View File

@ -335,7 +335,7 @@ void DialogArc::EvalRadius()
void DialogArc::EvalF1() void DialogArc::EvalF1()
{ {
labelEditFormula = ui->labelEditF1; labelEditFormula = ui->labelEditF1;
Eval(ui->plainTextEditF1->toPlainText(), flagF1, timerF1, ui->labelResultF1); Eval(ui->plainTextEditF1->toPlainText(), flagF1, timerF1, ui->labelResultF1, false);
} }
//--------------------------------------------------------------------------------------------------------------------- //---------------------------------------------------------------------------------------------------------------------
@ -345,7 +345,7 @@ void DialogArc::EvalF1()
void DialogArc::EvalF2() void DialogArc::EvalF2()
{ {
labelEditFormula = ui->labelEditF2; labelEditFormula = ui->labelEditF2;
Eval(ui->plainTextEditF2->toPlainText(), flagF2, timerF2, ui->labelResultF2); Eval(ui->plainTextEditF2->toPlainText(), flagF2, timerF2, ui->labelResultF2, false);
} }
//--------------------------------------------------------------------------------------------------------------------- //---------------------------------------------------------------------------------------------------------------------

5
src/app/dialogs/tools/dialogtool.cpp
View File

@ -425,8 +425,9 @@ void DialogTool::ValFormulaChanged(bool &flag, QPlainTextEdit *edit, QTimer *tim
* @param flag flag state of formula * @param flag flag state of formula
* @param timer timer of formula * @param timer timer of formula
* @param label label for signal error * @param label label for signal error
* @param checkZero true - if formula can't be equal zero
*/ */
void DialogTool::Eval(const QString &text, bool &flag, QTimer *timer, QLabel *label) void DialogTool::Eval(const QString &text, bool &flag, QTimer *timer, QLabel *label, bool checkZero)
{ {
SCASSERT(timer != nullptr); SCASSERT(timer != nullptr);
SCASSERT(label != nullptr); SCASSERT(label != nullptr);
@ -449,7 +450,7 @@ void DialogTool::Eval(const QString &text, bool &flag, QTimer *timer, QLabel *la
delete cal; delete cal;
//if result equal 0 //if result equal 0
if (qFuzzyCompare(1 + result, 1 + 0)) if (checkZero && qFuzzyCompare(1 + result, 1 + 0))
{ {
flag = false; flag = false;
ChangeColor(labelEditFormula, Qt::red); ChangeColor(labelEditFormula, Qt::red);

2
src/app/dialogs/tools/dialogtool.h
View File

@ -213,7 +213,7 @@ protected:
void PutValHere(QPlainTextEdit *plainTextEdit, QListWidget *listWidget); void PutValHere(QPlainTextEdit *plainTextEdit, QListWidget *listWidget);
void ValFormulaChanged(bool &flag, QLineEdit *edit, QTimer * timer); void ValFormulaChanged(bool &flag, QLineEdit *edit, QTimer * timer);
void ValFormulaChanged(bool &flag, QPlainTextEdit *edit, QTimer * timer); void ValFormulaChanged(bool &flag, QPlainTextEdit *edit, QTimer * timer);
void Eval(const QString &text, bool &flag, QTimer *timer, QLabel *label); void Eval(const QString &text, bool &flag, QTimer *timer, QLabel *label, bool checkZero = true);
void setCurrentPointId(QComboBox *box, quint32 &pointId, const quint32 &value) const; void setCurrentPointId(QComboBox *box, quint32 &pointId, const quint32 &value) const;
void setCurrentSplineId(QComboBox *box, quint32 &splineId, const quint32 &value, void setCurrentSplineId(QComboBox *box, quint32 &splineId, const quint32 &value,
ComboBoxCutSpline cut = ComboBoxCutSpline::NoCutSpline) const; ComboBoxCutSpline cut = ComboBoxCutSpline::NoCutSpline) const;

3
src/app/tools/drawTools/vdrawtool.cpp
View File

@ -214,8 +214,7 @@ qreal VDrawTool::CheckFormula(const quint32 &toolId, QString &formula, VContaine
{ {
formula = dialog->getFormula(); formula = dialog->getFormula();
/* Need delete dialog here because parser in dialog don't allow use correct separator for parsing /* Need delete dialog here because parser in dialog don't allow use correct separator for parsing
* here. * here. */
* Don't know why. */
delete dialog; delete dialog;
Calculator *cal1 = new Calculator(data); Calculator *cal1 = new Calculator(data);
result = cal1->EvalFormula(formula); result = cal1->EvalFormula(formula);