X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;ds=sidebyside;f=pv%2Fviews%2Ftrace%2Fanalogsignal.cpp;h=bbc23fb70074bace6adc25e304d70d50583de3dd;hb=d0c0573b3ee694827a747727f862c5f91736ca05;hp=cddf59c15059cdda26a209b4781032f73fdd9bce;hpb=526c8c00a61aa5f6ac7e3ee56991db957b45828d;p=pulseview.git

diff --git a/pv/views/trace/analogsignal.cpp b/pv/views/trace/analogsignal.cpp
index cddf59c..bbc23fb 100644
--- a/pv/views/trace/analogsignal.cpp
+++ b/pv/views/trace/analogsignal.cpp
@@ -118,8 +118,7 @@ AnalogSignal::AnalogSignal(
 	connect(analog_data, SIGNAL(min_max_changed(float, float)),
 		this, SLOT(on_min_max_changed(float, float)));
 
-	GlobalSettings::register_change_handler(GlobalSettings::Key_View_ConversionThresholdDispMode,
-		bind(&AnalogSignal::on_settingViewConversionThresholdDispMode_changed, this, _1));
+	GlobalSettings::add_change_handler(this);
 
 	GlobalSettings gs;
 	conversion_threshold_disp_mode_ =
@@ -131,6 +130,11 @@ AnalogSignal::AnalogSignal(
 	update_scale();
 }
 
+AnalogSignal::~AnalogSignal()
+{
+	GlobalSettings::remove_change_handler(this);
+}
+
 shared_ptr<pv::data::SignalData> AnalogSignal::data() const
 {
 	return base_->analog_data();
@@ -206,6 +210,12 @@ void AnalogSignal::scale_handle_drag_release()
 	update_scale();
 }
 
+void AnalogSignal::on_setting_changed(const QString &key, const QVariant &value)
+{
+	if (key == GlobalSettings::Key_View_ConversionThresholdDispMode)
+		on_settingViewConversionThresholdDispMode_changed(value);
+}
+
 void AnalogSignal::paint_back(QPainter &p, ViewItemPaintParams &pp)
 {
 	if (!base_->enabled())
@@ -268,19 +278,10 @@ void AnalogSignal::paint_mid(QPainter &p, ViewItemPaintParams &pp)
 	if ((display_type_ == DisplayAnalog) || (display_type_ == DisplayBoth)) {
 		paint_grid(p, y, pp.left(), pp.right());
 
-		const deque< shared_ptr<pv::data::AnalogSegment> > &segments =
-			base_->analog_data()->analog_segments();
-		if (segments.empty())
+		shared_ptr<pv::data::AnalogSegment> segment = get_analog_segment_to_paint();
+		if (!segment)
 			return;
 
-		shared_ptr<pv::data::AnalogSegment> segment;
-		try {
-			segment = segments.at(current_segment_);
-		} catch (out_of_range) {
-			qDebug() << "Current analog segment out of range for signal" << base_->name();
-			return;
-		}
-
 		const double pixels_offset = pp.pixels_offset();
 		const double samplerate = max(1.0, segment->samplerate());
 		const pv::util::Timestamp& start_time = segment->start_time();
@@ -539,19 +540,9 @@ void AnalogSignal::paint_logic_mid(QPainter &p, ViewItemPaintParams &pp)
 	const float high_offset = y - ph + signal_margin + 0.5f;
 	const float low_offset = y + nh - signal_margin - 0.5f;
 
-	const deque< shared_ptr<pv::data::LogicSegment> > &segments =
-		base_->logic_data()->logic_segments();
-
-	if (segments.empty())
-		return;
-
-	shared_ptr<pv::data::LogicSegment> segment;
-	try {
-		segment = segments.at(current_segment_);
-	} catch (out_of_range) {
-		qDebug() << "Current logic segment out of range for signal" << base_->name();
+	shared_ptr<pv::data::LogicSegment> segment = get_logic_segment_to_paint();
+	if (!segment)
 		return;
-	}
 
 	double samplerate = segment->samplerate();
 
@@ -666,6 +657,54 @@ void AnalogSignal::paint_logic_caps(QPainter &p, QLineF *const lines,
 	p.drawLines(lines, line - lines);
 }
 
+shared_ptr<pv::data::AnalogSegment> AnalogSignal::get_analog_segment_to_paint() const
+{
+	shared_ptr<pv::data::AnalogSegment> segment;
+
+	const deque< shared_ptr<pv::data::AnalogSegment> > &segments =
+		base_->analog_data()->analog_segments();
+
+	if (!segments.empty()) {
+		if (segment_display_mode_ == ShowLastSegmentOnly)
+			segment = segments.back();
+
+		if ((segment_display_mode_ == ShowSingleSegmentOnly) ||
+				(segment_display_mode_ == ShowLastCompleteSegmentOnly)) {
+			try {
+				segment = segments.at(current_segment_);
+			} catch (out_of_range) {
+				qDebug() << "Current analog segment out of range for signal" << base_->name() << ":" << current_segment_;
+			}
+		}
+	}
+
+	return segment;
+}
+
+shared_ptr<pv::data::LogicSegment> AnalogSignal::get_logic_segment_to_paint() const
+{
+	shared_ptr<pv::data::LogicSegment> segment;
+
+	const deque< shared_ptr<pv::data::LogicSegment> > &segments =
+		base_->logic_data()->logic_segments();
+
+	if (!segments.empty()) {
+		if (segment_display_mode_ == ShowLastSegmentOnly)
+			segment = segments.back();
+
+		if ((segment_display_mode_ == ShowSingleSegmentOnly) ||
+				(segment_display_mode_ == ShowLastCompleteSegmentOnly)) {
+			try {
+				segment = segments.at(current_segment_);
+			} catch (out_of_range) {
+				qDebug() << "Current logic segment out of range for signal" << base_->name() << ":" << current_segment_;
+			}
+		}
+	}
+
+	return segment;
+}
+
 float AnalogSignal::get_resolution(int scale_index)
 {
 	const float seq[] = {1.0f, 2.0f, 5.0f};