X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=pv%2Fdata%2Fsignalbase.cpp;h=fb68724401c4f979acb79d66191192653a8d0a72;hb=27ff2925665ce9c916d68c637827095e27b99ee7;hp=9f35725f8df1cc540e032680cb70d31b4fe6b5ad;hpb=f4ab4b5c657e5613caba82feaa81a8a400e4f331;p=pulseview.git diff --git a/pv/data/signalbase.cpp b/pv/data/signalbase.cpp index 9f35725f..fb687244 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,32 +118,10 @@ shared_ptr SignalBase::channel() const return channel_; } -QString SignalBase::name() const -{ - return (channel_) ? QString::fromStdString(channel_->name()) : name_; -} - -QString SignalBase::internal_name() const +bool SignalBase::is_generated() const { - return internal_name_; -} - -QString SignalBase::display_name() const -{ - if (name() != internal_name_) - return name() + " (" + internal_name_ + ")"; - else - return name(); -} - -void SignalBase::set_name(QString name) -{ - if (channel_) - channel_->set_name(name.toUtf8().constData()); - - name_ = name; - - name_changed(name); + // Only signals associated with a device have a corresponding sigrok channel + return channel_ == nullptr; } bool SignalBase::enabled() const @@ -119,17 +144,65 @@ SignalBase::ChannelType SignalBase::type() const unsigned int SignalBase::index() const { - return (channel_) ? channel_->index() : 0; + return index_; +} + +void SignalBase::set_index(unsigned int index) +{ + index_ = index; } unsigned int SignalBase::logic_bit_index() const { if (channel_type_ == LogicChannel) - return channel_->index(); + return index_; else return 0; } +void SignalBase::set_group(SignalGroup* group) +{ + group_ = group; +} + +SignalGroup* SignalBase::group() const +{ + return group_; +} + +QString SignalBase::name() const +{ + return (channel_) ? QString::fromStdString(channel_->name()) : name_; +} + +QString SignalBase::internal_name() const +{ + return internal_name_; +} + +void SignalBase::set_internal_name(QString internal_name) +{ + internal_name_ = internal_name; +} + +QString SignalBase::display_name() const +{ + if ((name() != internal_name_) && (!internal_name_.isEmpty())) + return name() + " (" + internal_name_ + ")"; + else + 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 { return color_; @@ -155,16 +228,13 @@ 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))); - - if (channel_type_ == AnalogChannel) { - shared_ptr analog = analog_data(); - assert(analog); + disconnect(data.get(), SIGNAL(samples_added(shared_ptr, uint64_t, uint64_t)), + this, SLOT(on_samples_added(shared_ptr, uint64_t, uint64_t))); + shared_ptr analog = analog_data(); + if (analog) disconnect(analog.get(), SIGNAL(min_max_changed(float, float)), this, SLOT(on_min_max_changed(float, float))); - } } data_ = data; @@ -172,35 +242,33 @@ 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))); - - if (channel_type_ == AnalogChannel) { - shared_ptr analog = analog_data(); - assert(analog); + connect(data.get(), SIGNAL(samples_added(SharedPtrToSegment, uint64_t, uint64_t)), + this, SLOT(on_samples_added(SharedPtrToSegment, uint64_t, uint64_t))); + shared_ptr analog = analog_data(); + if (analog) connect(analog.get(), SIGNAL(min_max_changed(float, float)), this, SLOT(on_min_max_changed(float, float))); - } } } -shared_ptr SignalBase::analog_data() const +void SignalBase::clear_sample_data() { - shared_ptr result = nullptr; + if (analog_data()) + analog_data()->clear(); - if (channel_type_ == AnalogChannel) - result = dynamic_pointer_cast(data_); + if (logic_data()) + logic_data()->clear(); +} - return result; +shared_ptr SignalBase::analog_data() const +{ + return dynamic_pointer_cast(data_); } shared_ptr SignalBase::logic_data() const { - shared_ptr result = nullptr; - - if (channel_type_ == LogicChannel) - result = dynamic_pointer_cast(data_); + shared_ptr result = dynamic_pointer_cast(data_); if (((conversion_type_ == A2LConversionByThreshold) || (conversion_type_ == A2LConversionBySchmittTrigger))) @@ -213,25 +281,25 @@ bool SignalBase::segment_is_complete(uint32_t segment_id) const { bool result = true; - if (channel_type_ == AnalogChannel) + shared_ptr adata = analog_data(); + if (adata) { - shared_ptr data = dynamic_pointer_cast(data_); - auto segments = data->analog_segments(); + auto segments = adata->analog_segments(); try { result = segments.at(segment_id)->is_complete(); } catch (out_of_range&) { // Do nothing } - } - - if (channel_type_ == LogicChannel) - { - shared_ptr data = dynamic_pointer_cast(data_); - auto segments = data->logic_segments(); - try { - result = segments.at(segment_id)->is_complete(); - } catch (out_of_range&) { - // Do nothing + } else { + shared_ptr ldata = logic_data(); + if (ldata) { + shared_ptr data = dynamic_pointer_cast(data_); + auto segments = data->logic_segments(); + try { + result = segments.at(segment_id)->is_complete(); + } catch (out_of_range&) { + // Do nothing + } } } @@ -242,21 +310,16 @@ bool SignalBase::has_samples() const { bool result = false; - if (channel_type_ == AnalogChannel) + shared_ptr adata = analog_data(); + if (adata) { - shared_ptr data = dynamic_pointer_cast(data_); - if (data) { - auto segments = data->analog_segments(); - if ((segments.size() > 0) && (segments.front()->get_sample_count() > 0)) - result = true; - } - } - - if (channel_type_ == LogicChannel) - { - shared_ptr data = dynamic_pointer_cast(data_); - if (data) { - auto segments = data->logic_segments(); + auto segments = adata->analog_segments(); + if ((segments.size() > 0) && (segments.front()->get_sample_count() > 0)) + result = true; + } else { + shared_ptr ldata = logic_data(); + if (ldata) { + auto segments = ldata->logic_segments(); if ((segments.size() > 0) && (segments.front()->get_sample_count() > 0)) result = true; } @@ -267,18 +330,13 @@ bool SignalBase::has_samples() const 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(); + shared_ptr adata = analog_data(); + if (adata) + return adata->get_samplerate(); + else { + shared_ptr ldata = logic_data(); + if (ldata) + return ldata->get_samplerate(); } // Default samplerate is 1 Hz @@ -450,7 +508,7 @@ 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())); @@ -470,8 +528,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()); @@ -493,8 +562,7 @@ void SignalBase::restore_settings(QSettings &settings) bool SignalBase::conversion_is_a2l() const { - return ((channel_type_ == AnalogChannel) && - ((conversion_type_ == A2LConversionByThreshold) || + return (((conversion_type_ == A2LConversionByThreshold) || (conversion_type_ == A2LConversionBySchmittTrigger))); } @@ -506,10 +574,13 @@ void SignalBase::convert_single_segment_range(AnalogSegment *asegment, // Create sigrok::Analog instance float *asamples = new float[ConversionBlockSize]; + assert(asamples); uint8_t *lsamples = new uint8_t[ConversionBlockSize]; + assert(lsamples); vector > channels; - channels.push_back(channel_); + if (channel_) + channels.push_back(channel_); vector mq_flags; const sigrok::Quantity * const mq = sigrok::Quantity::VOLTAGE; @@ -732,7 +803,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) { @@ -746,8 +817,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)