projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
SamplingBar: Added reference to MainWindow for run_stop
[pulseview.git]
/
pv
/
toolbars
/
samplingbar.hpp
diff --git
a/pv/toolbars/samplingbar.hpp
b/pv/toolbars/samplingbar.hpp
index d027d60e6b3b303802e3c87164d6dba3622e1319..af2743118ad7441d1140869b5989632bb46e8762 100644
(file)
--- a/
pv/toolbars/samplingbar.hpp
+++ b/
pv/toolbars/samplingbar.hpp
@@
-45,6
+45,7
@@
class QAction;
namespace pv {
namespace pv {
+class MainWindow;
class SigSession;
namespace toolbars {
class SigSession;
namespace toolbars {
@@
-59,7
+60,7
@@
private:
static const uint64_t DefaultSampleCount;
public:
static const uint64_t DefaultSampleCount;
public:
- SamplingBar(SigSession &session,
QWidget *parent
);
+ SamplingBar(SigSession &session,
pv::MainWindow &main_window
);
void set_device_list(
const std::list< std::pair<std::shared_ptr<sigrok::Device>, std::string> > &devices,
void set_device_list(
const std::list< std::pair<std::shared_ptr<sigrok::Device>, std::string> > &devices,
@@
-93,6
+94,7
@@
protected:
private:
SigSession &session_;
private:
SigSession &session_;
+ MainWindow &main_window_;
QComboBox device_selector_;
bool updating_device_selector_;
QComboBox device_selector_;
bool updating_device_selector_;