X-Git-Url: http://git.code-monkey.de/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fviews%2Ftrace%2Fanalogsignal.cpp;h=d8dbf6f1a08222fe71c1ed047316e3644d05dfd1;hp=14870285fd144da5314ce914bd87b5935d846ef8;hb=bc4b9ccfc78d9d0987525360fa6d93bed681951a;hpb=0cbadf1c6a80ec37481ae11ee3cb709eeffda3e7

diff --git a/pv/views/trace/analogsignal.cpp b/pv/views/trace/analogsignal.cpp
index 1487028..d8dbf6f 100644
--- a/pv/views/trace/analogsignal.cpp
+++ b/pv/views/trace/analogsignal.cpp
@@ -51,7 +51,8 @@
 using std::deque;
 using std::div;
 using std::div_t;
-using std::isnan;
+// Note that "using std::isnan;" is _not_ put here since that would break
+// compilation on some platforms. Use "std::isnan()" instead in checks below.
 using std::max;
 using std::make_pair;
 using std::min;
@@ -129,11 +130,6 @@ AnalogSignal::AnalogSignal(
 	update_scale();
 }
 
-AnalogSignal::~AnalogSignal()
-{
-	GlobalSettings::remove_change_handler(this);
-}
-
 shared_ptr<pv::data::SignalData> AnalogSignal::data() const
 {
 	return base_->analog_data();
@@ -321,7 +317,7 @@ void AnalogSignal::paint_fore(QPainter &p, ViewItemPaintParams &pp)
 		// Show the info section on the right side of the trace, including
 		// the value at the hover point when the hover marker is enabled
 		// and we have corresponding data available
-		if (show_hover_marker_ && !isnan(value_at_hover_pos_)) {
+		if (show_hover_marker_ && !std::isnan(value_at_hover_pos_)) {
 			infotext = QString("[%1] %2 V/div")
 				.arg(format_value_si(value_at_hover_pos_, SIPrefix::unspecified, 0, "V", false))
 				.arg(resolution_);
@@ -870,7 +866,7 @@ void AnalogSignal::process_next_sample_value(float x, float value)
 {
 	// Note: NAN is used to indicate the non-existance of a value at this pixel
 
-	if (isnan(prev_value_at_pixel_)) {
+	if (std::isnan(prev_value_at_pixel_)) {
 		if (x < 0) {
 			min_value_at_pixel_ = value;
 			max_value_at_pixel_ = value;
@@ -884,7 +880,7 @@ void AnalogSignal::process_next_sample_value(float x, float value)
 
 	if (pixel_pos > current_pixel_pos_) {
 		if (pixel_pos - current_pixel_pos_ == 1) {
-			if (isnan(prev_value_at_pixel_)) {
+			if (std::isnan(prev_value_at_pixel_)) {
 				value_at_pixel_pos_.push_back(prev_value_at_pixel_);
 			} else {
 				// Average the min/max range to create one value for the previous pixel
@@ -1004,7 +1000,7 @@ void AnalogSignal::populate_popup_form(QWidget *parent, QFormLayout *form)
 
     connect(conv_threshold_cb_, SIGNAL(currentIndexChanged(int)),
             this, SLOT(on_conv_threshold_changed(int)));
-    connect(conv_threshold_cb_, SIGNAL(editTextChanged(const QString)),
+    connect(conv_threshold_cb_, SIGNAL(editTextChanged(const QString&)),
             this, SLOT(on_conv_threshold_changed()));  // index will be -1
 
 	// Add the display type dropdown