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 81576dd4d19a9ef0a56465a8146c1f70e206ab08..cce9f4694e237da6fd7abd8a99b8f2c3f566fc68 100644 (file)
--- a/pv/view/signal.h
+++ b/pv/view/signal.h
@@ -18,36 +18,39 @@
  * 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 <memory>
 
 #include <QComboBox>
-#include <QPen>
 #include <QWidgetAction>
 
 #include <stdint.h>
 
-#include <libsigrok/libsigrok.h>
-
 #include "trace.h"
 
+struct sr_channel;
+
 namespace pv {
 
 namespace data {
 class SignalData;
 }
 
+namespace device {
+class DevInst;
+}
+
 namespace view {
 
 class Signal : public Trace
 {
        Q_OBJECT
 
-private:
-       static const QPen SignalAxisPen;
-
 protected:
-       Signal(pv::SigSession &session, const sr_probe *const probe);
+       Signal(std::shared_ptr<pv::device::DevInst> dev_inst,
+               const sr_channel *const channel);
 
 public:
        /**
@@ -55,34 +58,35 @@ public:
         */
        void set_name(QString name);
 
+       virtual std::shared_ptr<pv::data::SignalData> data() const = 0;
+
        /**
         * Returns true if the trace is visible and enabled.
         */
        bool enabled() const;
 
-protected:
+       void enable(bool enable = true);
 
-       /**
-        * 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);
+       const sr_channel* channel() const;
+
+       virtual void populate_popup_form(QWidget *parent, QFormLayout *form);
+
+       QMenu* create_context_menu(QWidget *parent);
+
+       void delete_pressed();
 
-private slots:
-       void on_text_changed(const QString &text);
+private Q_SLOTS:
+       void on_disable();
 
 protected:
-       const sr_probe *const _probe;
+       std::shared_ptr<pv::device::DevInst> _dev_inst;
+       const sr_channel *const _channel;
 
-       QWidgetAction _name_action;
-       QComboBox _name_widget;
+       QComboBox *_name_widget;
        bool _updating_name_widget;
 };
 
 } // namespace view
 } // namespace pv
 
-#endif // PULSEVIEW_PV_SIGNAL_H
+#endif // PULSEVIEW_PV_VIEW_SIGNAL_H