projects
/
pulseview.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
ed535cd
)
View: Fixes related to multi-segment display
author
Soeren Apel
<soeren@apelpie.net>
Wed, 13 Dec 2017 16:19:29 +0000
(17:19 +0100)
committer
Soeren Apel
<soeren@apelpie.net>
Fri, 5 Jan 2018 21:49:17 +0000
(22:49 +0100)
pv/views/trace/view.cpp
patch
|
blob
|
history
diff --git
a/pv/views/trace/view.cpp
b/pv/views/trace/view.cpp
index a79396d15b04715b0bb5f33ea461214190d0d044..2bfe68c22468858d3bc24bd47034798dad78f607 100644
(file)
--- a/
pv/views/trace/view.cpp
+++ b/
pv/views/trace/view.cpp
@@
-229,6
+229,9
@@
View::View(Session &session, bool is_main_view, QWidget *parent) :
// Update the zoom state
calculate_tick_spacing();
// Update the zoom state
calculate_tick_spacing();
+
+ // Make sure the standard bar's segment selector is in sync
+ set_segment_display_mode(segment_display_mode_);
}
Session& View::session()
}
Session& View::session()
@@
-497,7
+500,7
@@
void View::set_segment_display_mode(Trace::SegmentDisplayMode mode)
segment_selectable_ = true;
segment_selectable_ = true;
- if (mode == Trace::Show
Single
SegmentOnly)
+ if (mode == Trace::Show
Last
SegmentOnly)
segment_selectable_ = false;
segment_display_mode_changed(segment_selectable_);
segment_selectable_ = false;
segment_display_mode_changed(segment_selectable_);
@@
-1423,6
+1426,8
@@
void View::on_segment_changed(int segment)
current_segment_ = segment;
for (shared_ptr<Signal> signal : signals_)
signal->set_current_segment(current_segment_);
current_segment_ = segment;
for (shared_ptr<Signal> signal : signals_)
signal->set_current_segment(current_segment_);
+ for (shared_ptr<DecodeTrace> dt : decode_traces_)
+ dt->set_current_segment(current_segment_);
viewport_->update();
break;
viewport_->update();
break;