X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=pv%2Fviews%2Ftrace%2Fanalogsignal.cpp;h=930780731e1a550acf23c25602e11d59c334dc72;hb=b9cdbe03be1155f56cf06aa921d72bc2b6dc527d;hp=adb3c103230884b410e73ea827e96f28eb1c4b19;hpb=2b6e7a72139336bb77b9863890eebc9c94a4ab93;p=pulseview.git

diff --git a/pv/views/trace/analogsignal.cpp b/pv/views/trace/analogsignal.cpp
index adb3c10..9307807 100644
--- a/pv/views/trace/analogsignal.cpp
+++ b/pv/views/trace/analogsignal.cpp
@@ -245,7 +245,7 @@ void AnalogSignal::paint_mid(QPainter &p, ViewItemPaintParams &pp)
 	if ((display_type_ == DisplayConverted) || (display_type_ == DisplayBoth)) {
 		const SignalBase::ConversionType conv_type = base_->get_conversion_type();
 
-		if (((conv_type == SignalBase::A2LConversionByTreshold) ||
+		if (((conv_type == SignalBase::A2LConversionByThreshold) ||
 			(conv_type == SignalBase::A2LConversionBySchmittTrigger)))
 			paint_logic_mid(p, pp);
 	}
@@ -616,9 +616,9 @@ void AnalogSignal::update_conversion_widgets()
 
 	map < QString, QVariant > options = base_->get_conversion_options();
 
-	if (conv_type == SignalBase::A2LConversionByTreshold) {
+	if (conv_type == SignalBase::A2LConversionByThreshold) {
 		const vector<double> thresholds = base_->get_conversion_thresholds(
-				SignalBase::A2LConversionByTreshold, true);
+				SignalBase::A2LConversionByThreshold, true);
 		conv_threshold_cb_->addItem(
 				QString("%1V").arg(QString::number(thresholds[0], 'f', 1)), -1);
 	}
@@ -775,7 +775,7 @@ void AnalogSignal::populate_popup_form(QWidget *parent, QFormLayout *form)
 	conversion_cb_->addItem(tr("none"),
 		SignalBase::NoConversion);
 	conversion_cb_->addItem(tr("to logic via threshold"),
-		SignalBase::A2LConversionByTreshold);
+		SignalBase::A2LConversionByThreshold);
 	conversion_cb_->addItem(tr("to logic via schmitt-trigger"),
 		SignalBase::A2LConversionBySchmittTrigger);
 
@@ -801,14 +801,14 @@ void AnalogSignal::populate_popup_form(QWidget *parent, QFormLayout *form)
 	// Add the display type dropdown
 	display_type_cb_ = new QComboBox();
 
-	display_type_cb_->addItem(tr("Analog"), DisplayAnalog);
-	display_type_cb_->addItem(tr("Converted"), DisplayConverted);
-	display_type_cb_->addItem(tr("Analog+Converted"), DisplayBoth);
+	display_type_cb_->addItem(tr("analog"), DisplayAnalog);
+	display_type_cb_->addItem(tr("converted"), DisplayConverted);
+	display_type_cb_->addItem(tr("analog+converted"), DisplayBoth);
 
 	cur_idx = display_type_cb_->findData(QVariant(display_type_));
 	display_type_cb_->setCurrentIndex(cur_idx);
 
-	layout->addRow(tr("Traces to show:"), display_type_cb_);
+	layout->addRow(tr("Show traces for"), display_type_cb_);
 
 	connect(display_type_cb_, SIGNAL(currentIndexChanged(int)),
 		this, SLOT(on_display_type_changed(int)));
@@ -953,7 +953,7 @@ void AnalogSignal::on_conv_threshold_changed(int index)
 
 	const bool use_custom_thr = (index == -1) || (user_data == -1);
 
-	if (conv_type == SignalBase::A2LConversionByTreshold && use_custom_thr) {
+	if (conv_type == SignalBase::A2LConversionByThreshold && use_custom_thr) {
 		// Not one of the preset values, try to parse the combo box text
 		// Note: Regex loosely based on
 		// https://txt2re.com/index-c++.php3?s=0.1V&1&-13