X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=pv%2Fdevicemanager.cpp;h=ac6ce6fb433da3fa29eefa9ba551c043c70f63b5;hb=941e22a645e89e7253f0faeb63b74ee97201dd91;hp=17a49774465c3d90fa7c8e3171d10bd4900c33f1;hpb=3084ed4b15663dd717ff656745db305f377ab215;p=pulseview.git
diff --git a/pv/devicemanager.cpp b/pv/devicemanager.cpp
index 17a4977..ac6ce6f 100644
--- a/pv/devicemanager.cpp
+++ b/pv/devicemanager.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 "devicemanager.hpp"
@@ -23,51 +22,62 @@
#include
#include
-#include
+#include
#include
+#include
#include
-#include
#include
-#include
+#include
+#include
+#include
+
#include
#include
-using boost::algorithm::join;
-
using std::bind;
-using std::dynamic_pointer_cast;
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())
+ 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)));
+
driver_scan(entry.second, map());
-}
-DeviceManager::~DeviceManager()
-{
+ 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_;
}
@@ -91,6 +101,18 @@ DeviceManager::driver_scan(
assert(driver);
+ /*
+ * 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 (DMMs, sensors, etc).
+ */
+ const auto keys = driver->config_keys();
+ bool supported_device = keys.count(ConfigKey::LOGIC_ANALYZER) |
+ keys.count(ConfigKey::OSCILLOSCOPE);
+ if (!supported_device)
+ return driver_devices;
+
// 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) {
@@ -149,10 +171,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,7 +211,8 @@ const shared_ptr DeviceManager::find_device_from_info(
}
bool DeviceManager::compare_devices(shared_ptr a,
- shared_ptr b) {
+ shared_ptr b)
+{
assert(a);
assert(b);
return a->display_name(*this).compare(b->display_name(*this)) < 0;