X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=pv%2Fdevices%2Fhardwaredevice.cpp;h=a3d84d6fadf175973fab3a2a420f190838948fc2;hb=af33d4cbacc745f4473f5c0f4fa1f9ebb8d84d0a;hp=d1161aa26669a614bc36fc52e4871bdc1fb68496;hpb=4d6c6ea3e6b069787c270d4911083dae05eae4c6;p=pulseview.git
diff --git a/pv/devices/hardwaredevice.cpp b/pv/devices/hardwaredevice.cpp
index d1161aa..a3d84d6 100644
--- a/pv/devices/hardwaredevice.cpp
+++ b/pv/devices/hardwaredevice.cpp
@@ -14,8 +14,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+ * along with this program; if not, see .
*/
#include
@@ -28,7 +27,6 @@
#include "hardwaredevice.hpp"
-using std::dynamic_pointer_cast;
using std::shared_ptr;
using std::static_pointer_cast;
using std::string;
@@ -41,31 +39,43 @@ using sigrok::HardwareDevice;
namespace pv {
namespace devices {
-HardwareDevice::HardwareDevice(const std::shared_ptr &context,
- std::shared_ptr device) :
+HardwareDevice::HardwareDevice(const shared_ptr &context,
+ shared_ptr device) :
context_(context),
- device_open_(false) {
+ device_open_(false)
+{
device_ = device;
}
-HardwareDevice::~HardwareDevice() {
+HardwareDevice::~HardwareDevice()
+{
close();
}
-string HardwareDevice::full_name() const {
- vector parts = {device_->vendor(), device_->model(),
- device_->version(), device_->serial_number()};
+string HardwareDevice::full_name() const
+{
+ vector parts = {};
+ if (device_->vendor().length() > 0)
+ parts.push_back(device_->vendor());
+ if (device_->model().length() > 0)
+ parts.push_back(device_->model());
+ if (device_->version().length() > 0)
+ parts.push_back(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, " ");
}
-shared_ptr HardwareDevice::hardware_device() const {
+shared_ptr HardwareDevice::hardware_device() const
+{
return static_pointer_cast(device_);
}
string HardwareDevice::display_name(
- const DeviceManager &device_manager) const {
+ const DeviceManager &device_manager) const
+{
const auto hw_dev = hardware_device();
// If we can find another device with the same model/vendor then
@@ -81,11 +91,17 @@ string HardwareDevice::display_name(
dev->device_ != device_;
});
- vector parts = {device_->vendor(), device_->model()};
+ vector parts = {};
+ if (device_->vendor().length() > 0)
+ parts.push_back(device_->vendor());
+ if (device_->model().length() > 0)
+ parts.push_back(device_->model());
if (multiple_dev) {
- parts.push_back(device_->version());
- parts.push_back(device_->serial_number());
+ if (device_->version().length() > 0)
+ parts.push_back(device_->version());
+ if (device_->serial_number().length() > 0)
+ parts.push_back("[S/N: " + device_->serial_number() + "]");
if ((device_->serial_number().length() == 0) &&
(device_->connection_id().length() > 0))
@@ -95,13 +111,14 @@ string HardwareDevice::display_name(
return join(parts, " ");
}
-void HardwareDevice::open() {
+void HardwareDevice::open()
+{
if (device_open_)
close();
try {
device_->open();
- } catch(const sigrok::Error &e) {
+ } catch (const sigrok::Error &e) {
throw QString(e.what());
}
@@ -112,7 +129,8 @@ void HardwareDevice::open() {
session_->add_device(device_);
}
-void HardwareDevice::close() {
+void HardwareDevice::close()
+{
if (device_open_)
device_->close();