HardwareDevice: Make serial number display a bit clearer.

[pulseview.git] / pv / devices / hardwaredevice.cpp

diff --git a/pv/devices/hardwaredevice.cpp b/pv/devices/hardwaredevice.cpp
index 591c756ba84519abce9b2e0eed39e41f07b83763..50cab7b09b7c6f2c63c63549c57f5491297baceb 100644 (file)
--- a/pv/devices/hardwaredevice.cpp
+++ b/pv/devices/hardwaredevice.cpp
@@ -27,7 +27,6 @@
 
 #include "hardwaredevice.hpp"
 
-using std::dynamic_pointer_cast;
 using std::shared_ptr;
 using std::static_pointer_cast;
 using std::string;
@@ -40,8 +39,8 @@ using sigrok::HardwareDevice;
 namespace pv {
 namespace devices {
 
-HardwareDevice::HardwareDevice(const std::shared_ptr<sigrok::Context> &context,
-       std::shared_ptr<sigrok::HardwareDevice> device) :
+HardwareDevice::HardwareDevice(const shared_ptr<sigrok::Context> &context,
+       shared_ptr<sigrok::HardwareDevice> device) :
        context_(context),
        device_open_(false)
 {
@@ -56,7 +55,9 @@ HardwareDevice::~HardwareDevice()
 string HardwareDevice::full_name() const
 {
        vector<string> parts = {device_->vendor(), device_->model(),
-               device_->version(), device_->serial_number()};
+               device_->version()};
+       if (device_->serial_number().length() > 0)
+               parts.push_back("[S/N: " + device_->serial_number() + "]");
        if (device_->connection_id().length() > 0)
                parts.push_back("(" + device_->connection_id() + ")");
        return join(parts, " ");
@@ -89,7 +90,7 @@ string HardwareDevice::display_name(
 
        if (multiple_dev) {
                parts.push_back(device_->version());
-               parts.push_back(device_->serial_number());
+               parts.push_back("[S/N: " + device_->serial_number() + "]");
 
                if ((device_->serial_number().length() == 0) &&
                        (device_->connection_id().length() > 0))