X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=pv%2Fview%2Fsignal.h;h=540eb6eda38899b3027a9f3a4baac45ecb39b3ba;hb=03ce95a9bb81c05bae0da9de189d280214db67c3;hp=5732e19d5f45e632630d382ddcc5b36ef581f8fe;hpb=9e40e83daf6a2851f4883468a4237849f984b336;p=pulseview.git

diff --git a/pv/view/signal.h b/pv/view/signal.h
index 5732e19d..540eb6ed 100644
--- a/pv/view/signal.h
+++ b/pv/view/signal.h
@@ -21,21 +21,14 @@
 #ifndef PULSEVIEW_PV_SIGNAL_H
 #define PULSEVIEW_PV_SIGNAL_H
 
-#include <boost/shared_ptr.hpp>
-
-#include <QColor>
 #include <QComboBox>
-#include <QPainter>
-#include <QPen>
-#include <QRect>
-#include <QString>
 #include <QWidgetAction>
 
 #include <stdint.h>
 
 #include <libsigrok/libsigrok.h>
 
-#include "selectableitem.h"
+#include "trace.h"
 
 namespace pv {
 
@@ -45,130 +38,35 @@ class SignalData;
 
 namespace view {
 
-class Signal : public SelectableItem
+class Signal : public Trace
 {
 	Q_OBJECT
 
-private:
-	static const int LabelHitPadding;
-
-	static const QPen SignalAxisPen;
-
 protected:
-	Signal(const sr_probe *const probe);
+	Signal(pv::SigSession &session, const sr_probe *const probe);
 
 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;
-
-	/**
-	 * Set the colour of the signal.
-	 */
-	void set_colour(QColor colour);
-
-	/**
-	 * Gets the vertical layout offset of this signal.
-	 */
-	int get_v_offset() const;
-
-	/**
-	 * Sets the vertical layout offset of this signal.
-	 */
-	void set_v_offset(int v_offset);
-
-	/**
-	 * Paints the signal with a QPainter
-	 * @param p the QPainter to paint into.
-	 * @param y the y-coordinate to draw the signal at
-	 * @param left the x-coordinate of the left edge of the signal
-	 * @param right the x-coordinate of the right edge of the signal
-	 * @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, int y, int left, int right,
-		double scale, double offset) = 0;
-
-	/**
-	 * Paints the signal label into a QGLWidget.
-	 * @param p the QPainter to paint into.
-	 * @param y the y-coordinate of the signal.
-	 * @param right the x-coordinate of the right edge of the header
-	 * 	area.
-	 * @param hover true if the label is being hovered over by the mouse.
-	 */
-	virtual void paint_label(QPainter &p, int y, int right,
-		bool hover);
-
-	/**
-	 * Determines if a point is in the header label rect.
-	 * @param y the y-coordinate of the signal.
-	 * @param left the x-coordinate of the left edge of the header
-	 * 	area.
-	 * @param right the x-coordinate of the right edge of the header
-	 * 	area.
-	 * @param point the point to test.
-	 */
-	bool pt_in_label_rect(int y, int left, int right,
-		const QPoint &point);
-
-protected:
-
-	/**
-	 * 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.
+	 * Returns true if the trace is visible and enabled.
 	 */
-	void paint_axis(QPainter &p, int y, int left, int right);
+	bool enabled() const;
 
-private:
+	const sr_probe* probe() const;
 
-	/**
-	 * Computes an caches the size of the label text.
-	 */
-	void compute_text_size(QPainter &p);
-
-	/**
-	 * Computes the outline rectangle of a label.
-	 * @param p the QPainter to lay out text with.
-	 * @param y the y-coordinate of the signal.
-	 * @param right the x-coordinate of the right edge of the header
-	 * 	area.
-	 * @return Returns the rectangle of the signal label.
-	 */
-	QRectF get_label_rect(int y, int right);
+	virtual void populate_popup_form(QWidget *parent, QFormLayout *form);
 
 private slots:
 	void on_text_changed(const QString &text);
 
-signals:
-	void text_changed();	
-
 protected:
 	const sr_probe *const _probe;
 
-	QString _name;
-	QColor _colour;
-	int _v_offset;
-
-	QSizeF _text_size;
-
-	QWidgetAction _name_action;
-	QComboBox _name_widget;
+	QComboBox *_name_widget;
 	bool _updating_name_widget;
 };