X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fdata%2Fsignalbase.cpp;fp=pv%2Fdata%2Fsignalbase.cpp;h=2b38fe1ef1d3b7ec03af221453527d70cfd4f641;hp=86ef68566ce118b0b09d0ccdfc94d4f06b35bf87;hb=999869aa676f7077b7181355eee28e9b025d4cea;hpb=578d073553fa13c8f6939ad4bd7bd774950a33eb diff --git a/pv/data/signalbase.cpp b/pv/data/signalbase.cpp index 86ef6856..2b38fe1e 100644 --- a/pv/data/signalbase.cpp +++ b/pv/data/signalbase.cpp @@ -52,8 +52,10 @@ SignalBase::SignalBase(shared_ptr channel, ChannelType channel_ 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())); @@ -81,6 +83,11 @@ 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())) @@ -119,13 +126,18 @@ 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; }