diff --git a/src/app/dialogs/tools/dialognormal.cpp b/src/app/dialogs/tools/dialognormal.cpp index 8b19d366e..ed6c69b67 100644 --- a/src/app/dialogs/tools/dialognormal.cpp +++ b/src/app/dialogs/tools/dialognormal.cpp @@ -62,6 +62,10 @@ DialogNormal::DialogNormal(const VContainer *data, QWidget *parent) connect(ui->lineEditNamePoint, &QLineEdit::textChanged, this, &DialogNormal::NamePointChanged); connect(ui->plainTextEditFormula, &QPlainTextEdit::textChanged, this, &DialogNormal::FormulaTextChanged); connect(ui->pushButtonGrowLength, &QPushButton::clicked, this, &DialogNormal::DeployFormulaTextEdit); + connect(ui->comboBoxFirstPoint, static_cast(&QComboBox::currentIndexChanged), + this, &DialogNormal::PointNameChanged); + connect(ui->comboBoxSecondPoint, static_cast(&QComboBox::currentIndexChanged), + this, &DialogNormal::PointNameChanged); } //--------------------------------------------------------------------------------------------------------------------- @@ -70,6 +74,25 @@ void DialogNormal::FormulaTextChanged() this->FormulaChangedPlainText(); } + +//--------------------------------------------------------------------------------------------------------------------- +void DialogNormal::PointNameChanged() +{ + if (getCurrentObjectId(ui->comboBoxFirstPoint) == getCurrentObjectId(ui->comboBoxSecondPoint)) + { + flagError = false; + ChangeColor(ui->labelFirstPoint, Qt::red); + ChangeColor(ui->labelSecondPoint, Qt::red); + } + else + { + flagError = true; + ChangeColor(ui->labelFirstPoint, QColor(76, 76, 76)); + ChangeColor(ui->labelSecondPoint, QColor(76, 76, 76)); + } + CheckState(); +} + //--------------------------------------------------------------------------------------------------------------------- void DialogNormal::DeployFormulaTextEdit() { @@ -151,7 +174,7 @@ void DialogNormal::SaveData() */ void DialogNormal::setSecondPointId(const quint32 &value, const quint32 &id) { - setCurrentPointId(ui->comboBoxSecondPoint, secondPointId, value, id); + setPointId(ui->comboBoxSecondPoint, secondPointId, value, id); } //--------------------------------------------------------------------------------------------------------------------- @@ -162,7 +185,7 @@ void DialogNormal::setSecondPointId(const quint32 &value, const quint32 &id) */ void DialogNormal::setFirstPointId(const quint32 &value, const quint32 &id) { - setCurrentPointId(ui->comboBoxFirstPoint, firstPointId, value, id); + setPointId(ui->comboBoxFirstPoint, firstPointId, value, id); } //--------------------------------------------------------------------------------------------------------------------- diff --git a/src/app/dialogs/tools/dialognormal.h b/src/app/dialogs/tools/dialognormal.h index 747067463..6431faae5 100644 --- a/src/app/dialogs/tools/dialognormal.h +++ b/src/app/dialogs/tools/dialognormal.h @@ -69,15 +69,16 @@ public slots: /** * @brief DialogApply apply data and emit signal about applied dialog. */ - virtual void DialogApply(); + virtual void DialogApply(); /** * @brief DeployFormulaTextEdit grow or shrink formula input */ - void DeployFormulaTextEdit(); + void DeployFormulaTextEdit(); /** * @brief FormulaTextChanged when formula text changes for validation and calc */ - void FormulaTextChanged(); + void FormulaTextChanged(); + virtual void PointNameChanged(); private: Q_DISABLE_COPY(DialogNormal) diff --git a/src/app/dialogs/tools/dialognormal.ui b/src/app/dialogs/tools/dialognormal.ui index b774de117..1fcf1b501 100644 --- a/src/app/dialogs/tools/dialognormal.ui +++ b/src/app/dialogs/tools/dialognormal.ui @@ -270,7 +270,7 @@ - + 0 @@ -290,7 +290,7 @@ - + 0