Return old spline path name -> SplPath.

--HG--
branch : develop
This commit is contained in:
dismine 2014-07-08 17:35:46 +03:00
parent 2c24eead7d
commit c1319d8da7
4 changed files with 10 additions and 3 deletions

View File

@ -50,6 +50,8 @@ DialogUndo::DialogUndo(QWidget *parent)
} }
connect(ui->pushButtonFix, &QPushButton::clicked, this, &DialogUndo::Fix); connect(ui->pushButtonFix, &QPushButton::clicked, this, &DialogUndo::Fix);
connect(ui->pushButtonCancel, &QPushButton::clicked, this, &DialogUndo::Cancel); connect(ui->pushButtonCancel, &QPushButton::clicked, this, &DialogUndo::Cancel);
setCursor(Qt::ArrowCursor);
} }
//--------------------------------------------------------------------------------------------------------------------- //---------------------------------------------------------------------------------------------------------------------

View File

@ -169,7 +169,7 @@ const QString line_ = QStringLiteral("Line_");
const QString angleLine_ = QStringLiteral("AngleLine_"); const QString angleLine_ = QStringLiteral("AngleLine_");
const QString arc_ = QStringLiteral("Arc_"); const QString arc_ = QStringLiteral("Arc_");
const QString spl_ = QStringLiteral("Spl_"); const QString spl_ = QStringLiteral("Spl_");
const QString splPath = QStringLiteral("splPath"); const QString splPath = QStringLiteral("SplPath");
//functions //functions
const QString sin_F = QStringLiteral("sin"); const QString sin_F = QStringLiteral("sin");

View File

@ -183,6 +183,7 @@ void VDrawTool::SetFactor(qreal factor)
*/ */
qreal VDrawTool::CheckFormula(QString &formula, VContainer *data) qreal VDrawTool::CheckFormula(QString &formula, VContainer *data)
{ {
SCASSERT(data != nullptr)
qreal result = 0; qreal result = 0;
Calculator *cal = nullptr; Calculator *cal = nullptr;
try try
@ -193,7 +194,12 @@ qreal VDrawTool::CheckFormula(QString &formula, VContainer *data)
} }
catch (qmu::QmuParserError &e) catch (qmu::QmuParserError &e)
{ {
Q_UNUSED(e) //Q_UNUSED(e)
qDebug() << "\nMath parser error:\n"
<< "--------------------------------------\n"
<< "Message: " << e.GetMsg() << "\n"
<< "Expression: " << e.GetExpr() << "\n"
<< "--------------------------------------";
delete cal; delete cal;
DialogUndo *dialogUndo = new DialogUndo(qApp->getMainWindow()); DialogUndo *dialogUndo = new DialogUndo(qApp->getMainWindow());

View File

@ -1832,7 +1832,6 @@ QString VApplication::FormulaFromUser(const QString &formula)
} }
return newFormula; return newFormula;
} }
//--------------------------------------------------------------------------------------------------------------------- //---------------------------------------------------------------------------------------------------------------------