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 d55bcf1fe5205386ef8165be34b020232d496def..99b685c0bdc286f4f4f50e1b08290a8123e57acc 100644
(file)
--- a/
pv/view/signal.h
+++ b/
pv/view/signal.h
@@
-18,24
+18,30
@@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#ifndef PULSEVIEW_PV_SIGNAL_H
-#define PULSEVIEW_PV_SIGNAL_H
+#ifndef PULSEVIEW_PV_VIEW_SIGNAL_H
+#define PULSEVIEW_PV_VIEW_SIGNAL_H
+
+#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
@@
-43,30
+49,39
@@
class Signal : public Trace
Q_OBJECT
protected:
Q_OBJECT
protected:
- Signal(pv::SigSession &session, const sr_probe *const probe);
+ Signal(std::shared_ptr<pv::device::DevInst> dev_inst,
+ const sr_channel *const probe);
public:
public:
- virtual void init_context_bar_actions(QWidget *parent);
-
/**
* Sets the name of the signal.
*/
void set_name(QString name);
/**
* Sets the name of the signal.
*/
void set_name(QString name);
+ virtual std::shared_ptr<pv::data::SignalData> data() const = 0;
+
/**
* Returns true if the trace is visible and enabled.
*/
bool enabled() const;
/**
* Returns true if the trace is visible and enabled.
*/
bool enabled() const;
- const sr_probe* probe() const;
+ void enable(bool enable = true);
+
+ const sr_channel* probe() const;
+
+ virtual void populate_popup_form(QWidget *parent, QFormLayout *form);
+
+ QMenu* create_context_menu(QWidget *parent);
+
+ void delete_pressed();
private slots:
private slots:
- void on_
text_changed(const QString &text
);
+ void on_
disable(
);
protected:
protected:
- const sr_probe *const _probe;
+ std::shared_ptr<pv::device::DevInst> _dev_inst;
+ const sr_channel *const _probe;
- QWidgetAction *_name_action;
QComboBox *_name_widget;
bool _updating_name_widget;
};
QComboBox *_name_widget;
bool _updating_name_widget;
};
@@
-74,4
+89,4
@@
protected:
} // namespace view
} // namespace pv
} // namespace view
} // namespace pv
-#endif // PULSEVIEW_PV_SIGNAL_H
+#endif // PULSEVIEW_PV_
VIEW_
SIGNAL_H