DialogNormal - check if names of points don't equal.

--HG--
branch : develop

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<void (QComboBox::*)(const QString &)>(&QComboBox::currentIndexChanged),
+            this, &DialogNormal::PointNameChanged);
+    connect(ui->comboBoxSecondPoint, static_cast<void (QComboBox::*)(const QString &)>(&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);
 }
 
 //---------------------------------------------------------------------------------------------------------------------

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)
 

src/app/dialogs/tools/dialognormal.ui

@@ -270,7 +270,7 @@
        <item>
         <layout class="QHBoxLayout" name="horizontalLayout_3">
          <item>
-          <widget class="QLabel" name="label_3">
+          <widget class="QLabel" name="labelFirstPoint">
            <property name="sizePolicy">
             <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
              <horstretch>0</horstretch>
@@ -290,7 +290,7 @@
        <item>
         <layout class="QHBoxLayout" name="horizontalLayout_8">
          <item>
-          <widget class="QLabel" name="label_6">
+          <widget class="QLabel" name="labelSecondPoint">
            <property name="sizePolicy">
             <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
              <horstretch>0</horstretch>