X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=pv%2Fviews%2Ftrace%2Fview.cpp;h=156b3eef30276515ebbb59880cffbf3e9a37ccf1;hb=89914a8657612761ff962ee973721a4872cda8d7;hp=e26e8fc2582a8a45b57f41d3abbf2d72940ed6f7;hpb=7daebd054e65a244dce36933cbf173b8d7532a09;p=pulseview.git

diff --git a/pv/views/trace/view.cpp b/pv/views/trace/view.cpp
index e26e8fc..156b3ee 100644
--- 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();
+
+	// Make sure the standard bar's segment selector is in sync
+	set_segment_display_mode(segment_display_mode_);
 }
 
 Session& View::session()
@@ -258,6 +261,7 @@ void View::add_signal(const shared_ptr<Signal> signal)
 	signals_.insert(signal);
 
 	signal->set_segment_display_mode(segment_display_mode_);
+	signal->set_current_segment(current_segment_);
 
 	connect(signal->base().get(), SIGNAL(name_changed(const QString&)),
 		this, SLOT(on_signal_name_changed()));
@@ -276,6 +280,7 @@ void View::add_decode_signal(shared_ptr<data::DecodeSignal> signal)
 	decode_traces_.push_back(d);
 
 	d->set_segment_display_mode(segment_display_mode_);
+	d->set_current_segment(current_segment_);
 
 	connect(signal.get(), SIGNAL(name_changed(const QString&)),
 		this, SLOT(on_signal_name_changed()));
@@ -319,6 +324,7 @@ void View::save_settings(QSettings &settings) const
 		scrollarea_->verticalScrollBar()->sliderPosition());
 
 	settings.setValue("splitter_state", splitter_->saveState());
+	settings.setValue("segment_display_mode", segment_display_mode_);
 
 	stringstream ss;
 	boost::archive::text_oarchive oa(ss);
@@ -354,6 +360,10 @@ void View::restore_settings(QSettings &settings)
 	if (settings.contains("splitter_state"))
 		splitter_->restoreState(settings.value("splitter_state").toByteArray());
 
+	if (settings.contains("segment_display_mode"))
+		set_segment_display_mode(
+			(Trace::SegmentDisplayMode)(settings.value("segment_display_mode").toInt()));
+
 	for (shared_ptr<Signal> signal : signals_) {
 		settings.beginGroup(signal->base()->internal_name());
 		signal->restore_settings(settings);
@@ -431,6 +441,11 @@ unsigned int View::depth() const
 	return 0;
 }
 
+uint32_t View::current_segment() const
+{
+	return current_segment_;
+}
+
 pv::util::SIPrefix View::tick_prefix() const
 {
 	return tick_prefix_;
@@ -483,24 +498,74 @@ void View::set_time_unit(pv::util::TimeUnit time_unit)
 	}
 }
 
+void View::set_current_segment(uint32_t segment_id)
+{
+	current_segment_ = segment_id;
+
+	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();
+
+	segment_changed(segment_id);
+}
+
 bool View::segment_is_selectable() const
 {
 	return segment_selectable_;
 }
 
+Trace::SegmentDisplayMode View::segment_display_mode() const
+{
+	return segment_display_mode_;
+}
+
 void View::set_segment_display_mode(Trace::SegmentDisplayMode mode)
 {
+	segment_display_mode_ = mode;
+
 	for (shared_ptr<Signal> signal : signals_)
 		signal->set_segment_display_mode(mode);
 
-	viewport_->update();
+	uint32_t last_segment = session_.get_segment_count() - 1;
+
+	switch (mode) {
+	case Trace::ShowLastSegmentOnly:
+		if (current_segment_ != last_segment)
+			set_current_segment(last_segment);
+		break;
+
+	case Trace::ShowLastCompleteSegmentOnly:
+		// Do nothing if we only have one segment so far
+		if (last_segment > 0) {
+			// If the last segment isn't complete, the previous one must be
+			uint32_t segment_id =
+				(session_.all_segments_complete(last_segment)) ?
+				last_segment : last_segment - 1;
+
+			if (current_segment_ != segment_id)
+				set_current_segment(segment_id);
+		}
+		break;
+
+	case Trace::ShowSingleSegmentOnly:
+	case Trace::ShowAllSegments:
+	case Trace::ShowAccumulatedIntensity:
+	default:
+		// Current segment remains as-is
+		break;
+	}
 
 	segment_selectable_ = true;
 
-	if (mode == Trace::ShowSingleSegmentOnly)
+	if ((mode == Trace::ShowAllSegments) || (mode == Trace::ShowAccumulatedIntensity))
 		segment_selectable_ = false;
 
-	segment_display_mode_changed(segment_selectable_);
+	viewport_->update();
+
+	segment_display_mode_changed((int)mode, segment_selectable_);
 }
 
 void View::zoom(double steps)
@@ -1379,6 +1444,10 @@ void View::capture_state_updated(int state)
 
 		// Enable sticky scrolling if the setting is enabled
 		sticky_scrolling_ = settings.value(GlobalSettings::Key_View_StickyScrolling).toBool();
+
+		// Reset all traces to segment 0
+		current_segment_ = 0;
+		set_current_segment(current_segment_);
 	}
 
 	if (state == Session::Stopped) {
@@ -1412,7 +1481,11 @@ void View::capture_state_updated(int state)
 void View::on_new_segment(int new_segment_id)
 {
 	on_segment_changed(new_segment_id);
-	segment_changed(new_segment_id);
+}
+
+void View::on_segment_completed(int segment_id)
+{
+	on_segment_changed(segment_id);
 }
 
 void View::on_segment_changed(int segment)
@@ -1420,10 +1493,13 @@ void View::on_segment_changed(int segment)
 	switch (segment_display_mode_) {
 	case Trace::ShowLastSegmentOnly:
 	case Trace::ShowSingleSegmentOnly:
-		current_segment_ = segment - 1;
-		for (shared_ptr<Signal> signal : signals_)
-			signal->set_current_segment(current_segment_);
-		viewport_->update();
+		set_current_segment(segment);
+		break;
+
+	case Trace::ShowLastCompleteSegmentOnly:
+		// Only update if all segments are complete
+		if (session_.all_segments_complete(segment))
+			set_current_segment(segment);
 		break;
 
 	case Trace::ShowAllSegments: