const uint64_t SamplingBar::MaxSampleCount = 1000000000000ULL;
const uint64_t SamplingBar::DefaultSampleCount = 1000000;
-SamplingBar::SamplingBar(SigSession &session, MainWindow &main_window) :
+SamplingBar::SamplingBar(Session &session, MainWindow &main_window) :
QToolBar("Sampling Bar", &main_window),
session_(session),
main_window_(main_window),
sample_count_.show_min_max_step(0, UINT64_MAX, 1);
- set_capture_state(pv::SigSession::Stopped);
+ set_capture_state(pv::Session::Stopped);
configure_button_.setIcon(QIcon::fromTheme("configure",
QIcon(":/icons/configure.png")));
}
void SamplingBar::set_device_list(
- const std::list< std::pair<std::shared_ptr<sigrok::Device>, std::string> > &devices,
+ const std::list< std::shared_ptr<sigrok::Device> > &devices,
shared_ptr<Device> selected)
{
int selected_index = -1;
device_selector_.clear();
- for (auto entry : devices) {
- auto device = entry.first;
- auto display_name = entry.second;
-
+ for (auto device : devices) {
assert(device);
+ string display_name =
+ session_.device_manager().get_display_name(device);
+
if (selected == device)
selected_index = device_selector_.count();
return device_selector_.itemData(index).value<shared_ptr<Device>>();
}
-void SamplingBar::set_capture_state(pv::SigSession::capture_state state)
+void SamplingBar::set_capture_state(pv::Session::capture_state state)
{
const QIcon *icons[] = {&icon_grey_, &icon_red_, &icon_green_};
run_stop_button_.setIcon(*icons[state]);
- run_stop_button_.setText((state == pv::SigSession::Stopped) ?
+ run_stop_button_.setText((state == pv::Session::Stopped) ?
tr("Run") : tr("Stop"));
run_stop_button_.setShortcut(QKeySequence(Qt::Key_Space));
}
if (!device)
return;
- session_.set_device(device);
+ main_window_.select_device(device);
update_device_config_widgets();
}