X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fdata%2Fsignalbase.cpp;h=9f35725f8df1cc540e032680cb70d31b4fe6b5ad;hp=791094036ddcb23511329a9922c67f1774fa0268;hb=f4ab4b5c657e5613caba82feaa81a8a400e4f331;hpb=f20e9bfdf03694ddb13b8b955964527358e52c67 diff --git a/pv/data/signalbase.cpp b/pv/data/signalbase.cpp index 79109403..9f35725f 100644 --- a/pv/data/signalbase.cpp +++ b/pv/data/signalbase.cpp @@ -265,6 +265,26 @@ bool SignalBase::has_samples() const return result; } +double SignalBase::get_samplerate() const +{ + if (channel_type_ == AnalogChannel) + { + shared_ptr data = dynamic_pointer_cast(data_); + if (data) + return data->get_samplerate(); + } + + if (channel_type_ == LogicChannel) + { + shared_ptr data = dynamic_pointer_cast(data_); + if (data) + return data->get_samplerate(); + } + + // Default samplerate is 1 Hz + return 1.0; +} + SignalBase::ConversionType SignalBase::get_conversion_type() const { return conversion_type_; @@ -435,7 +455,7 @@ void SignalBase::save_settings(QSettings &settings) const settings.setValue("conv_options", (int)(conversion_options_.size())); int i = 0; - for (auto kvp : conversion_options_) { + for (auto& kvp : conversion_options_) { settings.setValue(QString("conv_option%1_key").arg(i), kvp.first); settings.setValue(QString("conv_option%1_value").arg(i), kvp.second); i++;