projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Change namespace for the trace view and implement ViewBase
[pulseview.git]
/
pv
/
popups
/
channels.hpp
diff --git
a/pv/popups/channels.hpp
b/pv/popups/channels.hpp
index 5ed5d4768ff18ec4fb14a86be53ed3fe10f8d422..25cd0ae66a3baf37a353acdc382ddfef8e2f92d7 100644
(file)
--- a/
pv/popups/channels.hpp
+++ b/
pv/popups/channels.hpp
@@
-47,6
+47,10
@@
namespace binding {
class Device;
}
class Device;
}
+namespace data {
+class SignalBase;
+}
+
namespace view {
class Signal;
}
namespace view {
class Signal;
}
@@
-64,10
+68,10
@@
private:
void set_all_channels(bool set);
void populate_group(std::shared_ptr<sigrok::ChannelGroup> group,
void set_all_channels(bool set);
void populate_group(std::shared_ptr<sigrok::ChannelGroup> group,
- const std::vector< std::shared_ptr<pv::
view::Signal
> > sigs);
+ const std::vector< std::shared_ptr<pv::
data::SignalBase
> > sigs);
QGridLayout* create_channel_group_grid(
QGridLayout* create_channel_group_grid(
- const std::vector< std::shared_ptr<pv::
view::Signal
> > sigs);
+ const std::vector< std::shared_ptr<pv::
data::SignalBase
> > sigs);
private:
void showEvent(QShowEvent *event);
private:
void showEvent(QShowEvent *event);
@@
-87,7
+91,7
@@
private:
std::vector< std::shared_ptr<pv::binding::Device> >
group_bindings_;
std::vector< std::shared_ptr<pv::binding::Device> >
group_bindings_;
- std::map< QCheckBox*, std::shared_ptr<pv::
view::Signal
> >
+ std::map< QCheckBox*, std::shared_ptr<pv::
data::SignalBase
> >
check_box_signal_map_;
QHBoxLayout buttons_bar_;
check_box_signal_map_;
QHBoxLayout buttons_bar_;