X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fdata%2Fsignalbase.cpp;h=104243b11db8a168ef24d1e9ed021f4c949958d7;hp=2972d4043cf7a7bb3e6b48b49e9b190589b92884;hb=144e72c9ec677e7df35d37d7de6e8a18bb3f2ba1;hpb=30677c1392b54604b01558cf29b44572731659fc diff --git a/pv/data/signalbase.cpp b/pv/data/signalbase.cpp index 2972d404..104243b1 100644 --- a/pv/data/signalbase.cpp +++ b/pv/data/signalbase.cpp @@ -28,8 +28,9 @@ #include -#include +#include #include +#include using std::dynamic_pointer_cast; using std::make_shared; @@ -41,24 +42,105 @@ using std::unique_lock; namespace pv { namespace data { -const int SignalBase::ColourBGAlpha = 8 * 256 / 100; +const QColor SignalBase::AnalogSignalColors[8] = +{ + QColor(0xC4, 0xA0, 0x00), // Yellow HSV: 49 / 100 / 77 + QColor(0x87, 0x20, 0x7A), // Magenta HSV: 308 / 70 / 53 + QColor(0x20, 0x4A, 0x87), // Blue HSV: 216 / 76 / 53 + QColor(0x4E, 0x9A, 0x06), // Green HSV: 91 / 96 / 60 + QColor(0xBF, 0x6E, 0x00), // Orange HSV: 35 / 100 / 75 + QColor(0x5E, 0x20, 0x80), // Purple HSV: 280 / 75 / 50 + QColor(0x20, 0x80, 0x7A), // Turqoise HSV: 177 / 75 / 50 + QColor(0x80, 0x20, 0x24) // Red HSV: 358 / 75 / 50 +}; + +const QColor SignalBase::LogicSignalColors[10] = +{ + QColor(0x16, 0x19, 0x1A), // Black + QColor(0x8F, 0x52, 0x02), // Brown + QColor(0xCC, 0x00, 0x00), // Red + QColor(0xF5, 0x79, 0x00), // Orange + QColor(0xED, 0xD4, 0x00), // Yellow + QColor(0x73, 0xD2, 0x16), // Green + QColor(0x34, 0x65, 0xA4), // Blue + QColor(0x75, 0x50, 0x7B), // Violet + QColor(0x88, 0x8A, 0x85), // Grey + QColor(0xEE, 0xEE, 0xEC), // White +}; + + +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())); delayed_conversion_starter_.setSingleShot(true); delayed_conversion_starter_.setInterval(ConversionDelay); + + // Only logic and analog SR channels can have their colors auto-set + // because for them, we have an index that can be used + if (channel_type == LogicChannel) + set_color(LogicSignalColors[index() % countof(LogicSignalColors)]); + else if (channel_type == AnalogChannel) + set_color(AnalogSignalColors[index() % countof(AnalogSignalColors)]); } SignalBase::~SignalBase() @@ -71,32 +153,10 @@ shared_ptr SignalBase::channel() const return channel_; } -QString SignalBase::name() const +bool SignalBase::is_generated() const { - return (channel_) ? QString::fromStdString(channel_->name()) : name_; -} - -QString SignalBase::internal_name() 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,35 +179,83 @@ 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; } -QColor SignalBase::colour() const +void SignalBase::set_group(SignalGroup* group) { - return colour_; + group_ = group; } -void SignalBase::set_colour(QColor colour) +SignalGroup* SignalBase::group() const { - colour_ = colour; + return group_; +} - bgcolour_ = colour; - bgcolour_.setAlpha(ColourBGAlpha); +QString SignalBase::name() const +{ + return (channel_) ? QString::fromStdString(channel_->name()) : name_; +} - colour_changed(colour); +QString SignalBase::internal_name() const +{ + return internal_name_; } -QColor SignalBase::bgcolour() const +void SignalBase::set_internal_name(QString internal_name) { - return bgcolour_; + 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_; +} + +void SignalBase::set_color(QColor color) +{ + color_ = color; + + bgcolor_ = color; + bgcolor_.setAlpha(ColorBGAlpha); + + color_changed(color); +} + +QColor SignalBase::bgcolor() const +{ + return bgcolor_; } void SignalBase::set_data(shared_ptr data) @@ -155,16 +263,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 +277,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,31 +316,68 @@ 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 } + } 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 + } + } } - if (channel_type_ == LogicChannel) + return result; +} + +bool SignalBase::has_samples() const +{ + bool result = false; + + shared_ptr adata = analog_data(); + if (adata) { - 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 + 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; } } return result; } +double SignalBase::get_samplerate() const +{ + 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 + return 1.0; +} + SignalBase::ConversionType SignalBase::get_conversion_type() const { return conversion_type_; @@ -403,12 +543,12 @@ void SignalBase::save_settings(QSettings &settings) const { settings.setValue("name", name()); settings.setValue("enabled", enabled()); - settings.setValue("colour", colour()); + 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++; @@ -417,40 +557,65 @@ void SignalBase::save_settings(QSettings &settings) const void SignalBase::restore_settings(QSettings &settings) { - set_name(settings.value("name").toString()); - set_enabled(settings.value("enabled").toBool()); - set_colour(settings.value("colour").value()); - set_conversion_type((ConversionType)settings.value("conversion_type").toInt()); + if (settings.contains("name")) + set_name(settings.value("name").toString()); + + if (settings.contains("enabled")) + set_enabled(settings.value("enabled").toBool()); + + if (settings.contains("color")) { + QVariant value = settings.value("color"); - int conv_options = settings.value("conv_options").toInt(); + // 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()); + + int conv_options = 0; + if (settings.contains("conv_options")) + conv_options = settings.value("conv_options").toInt(); if (conv_options) for (int i = 0; i < conv_options; i++) { - QString key = settings.value(QString("conv_option%1_key").arg(i)).toString(); - QVariant value = settings.value(QString("conv_option%1_value").arg(i)); - conversion_options_[key] = value; + const QString key_id = QString("conv_option%1_key").arg(i); + const QString value_id = QString("conv_option%1_value").arg(i); + + if (settings.contains(key_id) && settings.contains(value_id)) + conversion_options_[settings.value(key_id).toString()] = + settings.value(value_id); } } bool SignalBase::conversion_is_a2l() const { - return ((channel_type_ == AnalogChannel) && - ((conversion_type_ == A2LConversionByThreshold) || + return (((conversion_type_ == A2LConversionByThreshold) || (conversion_type_ == A2LConversionBySchmittTrigger))); } -void SignalBase::convert_single_segment_range(AnalogSegment *asegment, - LogicSegment *lsegment, uint64_t start_sample, uint64_t end_sample) +void SignalBase::convert_single_segment_range(shared_ptr asegment, + shared_ptr lsegment, uint64_t start_sample, uint64_t end_sample) { if (end_sample > start_sample) { tie(min_value_, max_value_) = asegment->get_min_max(); // 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; @@ -511,6 +676,7 @@ void SignalBase::convert_single_segment_range(AnalogSegment *asegment, lsegment->append_payload(logic->data_pointer(), logic->data_length()); samples_added(lsegment->segment_id(), i, i + ConversionBlockSize); + i += ConversionBlockSize; } @@ -536,7 +702,8 @@ void SignalBase::convert_single_segment_range(AnalogSegment *asegment, } } -void SignalBase::convert_single_segment(AnalogSegment *asegment, LogicSegment *lsegment) +void SignalBase::convert_single_segment(shared_ptr asegment, + shared_ptr lsegment) { uint64_t start_sample, end_sample, old_end_sample; start_sample = end_sample = 0; @@ -590,7 +757,7 @@ void SignalBase::conversion_thread_proc() uint32_t segment_id = 0; - AnalogSegment *asegment = analog_data->analog_segments().front().get(); + shared_ptr asegment = analog_data->analog_segments().front(); assert(asegment); const shared_ptr logic_data = dynamic_pointer_cast(converted_data_); @@ -603,7 +770,7 @@ void SignalBase::conversion_thread_proc() logic_data->push_segment(new_segment); } - LogicSegment *lsegment = logic_data->logic_segments().front().get(); + shared_ptr lsegment = logic_data->logic_segments().front(); assert(lsegment); do { @@ -612,11 +779,12 @@ void SignalBase::conversion_thread_proc() // Only advance to next segment if the current input segment is complete if (asegment->is_complete() && analog_data->analog_segments().size() > logic_data->logic_segments().size()) { + // There are more segments to process segment_id++; try { - asegment = analog_data->analog_segments().at(segment_id).get(); + asegment = analog_data->analog_segments().at(segment_id); } catch (out_of_range&) { qDebug() << "Conversion error for" << name() << ": no analog segment" \ << segment_id << ", segments size is" << analog_data->analog_segments().size(); @@ -627,13 +795,13 @@ void SignalBase::conversion_thread_proc() *logic_data.get(), segment_id, 1, asegment->samplerate()); logic_data->push_segment(new_segment); - lsegment = logic_data->logic_segments().back().get(); - } else { - // No more samples/segments to process, wait for data or interrupt - if (!conversion_interrupt_) { - unique_lock input_lock(conversion_input_mutex_); - conversion_input_cond_.wait(input_lock); - } + lsegment = logic_data->logic_segments().back(); + } + + // No more samples/segments to process, wait for data or interrupt + if (!conversion_interrupt_) { + unique_lock input_lock(conversion_input_mutex_); + conversion_input_cond_.wait(input_lock); } } while (!conversion_interrupt_); } @@ -649,11 +817,11 @@ void SignalBase::start_conversion(bool delayed_start) if (converted_data_) converted_data_->clear(); + samples_cleared(); conversion_interrupt_ = false; - conversion_thread_ = std::thread( - &SignalBase::conversion_thread_proc, this); + conversion_thread_ = std::thread(&SignalBase::conversion_thread_proc, this); } void SignalBase::stop_conversion() @@ -673,7 +841,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) { @@ -687,8 +855,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)