From cfbc13bd02a53d40977c341403bc830b5edfc73c Mon Sep 17 00:00:00 2001
From: Denis Shienkov <denis.shienkov@gmail.com>
Date: Fri, 24 Apr 2020 16:00:22 +0300
Subject: [PATCH] BareMetal: Display package info instead of family in UVSC

It is makes sense to show the 'package' identifier string
of the selected device instead of 'family'. Reason is that
'package' info is more informative. Besides, a 'package' info
also displayed in an original uVision wizard.

Change-Id: I01f53836dd2bd968ffb61e889211c6a892d7b5b7
Reviewed-by: hjk <hjk@qt.io>
---
 .../baremetal/debugservers/uvsc/uvproject.cpp        |  5 +++++
 src/plugins/baremetal/debugservers/uvsc/uvproject.h  |  5 +++++
 .../debugservers/uvsc/uvtargetdeviceviewer.cpp       | 12 ++++++------
 .../debugservers/uvsc/uvtargetdeviceviewer.h         |  2 +-
 4 files changed, 17 insertions(+), 7 deletions(-)

diff --git a/src/plugins/baremetal/debugservers/uvsc/uvproject.cpp b/src/plugins/baremetal/debugservers/uvsc/uvproject.cpp
index 785582f137a..1834dbfe50e 100644
--- a/src/plugins/baremetal/debugservers/uvsc/uvproject.cpp
+++ b/src/plugins/baremetal/debugservers/uvsc/uvproject.cpp
@@ -111,6 +111,11 @@ static void extractAllFiles(const DebuggerRunTool *runTool, QStringList &include
     }
 }
 
+QString buildPackageId(const DeviceSelection &selection)
+{
+    return buildPackageId(selection.package);
+}
+
 // Project
 
 Project::Project(const UvscServerProvider *provider, DebuggerRunTool *runTool)
diff --git a/src/plugins/baremetal/debugservers/uvsc/uvproject.h b/src/plugins/baremetal/debugservers/uvsc/uvproject.h
index 6642cf6cc3c..ccc11bd6111 100644
--- a/src/plugins/baremetal/debugservers/uvsc/uvproject.h
+++ b/src/plugins/baremetal/debugservers/uvsc/uvproject.h
@@ -39,6 +39,11 @@ class UvscServerProvider;
 
 namespace Uv {
 
+class DeviceSelection;
+
+// Helper function.
+QString buildPackageId(const DeviceSelection &selection);
+
 // UvProject
 
 class Project final : public Gen::Xml::Project
diff --git a/src/plugins/baremetal/debugservers/uvsc/uvtargetdeviceviewer.cpp b/src/plugins/baremetal/debugservers/uvsc/uvtargetdeviceviewer.cpp
index d75923f5516..e8aeb770793 100644
--- a/src/plugins/baremetal/debugservers/uvsc/uvtargetdeviceviewer.cpp
+++ b/src/plugins/baremetal/debugservers/uvsc/uvtargetdeviceviewer.cpp
@@ -23,7 +23,7 @@
 **
 ****************************************************************************/
 
-#include "uvproject.h" // for targetUVisionPath()
+#include "uvproject.h" // for buildPackageId()
 #include "uvtargetdevicemodel.h"
 #include "uvtargetdeviceviewer.h"
 
@@ -75,10 +75,10 @@ DeviceSelectorDetailsPanel::DeviceSelectorDetailsPanel(DeviceSelection &selectio
     m_vendorEdit = new QLineEdit;
     m_vendorEdit->setReadOnly(true);
     layout->addRow(tr("Vendor:"), m_vendorEdit);
-    m_fimilyEdit = new QLineEdit;;
-    m_fimilyEdit->setReadOnly(true);
-    layout->addRow(tr("Family:"), m_fimilyEdit);
-    m_descEdit = new QPlainTextEdit;;
+    m_packageEdit = new QLineEdit;
+    m_packageEdit->setReadOnly(true);
+    layout->addRow(tr("Package:"), m_packageEdit);
+    m_descEdit = new QPlainTextEdit;
     m_descEdit->setReadOnly(true);
     layout->addRow(tr("Description:"), m_descEdit);
     m_memoryView = new DeviceSelectionMemoryView(m_selection);
@@ -118,7 +118,7 @@ static QString trimVendor(const QString &vendor)
 void DeviceSelectorDetailsPanel::refresh()
 {
     m_vendorEdit->setText(trimVendor(m_selection.vendorName));
-    m_fimilyEdit->setText(m_selection.family);
+    m_packageEdit->setText(buildPackageId(m_selection));
     m_descEdit->setPlainText(m_selection.desc);
     m_memoryView->refresh();
     m_algorithmView->refresh();
diff --git a/src/plugins/baremetal/debugservers/uvsc/uvtargetdeviceviewer.h b/src/plugins/baremetal/debugservers/uvsc/uvtargetdeviceviewer.h
index d65bc64153e..a1639c48647 100644
--- a/src/plugins/baremetal/debugservers/uvsc/uvtargetdeviceviewer.h
+++ b/src/plugins/baremetal/debugservers/uvsc/uvtargetdeviceviewer.h
@@ -105,7 +105,7 @@ signals:
 private:
     DeviceSelection &m_selection;
     QLineEdit *m_vendorEdit = nullptr;
-    QLineEdit *m_fimilyEdit = nullptr;
+    QLineEdit *m_packageEdit = nullptr;
     QPlainTextEdit *m_descEdit = nullptr;
     DeviceSelectionMemoryView *m_memoryView = nullptr;
     DeviceSelectionAlgorithmView *m_algorithmView = nullptr;