X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=pv%2Fview%2Ftrace.h;h=0b9c509aeda37e2f7e017ec1ffda7d0c7e1d6131;hb=91e8bf08c9799cb1041d26bf2ff6b67abf9a420b;hp=bae5d253619e783f0553f8365fa187dcd75affe3;hpb=a28a212c7a9a3470e300911fe8aa62833a62d26a;p=pulseview.git diff --git a/pv/view/trace.h b/pv/view/trace.h index bae5d25..0b9c509 100644 --- 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 */ -#ifndef PULSEVIEW_PV_TRACE_H -#define PULSEVIEW_PV_TRACE_H +#ifndef PULSEVIEW_PV_VIEW_TRACE_H +#define PULSEVIEW_PV_VIEW_TRACE_H #include #include @@ -158,6 +158,8 @@ protected: */ 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: @@ -181,8 +183,13 @@ private slots: void on_action_set_colour_triggered(); + void on_text_changed(const QString &text); + + void on_colour_changed(const QColor &colour); + signals: void text_changed(); + void colour_changed(); protected: pv::SigSession &_session; @@ -198,4 +205,4 @@ protected: } // namespace view } // namespace pv -#endif // PULSEVIEW_PV_TRACEL_H +#endif // PULSEVIEW_PV_VIEW_TRACE_H