X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=pv%2Fview%2Ftracetreeitemowner.cpp;h=bff63c762135e2b402941a856118b7097cc77079;hb=64a21e782d6c9081f13f8398e6408c13648d1d14;hp=24174794456d01ffb2fd05cbf27601cdc1e16334;hpb=ac0708fb7e6b4010d90a569386810d3d2edc7eb9;p=pulseview.git

diff --git a/pv/view/tracetreeitemowner.cpp b/pv/view/tracetreeitemowner.cpp
index 24174794..bff63c76 100644
--- a/pv/view/tracetreeitemowner.cpp
+++ b/pv/view/tracetreeitemowner.cpp
@@ -14,35 +14,34 @@
  * 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 <cassert>
 
 #include "tracetreeitem.hpp"
-#include "tracetreeitemowner.hpp"
 #include "trace.hpp"
+#include "tracetreeitemowner.hpp"
 
-using std::dynamic_pointer_cast;
-using std::max;
+using std::find;
 using std::make_pair;
+using std::max;
 using std::min;
 using std::pair;
-using std::set;
 using std::shared_ptr;
 using std::static_pointer_cast;
 using std::vector;
 
 namespace pv {
-namespace view {
+namespace views {
+namespace TraceView {
 
 const ViewItemOwner::item_list& TraceTreeItemOwner::child_items() const
 {
 	return items_;
 }
 
-vector< std::shared_ptr<TraceTreeItem> >
+vector< shared_ptr<TraceTreeItem> >
 TraceTreeItemOwner::trace_tree_child_items() const
 {
 	vector< shared_ptr<TraceTreeItem> > items;
@@ -65,7 +64,7 @@ void TraceTreeItemOwner::clear_child_items()
 	items_.clear();
 }
 
-void TraceTreeItemOwner::add_child_item(std::shared_ptr<TraceTreeItem> item)
+void TraceTreeItemOwner::add_child_item(shared_ptr<TraceTreeItem> item)
 {
 	assert(!item->owner());
 	item->set_owner(this);
@@ -74,11 +73,11 @@ void TraceTreeItemOwner::add_child_item(std::shared_ptr<TraceTreeItem> item)
 	extents_changed(true, true);
 }
 
-void TraceTreeItemOwner::remove_child_item(std::shared_ptr<TraceTreeItem> item)
+void TraceTreeItemOwner::remove_child_item(shared_ptr<TraceTreeItem> item)
 {
 	assert(item->owner() == this);
 	item->set_owner(nullptr);
-	auto iter = std::find(items_.begin(), items_.end(), item);
+	auto iter = find(items_.begin(), items_.end(), item);
 	assert(iter != items_.end());
 	items_.erase(iter);
 
@@ -87,13 +86,16 @@ void TraceTreeItemOwner::remove_child_item(std::shared_ptr<TraceTreeItem> item)
 
 pair<int, int> TraceTreeItemOwner::v_extents() const
 {
-	pair<int, int> extents(INT_MAX, INT_MIN);
+	bool has_children = false;
 
+	pair<int, int> extents(INT_MAX, INT_MIN);
 	for (const shared_ptr<TraceTreeItem> t : trace_tree_child_items()) {
 		assert(t);
 		if (!t->enabled())
 			continue;
 
+		has_children = true;
+
 		const int child_offset = t->layout_v_offset();
 		const pair<int, int> child_extents = t->v_extents();
 		extents.first = min(child_extents.first + child_offset,
@@ -102,29 +104,16 @@ pair<int, int> TraceTreeItemOwner::v_extents() const
 			extents.second);
 	}
 
-	return extents;
-}
-
-bool TraceTreeItemOwner::reassign_bgcolour_states(bool next_bgcolour_state)
-{
-	vector< shared_ptr<TraceTreeItem> > items = trace_tree_child_items();
-
-	// Sort items according to vertical position
-	sort(items.begin(), items.end(),
-		[](const shared_ptr<TraceTreeItem> a, const shared_ptr<TraceTreeItem> b) {
-		return a->layout_v_offset() > b->layout_v_offset(); });
+	if (!has_children)
+		extents = make_pair(0, 0);
 
-	for (const shared_ptr<TraceTreeItem> item : items) {
-		item->set_bgcolour_state(next_bgcolour_state);
-		next_bgcolour_state = !next_bgcolour_state;
-	}
-
-	return next_bgcolour_state;
+	return extents;
 }
 
 void TraceTreeItemOwner::restack_items()
 {
 }
 
-} // view
-} // pv
+} // namespace TraceView
+} // namespace views
+} // namespace pv