X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fdata%2Fsignalbase.cpp;h=e1091f110d398fd02095114a57862f060f120a8d;hp=791094036ddcb23511329a9922c67f1774fa0268;hb=57e7e17efd833527069607595be0847080d0a6a2;hpb=f20e9bfdf03694ddb13b8b955964527358e52c67 diff --git a/pv/data/signalbase.cpp b/pv/data/signalbase.cpp index 79109403..e1091f11 100644 --- a/pv/data/signalbase.cpp +++ b/pv/data/signalbase.cpp @@ -45,15 +45,62 @@ const int SignalBase::ColorBGAlpha = 8 * 256 / 100; const uint64_t SignalBase::ConversionBlockSize = 4096; const uint32_t SignalBase::ConversionDelay = 1000; // 1 second + +SignalGroup::SignalGroup(const QString& name) +{ + name_ = name; +} + +void SignalGroup::append_signal(shared_ptr signal) +{ + if (!signal) + return; + + signals_.push_back(signal); + signal->set_group(this); +} + +void SignalGroup::remove_signal(shared_ptr signal) +{ + if (!signal) + return; + + signals_.erase(std::remove_if(signals_.begin(), signals_.end(), + [&](shared_ptr s) { return s == signal; }), + signals_.end()); +} + +deque> SignalGroup::signals() const +{ + return signals_; +} + +void SignalGroup::clear() +{ + for (shared_ptr sb : signals_) + sb->set_group(nullptr); + + signals_.clear(); +} + +const QString SignalGroup::name() const +{ + return name_; +} + + SignalBase::SignalBase(shared_ptr channel, ChannelType channel_type) : channel_(channel), channel_type_(channel_type), + group_(nullptr), conversion_type_(NoConversion), min_value_(0), max_value_(0) { - if (channel_) + if (channel_) { internal_name_ = QString::fromStdString(channel_->name()); + index_ = channel_->index(); + } connect(&delayed_conversion_starter_, SIGNAL(timeout()), this, SLOT(on_delayed_conversion_start())); @@ -71,63 +118,83 @@ shared_ptr SignalBase::channel() const return channel_; } -QString SignalBase::name() const +bool SignalBase::enabled() const { - return (channel_) ? QString::fromStdString(channel_->name()) : name_; + return (channel_) ? channel_->enabled() : true; } -QString SignalBase::internal_name() const +void SignalBase::set_enabled(bool value) { - return internal_name_; + if (channel_) { + channel_->set_enabled(value); + enabled_changed(value); + } } -QString SignalBase::display_name() const +SignalBase::ChannelType SignalBase::type() const { - if (name() != internal_name_) - return name() + " (" + internal_name_ + ")"; - else - return name(); + return channel_type_; } -void SignalBase::set_name(QString name) +unsigned int SignalBase::index() const { - if (channel_) - channel_->set_name(name.toUtf8().constData()); + return index_; +} - name_ = name; +void SignalBase::set_index(unsigned int index) +{ + index_ = index; +} - name_changed(name); +unsigned int SignalBase::logic_bit_index() const +{ + if (channel_type_ == LogicChannel) + return index_; + else + return 0; } -bool SignalBase::enabled() const +void SignalBase::set_group(SignalGroup* group) { - return (channel_) ? channel_->enabled() : true; + group_ = group; } -void SignalBase::set_enabled(bool value) +SignalGroup* SignalBase::group() const { - if (channel_) { - channel_->set_enabled(value); - enabled_changed(value); - } + return group_; } -SignalBase::ChannelType SignalBase::type() const +QString SignalBase::name() const { - return channel_type_; + return (channel_) ? QString::fromStdString(channel_->name()) : name_; } -unsigned int SignalBase::index() const +QString SignalBase::internal_name() const { - return (channel_) ? channel_->index() : 0; + return internal_name_; } -unsigned int SignalBase::logic_bit_index() const +void SignalBase::set_internal_name(QString internal_name) { - if (channel_type_ == LogicChannel) - return channel_->index(); + internal_name_ = internal_name; +} + +QString SignalBase::display_name() const +{ + if ((name() != internal_name_) && (!internal_name_.isEmpty())) + return name() + " (" + internal_name_ + ")"; else - return 0; + return name(); +} + +void SignalBase::set_name(QString name) +{ + if (channel_) + channel_->set_name(name.toUtf8().constData()); + + name_ = name; + + name_changed(name); } QColor SignalBase::color() const @@ -155,8 +222,8 @@ void SignalBase::set_data(shared_ptr data) if (data_) { disconnect(data.get(), SIGNAL(samples_cleared()), this, SLOT(on_samples_cleared())); - disconnect(data.get(), SIGNAL(samples_added(QObject*, uint64_t, uint64_t)), - this, SLOT(on_samples_added(QObject*, uint64_t, uint64_t))); + disconnect(data.get(), SIGNAL(samples_added(shared_ptr, uint64_t, uint64_t)), + this, SLOT(on_samples_added(shared_ptr, uint64_t, uint64_t))); if (channel_type_ == AnalogChannel) { shared_ptr analog = analog_data(); @@ -172,8 +239,8 @@ void SignalBase::set_data(shared_ptr data) if (data_) { connect(data.get(), SIGNAL(samples_cleared()), this, SLOT(on_samples_cleared())); - connect(data.get(), SIGNAL(samples_added(QObject*, uint64_t, uint64_t)), - this, SLOT(on_samples_added(QObject*, uint64_t, uint64_t))); + connect(data.get(), SIGNAL(samples_added(SharedPtrToSegment, uint64_t, uint64_t)), + this, SLOT(on_samples_added(SharedPtrToSegment, uint64_t, uint64_t))); if (channel_type_ == AnalogChannel) { shared_ptr analog = analog_data(); @@ -185,6 +252,15 @@ void SignalBase::set_data(shared_ptr data) } } +void SignalBase::clear_sample_data() +{ + if (analog_data()) + analog_data()->clear(); + + if (logic_data()) + logic_data()->clear(); +} + shared_ptr SignalBase::analog_data() const { shared_ptr result = nullptr; @@ -265,6 +341,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_; @@ -430,12 +526,12 @@ void SignalBase::save_settings(QSettings &settings) const { settings.setValue("name", name()); settings.setValue("enabled", enabled()); - settings.setValue("color", color()); + settings.setValue("color", color().rgba()); settings.setValue("conversion_type", (int)conversion_type_); 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++; @@ -450,8 +546,19 @@ void SignalBase::restore_settings(QSettings &settings) if (settings.contains("enabled")) set_enabled(settings.value("enabled").toBool()); - if (settings.contains("color")) - set_color(settings.value("color").value()); + if (settings.contains("color")) { + QVariant value = settings.value("color"); + + // Workaround for Qt QColor serialization bug on OSX + if ((QMetaType::Type)(value.type()) == QMetaType::QColor) + set_color(value.value()); + else + set_color(QColor::fromRgba(value.value())); + + // A color with an alpha value of 0 makes the signal marker invisible + if (color() == QColor(0, 0, 0, 0)) + set_color(Qt::gray); + } if (settings.contains("conversion_type")) set_conversion_type((ConversionType)settings.value("conversion_type").toInt()); @@ -712,7 +819,7 @@ void SignalBase::on_samples_cleared() samples_cleared(); } -void SignalBase::on_samples_added(QObject* segment, uint64_t start_sample, +void SignalBase::on_samples_added(SharedPtrToSegment segment, uint64_t start_sample, uint64_t end_sample) { if (conversion_type_ != NoConversion) { @@ -726,8 +833,7 @@ void SignalBase::on_samples_added(QObject* segment, uint64_t start_sample, } } - data::Segment* s = qobject_cast(segment); - samples_added(s->segment_id(), start_sample, end_sample); + samples_added(segment->segment_id(), start_sample, end_sample); } void SignalBase::on_min_max_changed(float min, float max)