X-Git-Url: http://git.code-monkey.de/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fview%2Ftrace.hpp;h=11f80ccbeb6426b0d163eecd7a2b8f36d20a7a7a;hp=4e95f5654724945e25093d8e7d407ca5e74a2ca4;hb=efdec55aec1a137460fa362a381ed1904182bfed;hpb=d55923a65aa672f65f9fe2c30ddbe46beddcaa3a

diff --git a/pv/view/trace.hpp b/pv/view/trace.hpp
index 4e95f56..11f80cc 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>
@@ -31,6 +30,8 @@
 
 #include "tracetreeitem.hpp"
 
+#include "pv/data/signalbase.hpp"
+
 class QFormLayout;
 
 namespace pv {
@@ -39,7 +40,8 @@ namespace widgets {
 class Popup;
 }
 
-namespace view {
+namespace views {
+namespace TraceView {
 
 class Trace : public TraceTreeItem
 {
@@ -49,33 +51,22 @@ private:
 	static const QPen AxisPen;
 	static const int LabelHitPadding;
 
-	static const int ColourBGAlpha;
 	static const QColor BrightGrayBGColour;
 	static const QColor DarkGrayBGColour;
 
 protected:
-	Trace(QString name);
+	Trace(std::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);
+	virtual void set_colour(QColor colour);
 
 	/**
 	 * Enables or disables the coloured background for this trace.
@@ -123,16 +114,20 @@ 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_, bgcolour_;
+	std::shared_ptr<data::SignalBase> base_;
 	bool coloured_bg_, coloured_bg_state_;
 
 private:
@@ -140,7 +135,8 @@ private:
 	QFormLayout *popup_form_;
 };
 
-} // namespace view
+} // namespace TraceView
+} // namespace views
 } // namespace pv
 
-#endif // PULSEVIEW_PV_VIEW_TRACE_HPP
+#endif // PULSEVIEW_PV_VIEWS_TRACEVIEW_TRACE_HPP