projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
MainWindow: Don't use get_active_view() to determine active session
[pulseview.git]
/
pv
/
view
/
analogsignal.hpp
diff --git
a/pv/view/analogsignal.hpp
b/pv/view/analogsignal.hpp
index 601ae110d0403fb9c54745dff5e156a030f9f828..08edda36f0dcc818135747189dc76ff8ada121c2 100644
(file)
--- a/
pv/view/analogsignal.hpp
+++ b/
pv/view/analogsignal.hpp
@@
-18,8
+18,8
@@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#ifndef PULSEVIEW_PV_VIEW_ANALOGSIGNAL_HPP
-#define PULSEVIEW_PV_VIEW_ANALOGSIGNAL_HPP
+#ifndef PULSEVIEW_PV_VIEW
S_TRACEVIEW
_ANALOGSIGNAL_HPP
+#define PULSEVIEW_PV_VIEW
S_TRACEVIEW
_ANALOGSIGNAL_HPP
#include "signal.hpp"
#include "signal.hpp"
@@
-35,7
+35,8
@@
class AnalogSegment;
class SignalBase;
}
class SignalBase;
}
-namespace view {
+namespace views {
+namespace TraceView {
class AnalogSignal : public Signal
{
class AnalogSignal : public Signal
{
@@
-53,14
+54,15
@@
private:
public:
AnalogSignal(pv::Session &session,
public:
AnalogSignal(pv::Session &session,
- std::shared_ptr<data::SignalBase> channel,
- 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;
+ virtual void save_settings(QSettings &settings) const;
+
+ virtual void restore_settings(QSettings &settings);
/**
* Computes the vertical extents of the contents of this row item.
/**
* Computes the vertical extents of the contents of this row item.
@@
-134,8
+136,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_;
@@
-147,7
+147,8
@@
private:
float resolution_; // e.g. 10 for 10 V/div
};
float resolution_; // e.g. 10 for 10 V/div
};
-} // namespace view
+} // namespace TraceView
+} // namespace views
} // namespace pv
} // namespace pv
-#endif // PULSEVIEW_PV_VIEW_ANALOGSIGNAL_HPP
+#endif // PULSEVIEW_PV_VIEW
S_TRACEVIEW
_ANALOGSIGNAL_HPP