projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Don't use Qt-defined keywords, they can cause problems with other headers.
[pulseview.git]
/
pv
/
popups
/
probes.h
diff --git
a/pv/popups/probes.h
b/pv/popups/probes.h
index dc7324d1ddd278cf631fefd72935d1c3a00c462b..434d03986378cb048944bbe8c05d412d06b3ab38 100644
(file)
--- a/
pv/popups/probes.h
+++ b/
pv/popups/probes.h
@@
-21,14
+21,19
@@
#ifndef PULSEVIEW_PV_POPUPS_PROBES_H
#define PULSEVIEW_PV_POPUPS_PROBES_H
#ifndef PULSEVIEW_PV_POPUPS_PROBES_H
#define PULSEVIEW_PV_POPUPS_PROBES_H
+#include <map>
+#include <memory>
#include <vector>
#include <QFormLayout>
#include <vector>
#include <QFormLayout>
-#include <QToolBar>
-#include <QToolButton>
+#include <QHBoxLayout>
+#include <QPushButton>
+#include <QSignalMapper>
#include <pv/widgets/popup.h>
#include <pv/widgets/popup.h>
+struct sr_channel_group;
+
class QCheckBox;
class QGridLayout;
class QCheckBox;
class QGridLayout;
@@
-58,16
+63,16
@@
public:
private:
void set_all_probes(bool set);
private:
void set_all_probes(bool set);
- void populate_group(const sr_
probe
_group *group,
- const std::vector<
boost
::shared_ptr<pv::view::Signal> > sigs);
+ void populate_group(const sr_
channel
_group *group,
+ const std::vector<
std
::shared_ptr<pv::view::Signal> > sigs);
- QGridLayout* create_
probe
_group_grid(
- const std::vector<
boost
::shared_ptr<pv::view::Signal> > sigs);
+ QGridLayout* create_
channel
_group_grid(
+ const std::vector<
std
::shared_ptr<pv::view::Signal> > sigs);
private:
void showEvent(QShowEvent *e);
private:
void showEvent(QShowEvent *e);
-private
slots
:
+private
Q_SLOTS
:
void on_probe_checked(QWidget *widget);
void enable_all_probes();
void on_probe_checked(QWidget *widget);
void enable_all_probes();
@@
-80,14
+85,14
@@
private:
bool _updating_probes;
bool _updating_probes;
- std::vector<
boost
::shared_ptr<pv::prop::binding::DeviceOptions> >
+ std::vector<
std
::shared_ptr<pv::prop::binding::DeviceOptions> >
_group_bindings;
_group_bindings;
- std::map< QCheckBox*,
boost
::shared_ptr<pv::view::Signal> >
+ std::map< QCheckBox*,
std
::shared_ptr<pv::view::Signal> >
_check_box_signal_map;
_check_box_signal_map;
- Q
ToolBar _probe
s_bar;
- Q
Tool
Button _enable_all_probes;
- Q
Tool
Button _disable_all_probes;
+ Q
HBoxLayout _button
s_bar;
+ Q
Push
Button _enable_all_probes;
+ Q
Push
Button _disable_all_probes;
QSignalMapper _check_box_mapper;
};
QSignalMapper _check_box_mapper;
};