projects
/
pulseview.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
7aa09b0
)
Added Signal::data accessor function
author
Joel Holdsworth
<joel@airwebreathe.org.uk>
Mon, 2 Dec 2013 20:08:31 +0000
(20:08 +0000)
committer
Joel Holdsworth
<joel@airwebreathe.org.uk>
Mon, 2 Dec 2013 20:08:31 +0000
(20:08 +0000)
pv/view/analogsignal.cpp
patch
|
blob
|
history
pv/view/analogsignal.h
patch
|
blob
|
history
pv/view/logicsignal.cpp
patch
|
blob
|
history
pv/view/logicsignal.h
patch
|
blob
|
history
pv/view/signal.h
patch
|
blob
|
history
diff --git
a/pv/view/analogsignal.cpp
b/pv/view/analogsignal.cpp
index 4304fd1e5a9bfd7ec61fcf3e3a9c24594086fed0..bcd0f20020a2d326b7b1be314fe97838909acbcc 100644
(file)
--- a/
pv/view/analogsignal.cpp
+++ b/
pv/view/analogsignal.cpp
@@
-55,6
+55,11
@@
AnalogSignal::~AnalogSignal()
{
}
{
}
+boost::shared_ptr<pv::data::SignalData> AnalogSignal::data() const
+{
+ return _data;
+}
+
void AnalogSignal::set_scale(float scale)
{
_scale = scale;
void AnalogSignal::set_scale(float scale)
{
_scale = scale;
diff --git
a/pv/view/analogsignal.h
b/pv/view/analogsignal.h
index 64d138d84a19f0a13948c1fded2c4d125a98e4cf..279ed108938c7538ec9a293fa96712cc538cb18e 100644
(file)
--- a/
pv/view/analogsignal.h
+++ b/
pv/view/analogsignal.h
@@
-47,6
+47,8
@@
public:
virtual ~AnalogSignal();
virtual ~AnalogSignal();
+ boost::shared_ptr<pv::data::SignalData> data() const;
+
void set_scale(float scale);
/**
void set_scale(float scale);
/**
diff --git
a/pv/view/logicsignal.cpp
b/pv/view/logicsignal.cpp
index fb84d70a8e78dc6838678038bcfedd9e88ecb0c1..54faa601dc16f97ac4b80fba50e5d8af0f3bf992 100644
(file)
--- a/
pv/view/logicsignal.cpp
+++ b/
pv/view/logicsignal.cpp
@@
-76,6
+76,11
@@
LogicSignal::~LogicSignal()
{
}
{
}
+boost::shared_ptr<pv::data::SignalData> LogicSignal::data() const
+{
+ return _data;
+}
+
boost::shared_ptr<pv::data::Logic> LogicSignal::logic_data() const
{
return _data;
boost::shared_ptr<pv::data::Logic> LogicSignal::logic_data() const
{
return _data;
diff --git
a/pv/view/logicsignal.h
b/pv/view/logicsignal.h
index 86c411a00106fe1e78e76c21356965c52c313784..992745eb8e6ff6927ae10bf8db0ddbe952244b82 100644
(file)
--- a/
pv/view/logicsignal.h
+++ b/
pv/view/logicsignal.h
@@
-54,6
+54,8
@@
public:
virtual ~LogicSignal();
virtual ~LogicSignal();
+ boost::shared_ptr<pv::data::SignalData> data() const;
+
boost::shared_ptr<pv::data::Logic> logic_data() const;
/**
boost::shared_ptr<pv::data::Logic> logic_data() const;
/**
diff --git
a/pv/view/signal.h
b/pv/view/signal.h
index e5e919548be0679147730823eaf113785c3871fe..bdbd27a35f1b9554cde55dd75b1a441f0b1619b8 100644
(file)
--- a/
pv/view/signal.h
+++ b/
pv/view/signal.h
@@
-21,6
+21,8
@@
#ifndef PULSEVIEW_PV_VIEW_SIGNAL_H
#define PULSEVIEW_PV_VIEW_SIGNAL_H
#ifndef PULSEVIEW_PV_VIEW_SIGNAL_H
#define PULSEVIEW_PV_VIEW_SIGNAL_H
+#include <boost/shared_ptr.hpp>
+
#include <QComboBox>
#include <QWidgetAction>
#include <QComboBox>
#include <QWidgetAction>
@@
-51,6
+53,8
@@
public:
*/
void set_name(QString name);
*/
void set_name(QString name);
+ virtual boost::shared_ptr<pv::data::SignalData> data() const = 0;
+
/**
* Returns true if the trace is visible and enabled.
*/
/**
* Returns true if the trace is visible and enabled.
*/