X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fview%2Ftracegroup.cpp;h=e33bba4ea7aeb7aaad9d68abf0194ffb3768331c;hp=74221d440a15331a0ac657cadab0b3cf88b8399d;hb=66e4eae9ce743016c3f6d4974bceb9b7fc0ae7d7;hpb=4c60462b00cc329e61daedd1c2e66724077bd412

diff --git a/pv/view/tracegroup.cpp b/pv/view/tracegroup.cpp
index 74221d44..e33bba4e 100644
--- a/pv/view/tracegroup.cpp
+++ b/pv/view/tracegroup.cpp
@@ -14,8 +14,7 @@
  * 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/>.
  */
 
 #include <extdef.h>
@@ -33,7 +32,8 @@ using std::shared_ptr;
 using std::vector;
 
 namespace pv {
-namespace view {
+namespace views {
+namespace TraceView {
 
 const int TraceGroup::Padding = 8;
 const int TraceGroup::Width = 12;
@@ -49,7 +49,7 @@ TraceGroup::~TraceGroup()
 bool TraceGroup::enabled() const
 {
 	return std::any_of(child_items().begin(), child_items().end(),
-		[](const shared_ptr<RowItem> &r) { return r->enabled(); });
+		[](const shared_ptr<ViewItem> &r) { return r->enabled(); });
 }
 
 pv::Session& TraceGroup::session()
@@ -64,13 +64,13 @@ const pv::Session& TraceGroup::session() const
 	return owner_->session();
 }
 
-pv::view::View* TraceGroup::view()
+View* TraceGroup::view()
 {
 	assert(owner_);
 	return owner_->view();
 }
 
-const pv::view::View* TraceGroup::view() const
+const View* TraceGroup::view() const
 {
 	assert(owner_);
 	return owner_->view();
@@ -78,7 +78,7 @@ const pv::view::View* TraceGroup::view() const
 
 pair<int, int> TraceGroup::v_extents() const
 {
-	return RowItemOwner::v_extents();
+	return TraceTreeItemOwner::v_extents();
 }
 
 void TraceGroup::paint_label(QPainter &p, const QRect &rect, bool hover)
@@ -115,7 +115,7 @@ void TraceGroup::paint_label(QPainter &p, const QRect &rect, bool hover)
 QRectF TraceGroup::label_rect(const QRectF &rect) const
 {
 	QRectF child_rect;
-	for (const shared_ptr<RowItem> r : child_items())
+	for (const shared_ptr<ViewItem> r : child_items())
 		if (r && r->enabled())
 			child_rect = child_rect.united(r->label_rect(rect));
 
@@ -157,22 +157,21 @@ int TraceGroup::owner_visual_v_offset() const
 
 void TraceGroup::restack_items()
 {
-	vector< shared_ptr<RowItem> > items(
-		child_items().begin(), child_items().end());
+	vector<shared_ptr<TraceTreeItem>> items(trace_tree_child_items());
 
 	// Sort by the centre line of the extents
 	stable_sort(items.begin(), items.end(),
-		[](const shared_ptr<RowItem> &a, const shared_ptr<RowItem> &b) {
+		[](const shared_ptr<TraceTreeItem> &a, const shared_ptr<TraceTreeItem> &b) {
 			const auto aext = a->v_extents();
 			const auto bext = b->v_extents();
-                        return a->layout_v_offset() +
+			return a->layout_v_offset() +
 					(aext.first + aext.second) / 2 <
 				b->layout_v_offset() +
 					(bext.first + bext.second) / 2;
 		});
 
 	int total_offset = 0;
-	for (shared_ptr<RowItem> r : items) {
+	for (shared_ptr<TraceTreeItem> r : items) {
 		const pair<int, int> extents = r->v_extents();
 		if (extents.first == 0 && extents.second == 0)
 			continue;
@@ -197,11 +196,10 @@ unsigned int TraceGroup::depth() const
 
 void TraceGroup::ungroup()
 {
-	const vector< shared_ptr<RowItem> > items(
-		child_items().begin(), child_items().end());
+	const vector<shared_ptr<TraceTreeItem>> items(trace_tree_child_items());
 	clear_child_items();
 
-	for (shared_ptr<RowItem> r : items)
+	for (shared_ptr<TraceTreeItem> r : items)
 		owner_->add_child_item(r);
 
 	owner_->remove_child_item(shared_from_this());
@@ -224,5 +222,6 @@ void TraceGroup::extents_changed(bool horz, bool vert)
 		owner_->extents_changed(horz, vert);
 }
 
-} // namespace view
+} // namespace TraceView
+} // namespace views
 } // namespace pv