X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fdevicemanager.cpp;h=a51148b1d3ad2851a55888749312cb12b837e523;hp=4c9f768a909a07e1585c84d9c0785c2c7b92d6e8;hb=8b9056d493c657e01fcea037eff6b477c1ec9253;hpb=cbe9f991ccfc62182cddb758c69bc5d90f30302f diff --git a/pv/devicemanager.cpp b/pv/devicemanager.cpp index 4c9f768a..a51148b1 100644 --- a/pv/devicemanager.cpp +++ b/pv/devicemanager.cpp @@ -14,129 +14,135 @@ * 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 "devicemanager.h" -#include "sigsession.h" +#include "devicemanager.hpp" +#include "session.hpp" #include -#include +#include #include +#include #include -#include -#include +#include #include -using std::dynamic_pointer_cast; +#include + +using std::bind; using std::list; using std::map; -using std::ostringstream; -using std::remove_if; -using std::runtime_error; +using std::placeholders::_1; +using std::placeholders::_2; using std::shared_ptr; using std::string; -using std::vector; using Glib::VariantBase; using sigrok::ConfigKey; using sigrok::Context; using sigrok::Driver; -using sigrok::Device; -using sigrok::HardwareDevice; -using sigrok::SessionDevice; namespace pv { DeviceManager::DeviceManager(shared_ptr context) : - _context(context) + context_(context) { for (auto entry : context->drivers()) driver_scan(entry.second, map()); } -DeviceManager::~DeviceManager() +const shared_ptr& DeviceManager::context() const { + return context_; } shared_ptr DeviceManager::context() { - return _context; + return context_; } -const list< shared_ptr >& DeviceManager::devices() const +const list< shared_ptr >& +DeviceManager::devices() const { - return _devices; + return devices_; } -list< shared_ptr > DeviceManager::driver_scan( +list< shared_ptr > +DeviceManager::driver_scan( shared_ptr driver, map drvopts) { - list< shared_ptr > driver_devices; + list< shared_ptr > driver_devices; assert(driver); // 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) { - return device->driver() == driver; }); + devices_.remove_if([&](shared_ptr device) { + return device->hardware_device()->driver() == driver; }); // Do the scan auto devices = driver->scan(drvopts); - driver_devices.insert(driver_devices.end(), devices.begin(), devices.end()); - driver_devices.sort(compare_devices); - // Add the scanned devices to the main list - _devices.insert(_devices.end(), driver_devices.begin(), + // Add the scanned devices to the main list, set display names and sort. + for (shared_ptr device : devices) { + const shared_ptr d( + new devices::HardwareDevice(context_, device)); + driver_devices.push_back(d); + } + + devices_.insert(devices_.end(), driver_devices.begin(), driver_devices.end()); - _devices.sort(compare_devices); + devices_.sort(bind(&DeviceManager::compare_devices, this, _1, _2)); + driver_devices.sort(bind( + &DeviceManager::compare_devices, this, _1, _2)); return driver_devices; } const map DeviceManager::get_device_info( - shared_ptr device) + shared_ptr device) { map result; assert(device); - if (device->vendor().length() > 0) - result["vendor"] = device->vendor(); - if (device->model().length() > 0) - result["model"] = device->model(); - if (device->version().length() > 0) - result["version"] = device->version(); - if (device->serial_number().length() > 0) - result["serial_num"] = device->serial_number(); - if (device->connection_id().length() > 0) - result["connection_id"] = device->connection_id(); + const shared_ptr sr_dev = device->device(); + if (sr_dev->vendor().length() > 0) + result["vendor"] = sr_dev->vendor(); + if (sr_dev->model().length() > 0) + result["model"] = sr_dev->model(); + if (sr_dev->version().length() > 0) + result["version"] = sr_dev->version(); + if (sr_dev->serial_number().length() > 0) + result["serial_num"] = sr_dev->serial_number(); + if (sr_dev->connection_id().length() > 0) + result["connection_id"] = sr_dev->connection_id(); return result; } -const shared_ptr DeviceManager::find_device_from_info( +const shared_ptr DeviceManager::find_device_from_info( const map search_info) { - shared_ptr last_resort_dev; + shared_ptr last_resort_dev; map dev_info; - last_resort_dev = NULL; - - for (shared_ptr dev : _devices) { + for (shared_ptr dev : devices_) { assert(dev); dev_info = get_device_info(dev); // If present, vendor and model always have to match. if (dev_info.count("vendor") > 0 && search_info.count("vendor") > 0) - if (dev_info.at("vendor") != search_info.at("vendor")) continue; + if (dev_info.at("vendor") != search_info.at("vendor")) + continue; if (dev_info.count("model") > 0 && search_info.count("model") > 0) - if (dev_info.at("model") != search_info.at("model")) continue; + if (dev_info.at("model") != search_info.at("model")) + continue; // Most unique match: vendor/model/serial_num (but don't match a S/N of 0) if ((dev_info.count("serial_num") > 0) && (dev_info.at("serial_num") != "0") @@ -170,43 +176,12 @@ const shared_ptr DeviceManager::find_device_from_info( return last_resort_dev; } -string DeviceManager::device_description(shared_ptr device) -{ - auto session_device = dynamic_pointer_cast(device); - - if (session_device) - return boost::filesystem::path( - session_device->parent()->filename()).filename().string(); - - ostringstream s; - - vector parts = {device->vendor(), device->model(), - device->version(), device->serial_number()}; - - for (size_t i = 0; i < parts.size(); i++) - { - if (parts[i].length() > 0) - { - if (i != 0) - s << " "; - s << parts[i]; - } - } - - if (device->serial_number().length() == 0 && - device->connection_id().length() > 0) - s << " " << device->connection_id(); - - return s.str(); -} - -bool DeviceManager::compare_devices(shared_ptr a, - shared_ptr b) +bool DeviceManager::compare_devices(shared_ptr a, + shared_ptr b) { assert(a); assert(b); - - return device_description(a).compare(device_description(b)) < 0; + return a->display_name(*this).compare(b->display_name(*this)) < 0; } } // namespace pv