diff --git a/src/app/dialogs/app/dialogundo.cpp b/src/app/dialogs/app/dialogundo.cpp index 7032c1a60..d863e7fe7 100644 --- a/src/app/dialogs/app/dialogundo.cpp +++ b/src/app/dialogs/app/dialogundo.cpp @@ -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); } //--------------------------------------------------------------------------------------------------------------------- diff --git a/src/app/options.cpp b/src/app/options.cpp index 06a2adb8e..5e2f5139c 100644 --- a/src/app/options.cpp +++ b/src/app/options.cpp @@ -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"); diff --git a/src/app/tools/drawTools/vdrawtool.cpp b/src/app/tools/drawTools/vdrawtool.cpp index d21179708..1d1713cee 100644 --- a/src/app/tools/drawTools/vdrawtool.cpp +++ b/src/app/tools/drawTools/vdrawtool.cpp @@ -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()); diff --git a/src/app/widgets/vapplication.cpp b/src/app/widgets/vapplication.cpp index 44b21f9a1..233685dd8 100644 --- a/src/app/widgets/vapplication.cpp +++ b/src/app/widgets/vapplication.cpp @@ -1832,7 +1832,6 @@ QString VApplication::FormulaFromUser(const QString &formula) } return newFormula; - } //---------------------------------------------------------------------------------------------------------------------