projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Integrated ColourButton into popup
[pulseview.git]
/
pv
/
view
/
trace.h
diff --git
a/pv/view/trace.h
b/pv/view/trace.h
index 415a7dc28c70c4e273f2bcde3bd5d037306d10f2..0b9c509aeda37e2f7e017ec1ffda7d0c7e1d6131 100644
(file)
--- a/
pv/view/trace.h
+++ b/
pv/view/trace.h
@@
-18,8
+18,8
@@
* 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_TRACE_H
-#define PULSEVIEW_PV_TRACE_H
+#ifndef PULSEVIEW_PV_
VIEW_
TRACE_H
+#define PULSEVIEW_PV_
VIEW_
TRACE_H
#include <QColor>
#include <QPainter>
#include <QColor>
#include <QPainter>
@@
-131,12
+131,16
@@
public:
*/
bool pt_in_label_rect(int left, int right, const QPoint &point);
*/
bool pt_in_label_rect(int left, int right, const QPoint &point);
-protected:
+ virtual QMenu* create_context_menu(QWidget *parent);
+
+ pv::widgets::Popup* create_popup(QWidget *parent);
+
/**
* Gets the y-offset of the axis.
*/
int get_y() const;
/**
* Gets the y-offset of the axis.
*/
int get_y() const;
+protected:
/**
* Gets the text colour.
* @remarks This colour is computed by comparing the lightness
/**
* Gets the text colour.
* @remarks This colour is computed by comparing the lightness
@@
-154,6
+158,10
@@
protected:
*/
void paint_axis(QPainter &p, int y, int left, int right);
*/
void paint_axis(QPainter &p, int y, int left, int right);
+ void add_colour_option(QWidget *parent, QFormLayout *form);
+
+ virtual void populate_popup_form(QWidget *parent, QFormLayout *form);
+
private:
/**
private:
/**
@@
-170,8
+178,18
@@
private:
*/
QRectF get_label_rect(int right);
*/
QRectF get_label_rect(int right);
+private slots:
+ void on_action_set_name_triggered();
+
+ void on_action_set_colour_triggered();
+
+ void on_text_changed(const QString &text);
+
+ void on_colour_changed(const QColor &colour);
+
signals:
void text_changed();
signals:
void text_changed();
+ void colour_changed();
protected:
pv::SigSession &_session;
protected:
pv::SigSession &_session;
@@
-187,4
+205,4
@@
protected:
} // namespace view
} // namespace pv
} // namespace view
} // namespace pv
-#endif // PULSEVIEW_PV_
TRACEL
_H
+#endif // PULSEVIEW_PV_
VIEW_TRACE
_H