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

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

diff --git a/pv/view/signal.h b/pv/view/signal.h
index 6f08e947c61a36958a8efbf5a0a380739576373d..cce9f4694e237da6fd7abd8a99b8f2c3f566fc68 100644 (file)
--- a/pv/view/signal.h
+++ b/pv/view/signal.h
@@ -18,111 +18,75 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
-#ifndef PULSEVIEW_PV_SIGNAL_H
-#define PULSEVIEW_PV_SIGNAL_H
+#ifndef PULSEVIEW_PV_VIEW_SIGNAL_H
+#define PULSEVIEW_PV_VIEW_SIGNAL_H
 
-#include <boost/shared_ptr.hpp>
+#include <memory>
 
-#include <QColor>
-#include <QPainter>
-#include <QRect>
-#include <QString>
+#include <QComboBox>
+#include <QWidgetAction>
 
 #include <stdint.h>
 
+#include "trace.h"
+
+struct sr_channel;
+
 namespace pv {
 
+namespace data {
 class SignalData;
+}
+
+namespace device {
+class DevInst;
+}
 
 namespace view {
 
-class Signal
+class Signal : public Trace
 {
-private:
-       static const int LabelHitPadding;
+       Q_OBJECT
 
 protected:
-       Signal(QString name);
+       Signal(std::shared_ptr<pv::device::DevInst> dev_inst,
+               const sr_channel *const channel);
 
 public:
-       /**
-        * Gets the name of this signal.
-        */
-       QString get_name() const;
-
        /**
         * Sets the name of the signal.
         */
        void set_name(QString name);
 
-       /**
-        * Get the colour of the signal.
-        */
-       QColor get_colour() const;
+       virtual std::shared_ptr<pv::data::SignalData> data() const = 0;
 
        /**
-        * Set the colour of the signal.
+        * Returns true if the trace is visible and enabled.
         */
-       void set_colour(QColor colour);
+       bool enabled() const;
 
-       /**
-        * Paints the signal with a QPainter
-        * @param p the QPainter to paint into.
-        * @param rect the rectangular area to draw the trace into.
-        * @param scale the scale in seconds per pixel.
-        * @param offset the time to show at the left hand edge of
-        *   the view in seconds.
-        **/
-       virtual void paint(QPainter &p, const QRect &rect, double scale,
-               double offset) = 0;
+       void enable(bool enable = true);
 
+       const sr_channel* channel() const;
 
-       /**
-        * Paints the signal label into a QGLWidget.
-        * @param p the QPainter to paint into.
-        * @param rect the rectangular area to draw the label into.
-        * @param hover true if the label is being hovered over by the mouse.
-        */
-       virtual void paint_label(QPainter &p, const QRect &rect,
-               bool hover);
+       virtual void populate_popup_form(QWidget *parent, QFormLayout *form);
 
-       /**
-        * Determines if a point is in the header label rect.
-        * @param rect the rectangular area to draw the label into.
-        * @param point the point to test.
-        */
-       bool pt_in_label_rect(const QRect &rect, const QPoint &point);
-
-private:
-
-       /**
-        * Computes an caches the size of the label text.
-        */
-       void compute_text_size(QPainter &p);
+       QMenu* create_context_menu(QWidget *parent);
 
-       /**
-        * Computes the outline rectangle of a label.
-        * @param p the QPainter to lay out text with.
-        * @param rect The rectangle of the signal header.
-        * @return Returns the rectangle of the signal label.
-        */
-       QRectF get_label_rect(const QRect &rect);
+       void delete_pressed();
 
-protected:
-       /**
-        * When painting into the rectangle, calculate the y
-        * offset of the zero point.
-        **/
-       virtual int get_nominal_offset(const QRect &rect) const = 0;
+private Q_SLOTS:
+       void on_disable();
 
 protected:
-       QString _name;
-       QColor _colour;
+       std::shared_ptr<pv::device::DevInst> _dev_inst;
+       const sr_channel *const _channel;
 
-       QSizeF _text_size;
+       QComboBox *_name_widget;
+       bool _updating_name_widget;
 };
 
 } // namespace view
 } // namespace pv
 
-#endif // PULSEVIEW_PV_SIGNAL_H
+#endif // PULSEVIEW_PV_VIEW_SIGNAL_H