projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Remove data_ also for LogicSignal and use SignalBase data instead
[pulseview.git]
/
pv
/
view
/
logicsignal.hpp
diff --git
a/pv/view/logicsignal.hpp
b/pv/view/logicsignal.hpp
index 71dcc0361404648091532a767209b9d88e9170bc..8274b618a541b565126aa4c67562292957e29cd8 100644
(file)
--- a/
pv/view/logicsignal.hpp
+++ b/
pv/view/logicsignal.hpp
@@
-51,9
+51,6
@@
class LogicSignal : public Signal
Q_OBJECT
private:
Q_OBJECT
private:
- static const int SignalHeight;
- static const int SignalMargin;
-
static const float Oversampling;
static const QColor EdgeColour;
static const float Oversampling;
static const QColor EdgeColour;
@@
-69,17
+66,14
@@
private:
public:
LogicSignal(pv::Session &session,
std::shared_ptr<devices::Device> device,
public:
LogicSignal(pv::Session &session,
std::shared_ptr<devices::Device> device,
- std::shared_ptr<sigrok::Channel> channel,
- std::shared_ptr<pv::data::Logic> data);
+ std::shared_ptr<data::SignalBase> base);
- virtual ~LogicSignal();
+ virtual ~LogicSignal()
= default
;
std::shared_ptr<pv::data::SignalData> data() const;
std::shared_ptr<pv::data::Logic> logic_data() const;
std::shared_ptr<pv::data::SignalData> data() const;
std::shared_ptr<pv::data::Logic> logic_data() const;
- void set_logic_data(std::shared_ptr<pv::data::Logic> data);
-
/**
* Computes the vertical extents of the contents of this row item.
* @return A pair containing the minimum and maximum y-values.
/**
* Computes the vertical extents of the contents of this row item.
* @return A pair containing the minimum and maximum y-values.
@@
-97,25
+91,18
@@
public:
*/
void scale_handle_dragged(int offset);
*/
void scale_handle_dragged(int offset);
- /**
- * Paints the background layer of the signal with a QPainter
- * @param p the QPainter to paint into.
- * @param pp the painting parameters object to paint with..
- **/
- void paint_back(QPainter &p, const ViewItemPaintParams &pp);
-
/**
* Paints the mid-layer of the signal with a QPainter
* @param p the QPainter to paint into.
* @param pp the painting parameters object to paint with..
/**
* Paints the mid-layer of the signal with a QPainter
* @param p the QPainter to paint into.
* @param pp the painting parameters object to paint with..
- *
*
/
+ */
void paint_mid(QPainter &p, const ViewItemPaintParams &pp);
/**
* Paints the foreground layer of the signal with a QPainter
* @param p the QPainter to paint into.
* @param pp the painting parameters object to paint with.
void paint_mid(QPainter &p, const ViewItemPaintParams &pp);
/**
* Paints the foreground layer of the signal with a QPainter
* @param p the QPainter to paint into.
* @param pp the painting parameters object to paint with.
- *
*
/
+ */
virtual void paint_fore(QPainter &p, const ViewItemPaintParams &pp);
private:
virtual void paint_fore(QPainter &p, const ViewItemPaintParams &pp);
private:
@@
-128,7
+115,7
@@
private:
const std::vector<int32_t> get_trigger_types() const;
QAction* action_from_trigger_type(
const std::vector<int32_t> get_trigger_types() const;
QAction* action_from_trigger_type(
- const sigrok::TriggerMatchType *
match
);
+ const sigrok::TriggerMatchType *
type
);
const sigrok::TriggerMatchType* trigger_type_from_action(
QAction *action);
void populate_popup_form(QWidget *parent, QFormLayout *form);
const sigrok::TriggerMatchType* trigger_type_from_action(
QAction *action);
void populate_popup_form(QWidget *parent, QFormLayout *form);
@@
-141,8
+128,9
@@
private Q_SLOTS:
void on_trigger();
private:
void on_trigger();
private:
+ int signal_height_;
+
std::shared_ptr<pv::devices::Device> device_;
std::shared_ptr<pv::devices::Device> device_;
- std::shared_ptr<pv::data::Logic> data_;
const sigrok::TriggerMatchType *trigger_match_;
QToolBar *trigger_bar_;
const sigrok::TriggerMatchType *trigger_match_;
QToolBar *trigger_bar_;