X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=pv%2Fdata%2Fsignalbase.cpp;h=b455111a89fbbd868dde6e92198dc1418a564153;hb=561ba3ae052a93fe150a2161fcdc361144e68e4f;hp=514459d283449b9617fbf0353962ff18cc974de5;hpb=52c900ac8626b33cfd55485b4474fb5160524d33;p=pulseview.git diff --git a/pv/data/signalbase.cpp b/pv/data/signalbase.cpp index 514459d2..b455111a 100644 --- a/pv/data/signalbase.cpp +++ b/pv/data/signalbase.cpp @@ -169,7 +169,7 @@ shared_ptr SignalBase::logic_data() const if (channel_type_ == LogicChannel) result = dynamic_pointer_cast(data_); - if (((conversion_type_ == A2LConversionByTreshold) || + if (((conversion_type_ == A2LConversionByThreshold) || (conversion_type_ == A2LConversionBySchmittTrigger))) result = dynamic_pointer_cast(converted_data_); @@ -239,7 +239,7 @@ vector SignalBase::get_conversion_thresholds(const ConversionType t, else preset = get_current_conversion_preset(); - if (conv_type == A2LConversionByTreshold) { + if (conv_type == A2LConversionByThreshold) { double thr = 0; if (preset == -1) { @@ -295,7 +295,7 @@ vector< pair > SignalBase::get_conversion_presets() const { vector< pair > presets; - if (conversion_type_ == A2LConversionByTreshold) { + if (conversion_type_ == A2LConversionByThreshold) { // Source: http://www.interfacebus.com/voltage_threshold.html presets.emplace_back(tr("Signal average"), 0); presets.emplace_back(tr("0.9V (for 1.8V CMOS)"), 1); @@ -373,7 +373,7 @@ void SignalBase::restore_settings(QSettings &settings) bool SignalBase::conversion_is_a2l() const { return ((channel_type_ == AnalogChannel) && - ((conversion_type_ == A2LConversionByTreshold) || + ((conversion_type_ == A2LConversionByThreshold) || (conversion_type_ == A2LConversionBySchmittTrigger))); } @@ -427,7 +427,7 @@ void SignalBase::conversion_thread_proc(QObject* segment) // Convert uint64_t i = start_sample; - if (conversion_type_ == A2LConversionByTreshold) { + if (conversion_type_ == A2LConversionByThreshold) { const double threshold = get_conversion_thresholds()[0]; // Convert as many sample blocks as we can