X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fview%2Ftrace.hpp;h=882c2d7089d7ea90f59c752a24e8b75a7d919705;hp=677f366b477f7b1caaaae3bfb03a523ff3a51a0d;hb=489953884c0d7692fa20748314751e114ae54cf2;hpb=cbf0f87e496c9d9157591c94dc445aaa960fe79d

diff --git a/pv/view/trace.hpp b/pv/view/trace.hpp
index 677f366b..882c2d70 100644
--- a/pv/view/trace.hpp
+++ b/pv/view/trace.hpp
@@ -14,12 +14,11 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef PULSEVIEW_PV_VIEW_TRACE_HPP
-#define PULSEVIEW_PV_VIEW_TRACE_HPP
+#ifndef PULSEVIEW_PV_VIEWS_TRACEVIEW_TRACE_HPP
+#define PULSEVIEW_PV_VIEWS_TRACEVIEW_TRACE_HPP
 
 #include <QColor>
 #include <QPainter>
@@ -27,10 +26,14 @@
 #include <QRect>
 #include <QString>
 
-#include <stdint.h>
+#include <cstdint>
 
 #include "tracetreeitem.hpp"
 
+#include "pv/data/signalbase.hpp"
+
+using std::shared_ptr;
+
 class QFormLayout;
 
 namespace pv {
@@ -39,7 +42,8 @@ namespace widgets {
 class Popup;
 }
 
-namespace view {
+namespace views {
+namespace TraceView {
 
 class Trace : public TraceTreeItem
 {
@@ -49,36 +53,22 @@ private:
 	static const QPen AxisPen;
 	static const int LabelHitPadding;
 
+	static const QColor BrightGrayBGColour;
+	static const QColor DarkGrayBGColour;
+
 protected:
-	Trace(QString name);
+	Trace(shared_ptr<data::SignalBase> channel);
 
 public:
-	/**
-	 * Gets the name of this signal.
-	 */
-	QString name() const;
-
 	/**
 	 * Sets the name of the signal.
 	 */
 	virtual void set_name(QString name);
 
-	/**
-	 * Get the colour of the signal.
-	 */
-	QColor colour() const;
-
 	/**
 	 * Set the colour of the signal.
 	 */
-	void set_colour(QColor colour);
-
-	/**
-	 * Computes the outline rectangle of the viewport hit-box.
-	 * @param rect the rectangle of the viewport area.
-	 * @return Returns the rectangle of the hit-box.
-	 */
-	QRectF hit_box_rect(const ViewItemPaintParams &pp) const;
+	virtual void set_colour(QColor colour);
 
 	/**
 	 * Paints the signal label.
@@ -100,6 +90,13 @@ public:
 	QRectF label_rect(const QRectF &rect) const;
 
 protected:
+	/**
+	 * Paints the background layer of the signal with a QPainter.
+	 * @param p The QPainter to paint into.
+	 * @param pp The painting parameters object to paint with.
+	 */
+	virtual void paint_back(QPainter &p, const ViewItemPaintParams &pp);
+
 	/**
 	 * Paints a zero axis across the viewport.
 	 * @param p the QPainter to paint into.
@@ -114,23 +111,29 @@ protected:
 
 	virtual void populate_popup_form(QWidget *parent, QFormLayout *form);
 
-private Q_SLOTS:
-	void on_text_changed(const QString &text);
+protected Q_SLOTS:
+	virtual void on_name_changed(const QString &text);
 
-	void on_colour_changed(const QColor &colour);
+	virtual void on_colour_changed(const QColor &colour);
 
 	void on_popup_closed();
 
+private Q_SLOTS:
+	void on_nameedit_changed(const QString &name);
+
+	void on_colouredit_changed(const QColor &colour);
+
 protected:
-	QString name_;
-	QColor colour_;
+	shared_ptr<data::SignalBase> base_;
+	bool coloured_bg_state_;
 
 private:
 	pv::widgets::Popup *popup_;
 	QFormLayout *popup_form_;
 };
 
-} // namespace view
+} // namespace TraceView
+} // namespace views
 } // namespace pv
 
-#endif // PULSEVIEW_PV_VIEW_TRACE_HPP
+#endif // PULSEVIEW_PV_VIEWS_TRACEVIEW_TRACE_HPP