X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=pv%2Fview%2Ftrace.hpp;h=b6b15198451e74bbfd014e5591f8d451da531dfc;hb=303eec78f3c499cd30fc88b282aa1f336e82a806;hp=0a6735f59d0787539fec1ef1cdac4e5eb91c645c;hpb=73a25a6e488f1813c1cd12da085a16e4f91ed4da;p=pulseview.git
diff --git a/pv/view/trace.hpp b/pv/view/trace.hpp
index 0a6735f..b6b1519 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 .
*/
-#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
#include
@@ -27,21 +26,28 @@
#include
#include
-#include
+#include
#include "tracetreeitem.hpp"
#include "pv/data/signalbase.hpp"
+using std::shared_ptr;
+
class QFormLayout;
namespace pv {
+namespace data {
+class SignalBase;
+}
+
namespace widgets {
class Popup;
}
-namespace view {
+namespace views {
+namespace TraceView {
class Trace : public TraceTreeItem
{
@@ -55,9 +61,14 @@ private:
static const QColor DarkGrayBGColour;
protected:
- Trace(std::shared_ptr channel);
+ Trace(shared_ptr channel);
public:
+ /**
+ * Returns the underlying SignalBase instance.
+ */
+ shared_ptr base() const;
+
/**
* Sets the name of the signal.
*/
@@ -68,11 +79,6 @@ public:
*/
virtual void set_colour(QColor colour);
- /**
- * Enables or disables the coloured background for this trace.
- */
- void set_coloured_bg(bool state);
-
/**
* Paints the signal label.
* @param p the QPainter to paint into.
@@ -98,7 +104,7 @@ protected:
* @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);
+ virtual void paint_back(QPainter &p, ViewItemPaintParams &pp);
/**
* Paints a zero axis across the viewport.
@@ -106,7 +112,7 @@ protected:
* @param pp the painting parameters object to paint with.
* @param y the y-offset of the axis.
*/
- void paint_axis(QPainter &p, const ViewItemPaintParams &pp, int y);
+ void paint_axis(QPainter &p, ViewItemPaintParams &pp, int y);
void add_colour_option(QWidget *parent, QFormLayout *form);
@@ -127,15 +133,15 @@ private Q_SLOTS:
void on_colouredit_changed(const QColor &colour);
protected:
- std::shared_ptr base_;
- bool coloured_bg_, coloured_bg_state_;
+ shared_ptr base_;
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