projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Minor whitespace fixes.
[pulseview.git]
/
pv
/
toolbars
/
samplingbar.cpp
diff --git
a/pv/toolbars/samplingbar.cpp
b/pv/toolbars/samplingbar.cpp
index ddca7b5961a8145155c2a64ab0f9f6df0e1fea33..b5a2aee513c7a12026b94e7bd3720894fd9e735e 100644
(file)
--- a/
pv/toolbars/samplingbar.cpp
+++ b/
pv/toolbars/samplingbar.cpp
@@
-30,6
+30,7
@@
#include "samplingbar.hpp"
#include <pv/devicemanager.hpp>
#include "samplingbar.hpp"
#include <pv/devicemanager.hpp>
+#include <pv/mainwindow.hpp>
#include <pv/popups/deviceoptions.hpp>
#include <pv/popups/channels.hpp>
#include <pv/util.hpp>
#include <pv/popups/deviceoptions.hpp>
#include <pv/popups/channels.hpp>
#include <pv/util.hpp>
@@
-55,9
+56,10
@@
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
igSession &session, QWidget *parent
) :
- QToolBar("Sampling Bar",
parent
),
+SamplingBar::SamplingBar(S
ession &session, MainWindow &main_window
) :
+ QToolBar("Sampling Bar",
&main_window
),
session_(session),
session_(session),
+ main_window_(main_window),
device_selector_(this),
updating_device_selector_(false),
configure_button_(this),
device_selector_(this),
updating_device_selector_(false),
configure_button_(this),
@@
-86,7
+88,7
@@
SamplingBar::SamplingBar(SigSession &session, QWidget *parent) :
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")));
@@
-151,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));
}
@@
-430,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();
}
@@
-449,7
+451,7
@@
void SamplingBar::on_run_stop()
{
commit_sample_count();
commit_sample_rate();
{
commit_sample_count();
commit_sample_rate();
- run_stop();
+
main_window_.
run_stop();
}
void SamplingBar::on_config_changed()
}
void SamplingBar::on_config_changed()