Change namespace for the trace view and implement ViewBase

[pulseview.git] / pv / view / tracegroup.hpp

diff --git a/pv/view/tracegroup.hpp b/pv/view/tracegroup.hpp
index 960a15d9a23105bd314ae090bee1bc680792c816..badddf7d396ae6e3ff005e756ca03603b96f5034 100644 (file)
--- a/pv/view/tracegroup.hpp
+++ b/pv/view/tracegroup.hpp
@@ -18,16 +18,17 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
-#ifndef PULSEVIEW_PV_VIEW_TRACEGROUP_H
-#define PULSEVIEW_PV_VIEW_TRACEGROUP_H
+#ifndef PULSEVIEW_PV_VIEWS_TRACEVIEW_TRACEGROUP_HPP
+#define PULSEVIEW_PV_VIEWS_TRACEVIEW_TRACEGROUP_HPP
 
-#include "rowitem.hpp"
-#include "rowitemowner.hpp"
+#include "tracetreeitem.hpp"
+#include "tracetreeitemowner.hpp"
 
 namespace pv {
-namespace view {
+namespace views {
+namespace TraceView {
 
-class TraceGroup : public RowItem, public RowItemOwner
+class TraceGroup : public TraceTreeItem, public TraceTreeItemOwner
 {
        Q_OBJECT
 
@@ -51,22 +52,22 @@ public:
        /**
         * Returns the session of the onwer.
         */
-       pv::SigSession& session();
+       pv::Session& session();
 
        /**
         * Returns the session of the onwer.
         */
-       const pv::SigSession& session() const;
+       const pv::Session& session() const;
 
        /**
         * Returns the view of the owner.
         */
-       virtual pv::view::View* view();
+       virtual View* view();
 
        /**
         * Returns the view of the owner.
         */
-       virtual const pv::view::View* view() const;
+       virtual const View* view() const;
 
        /**
         * Computes the vertical extents of the contents of this row item.
@@ -81,15 +82,14 @@ public:
         *      area.
         * @param hover true if the label is being hovered over by the mouse.
         */
-       void paint_label(QPainter &p, int right, bool hover);
+       void paint_label(QPainter &p, const QRect &rect, bool hover);
 
        /**
         * Computes the outline rectangle of a label.
-        * @param right the x-coordinate of the right edge of the header
-        *      area.
+        * @param rect the rectangle of the header area.
         * @return Returns the rectangle of the signal label.
         */
-       QRectF label_rect(int right) const;
+       QRectF label_rect(const QRectF &rect) const;
 
        /**
         * Determines if a point is in the header label rect.
@@ -120,7 +120,7 @@ public:
        void ungroup();
 
 public:
-       void appearance_changed(bool label, bool content);
+       void row_item_appearance_changed(bool label, bool content);
 
        void extents_changed(bool horz, bool vert);
 
@@ -128,7 +128,8 @@ private Q_SLOTS:
        void on_ungroup();
 };
 
-} // view
-} // pv
+} // namespace TraceView
+} // namespace views
+} // namespace pv
 
-#endif // PULSEVIEW_PV_VIEW_TRACEGROUP_H
+#endif // PULSEVIEW_PV_VIEWS_TRACEVIEW_TRACEGROUP_HPP