diff --git a/src/app/dialogs/tools/dialogalongline.cpp b/src/app/dialogs/tools/dialogalongline.cpp index 66a45239f..eea51a13c 100644 --- a/src/app/dialogs/tools/dialogalongline.cpp +++ b/src/app/dialogs/tools/dialogalongline.cpp @@ -190,6 +190,13 @@ void DialogAlongLine::SaveData() line->RefreshGeometry(); } +//--------------------------------------------------------------------------------------------------------------------- +void DialogAlongLine::closeEvent(QCloseEvent *event) +{ + ui->plainTextEditFormula->blockSignals(true); + DialogTool::closeEvent(event); +} + //--------------------------------------------------------------------------------------------------------------------- /** * @brief setSecondPointId set id second point of line diff --git a/src/app/dialogs/tools/dialogalongline.h b/src/app/dialogs/tools/dialogalongline.h index 335ffd22a..01dd498a5 100644 --- a/src/app/dialogs/tools/dialogalongline.h +++ b/src/app/dialogs/tools/dialogalongline.h @@ -78,6 +78,7 @@ protected: * @brief SaveData Put dialog data in local variables */ virtual void SaveData(); + virtual void closeEvent(QCloseEvent *event); private: Q_DISABLE_COPY(DialogAlongLine) diff --git a/src/app/dialogs/tools/dialogarc.cpp b/src/app/dialogs/tools/dialogarc.cpp index 9d0293416..7349aedbb 100644 --- a/src/app/dialogs/tools/dialogarc.cpp +++ b/src/app/dialogs/tools/dialogarc.cpp @@ -240,6 +240,15 @@ void DialogArc::SaveData() path->RefreshGeometry(); } +//--------------------------------------------------------------------------------------------------------------------- +void DialogArc::closeEvent(QCloseEvent *event) +{ + ui->plainTextEditFormula->blockSignals(true); + ui->plainTextEditF1->blockSignals(true); + ui->plainTextEditF2->blockSignals(true); + DialogTool::closeEvent(event); +} + //--------------------------------------------------------------------------------------------------------------------- /** * @brief ValChenged show description angles of lines diff --git a/src/app/dialogs/tools/dialogarc.h b/src/app/dialogs/tools/dialogarc.h index b042268ea..189e86abe 100644 --- a/src/app/dialogs/tools/dialogarc.h +++ b/src/app/dialogs/tools/dialogarc.h @@ -83,6 +83,7 @@ protected: * @brief SaveData Put dialog data in local variables */ virtual void SaveData(); + virtual void closeEvent(QCloseEvent *event); private: Q_DISABLE_COPY(DialogArc) diff --git a/src/app/dialogs/tools/dialogbisector.cpp b/src/app/dialogs/tools/dialogbisector.cpp index b2a9a8535..cbcdedfee 100644 --- a/src/app/dialogs/tools/dialogbisector.cpp +++ b/src/app/dialogs/tools/dialogbisector.cpp @@ -287,3 +287,10 @@ void DialogBisector::SaveData() line->setLineStyle(VAbstractTool::LineStyle(typeLine)); line->RefreshGeometry(); } + +//--------------------------------------------------------------------------------------------------------------------- +void DialogBisector::closeEvent(QCloseEvent *event) +{ + ui->plainTextEditFormula->blockSignals(true); + DialogTool::closeEvent(event); +} diff --git a/src/app/dialogs/tools/dialogbisector.h b/src/app/dialogs/tools/dialogbisector.h index 4b3cabad0..2cc69c2ca 100644 --- a/src/app/dialogs/tools/dialogbisector.h +++ b/src/app/dialogs/tools/dialogbisector.h @@ -83,6 +83,7 @@ protected: * @brief SaveData Put dialog data in local variables */ virtual void SaveData(); + virtual void closeEvent(QCloseEvent *event); private: Q_DISABLE_COPY(DialogBisector) diff --git a/src/app/dialogs/tools/dialogcurveintersectaxis.cpp b/src/app/dialogs/tools/dialogcurveintersectaxis.cpp index 65f0c54d2..34e85644e 100644 --- a/src/app/dialogs/tools/dialogcurveintersectaxis.cpp +++ b/src/app/dialogs/tools/dialogcurveintersectaxis.cpp @@ -269,3 +269,10 @@ void DialogCurveIntersectAxis::SaveData() line->setLineStyle(VAbstractTool::LineStyle(typeLine)); line->RefreshGeometry(); } + +//--------------------------------------------------------------------------------------------------------------------- +void DialogCurveIntersectAxis::closeEvent(QCloseEvent *event) +{ + ui->plainTextEditFormula->blockSignals(true); + DialogTool::closeEvent(event); +} diff --git a/src/app/dialogs/tools/dialogcurveintersectaxis.h b/src/app/dialogs/tools/dialogcurveintersectaxis.h index 19b83efc6..9ab667062 100644 --- a/src/app/dialogs/tools/dialogcurveintersectaxis.h +++ b/src/app/dialogs/tools/dialogcurveintersectaxis.h @@ -73,6 +73,7 @@ protected: * @brief SaveData Put dialog data in local variables */ virtual void SaveData(); + virtual void closeEvent(QCloseEvent *event); private: Q_DISABLE_COPY(DialogCurveIntersectAxis) Ui::DialogCurveIntersectAxis *ui; diff --git a/src/app/dialogs/tools/dialogcutarc.cpp b/src/app/dialogs/tools/dialogcutarc.cpp index 748ff0501..c5fc282b2 100644 --- a/src/app/dialogs/tools/dialogcutarc.cpp +++ b/src/app/dialogs/tools/dialogcutarc.cpp @@ -137,6 +137,13 @@ void DialogCutArc::SaveData() path->RefreshGeometry(); } +//--------------------------------------------------------------------------------------------------------------------- +void DialogCutArc::closeEvent(QCloseEvent *event) +{ + ui->plainTextEditFormula->blockSignals(true); + DialogTool::closeEvent(event); +} + //--------------------------------------------------------------------------------------------------------------------- /** * @brief setArcId set id of arc diff --git a/src/app/dialogs/tools/dialogcutarc.h b/src/app/dialogs/tools/dialogcutarc.h index a320b7e37..d2cf2f288 100644 --- a/src/app/dialogs/tools/dialogcutarc.h +++ b/src/app/dialogs/tools/dialogcutarc.h @@ -73,6 +73,7 @@ protected: * @brief SaveData Put dialog data in local variables */ virtual void SaveData(); + virtual void closeEvent(QCloseEvent *event); private: Q_DISABLE_COPY(DialogCutArc) /** @brief ui keeps information about user interface */ diff --git a/src/app/dialogs/tools/dialogcutspline.cpp b/src/app/dialogs/tools/dialogcutspline.cpp index ebfb4e5a9..7c739fa99 100644 --- a/src/app/dialogs/tools/dialogcutspline.cpp +++ b/src/app/dialogs/tools/dialogcutspline.cpp @@ -152,6 +152,13 @@ void DialogCutSpline::SaveData() path->RefreshGeometry(); } +//--------------------------------------------------------------------------------------------------------------------- +void DialogCutSpline::closeEvent(QCloseEvent *event) +{ + ui->plainTextEditFormula->blockSignals(true); + DialogTool::closeEvent(event); +} + //--------------------------------------------------------------------------------------------------------------------- void DialogCutSpline::DeployFormulaTextEdit() { diff --git a/src/app/dialogs/tools/dialogcutspline.h b/src/app/dialogs/tools/dialogcutspline.h index 257324c54..163d703c0 100644 --- a/src/app/dialogs/tools/dialogcutspline.h +++ b/src/app/dialogs/tools/dialogcutspline.h @@ -68,6 +68,7 @@ protected: * @brief SaveData Put dialog data in local variables */ virtual void SaveData(); + virtual void closeEvent(QCloseEvent *event); private: Q_DISABLE_COPY(DialogCutSpline) diff --git a/src/app/dialogs/tools/dialogcutsplinepath.cpp b/src/app/dialogs/tools/dialogcutsplinepath.cpp index a5abc37e1..5dd32cce1 100644 --- a/src/app/dialogs/tools/dialogcutsplinepath.cpp +++ b/src/app/dialogs/tools/dialogcutsplinepath.cpp @@ -152,6 +152,13 @@ void DialogCutSplinePath::SaveData() path->RefreshGeometry(); } +//--------------------------------------------------------------------------------------------------------------------- +void DialogCutSplinePath::closeEvent(QCloseEvent *event) +{ + ui->plainTextEditFormula->blockSignals(true); + DialogTool::closeEvent(event); +} + //--------------------------------------------------------------------------------------------------------------------- void DialogCutSplinePath::DeployFormulaTextEdit() { diff --git a/src/app/dialogs/tools/dialogcutsplinepath.h b/src/app/dialogs/tools/dialogcutsplinepath.h index ff06576c1..063cd316b 100644 --- a/src/app/dialogs/tools/dialogcutsplinepath.h +++ b/src/app/dialogs/tools/dialogcutsplinepath.h @@ -68,6 +68,7 @@ protected: * @brief SaveData Put dialog data in local variables */ virtual void SaveData(); + virtual void closeEvent(QCloseEvent *event); private: Q_DISABLE_COPY(DialogCutSplinePath) diff --git a/src/app/dialogs/tools/dialogeditwrongformula.cpp b/src/app/dialogs/tools/dialogeditwrongformula.cpp index fa7170e39..3987b12a7 100644 --- a/src/app/dialogs/tools/dialogeditwrongformula.cpp +++ b/src/app/dialogs/tools/dialogeditwrongformula.cpp @@ -113,6 +113,13 @@ void DialogEditWrongFormula::CheckState() bOk->setEnabled(flagFormula); } +//--------------------------------------------------------------------------------------------------------------------- +void DialogEditWrongFormula::closeEvent(QCloseEvent *event) +{ + ui->plainTextEditFormula->blockSignals(true); + DialogTool::closeEvent(event); +} + //--------------------------------------------------------------------------------------------------------------------- void DialogEditWrongFormula::setFormula(const QString &value) { diff --git a/src/app/dialogs/tools/dialogeditwrongformula.h b/src/app/dialogs/tools/dialogeditwrongformula.h index 8a6de06e9..a2d389baf 100644 --- a/src/app/dialogs/tools/dialogeditwrongformula.h +++ b/src/app/dialogs/tools/dialogeditwrongformula.h @@ -65,6 +65,7 @@ public slots: virtual void EvalFormula(); protected: virtual void CheckState(); + virtual void closeEvent(QCloseEvent *event); private: Q_DISABLE_COPY(DialogEditWrongFormula) Ui::DialogEditWrongFormula *ui; diff --git a/src/app/dialogs/tools/dialogendline.cpp b/src/app/dialogs/tools/dialogendline.cpp index 76ef75132..3c13c3dfe 100644 --- a/src/app/dialogs/tools/dialogendline.cpp +++ b/src/app/dialogs/tools/dialogendline.cpp @@ -1,4 +1,4 @@ -/************************************************************************ +/************************************************************************ ** ** @file dialogendline.cpp ** @author Roman Telezhynskyi @@ -291,6 +291,14 @@ void DialogEndLine::SaveData() line->RefreshGeometry(); } +//--------------------------------------------------------------------------------------------------------------------- +void DialogEndLine::closeEvent(QCloseEvent *event) +{ + ui->plainTextEditFormula->blockSignals(true); + ui->plainTextEditAngle->blockSignals(true); + DialogTool::closeEvent(event); +} + //--------------------------------------------------------------------------------------------------------------------- DialogEndLine::~DialogEndLine() { diff --git a/src/app/dialogs/tools/dialogendline.h b/src/app/dialogs/tools/dialogendline.h index 6fa3ebfc4..0747f4b65 100644 --- a/src/app/dialogs/tools/dialogendline.h +++ b/src/app/dialogs/tools/dialogendline.h @@ -83,6 +83,7 @@ protected: * @brief SaveData Put dialog data in local variables */ virtual void SaveData(); + virtual void closeEvent(QCloseEvent *event); private: Q_DISABLE_COPY(DialogEndLine) diff --git a/src/app/dialogs/tools/dialoglineintersectaxis.cpp b/src/app/dialogs/tools/dialoglineintersectaxis.cpp index 30ac4d701..baf4b44db 100644 --- a/src/app/dialogs/tools/dialoglineintersectaxis.cpp +++ b/src/app/dialogs/tools/dialoglineintersectaxis.cpp @@ -336,3 +336,10 @@ void DialogLineIntersectAxis::SaveData() line->setLineStyle(VAbstractTool::LineStyle(typeLine)); line->RefreshGeometry(); } + +//--------------------------------------------------------------------------------------------------------------------- +void DialogLineIntersectAxis::closeEvent(QCloseEvent *event) +{ + ui->plainTextEditFormula->blockSignals(true); + DialogTool::closeEvent(event); +} diff --git a/src/app/dialogs/tools/dialoglineintersectaxis.h b/src/app/dialogs/tools/dialoglineintersectaxis.h index cc287c199..73115d278 100644 --- a/src/app/dialogs/tools/dialoglineintersectaxis.h +++ b/src/app/dialogs/tools/dialoglineintersectaxis.h @@ -77,6 +77,7 @@ protected: * @brief SaveData Put dialog data in local variables */ virtual void SaveData(); + virtual void closeEvent(QCloseEvent *event); private: Q_DISABLE_COPY(DialogLineIntersectAxis) Ui::DialogLineIntersectAxis *ui; diff --git a/src/app/dialogs/tools/dialognormal.cpp b/src/app/dialogs/tools/dialognormal.cpp index f6b508aad..f71fb5663 100644 --- a/src/app/dialogs/tools/dialognormal.cpp +++ b/src/app/dialogs/tools/dialognormal.cpp @@ -184,6 +184,13 @@ void DialogNormal::SaveData() line->RefreshGeometry(); } +//--------------------------------------------------------------------------------------------------------------------- +void DialogNormal::closeEvent(QCloseEvent *event) +{ + ui->plainTextEditFormula->blockSignals(true); + DialogTool::closeEvent(event); +} + //--------------------------------------------------------------------------------------------------------------------- /** * @brief setSecondPointId set id of second point diff --git a/src/app/dialogs/tools/dialognormal.h b/src/app/dialogs/tools/dialognormal.h index 222ced37b..0b346d473 100644 --- a/src/app/dialogs/tools/dialognormal.h +++ b/src/app/dialogs/tools/dialognormal.h @@ -82,6 +82,7 @@ protected: * @brief SaveData Put dialog data in local variables */ virtual void SaveData(); + virtual void closeEvent(QCloseEvent *event); private: Q_DISABLE_COPY(DialogNormal) diff --git a/src/app/dialogs/tools/dialogpointofcontact.cpp b/src/app/dialogs/tools/dialogpointofcontact.cpp index 4af6aa7cc..2ee18bfd8 100644 --- a/src/app/dialogs/tools/dialogpointofcontact.cpp +++ b/src/app/dialogs/tools/dialogpointofcontact.cpp @@ -225,6 +225,13 @@ void DialogPointOfContact::SaveData() line->RefreshGeometry(); } +//--------------------------------------------------------------------------------------------------------------------- +void DialogPointOfContact::closeEvent(QCloseEvent *event) +{ + ui->plainTextEditFormula->blockSignals(true); + DialogTool::closeEvent(event); +} + //--------------------------------------------------------------------------------------------------------------------- /** * @brief setSecondPoint set id second point diff --git a/src/app/dialogs/tools/dialogpointofcontact.h b/src/app/dialogs/tools/dialogpointofcontact.h index 11fd4ed7a..2b7126f3e 100644 --- a/src/app/dialogs/tools/dialogpointofcontact.h +++ b/src/app/dialogs/tools/dialogpointofcontact.h @@ -80,6 +80,7 @@ protected: * @brief SaveData Put dialog data in local variables */ virtual void SaveData(); + virtual void closeEvent(QCloseEvent *event); private: Q_DISABLE_COPY(DialogPointOfContact) diff --git a/src/app/dialogs/tools/dialogshoulderpoint.cpp b/src/app/dialogs/tools/dialogshoulderpoint.cpp index 55c062a67..e07a72a5b 100644 --- a/src/app/dialogs/tools/dialogshoulderpoint.cpp +++ b/src/app/dialogs/tools/dialogshoulderpoint.cpp @@ -213,6 +213,13 @@ void DialogShoulderPoint::SaveData() line->RefreshGeometry(); } +//--------------------------------------------------------------------------------------------------------------------- +void DialogShoulderPoint::closeEvent(QCloseEvent *event) +{ + ui->plainTextEditFormula->blockSignals(true); + DialogTool::closeEvent(event); +} + //--------------------------------------------------------------------------------------------------------------------- /** * @brief setPShoulder set id shoulder point diff --git a/src/app/dialogs/tools/dialogshoulderpoint.h b/src/app/dialogs/tools/dialogshoulderpoint.h index 5e46f4a68..47c1d489c 100644 --- a/src/app/dialogs/tools/dialogshoulderpoint.h +++ b/src/app/dialogs/tools/dialogshoulderpoint.h @@ -82,6 +82,7 @@ protected: * @brief SaveData Put dialog data in local variables */ virtual void SaveData(); + virtual void closeEvent(QCloseEvent *event); private: Q_DISABLE_COPY(DialogShoulderPoint) diff --git a/src/app/dialogs/tools/dialogtool.cpp b/src/app/dialogs/tools/dialogtool.cpp index a8da5a01c..ef3d57c4a 100644 --- a/src/app/dialogs/tools/dialogtool.cpp +++ b/src/app/dialogs/tools/dialogtool.cpp @@ -87,7 +87,7 @@ DialogTool::~DialogTool() */ void DialogTool::closeEvent(QCloseEvent *event) { - DialogClosed(QDialog::Rejected); + DialogRejected(); event->accept(); }