X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=pv%2Fdevicemanager.cpp;h=540f88150e4cf117be1ca1fa12762e8b734f3943;hb=311da12176d31b4cab2a7af9c4acf4cec6030dbf;hp=36d6fb6a44f1d0c10ae05a234503e5347122a85c;hpb=da30ecb7e72bd2547e524258efa5ec642988b70b;p=pulseview.git
diff --git a/pv/devicemanager.cpp b/pv/devicemanager.cpp
index 36d6fb6..540f881 100644
--- a/pv/devicemanager.cpp
+++ b/pv/devicemanager.cpp
@@ -14,58 +14,83 @@
* 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.hpp"
#include "session.hpp"
#include
-#include
+#include
+#include
#include
+#include
#include
-#include
#include
-#include
+#include
+#include
+#include
+
#include
#include
-using boost::algorithm::join;
-
-using std::dynamic_pointer_cast;
+using std::bind;
using std::list;
using std::map;
-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 std::unique_ptr;
using Glib::VariantBase;
using sigrok::ConfigKey;
using sigrok::Context;
using sigrok::Driver;
-using sigrok::SessionDevice;
namespace pv {
DeviceManager::DeviceManager(shared_ptr context) :
context_(context)
{
- for (auto entry : context->drivers())
- driver_scan(entry.second, map());
-}
-
-DeviceManager::~DeviceManager()
-{
+ unique_ptr progress(new QProgressDialog("",
+ QObject::tr("Cancel"), 0, context->drivers().size()));
+ progress->setWindowModality(Qt::WindowModal);
+ progress->setMinimumDuration(1); // To show the dialog immediately
+
+ int entry_num = 1;
+
+ for (auto entry : context->drivers()) {
+ progress->setLabelText(QObject::tr("Scanning for %1...")
+ .arg(QString::fromStdString(entry.first)));
+
+ /**
+ * We currently only support devices that can deliver
+ * samples at a fixed samplerate i.e. oscilloscopes and
+ * logic analysers.
+ * @todo Add support for non-monotonic devices i.e. DMMs
+ * and sensors.
+ */
+ const auto keys = (entry.second)->config_keys();
+
+ bool supported_device = keys.count(ConfigKey::LOGIC_ANALYZER) |
+ keys.count(ConfigKey::OSCILLOSCOPE);
+
+ if (supported_device)
+ driver_scan(entry.second, map());
+
+ progress->setValue(entry_num++);
+ QApplication::processEvents();
+ if (progress->wasCanceled())
+ break;
+ }
}
-const std::shared_ptr& DeviceManager::context() const
+const shared_ptr& DeviceManager::context() const
{
return context_;
}
@@ -104,14 +129,11 @@ DeviceManager::driver_scan(
driver_devices.push_back(d);
}
- for (shared_ptr device : driver_devices)
- build_display_name(device);
-
devices_.insert(devices_.end(), driver_devices.begin(),
driver_devices.end());
- devices_.sort([&](shared_ptr a,
- shared_ptr b)
- { return compare_devices(a, b); });
+ devices_.sort(bind(&DeviceManager::compare_devices, this, _1, _2));
+ driver_devices.sort(bind(
+ &DeviceManager::compare_devices, this, _1, _2));
return driver_devices;
}
@@ -150,10 +172,12 @@ const shared_ptr DeviceManager::find_device_from_info(
// 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")
@@ -187,80 +211,12 @@ const shared_ptr DeviceManager::find_device_from_info(
return last_resort_dev;
}
-void DeviceManager::build_display_name(shared_ptr device)
-{
- const shared_ptr sr_dev = device->device();
- auto session_device = dynamic_pointer_cast(sr_dev);
- auto hardware_device = dynamic_pointer_cast(sr_dev);
-
- 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 = {sr_dev->vendor(), sr_dev->model(),
- sr_dev->version(), sr_dev->serial_number()};
-
- if (sr_dev->connection_id().length() > 0)
- parts.push_back("("+sr_dev->connection_id()+")");
-
- full_names_[device] = join(parts, " ");
-
- // 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.
- const bool multiple_dev = hardware_device && any_of(
- devices_.begin(), devices_.end(),
- [&](shared_ptr dev) {
- return (dev->device()->vendor() == hardware_device->vendor() &&
- dev->device()->model() == hardware_device->model()) &&
- dev != device;
- } );
-
- parts = {sr_dev->vendor(), sr_dev->model()};
-
- if (multiple_dev) {
- parts.push_back(sr_dev->version());
- parts.push_back(sr_dev->serial_number());
-
- if ((sr_dev->serial_number().length() == 0) &&
- (sr_dev->connection_id().length() > 0))
- parts.push_back("("+sr_dev->connection_id()+")");
- }
-
- display_names_[device] = join(parts, " ");
-}
-
-const std::string DeviceManager::get_display_name(
- std::shared_ptr 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)
-{
- build_display_name(dev);
-}
-
-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 display_names_[a].compare(display_names_[b]) < 0;
+ return a->display_name(*this).compare(b->display_name(*this)) < 0;
}
} // namespace pv