X-Git-Url: http://git.code-monkey.de/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fviews%2Ftrace%2Fanalogsignal.cpp;h=11a73068b25c13bb7724971a57aad8775796e38b;hp=cb4c0325e3e83fd42fbd7335d09cf77faee4bef0;hb=20df1a39d587c284f5ee8873dc05470d6a6b11eb;hpb=341d9a7975be53bb44af8d2deeba9b4a5e086929

diff --git a/pv/views/trace/analogsignal.cpp b/pv/views/trace/analogsignal.cpp
index cb4c032..11a7306 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())
@@ -275,7 +285,7 @@ void AnalogSignal::paint_mid(QPainter &p, ViewItemPaintParams &pp)
 		const double pixels_offset = pp.pixels_offset();
 		const double samplerate = max(1.0, segment->samplerate());
 		const pv::util::Timestamp& start_time = segment->start_time();
-		const int64_t last_sample = segment->get_sample_count() - 1;
+		const int64_t last_sample = (int64_t)segment->get_sample_count() - 1;
 		const double samples_per_pixel = samplerate * pp.scale();
 		const pv::util::Timestamp start = samplerate * (pp.offset() - start_time);
 		const pv::util::Timestamp end = start + samples_per_pixel * pp.width();
@@ -542,7 +552,7 @@ void AnalogSignal::paint_logic_mid(QPainter &p, ViewItemPaintParams &pp)
 
 	const double pixels_offset = pp.pixels_offset();
 	const pv::util::Timestamp& start_time = segment->start_time();
-	const int64_t last_sample = segment->get_sample_count() - 1;
+	const int64_t last_sample = (int64_t)segment->get_sample_count() - 1;
 	const double samples_per_pixel = samplerate * pp.scale();
 	const double pixels_per_sample = 1 / samples_per_pixel;
 	const pv::util::Timestamp start = samplerate * (pp.offset() - start_time);
@@ -658,7 +668,8 @@ shared_ptr<pv::data::AnalogSegment> AnalogSignal::get_analog_segment_to_paint()
 		if (segment_display_mode_ == ShowLastSegmentOnly)
 			segment = segments.back();
 
-		if (segment_display_mode_ == ShowSingleSegmentOnly) {
+		if ((segment_display_mode_ == ShowSingleSegmentOnly) ||
+				(segment_display_mode_ == ShowLastCompleteSegmentOnly)) {
 			try {
 				segment = segments.at(current_segment_);
 			} catch (out_of_range) {
@@ -681,7 +692,8 @@ shared_ptr<pv::data::LogicSegment> AnalogSignal::get_logic_segment_to_paint() co
 		if (segment_display_mode_ == ShowLastSegmentOnly)
 			segment = segments.back();
 
-		if (segment_display_mode_ == ShowSingleSegmentOnly) {
+		if ((segment_display_mode_ == ShowSingleSegmentOnly) ||
+				(segment_display_mode_ == ShowLastCompleteSegmentOnly)) {
 			try {
 				segment = segments.at(current_segment_);
 			} catch (out_of_range) {