X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fview%2Fview.cpp;h=3f0fe9d1dc9991febf113d45f02f5dc6189c0ace;hp=37cc94301ad24cd1c819108eb7ba66ab3459cf6d;hb=cef5997ee1e08d713663d2ae02c839a315f41409;hpb=adb3831eeae71b69bb035c9af713ea1f8623407f

diff --git a/pv/view/view.cpp b/pv/view/view.cpp
index 37cc9430..3f0fe9d1 100644
--- a/pv/view/view.cpp
+++ b/pv/view/view.cpp
@@ -60,7 +60,6 @@ using boost::shared_mutex;
 
 using pv::data::SignalData;
 using pv::data::Segment;
-using pv::util::format_time;
 using pv::util::TimeUnit;
 using pv::util::Timestamp;
 
@@ -505,13 +504,13 @@ void View::update_viewport()
 	header_->update();
 }
 
-void View::restack_all_row_items()
+void View::restack_all_trace_tree_items()
 {
 	// Make a list of owners that is sorted from deepest first
 	const auto owners = list_row_item_owners();
-	vector< RowItemOwner* > sorted_owners(owners.begin(), owners.end());
+	vector< TraceTreeItemOwner* > sorted_owners(owners.begin(), owners.end());
 	sort(sorted_owners.begin(), sorted_owners.end(),
-		[](const RowItemOwner* a, const RowItemOwner *b) {
+		[](const TraceTreeItemOwner* a, const TraceTreeItemOwner *b) {
 			return a->depth() > b->depth(); });
 
 	// Restack the items recursively
@@ -519,8 +518,10 @@ void View::restack_all_row_items()
 		o->restack_items();
 
 	// Animate the items to their destination
-	for (const auto &r : *this)
-		r->animate_to_layout_v_offset();
+	const vector< shared_ptr<TraceTreeItem> > items(
+		list_by_type<TraceTreeItem>());
+	for (const auto &i : items)
+		i->animate_to_layout_v_offset();
 }
 
 void View::get_scroll_layout(double &length, Timestamp &offset) const
@@ -594,8 +595,8 @@ void View::calculate_tick_spacing()
 
 		tick_period_width = (tick_period / scale_).convert_to<double>();
 
-		const QString label_text =
-			format_time(max_time, tick_prefix, time_unit_, tick_precision);
+		const QString label_text = Ruler::format_time_with_distance(
+			tick_period, max_time, tick_prefix, time_unit_, tick_precision);
 
 		label_width = m.boundingRect(0, 0, INT_MAX, INT_MAX,
 			Qt::AlignLeft | Qt::AlignTop, label_text).width() +
@@ -673,15 +674,15 @@ QRectF View::label_rect(const QRectF &rect)
 	return QRectF();
 }
 
-RowItemOwner* View::find_prevalent_trace_group(
+TraceTreeItemOwner* View::find_prevalent_trace_group(
 	const shared_ptr<sigrok::ChannelGroup> &group,
 	const unordered_map<shared_ptr<sigrok::Channel>, shared_ptr<Signal> >
 		&signal_map)
 {
 	assert(group);
 
-	unordered_set<RowItemOwner*> owners;
-	vector<RowItemOwner*> owner_list;
+	unordered_set<TraceTreeItemOwner*> owners;
+	vector<TraceTreeItemOwner*> owner_list;
 
 	// Make a set and a list of all the owners
 	for (const auto &channel : group->channels()) {
@@ -689,18 +690,18 @@ RowItemOwner* View::find_prevalent_trace_group(
 		if (iter == signal_map.end())
 			continue;
 
-		RowItemOwner *const o = (*iter).second->owner();
+		TraceTreeItemOwner *const o = (*iter).second->owner();
 		owner_list.push_back(o);
 		owners.insert(o);
 	}
 
 	// Iterate through the list of owners, and find the most prevalent
 	size_t max_prevalence = 0;
-	RowItemOwner *prevalent_owner = nullptr;
-	for (RowItemOwner *owner : owners) {
+	TraceTreeItemOwner *prevalent_owner = nullptr;
+	for (TraceTreeItemOwner *owner : owners) {
 		const size_t prevalence = std::count_if(
 			owner_list.begin(), owner_list.end(),
-			[&](RowItemOwner *o) { return o == owner; });
+			[&](TraceTreeItemOwner *o) { return o == owner; });
 		if (prevalence > max_prevalence) {
 			max_prevalence = prevalence;
 			prevalent_owner = owner;
@@ -826,8 +827,8 @@ void View::time_item_appearance_changed(bool label, bool content)
 void View::extents_changed(bool horz, bool vert)
 {
 	sticky_events_ |=
-		(horz ? RowItemHExtentsChanged : 0) |
-		(vert ? RowItemVExtentsChanged : 0);
+		(horz ? TraceTreeItemHExtentsChanged : 0) |
+		(vert ? TraceTreeItemVExtentsChanged : 0);
 	lazy_event_handler_.start();
 }
 
@@ -865,7 +866,7 @@ void View::v_scroll_value_changed()
 
 void View::signals_changed()
 {
-	vector< shared_ptr<RowItem> > new_top_level_items;
+	vector< shared_ptr<TraceTreeItem> > new_top_level_items;
 
 	const auto device = session_.device();
 	if (!device)
@@ -876,7 +877,9 @@ void View::signals_changed()
 
 	// Make a list of traces that are being added, and a list of traces
 	// that are being removed
-	const set<shared_ptr<Trace>> prev_traces = list_by_type<Trace>();
+	const vector<shared_ptr<Trace>> prev_trace_list = list_by_type<Trace>();
+	const set<shared_ptr<Trace>> prev_traces(
+		prev_trace_list.begin(), prev_trace_list.end());
 
 	shared_lock<shared_mutex> lock(session_.signals_mutex());
 	const unordered_set< shared_ptr<Signal> > &sigs(session_.signals());
@@ -914,7 +917,7 @@ void View::signals_changed()
 			continue;
 
 		// Find best trace group to add to
-		RowItemOwner *owner = find_prevalent_trace_group(
+		TraceTreeItemOwner *owner = find_prevalent_trace_group(
 			group, signal_map);
 
 		// If there is no trace group, create one
@@ -964,7 +967,7 @@ void View::signals_changed()
 
 	// Remove any removed traces
 	for (shared_ptr<Trace> trace : remove_traces) {
-		RowItemOwner *const owner = trace->owner();
+		TraceTreeItemOwner *const owner = trace->owner();
 		assert(owner);
 		owner->remove_child_item(trace);
 	}
@@ -1045,10 +1048,10 @@ void View::perform_delayed_view_update()
 
 void View::process_sticky_events()
 {
-	if (sticky_events_ & RowItemHExtentsChanged)
+	if (sticky_events_ & TraceTreeItemHExtentsChanged)
 		update_layout();
-	if (sticky_events_ & RowItemVExtentsChanged) {
-		restack_all_row_items();
+	if (sticky_events_ & TraceTreeItemVExtentsChanged) {
+		restack_all_trace_tree_items();
 		update_scroll();
 	}
 
@@ -1058,7 +1061,7 @@ void View::process_sticky_events()
 
 void View::on_hover_point_changed()
 {
-	for (shared_ptr<RowItem> r : *this)
+	for (shared_ptr<TraceTreeItem> r : *this)
 		r->hover_point_changed();
 }