From 637eaa4256ca532e9f38bdcbc65eb77d618d1cbf Mon Sep 17 00:00:00 2001
From: Roman Telezhynskyi <kroluku@gmail.com>
Date: Tue, 31 Jan 2017 14:28:05 +0200
Subject: [PATCH] Refactoring and bug fix in dialog Piece path.

--HG--
branch : feature
---
 .../vtools/dialogs/tools/dialogpiecepath.cpp  | 23 +++++--------------
 .../vtools/dialogs/tools/dialogpiecepath.h    |  2 --
 2 files changed, 6 insertions(+), 19 deletions(-)

diff --git a/src/libs/vtools/dialogs/tools/dialogpiecepath.cpp b/src/libs/vtools/dialogs/tools/dialogpiecepath.cpp
index 9bd71171d..7cdce8e17 100644
--- a/src/libs/vtools/dialogs/tools/dialogpiecepath.cpp
+++ b/src/libs/vtools/dialogs/tools/dialogpiecepath.cpp
@@ -175,10 +175,6 @@ void DialogPiecePath::ShowDialog(bool click)
     }
 }
 
-//---------------------------------------------------------------------------------------------------------------------
-void DialogPiecePath::SaveData()
-{}
-
 //---------------------------------------------------------------------------------------------------------------------
 void DialogPiecePath::CheckState()
 {
@@ -841,18 +837,7 @@ void DialogPiecePath::SetFormulaSAWidth(const QString &formula)
 //---------------------------------------------------------------------------------------------------------------------
 quint32 DialogPiecePath::GetPieceId() const
 {
-    quint32 id = NULL_ID;
-
-    if (ui->comboBoxPiece->count() > 0)
-    {
-#if QT_VERSION < QT_VERSION_CHECK(5, 2, 0)
-    id = ui->comboBoxPiece->itemData(ui->comboBoxPiece->currentIndex()).toUInt();
-#else
-    id = ui->comboBoxPiece->currentData().toUInt();
-#endif
-    }
-
-    return id;
+    return getCurrentObjectId(ui->comboBoxPiece);
 }
 
 //---------------------------------------------------------------------------------------------------------------------
@@ -868,7 +853,11 @@ void DialogPiecePath::SetPieceId(quint32 id)
         const qint32 index = ui->comboBoxPiece->findData(id);
         if (index != -1)
         {
-            ui->comboBoxType->setCurrentIndex(index);
+            ui->comboBoxPiece->setCurrentIndex(index);
+        }
+        else
+        {
+            ui->comboBoxPiece->setCurrentIndex(0);
         }
     }
 
diff --git a/src/libs/vtools/dialogs/tools/dialogpiecepath.h b/src/libs/vtools/dialogs/tools/dialogpiecepath.h
index a362cd886..19e79e4cd 100644
--- a/src/libs/vtools/dialogs/tools/dialogpiecepath.h
+++ b/src/libs/vtools/dialogs/tools/dialogpiecepath.h
@@ -61,8 +61,6 @@ public slots:
     virtual void ShowDialog(bool click) Q_DECL_OVERRIDE;
 
 protected:
-    /** @brief SaveData Put dialog data in local variables */
-    virtual void SaveData() Q_DECL_OVERRIDE;
     virtual void CheckState() Q_DECL_OVERRIDE;
     virtual void ShowVisualization() Q_DECL_OVERRIDE;
     virtual void closeEvent(QCloseEvent *event) Q_DECL_OVERRIDE;