projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Move signal data to SignalBase and adjust view::AnalogSignal
[pulseview.git]
/
pv
/
view
/
analogsignal.hpp
diff --git
a/pv/view/analogsignal.hpp
b/pv/view/analogsignal.hpp
index f35fe79f1eb839ee719f452c3ca0183b4c7348ad..81fdf393abb16aab3e633582a5c83060d83df0c7 100644
(file)
--- a/
pv/view/analogsignal.hpp
+++ b/
pv/view/analogsignal.hpp
@@
-53,15
+53,12
@@
private:
public:
AnalogSignal(pv::Session &session,
public:
AnalogSignal(pv::Session &session,
- std::shared_ptr<data::SignalBase> base,
- std::shared_ptr<pv::data::Analog> data);
+ std::shared_ptr<data::SignalBase> base);
virtual ~AnalogSignal() = default;
std::shared_ptr<pv::data::SignalData> data() const;
virtual ~AnalogSignal() = default;
std::shared_ptr<pv::data::SignalData> data() const;
- std::shared_ptr<pv::data::Analog> analog_data() const;
-
/**
* Computes the vertical extents of the contents of this row item.
* @return A pair containing the minimum and maximum y-values.
/**
* Computes the vertical extents of the contents of this row item.
* @return A pair containing the minimum and maximum y-values.
@@
-134,8
+131,6
@@
private Q_SLOTS:
void on_resolution_changed(int index);
private:
void on_resolution_changed(int index);
private:
- std::shared_ptr<pv::data::Analog> data_;
-
QComboBox *resolution_cb_;
float scale_;
QComboBox *resolution_cb_;
float scale_;