projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Introduce pv::data::SignalBase
[pulseview.git]
/
pv
/
view
/
signal.hpp
diff --git
a/pv/view/signal.hpp
b/pv/view/signal.hpp
index bcd4e2eb617eef83a46a5c1e98bf308751b48d8e..36d87d4594d0a6def78eb2f29daeb1c42408ace4 100644
(file)
--- a/
pv/view/signal.hpp
+++ b/
pv/view/signal.hpp
@@
-32,15
+32,12
@@
#include "trace.hpp"
#include "viewitemowner.hpp"
#include "trace.hpp"
#include "viewitemowner.hpp"
-namespace sigrok {
- class Channel;
-}
-
namespace pv {
class Session;
namespace data {
namespace pv {
class Session;
namespace data {
+class SignalBase;
class SignalData;
}
class SignalData;
}
@@
-52,13
+49,13
@@
class Signal : public Trace, public ViewItemOwner
protected:
Signal(pv::Session &session,
protected:
Signal(pv::Session &session,
- std::shared_ptr<
sigrok::Channel
> channel);
+ std::shared_ptr<
data::SignalBase
> channel);
public:
/**
* Sets the name of the signal.
*/
public:
/**
* Sets the name of the signal.
*/
- void set_name(QString name);
+ v
irtual v
oid set_name(QString name);
virtual std::shared_ptr<pv::data::SignalData> data() const = 0;
virtual std::shared_ptr<pv::data::SignalData> data() const = 0;
@@
-69,7
+66,7
@@
public:
void enable(bool enable = true);
void enable(bool enable = true);
- std::shared_ptr<
sigrok::Channel
> channel() const;
+ std::shared_ptr<
data::SignalBase
> channel() const;
/**
* Returns a list of row items owned by this object.
/**
* Returns a list of row items owned by this object.
@@
-100,18
+97,18
@@
public:
*/
virtual void scale_handle_released() {};
*/
virtual void scale_handle_released() {};
-private Q_SLOTS:
+protected Q_SLOTS:
+ virtual void on_name_changed(const QString &text);
+
void on_disable();
protected:
pv::Session &session_;
void on_disable();
protected:
pv::Session &session_;
- std::shared_ptr<sigrok::Channel> channel_;
const std::shared_ptr<SignalScaleHandle> scale_handle_;
const item_list items_;
QComboBox *name_widget_;
const std::shared_ptr<SignalScaleHandle> scale_handle_;
const item_list items_;
QComboBox *name_widget_;
- bool updating_name_widget_;
};
} // namespace view
};
} // namespace view