projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Implemented support for probe groups
[pulseview.git]
/
pv
/
popups
/
probes.h
diff --git
a/pv/popups/probes.h
b/pv/popups/probes.h
index b5eda58f3d9f5dd2c53a2286f4daa133765020b4..dc7324d1ddd278cf631fefd72935d1c3a00c462b 100644
(file)
--- a/
pv/popups/probes.h
+++ b/
pv/popups/probes.h
@@
-21,17
+21,31
@@
#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 <QListWidget>
+#include <vector>
+
+#include <QFormLayout>
#include <QToolBar>
#include <QToolButton>
#include <QToolBar>
#include <QToolButton>
-#include <QVBoxLayout>
#include <pv/widgets/popup.h>
#include <pv/widgets/popup.h>
+class QCheckBox;
+class QGridLayout;
+
namespace pv {
class SigSession;
namespace pv {
class SigSession;
+namespace prop {
+namespace binding {
+class DeviceOptions;
+}
+}
+
+namespace view {
+class Signal;
+}
+
namespace popups {
class Probes : public pv::widgets::Popup
namespace popups {
class Probes : public pv::widgets::Popup
@@
-44,11
+58,17
@@
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);
+
+ QGridLayout* create_probe_group_grid(
+ const std::vector< boost::shared_ptr<pv::view::Signal> > sigs);
+
private:
void showEvent(QShowEvent *e);
private slots:
private:
void showEvent(QShowEvent *e);
private slots:
- void
item_changed(QListWidgetItem *item
);
+ void
on_probe_checked(QWidget *widget
);
void enable_all_probes();
void disable_all_probes();
void enable_all_probes();
void disable_all_probes();
@@
-56,14
+76,20
@@
private slots:
private:
pv::SigSession &_session;
private:
pv::SigSession &_session;
- Q
VBox
Layout _layout;
+ Q
Form
Layout _layout;
- QListWidget _probes;
bool _updating_probes;
bool _updating_probes;
+ std::vector< boost::shared_ptr<pv::prop::binding::DeviceOptions> >
+ _group_bindings;
+ std::map< QCheckBox*, boost::shared_ptr<pv::view::Signal> >
+ _check_box_signal_map;
+
QToolBar _probes_bar;
QToolButton _enable_all_probes;
QToolButton _disable_all_probes;
QToolBar _probes_bar;
QToolButton _enable_all_probes;
QToolButton _disable_all_probes;
+
+ QSignalMapper _check_box_mapper;
};
} // popups
};
} // popups