projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Introduce PV-internal channel types
[pulseview.git]
/
pv
/
data
/
signalbase.cpp
diff --git
a/pv/data/signalbase.cpp
b/pv/data/signalbase.cpp
index beefa5168a32befb421de14f36e7ef69a08a33c7..ccdc1da7f931fa4b69e0523986876c93467b3aca 100644
(file)
--- a/
pv/data/signalbase.cpp
+++ b/
pv/data/signalbase.cpp
@@
-15,8
+15,7
@@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
*/
#include "analog.hpp"
*/
#include "analog.hpp"
@@
-31,15
+30,15
@@
using std::dynamic_pointer_cast;
using std::shared_ptr;
using sigrok::Channel;
using std::shared_ptr;
using sigrok::Channel;
-using sigrok::ChannelType;
namespace pv {
namespace data {
const int SignalBase::ColourBGAlpha = 8*256/100;
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());
{
if (channel_)
internal_name_ = QString::fromStdString(channel_->name());
@@
-83,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
}
unsigned int SignalBase::index() const
@@
-120,7
+119,7
@@
void SignalBase::set_data(shared_ptr<pv::data::SignalData> data)
shared_ptr<data::Analog> SignalBase::analog_data() const
{
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 dynamic_pointer_cast<data::Analog>(data_);
else
return shared_ptr<data::Analog>();
@@
-128,7
+127,7
@@
shared_ptr<data::Analog> SignalBase::analog_data() const
shared_ptr<data::Logic> SignalBase::logic_data() const
{
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 dynamic_pointer_cast<data::Logic>(data_);
else
return shared_ptr<data::Logic>();
@@
-140,12
+139,12
@@
bool SignalBase::is_decode_signal() const
return (decoder_stack_ != nullptr);
}
return (decoder_stack_ != nullptr);
}
-s
td::s
hared_ptr<pv::data::DecoderStack> SignalBase::decoder_stack() const
+shared_ptr<pv::data::DecoderStack> SignalBase::decoder_stack() const
{
return decoder_stack_;
}
{
return decoder_stack_;
}
-void SignalBase::set_decoder_stack(s
td::s
hared_ptr<pv::data::DecoderStack>
+void SignalBase::set_decoder_stack(shared_ptr<pv::data::DecoderStack>
decoder_stack)
{
decoder_stack_ = decoder_stack;
decoder_stack)
{
decoder_stack_ = decoder_stack;