projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Added _session reference to Signal objects
[pulseview.git]
/
pv
/
view
/
signal.h
diff --git
a/pv/view/signal.h
b/pv/view/signal.h
index b53d05393e814e28e1212a0862c0309823ae992c..eeef55389eb79384f5f84ccaa9542bb631b28999 100644
(file)
--- a/
pv/view/signal.h
+++ b/
pv/view/signal.h
@@
-24,33
+24,40
@@
#include <boost/shared_ptr.hpp>
#include <QColor>
#include <boost/shared_ptr.hpp>
#include <QColor>
+#include <QComboBox>
#include <QPainter>
#include <QPen>
#include <QRect>
#include <QString>
#include <QPainter>
#include <QPen>
#include <QRect>
#include <QString>
+#include <QWidgetAction>
#include <stdint.h>
#include <libsigrok/libsigrok.h>
#include <stdint.h>
#include <libsigrok/libsigrok.h>
+#include "selectableitem.h"
+
namespace pv {
namespace pv {
+class SigSession;
+
namespace data {
class SignalData;
}
namespace view {
namespace data {
class SignalData;
}
namespace view {
-class Signal
+class Signal
: public SelectableItem
{
{
+ Q_OBJECT
+
private:
static const int LabelHitPadding;
private:
static const int LabelHitPadding;
- static const int LabelHighlightRadius;
static const QPen SignalAxisPen;
protected:
static const QPen SignalAxisPen;
protected:
- Signal(const sr_probe *const probe);
+ Signal(
pv::SigSession &session,
const sr_probe *const probe);
public:
/**
public:
/**
@@
-83,16
+90,6
@@
public:
*/
void set_v_offset(int v_offset);
*/
void set_v_offset(int v_offset);
- /**
- * Returns true if the signal has been selected by the user.
- */
- bool selected() const;
-
- /**
- * Selects or deselects the signal.
- */
- void select(bool select = true);
-
/**
* Paints the signal with a QPainter
* @param p the QPainter to paint into.
/**
* Paints the signal with a QPainter
* @param p the QPainter to paint into.
@@
-157,16
+154,25
@@
private:
*/
QRectF get_label_rect(int y, int right);
*/
QRectF get_label_rect(int y, int right);
+private slots:
+ void on_text_changed(const QString &text);
+
+signals:
+ void text_changed();
+
protected:
protected:
+ pv::SigSession &_session;
const sr_probe *const _probe;
QString _name;
QColor _colour;
int _v_offset;
const sr_probe *const _probe;
QString _name;
QColor _colour;
int _v_offset;
- bool _selected;
-
QSizeF _text_size;
QSizeF _text_size;
+
+ QWidgetAction _name_action;
+ QComboBox _name_widget;
+ bool _updating_name_widget;
};
} // namespace view
};
} // namespace view