From 22d21a867a9882764859fb0926f788708267d7f5 Mon Sep 17 00:00:00 2001
From: Roman Telezhynskyi <dismine@gmail.com>
Date: Wed, 20 Jul 2022 08:29:59 +0300
Subject: [PATCH] Refactoring.

---
 src/app/tape/dialogs/dialogsetupmultisize.cpp | 60 ++++++++++---------
 src/app/tape/dialogs/dialogsetupmultisize.h   |  4 ++
 2 files changed, 35 insertions(+), 29 deletions(-)

diff --git a/src/app/tape/dialogs/dialogsetupmultisize.cpp b/src/app/tape/dialogs/dialogsetupmultisize.cpp
index 2f8a45be6..41e8e7f87 100644
--- a/src/app/tape/dialogs/dialogsetupmultisize.cpp
+++ b/src/app/tape/dialogs/dialogsetupmultisize.cpp
@@ -405,6 +405,37 @@ void DialogSetupMultisize::ZDimensionBodyMeasurementChanged()
     CheckState();
 }
 
+//---------------------------------------------------------------------------------------------------------------------
+void DialogSetupMultisize::CheckDimension(QGroupBox *group, QGroupBox *nameGroup, QLineEdit *lineEdit,
+                                          bool &dimensionValid, int &dimensions,
+                                          const MeasurementDimension_p &dimension)
+{
+    SCASSERT(group != nullptr)
+    SCASSERT(nameGroup != nullptr)
+    SCASSERT(lineEdit != nullptr)
+
+    if (group->isChecked())
+    {
+        dimensionValid = dimension->IsValid();
+        ++dimensions;
+
+        if (ui->labelError->text().isEmpty() && not dimensionValid)
+        {
+            ui->labelError->setText(tr("Please, provide correct data for dimension %1").arg(dimension->Axis()));
+            return;
+        }
+
+        if (nameGroup->isChecked() && lineEdit->text().isEmpty())
+        {
+            if (ui->labelError->text().isEmpty())
+            {
+                ui->labelError->setText(tr("Please, provide custom name for dimension %1").arg(dimension->Axis()));
+                return;
+            }
+        }
+    }
+}
+
 //---------------------------------------------------------------------------------------------------------------------
 void DialogSetupMultisize::CheckState()
 {
@@ -417,35 +448,6 @@ void DialogSetupMultisize::CheckState()
 
     int dimensions = 0;
 
-    auto CheckDimension = [this](QGroupBox *group, QGroupBox *nameGroup, QLineEdit *lineEdit, bool &dimensionValid,
-            int &dimensions, const MeasurementDimension_p &dimension)
-    {
-        SCASSERT(group != nullptr)
-        SCASSERT(nameGroup != nullptr)
-        SCASSERT(lineEdit != nullptr)
-
-        if (group->isChecked())
-        {
-            dimensionValid = dimension->IsValid();
-            ++dimensions;
-
-            if (ui->labelError->text().isEmpty() && not dimensionValid)
-            {
-                ui->labelError->setText(tr("Please, provide correct data for dimension %1").arg(dimension->Axis()));
-                return;
-            }
-
-            if (nameGroup->isChecked() && lineEdit->text().isEmpty())
-            {
-                if (ui->labelError->text().isEmpty())
-                {
-                    ui->labelError->setText(tr("Please, provide custom name for dimension %1").arg(dimension->Axis()));
-                    return;
-                }
-            }
-        }
-    };
-
     CheckDimension(ui->groupBoxXDimension, ui->groupBoxCustomXDimensionName, ui->lineEditCustomXDimensionName,
                    xDimensionValid, dimensions, m_xDimension);
     CheckDimension(ui->groupBoxYDimension, ui->groupBoxCustomYDimensionName, ui->lineEditCustomYDimensionName,
diff --git a/src/app/tape/dialogs/dialogsetupmultisize.h b/src/app/tape/dialogs/dialogsetupmultisize.h
index 4a9ccaf3e..6c1ff85db 100644
--- a/src/app/tape/dialogs/dialogsetupmultisize.h
+++ b/src/app/tape/dialogs/dialogsetupmultisize.h
@@ -38,6 +38,8 @@
 #endif // QT_VERSION < QT_VERSION_CHECK(5, 13, 0)
 
 class QDoubleSpinBox;
+class QGroupBox;
+class QLineEdit;
 
 namespace Ui
 {
@@ -76,6 +78,8 @@ private:
     QSharedPointer<VWMeasurementDimension> m_wDimension;
     QSharedPointer<VZMeasurementDimension> m_zDimension;
 
+    void CheckDimension(QGroupBox *group, QGroupBox *nameGroup, QLineEdit *lineEdit, bool &dimensionValid,
+                        int &dimensions, const MeasurementDimension_p &dimension);
     void CheckState();
 
     void InitDimensionMinMax(QDoubleSpinBox *doubleSpinBoxMinValue, QDoubleSpinBox *doubleSpinBoxMaxValue,