* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
+#include <boost/foreach.hpp>
+
#include "connect.h"
+#include "pv/devicemanager.h"
+
extern "C" {
/* __STDC_FORMAT_MACROS is required for PRIu64 and friends (in C++). */
#define __STDC_FORMAT_MACROS
#include <libsigrok/libsigrok.h>
}
+using namespace std;
+
extern sr_context *sr_ctx;
namespace pv {
namespace dialogs {
-Connect::Connect(QWidget *parent) :
+Connect::Connect(QWidget *parent, pv::DeviceManager &device_manager) :
QDialog(parent),
+ _device_manager(device_manager),
_layout(this),
_form(this),
_form_layout(&_form),
*/
bool supported_device = false;
if ((sr_config_list(drivers[i], SR_CONF_DEVICE_OPTIONS,
- &gvar_opts, NULL) == SR_OK))
+ &gvar_opts, NULL) == SR_OK)) {
hwopts = (const int32_t *)g_variant_get_fixed_array(gvar_opts,
&num_opts, sizeof(int32_t));
for (unsigned int j = 0; j < num_opts; j++)
supported_device = true;
break;
}
+ }
if (supported_device)
_drivers.addItem(QString("%1 (%2)").arg(
drvopts = g_slist_append(drvopts, src);
}
- GSList *const devices = sr_driver_scan(driver, drvopts);
+ const list<sr_dev_inst*> devices = _device_manager.driver_scan(
+ driver, drvopts);
- for (GSList *l = devices; l; l = l->next) {
-
- sr_dev_inst *const sdi = (sr_dev_inst*)l->data;
+ g_slist_free_full(drvopts, (GDestroyNotify)free_drvopts);
- QString text;
- if (sdi->vendor && sdi->vendor[0])
- text += QString("%1 ").arg(sdi->vendor);
- if (sdi->model && sdi->model[0])
- text += QString("%1 ").arg(sdi->model);
- if (sdi->version && sdi->version[0])
- text += QString("%1 ").arg(sdi->version);
+ BOOST_FOREACH(sr_dev_inst *const sdi, devices)
+ {
+ const string title = DeviceManager::format_device_title(sdi);
+ QString text(title.c_str());
if (sdi->probes) {
- text += QString("with %1 probes").arg(
+ text += QString(" with %1 probes").arg(
g_slist_length(sdi->probes));
}
_device_list.addItem(item);
}
- g_slist_free(devices);
- g_slist_free_full(drvopts, (GDestroyNotify)free_drvopts);
-
_device_list.setCurrentRow(0);
_button_box.button(QDialogButtonBox::Ok)->setDisabled(false);
}