projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix an isnan() issue on (at least) MinGW and Mac OS X.
[pulseview.git]
/
pv
/
toolbars
/
samplingbar.cpp
diff --git
a/pv/toolbars/samplingbar.cpp
b/pv/toolbars/samplingbar.cpp
index 2002dd237b4f88ce3dd5edb012ae6a1ee81b6c01..7ee4d98150b5ccdb491ff9e2093a3507a9e7ad0d 100644
(file)
--- a/
pv/toolbars/samplingbar.cpp
+++ b/
pv/toolbars/samplingbar.cpp
@@
-56,7
+56,7
@@
const uint64_t SamplingBar::MinSampleCount = 100ULL;
const uint64_t SamplingBar::MaxSampleCount = 1000000000000ULL;
const uint64_t SamplingBar::DefaultSampleCount = 1000000;
const uint64_t SamplingBar::MaxSampleCount = 1000000000000ULL;
const uint64_t SamplingBar::DefaultSampleCount = 1000000;
-SamplingBar::SamplingBar(S
igS
ession &session, MainWindow &main_window) :
+SamplingBar::SamplingBar(Session &session, MainWindow &main_window) :
QToolBar("Sampling Bar", &main_window),
session_(session),
main_window_(main_window),
QToolBar("Sampling Bar", &main_window),
session_(session),
main_window_(main_window),
@@
-88,7
+88,7
@@
SamplingBar::SamplingBar(SigSession &session, MainWindow &main_window) :
sample_count_.show_min_max_step(0, UINT64_MAX, 1);
sample_count_.show_min_max_step(0, UINT64_MAX, 1);
- set_capture_state(pv::S
igS
ession::Stopped);
+ set_capture_state(pv::Session::Stopped);
configure_button_.setIcon(QIcon::fromTheme("configure",
QIcon(":/icons/configure.png")));
configure_button_.setIcon(QIcon::fromTheme("configure",
QIcon(":/icons/configure.png")));
@@
-111,7
+111,7
@@
SamplingBar::SamplingBar(SigSession &session, MainWindow &main_window) :
}
void SamplingBar::set_device_list(
}
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;
shared_ptr<Device> selected)
{
int selected_index = -1;
@@
-122,12
+122,12
@@
void SamplingBar::set_device_list(
device_selector_.clear();
device_selector_.clear();
- for (auto entry : devices) {
- auto device = entry.first;
- auto display_name = entry.second;
-
+ for (auto device : devices) {
assert(device);
assert(device);
+ string display_name =
+ session_.device_manager().get_display_name(device);
+
if (selected == device)
selected_index = device_selector_.count();
if (selected == device)
selected_index = device_selector_.count();
@@
-153,11
+153,11
@@
shared_ptr<Device> SamplingBar::get_selected_device() const
return device_selector_.itemData(index).value<shared_ptr<Device>>();
}
return device_selector_.itemData(index).value<shared_ptr<Device>>();
}
-void SamplingBar::set_capture_state(pv::S
igS
ession::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]);
{
const QIcon *icons[] = {&icon_grey_, &icon_red_, &icon_green_};
run_stop_button_.setIcon(*icons[state]);
- run_stop_button_.setText((state == pv::S
igS
ession::Stopped) ?
+ run_stop_button_.setText((state == pv::Session::Stopped) ?
tr("Run") : tr("Stop"));
run_stop_button_.setShortcut(QKeySequence(Qt::Key_Space));
}
tr("Run") : tr("Stop"));
run_stop_button_.setShortcut(QKeySequence(Qt::Key_Space));
}
@@
-432,7
+432,7
@@
void SamplingBar::on_device_selected()
if (!device)
return;
if (!device)
return;
-
session_.se
t_device(device);
+
main_window_.selec
t_device(device);
update_device_config_widgets();
}
update_device_config_widgets();
}