X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fdevicemanager.cpp;h=0c6c354fe6f12e14c06a7cfa955464b8049f4088;hp=ee6a01232e73e365a1dc399da73f3ddc04a99f14;hb=6e2c3c855dff36f6e946e2a54d576bea699f4a61;hpb=a4cf020a253c8c874ed8652f38a1c61c9a4754a4 diff --git a/pv/devicemanager.cpp b/pv/devicemanager.cpp index ee6a0123..0c6c354f 100644 --- a/pv/devicemanager.cpp +++ b/pv/devicemanager.cpp @@ -18,8 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "devicemanager.h" -#include "sigsession.h" +#include "devicemanager.hpp" +#include "session.hpp" #include #include @@ -29,12 +29,14 @@ #include +#include #include +using boost::algorithm::join; + using std::dynamic_pointer_cast; using std::list; using std::map; -using std::ostringstream; using std::remove_if; using std::runtime_error; using std::shared_ptr; @@ -53,7 +55,7 @@ using sigrok::SessionDevice; namespace pv { DeviceManager::DeviceManager(shared_ptr context) : - _context(context) + context_(context) { for (auto entry : context->drivers()) driver_scan(entry.second, map()); @@ -65,12 +67,12 @@ DeviceManager::~DeviceManager() shared_ptr DeviceManager::context() { - return _context; + return context_; } const list< shared_ptr >& DeviceManager::devices() const { - return _devices; + return devices_; } list< shared_ptr > DeviceManager::driver_scan( @@ -82,7 +84,7 @@ list< shared_ptr > DeviceManager::driver_scan( // Remove any device instances from this driver from the device // list. They will not be valid after the scan. - _devices.remove_if([&](shared_ptr device) { + devices_.remove_if([&](shared_ptr device) { return device->driver() == driver; }); // Do the scan @@ -90,21 +92,21 @@ list< shared_ptr > DeviceManager::driver_scan( driver_devices.insert(driver_devices.end(), devices.begin(), devices.end()); // Add the scanned devices to the main list, set display names and sort. - _devices.insert(_devices.end(), driver_devices.begin(), + devices_.insert(devices_.end(), driver_devices.begin(), driver_devices.end()); - for (shared_ptr device : _devices) - _display_names[device] = build_display_name(device); + for (shared_ptr device : devices_) + build_display_name(device); - _devices.sort([&](shared_ptr a, shared_ptr b) + devices_.sort([&](shared_ptr a, shared_ptr b) { return compare_devices(a, b); }); - // As the display names depend on the complete _devices list, + // As the display names depend on the complete devices_ list, // we need to recompute them. However, there is no need to - // recomute all names of the _devices list since only the + // recomute all names of the devices_ list since only the // devices that use the given driver can be affected. for (shared_ptr device : driver_devices) - _display_names[device] = build_display_name(device); + build_display_name(device); driver_devices.sort([&](shared_ptr a, shared_ptr b) { return compare_devices(a, b); }); @@ -141,7 +143,7 @@ const shared_ptr DeviceManager::find_device_from_info( last_resort_dev = NULL; - for (shared_ptr dev : _devices) { + for (shared_ptr dev : devices_) { assert(dev); dev_info = get_device_info(dev); @@ -184,30 +186,41 @@ const shared_ptr DeviceManager::find_device_from_info( return last_resort_dev; } -const string DeviceManager::build_display_name(shared_ptr device) +void DeviceManager::build_display_name(shared_ptr device) { auto session_device = dynamic_pointer_cast(device); auto hardware_device = dynamic_pointer_cast(device); - if (session_device) - return boost::filesystem::path( + if (session_device) { + full_names_[device] = display_names_[device] = + boost::filesystem::path( session_device->parent()->filename()).filename().string(); + return; + } + + // First, build the device's full name. It always contains all + // possible information. + vector parts = {device->vendor(), device->model(), + device->version(), device->serial_number()}; + + if (device->connection_id().length() > 0) + parts.push_back("("+device->connection_id()+")"); - ostringstream s; + full_names_[device] = join(parts, " "); - bool multiple_dev = false; + // Next, build the display name. It only contains fields as required. // If we can find another device with the same model/vendor then // we have at least two such devices and need to distinguish them. - if (hardware_device) - multiple_dev = any_of(_devices.begin(), _devices.end(), - [&](shared_ptr dev) { + const bool multiple_dev = hardware_device && any_of( + devices_.begin(), devices_.end(), + [&](shared_ptr dev) { return (dev->vendor() == hardware_device->vendor() && - dev->model() == hardware_device->model()) && - dev != hardware_device; - } ); + dev->model() == hardware_device->model()) && + dev != hardware_device; + } ); - vector parts = {device->vendor(), device->model()}; + parts = {device->vendor(), device->model()}; if (multiple_dev) { parts.push_back(device->version()); @@ -218,27 +231,22 @@ const string DeviceManager::build_display_name(shared_ptr device) parts.push_back("("+device->connection_id()+")"); } - for (size_t i = 0; i < parts.size(); i++) - { - if (parts[i].length() > 0) - { - if (i != 0) - s << " "; - s << parts[i]; - } - } - - return s.str(); + display_names_[device] = join(parts, " "); } const std::string DeviceManager::get_display_name(std::shared_ptr dev) { - return _display_names[dev]; + return display_names_[dev]; +} + +const std::string DeviceManager::get_full_name(std::shared_ptr dev) +{ + return full_names_[dev]; } void DeviceManager::update_display_name(std::shared_ptr dev) { - _display_names[dev] = build_display_name(dev); + build_display_name(dev); } bool DeviceManager::compare_devices(shared_ptr a, @@ -247,7 +255,7 @@ bool DeviceManager::compare_devices(shared_ptr a, assert(a); assert(b); - return _display_names[a].compare(_display_names[b]) < 0; + return display_names_[a].compare(display_names_[b]) < 0; } } // namespace pv