Use a generic approach when adding the "close on enter" hook for popups

[pulseview.git] / pv / view / trace.h

diff --git a/pv/view/trace.h b/pv/view/trace.h
index ffd87fa45524feae6e5d2cade3d3ef86cdb368da..7726be255f05db2e0f50307881ffc4763bdfe93a 100644 (file)
--- a/pv/view/trace.h
+++ b/pv/view/trace.h
@@ -18,11 +18,12 @@
  * 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 <QPen>
 #include <QRect>
 #include <QString>
 
@@ -30,10 +31,9 @@
 
 #include "selectableitem.h"
 
-namespace pv {
-
-class SigSession;
+class QFormLayout;
 
+namespace pv {
 namespace view {
 
 class View;
@@ -43,10 +43,11 @@ class Trace : public SelectableItem
        Q_OBJECT
 
 private:
+       static const QPen AxisPen;
        static const int LabelHitPadding;
 
 protected:
-       Trace(SigSession &session, QString name);
+       Trace(QString name);
 
 public:
        /**
@@ -87,15 +88,31 @@ public:
        virtual void set_view(pv::view::View *view);
 
        /**
-        * Paints the trace with a QPainter
+        * Paints the background layer of the trace with a QPainter
+        * @param p the QPainter to paint into.
+        * @param left the x-coordinate of the left edge of the signal
+        * @param right the x-coordinate of the right edge of the signal
+        **/
+       virtual void paint_back(QPainter &p, int left, int right);
+
+       /**
+        * Paints the mid-layer of the trace with a QPainter
         * @param p the QPainter to paint into.
         * @param left the x-coordinate of the left edge of the signal
         * @param right the x-coordinate of the right edge of the signal
         **/
-       virtual void paint(QPainter &p, int left, int right) = 0;
+       virtual void paint_mid(QPainter &p, int left, int right);
 
        /**
-        * Paints the signal label into a QGLWidget.
+        * Paints the foreground layer of the trace with a QPainter
+        * @param p the QPainter to paint into.
+        * @param left the x-coordinate of the left edge of the signal
+        * @param right the x-coordinate of the right edge of the signal
+        **/
+       virtual void paint_fore(QPainter &p, int left, int right);
+
+       /**
+        * Paints the signal label.
         * @param p the QPainter to paint into.
         * @param right the x-coordinate of the right edge of the header
         *      area.
@@ -113,12 +130,14 @@ public:
         */
        bool pt_in_label_rect(int left, int right, const QPoint &point);
 
-private:
+       virtual QMenu* create_context_menu(QWidget *parent);
+
+       pv::widgets::Popup* create_popup(QWidget *parent);
 
        /**
-        * Computes an caches the size of the label text.
+        * Gets the y-offset of the axis.
         */
-       void compute_text_size(QPainter &p);
+       int get_y() const;
 
        /**
         * Computes the outline rectangle of a label.
@@ -129,21 +148,56 @@ private:
         */
        QRectF get_label_rect(int right);
 
-signals:
+protected:
+
+       /**
+        * Gets the text colour.
+        * @remarks This colour is computed by comparing the lightness
+        * of the trace colour against a threshold to determine whether
+        * white or black would be more visible.
+        */
+       QColor get_text_colour() const;
+
+       /**
+        * Paints a zero axis across the viewport.
+        * @param p the QPainter to paint into.
+        * @param y the y-offset of the axis.
+        * @param left the x-coordinate of the left edge of the view.
+        * @param right the x-coordinate of the right edge of the view.
+        */
+       void paint_axis(QPainter &p, int y, int left, int right);
+
+       void add_colour_option(QWidget *parent, QFormLayout *form);
+
+       void create_popup_form();
+
+       virtual void populate_popup_form(QWidget *parent, QFormLayout *form);
+
+private Q_SLOTS:
+       void on_text_changed(const QString &text);
+
+       void on_colour_changed(const QColor &colour);
+
+       void on_popup_closed();
+
+Q_SIGNALS:
+       void visibility_changed();
        void text_changed();    
+       void colour_changed();
 
 protected:
-       pv::SigSession &_session;
        pv::view::View *_view;
 
        QString _name;
        QColor _colour;
        int _v_offset;
 
-       QSizeF _text_size;
+private:
+       pv::widgets::Popup *_popup;
+       QFormLayout *_popup_form;
 };
 
 } // namespace view
 } // namespace pv
 
-#endif // PULSEVIEW_PV_TRACEL_H
+#endif // PULSEVIEW_PV_VIEW_TRACE_H