Ignore Enter key in formula field.

--HG--
branch : develop

src/app/dialogs/tools/dialogalongline.cpp

@@ -52,6 +52,7 @@ DialogAlongLine::DialogAlongLine(const VContainer *data, const quint32 &toolId,
     labelEditNamePoint = ui->labelEditNamePoint;
 
     this->formulaBaseHeight = ui->plainTextEditFormula->height();
+    ui->plainTextEditFormula->installEventFilter(this);
 
     InitOkCancelApply(ui);
     flagFormula = false;

src/app/dialogs/tools/dialogarc.cpp

@@ -57,6 +57,10 @@ DialogArc::DialogArc(const VContainer *data, const quint32 &toolId, QWidget *par
     this->formulaBaseHeightF1 = ui->plainTextEditF1->height();
     this->formulaBaseHeightF2 = ui->plainTextEditF2->height();
 
+    ui->plainTextEditFormula->installEventFilter(this);
+    ui->plainTextEditF1->installEventFilter(this);
+    ui->plainTextEditF2->installEventFilter(this);
+
     timerRadius = new QTimer(this);
     connect(timerRadius, &QTimer::timeout, this, &DialogArc::EvalRadius);
 

src/app/dialogs/tools/dialogbisector.cpp

@@ -52,6 +52,7 @@ DialogBisector::DialogBisector(const VContainer *data, const quint32 &toolId, QW
     ui->lineEditNamePoint->setText(qApp->getCurrentDocument()->GenerateLabel(LabelType::NewLabel));
     labelEditNamePoint = ui->labelEditNamePoint;
     this->formulaBaseHeight = ui->plainTextEditFormula->height();
+    ui->plainTextEditFormula->installEventFilter(this);
 
     InitOkCancelApply(ui);
     flagFormula = false;

src/app/dialogs/tools/dialogcurveintersectaxis.cpp

@@ -48,6 +48,7 @@ DialogCurveIntersectAxis::DialogCurveIntersectAxis(const VContainer *data, const
     ui->lineEditNamePoint->setText(qApp->getCurrentDocument()->GenerateLabel(LabelType::NewLabel));
     labelEditNamePoint = ui->labelEditNamePoint;
     this->formulaBaseHeightAngle = ui->plainTextEditFormula->height();
+    ui->plainTextEditFormula->installEventFilter(this);
 
     InitOkCancelApply(ui);
     flagFormula = false;

src/app/dialogs/tools/dialogcutarc.cpp

@@ -51,6 +51,7 @@ DialogCutArc::DialogCutArc(const VContainer *data, const quint32 &toolId, QWidge
     ui->lineEditNamePoint->setText(qApp->getCurrentDocument()->GenerateLabel(LabelType::NewLabel));
     labelEditNamePoint = ui->labelEditNamePoint;
     this->formulaBaseHeight = ui->plainTextEditFormula->height();
+    ui->plainTextEditFormula->installEventFilter(this);
 
     InitOkCancelApply(ui);
     flagFormula = false;

src/app/dialogs/tools/dialogcutspline.cpp

@@ -50,6 +50,7 @@ DialogCutSpline::DialogCutSpline(const VContainer *data, const quint32 &toolId,
     ui->lineEditNamePoint->setText(qApp->getCurrentDocument()->GenerateLabel(LabelType::NewLabel));
     labelEditNamePoint = ui->labelEditNamePoint;
     this->formulaBaseHeight = ui->plainTextEditFormula->height();
+    ui->plainTextEditFormula->installEventFilter(this);
 
     InitOkCancelApply(ui);
     flagFormula = false;

src/app/dialogs/tools/dialogcutsplinepath.cpp

@@ -50,6 +50,7 @@ DialogCutSplinePath::DialogCutSplinePath(const VContainer *data, const quint32 &
     ui->lineEditNamePoint->setText(qApp->getCurrentDocument()->GenerateLabel(LabelType::NewLabel));
     labelEditNamePoint = ui->labelEditNamePoint;
     this->formulaBaseHeight = ui->plainTextEditFormula->height();
+    ui->plainTextEditFormula->installEventFilter(this);
 
     InitOkCancelApply(ui);
     flagFormula = false;

src/app/dialogs/tools/dialogeditwrongformula.cpp

@@ -38,6 +38,7 @@ DialogEditWrongFormula::DialogEditWrongFormula(const VContainer *data, const qui
     InitVariables(ui);
     InitFormulaUI(ui);
     this->formulaBaseHeight = ui->plainTextEditFormula->height();
+    ui->plainTextEditFormula->installEventFilter(this);
 
     InitOkCancel(ui);
     flagFormula = false;

src/app/dialogs/tools/dialogendline.cpp

@@ -55,6 +55,9 @@ DialogEndLine::DialogEndLine(const VContainer *data, const quint32 &toolId, QWid
     this->formulaBaseHeight = ui->plainTextEditFormula->height();
     this->formulaBaseHeightAngle = ui->plainTextEditAngle->height();
 
+    ui->plainTextEditFormula->installEventFilter(this);
+    ui->plainTextEditAngle->installEventFilter(this);
+
     InitOkCancelApply(ui);
     flagFormula = false;
     CheckState();

src/app/dialogs/tools/dialoglineintersectaxis.cpp

@@ -48,6 +48,7 @@ DialogLineIntersectAxis::DialogLineIntersectAxis(const VContainer *data, const q
     ui->lineEditNamePoint->setText(qApp->getCurrentDocument()->GenerateLabel(LabelType::NewLabel));
     labelEditNamePoint = ui->labelEditNamePoint;
     this->formulaBaseHeightAngle = ui->plainTextEditFormula->height();
+    ui->plainTextEditFormula->installEventFilter(this);
 
     InitOkCancelApply(ui);
     flagFormula = false;

src/app/dialogs/tools/dialognormal.cpp

@@ -48,6 +48,7 @@ DialogNormal::DialogNormal(const VContainer *data, const quint32 &toolId, QWidge
     ui->lineEditNamePoint->setText(qApp->getCurrentDocument()->GenerateLabel(LabelType::NewLabel));
     labelEditNamePoint = ui->labelEditNamePoint;
     this->formulaBaseHeight = ui->plainTextEditFormula->height();
+    ui->plainTextEditFormula->installEventFilter(this);
 
     InitOkCancelApply(ui);
     flagFormula = false;

src/app/dialogs/tools/dialogpointofcontact.cpp

@@ -50,6 +50,7 @@ DialogPointOfContact::DialogPointOfContact(const VContainer *data, const quint32
     ui->lineEditNamePoint->setText(qApp->getCurrentDocument()->GenerateLabel(LabelType::NewLabel));
     labelEditNamePoint = ui->labelEditNamePoint;
     this->formulaBaseHeight = ui->plainTextEditFormula->height();
+    ui->plainTextEditFormula->installEventFilter(this);
 
     InitOkCancelApply(ui);
     flagFormula = false;

src/app/dialogs/tools/dialogshoulderpoint.cpp

@@ -52,6 +52,7 @@ DialogShoulderPoint::DialogShoulderPoint(const VContainer *data, const quint32 &
     ui->lineEditNamePoint->setText(qApp->getCurrentDocument()->GenerateLabel(LabelType::NewLabel));
     labelEditNamePoint = ui->labelEditNamePoint;
     this->formulaBaseHeight = ui->plainTextEditFormula->height();
+    ui->plainTextEditFormula->installEventFilter(this);
 
     InitOkCancelApply(ui);
     flagFormula = false;

src/app/dialogs/tools/dialogtool.cpp

@@ -401,6 +401,27 @@ void DialogTool::MoveCursorToEnd(QPlainTextEdit *plainTextEdit)
     plainTextEdit->setTextCursor(cursor);
 }
 
+//---------------------------------------------------------------------------------------------------------------------
+bool DialogTool::eventFilter(QObject *object, QEvent *event)
+{
+    QPlainTextEdit *plainTextEdit = qobject_cast<QPlainTextEdit *>(object);
+    if (plainTextEdit != nullptr)
+    {
+        QKeyEvent *keyEvent = static_cast<QKeyEvent *>(event);
+        if ((keyEvent->key() == Qt::Key_Enter) || (keyEvent->key() == Qt::Key_Return))
+        {
+            // Ignore Enter key
+            return true;
+        }
+    }
+    else
+    {
+        // pass the event on to the parent class
+        return QDialog::eventFilter(object, event);
+    }
+    return false;
+}
+
 //---------------------------------------------------------------------------------------------------------------------
 /**
  * @brief ValFormulaChanged handle change formula

src/app/dialogs/tools/dialogtool.h

@@ -334,6 +334,7 @@ protected:
      */
     virtual void     SaveData(){}
     void             MoveCursorToEnd(QPlainTextEdit *plainTextEdit);
+    bool             eventFilter(QObject *object, QEvent *event);
 private:
     void             FillList(QComboBox *box, const QMap<QString, quint32> &list)const;
 };