using std::bind;
using std::dynamic_pointer_cast;
using std::make_shared;
-using std::map;
using std::placeholders::_1;
using std::shared_ptr;
using std::string;
if (type == views::ViewTypeTrace)
// This view will be the main view if there's no main bar yet
- v = make_shared<views::TraceView::View>(session,
+ v = make_shared<views::trace::View>(session,
(main_bar ? false : true), dock_main);
if (!v)
SLOT(trigger_event(util::Timestamp)));
if (type == views::ViewTypeTrace) {
- views::TraceView::View *tv =
- qobject_cast<views::TraceView::View*>(v.get());
+ views::trace::View *tv =
+ qobject_cast<views::trace::View*>(v.get());
tv->enable_coloured_bg(settings.value(GlobalSettings::Key_View_ColouredBG).toBool());
tv->enable_show_sampling_points(settings.value(GlobalSettings::Key_View_ShowSamplingPoints).toBool());
shared_ptr<Session> session = add_session();
- map<string, string> dev_info;
- shared_ptr<devices::HardwareDevice> other_device, demo_device;
-
- // Use any available device that's not demo
+ // Check the list of available devices. Prefer the one that was
+ // found with user supplied scan specs (if applicable). Then try
+ // one of the auto detected devices that are not the demo device.
+ // Pick demo in the absence of "genuine" hardware devices.
+ shared_ptr<devices::HardwareDevice> user_device, other_device, demo_device;
for (shared_ptr<devices::HardwareDevice> dev : device_manager_.devices()) {
- if (dev->hardware_device()->driver()->name() == "demo") {
+ if (dev == device_manager_.user_spec_device()) {
+ user_device = dev;
+ } else if (dev->hardware_device()->driver()->name() == "demo") {
demo_device = dev;
} else {
other_device = dev;
}
}
-
- // ...and if there isn't any, just use demo then
- session->select_device(other_device ? other_device : demo_device);
+ if (user_device)
+ session->select_device(user_device);
+ else if (other_device)
+ session->select_device(other_device);
+ else
+ session->select_device(demo_device);
}
void MainWindow::save_sessions()
// Set the window icon
QIcon icon;
- icon.addFile(QString(":/icons/sigrok-logo-notext.png"));
+ icon.addFile(QString(":/icons/pulseview.png"));
setWindowIcon(icon);
view_sticky_scrolling_shortcut_ = new QShortcut(QKeySequence(Qt::Key_S), this, SLOT(on_view_sticky_scrolling_shortcut()));
shared_ptr<views::ViewBase> viewbase = entry.second;
// Only trace views have this setting
- views::TraceView::View* view =
- qobject_cast<views::TraceView::View*>(viewbase.get());
+ views::trace::View* view =
+ qobject_cast<views::trace::View*>(viewbase.get());
if (view)
view->enable_coloured_bg(state);
}
shared_ptr<views::ViewBase> viewbase = entry.second;
// Only trace views have this setting
- views::TraceView::View* view =
- qobject_cast<views::TraceView::View*>(viewbase.get());
+ views::trace::View* view =
+ qobject_cast<views::trace::View*>(viewbase.get());
if (view)
view->enable_show_sampling_points(state);
}
shared_ptr<views::ViewBase> viewbase = entry.second;
// Only trace views have this setting
- views::TraceView::View* view =
- qobject_cast<views::TraceView::View*>(viewbase.get());
+ views::trace::View* view =
+ qobject_cast<views::trace::View*>(viewbase.get());
if (view)
view->enable_show_analog_minor_grid(state);
}