projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix #1204 by making sure the lazy event handler is fired
[pulseview.git]
/
pv
/
popups
/
channels.hpp
diff --git
a/pv/popups/channels.hpp
b/pv/popups/channels.hpp
index 56a7bd1a643abf3611106afc91d3e7e42a5bd3d0..344d21a824e7bb79e27bc28f0f44054e78d6b24c 100644
(file)
--- a/
pv/popups/channels.hpp
+++ b/
pv/popups/channels.hpp
@@
-25,8
+25,11
@@
#include <memory>
#include <vector>
#include <memory>
#include <vector>
+#include <QCheckBox>
#include <QFormLayout>
#include <QFormLayout>
+#include <QGridLayout>
#include <QHBoxLayout>
#include <QHBoxLayout>
+#include <QLabel>
#include <QPushButton>
#include <QSignalMapper>
#include <QPushButton>
#include <QSignalMapper>
@@
-37,9
+40,6
@@
using std::map;
using std::shared_ptr;
using std::vector;
using std::shared_ptr;
using std::vector;
-class QCheckBox;
-class QGridLayout;
-
namespace sigrok {
class ChannelGroup;
}
namespace sigrok {
class ChannelGroup;
}
@@
-71,7
+71,7
@@
public:
private:
void set_all_channels(bool set);
private:
void set_all_channels(bool set);
- void
set_all
_channels_conditionally(
+ void
enable
_channels_conditionally(
function<bool (const shared_ptr<data::SignalBase>)> cond_func);
void populate_group(shared_ptr<sigrok::ChannelGroup> group,
function<bool (const shared_ptr<data::SignalBase>)> cond_func);
void populate_group(shared_ptr<sigrok::ChannelGroup> group,