SignalBase: Allow checking for logic data directly

[pulseview.git] / pv / data / signalbase.cpp

diff --git a/pv/data/signalbase.cpp b/pv/data/signalbase.cpp
index 06b3e1d866b671b397bb396d95f1c714b6b340f6..e29bbe8745352ff84c0257391bf950949683a2bb 100644 (file)
--- a/pv/data/signalbase.cpp
+++ b/pv/data/signalbase.cpp
@@ -30,15 +30,15 @@ using std::dynamic_pointer_cast;
 using std::shared_ptr;
 
 using sigrok::Channel;
-using sigrok::ChannelType;
 
 namespace pv {
 namespace data {
 
 const int SignalBase::ColourBGAlpha = 8*256/100;
 
-SignalBase::SignalBase(shared_ptr<sigrok::Channel> channel) :
-       channel_(channel)
+SignalBase::SignalBase(shared_ptr<sigrok::Channel> channel, ChannelType channel_type) :
+       channel_(channel),
+       channel_type_(channel_type)
 {
        if (channel_)
                internal_name_ = QString::fromStdString(channel_->name());
@@ -82,9 +82,9 @@ void SignalBase::set_enabled(bool value)
        }
 }
 
-const ChannelType *SignalBase::type() const
+SignalBase::ChannelType SignalBase::type() const
 {
-       return (channel_) ? channel_->type() : nullptr;
+       return channel_type_;
 }
 
 unsigned int SignalBase::index() const
@@ -119,18 +119,18 @@ void SignalBase::set_data(shared_ptr<pv::data::SignalData> data)
 
 shared_ptr<data::Analog> SignalBase::analog_data() const
 {
-       if (type() == ChannelType::ANALOG)
+       if (channel_type_ == AnalogChannel)
                return dynamic_pointer_cast<data::Analog>(data_);
        else
-               return shared_ptr<data::Analog>();
+               return nullptr;
 }
 
 shared_ptr<data::Logic> SignalBase::logic_data() const
 {
-       if (type() == ChannelType::LOGIC)
+       if (channel_type_ == LogicChannel)
                return dynamic_pointer_cast<data::Logic>(data_);
        else
-               return shared_ptr<data::Logic>();
+               return nullptr;
 }
 
 #ifdef ENABLE_DECODE