Return old spline path name -> SplPath.
--HG-- branch : develop
This commit is contained in:
parent
2c24eead7d
commit
c1319d8da7
|
@ -50,6 +50,8 @@ DialogUndo::DialogUndo(QWidget *parent)
|
|||
}
|
||||
connect(ui->pushButtonFix, &QPushButton::clicked, this, &DialogUndo::Fix);
|
||||
connect(ui->pushButtonCancel, &QPushButton::clicked, this, &DialogUndo::Cancel);
|
||||
|
||||
setCursor(Qt::ArrowCursor);
|
||||
}
|
||||
|
||||
//---------------------------------------------------------------------------------------------------------------------
|
||||
|
|
|
@ -169,7 +169,7 @@ const QString line_ = QStringLiteral("Line_");
|
|||
const QString angleLine_ = QStringLiteral("AngleLine_");
|
||||
const QString arc_ = QStringLiteral("Arc_");
|
||||
const QString spl_ = QStringLiteral("Spl_");
|
||||
const QString splPath = QStringLiteral("splPath");
|
||||
const QString splPath = QStringLiteral("SplPath");
|
||||
|
||||
//functions
|
||||
const QString sin_F = QStringLiteral("sin");
|
||||
|
|
|
@ -183,6 +183,7 @@ void VDrawTool::SetFactor(qreal factor)
|
|||
*/
|
||||
qreal VDrawTool::CheckFormula(QString &formula, VContainer *data)
|
||||
{
|
||||
SCASSERT(data != nullptr)
|
||||
qreal result = 0;
|
||||
Calculator *cal = nullptr;
|
||||
try
|
||||
|
@ -193,7 +194,12 @@ qreal VDrawTool::CheckFormula(QString &formula, VContainer *data)
|
|||
}
|
||||
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;
|
||||
|
||||
DialogUndo *dialogUndo = new DialogUndo(qApp->getMainWindow());
|
||||
|
|
|
@ -1832,7 +1832,6 @@ QString VApplication::FormulaFromUser(const QString &formula)
|
|||
}
|
||||
|
||||
return newFormula;
|
||||
|
||||
}
|
||||
|
||||
//---------------------------------------------------------------------------------------------------------------------
|
||||
|
|
Loading…
Reference in New Issue
Block a user