projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Use a separate widget to hold the cursor labels.
[pulseview.git]
/
pv
/
view
/
signal.h
diff --git
a/pv/view/signal.h
b/pv/view/signal.h
index bdbd27a35f1b9554cde55dd75b1a441f0b1619b8..99b685c0bdc286f4f4f50e1b08290a8123e57acc 100644
(file)
--- a/
pv/view/signal.h
+++ b/
pv/view/signal.h
@@
-21,23
+21,27
@@
#ifndef PULSEVIEW_PV_VIEW_SIGNAL_H
#define PULSEVIEW_PV_VIEW_SIGNAL_H
#ifndef PULSEVIEW_PV_VIEW_SIGNAL_H
#define PULSEVIEW_PV_VIEW_SIGNAL_H
-#include <
boost/shared_ptr.hpp
>
+#include <
memory
>
#include <QComboBox>
#include <QWidgetAction>
#include <stdint.h>
#include <QComboBox>
#include <QWidgetAction>
#include <stdint.h>
-#include <libsigrok/libsigrok.h>
-
#include "trace.h"
#include "trace.h"
+struct sr_channel;
+
namespace pv {
namespace data {
class SignalData;
}
namespace pv {
namespace data {
class SignalData;
}
+namespace device {
+class DevInst;
+}
+
namespace view {
class Signal : public Trace
namespace view {
class Signal : public Trace
@@
-45,7
+49,8
@@
class Signal : public Trace
Q_OBJECT
protected:
Q_OBJECT
protected:
- Signal(pv::SigSession &session, sr_probe *const probe);
+ Signal(std::shared_ptr<pv::device::DevInst> dev_inst,
+ const sr_channel *const probe);
public:
/**
public:
/**
@@
-53,7
+58,7
@@
public:
*/
void set_name(QString name);
*/
void set_name(QString name);
- virtual
boost
::shared_ptr<pv::data::SignalData> data() const = 0;
+ virtual
std
::shared_ptr<pv::data::SignalData> data() const = 0;
/**
* Returns true if the trace is visible and enabled.
/**
* Returns true if the trace is visible and enabled.
@@
-62,7
+67,7
@@
public:
void enable(bool enable = true);
void enable(bool enable = true);
- const sr_
probe
* probe() const;
+ const sr_
channel
* probe() const;
virtual void populate_popup_form(QWidget *parent, QFormLayout *form);
virtual void populate_popup_form(QWidget *parent, QFormLayout *form);
@@
-74,7
+79,8
@@
private slots:
void on_disable();
protected:
void on_disable();
protected:
- sr_probe *const _probe;
+ std::shared_ptr<pv::device::DevInst> _dev_inst;
+ const sr_channel *const _probe;
QComboBox *_name_widget;
bool _updating_name_widget;
QComboBox *_name_widget;
bool _updating_name_widget;