X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fview%2Fanalogsignal.hpp;h=08edda36f0dcc818135747189dc76ff8ada121c2;hp=f35fe79f1eb839ee719f452c3ca0183b4c7348ad;hb=2d25fc473d6dc5d578f45f8d6bb061639afec405;hpb=73a25a6e488f1813c1cd12da085a16e4f91ed4da diff --git a/pv/view/analogsignal.hpp b/pv/view/analogsignal.hpp index f35fe79f..08edda36 100644 --- 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 */ -#ifndef PULSEVIEW_PV_VIEW_ANALOGSIGNAL_HPP -#define PULSEVIEW_PV_VIEW_ANALOGSIGNAL_HPP +#ifndef PULSEVIEW_PV_VIEWS_TRACEVIEW_ANALOGSIGNAL_HPP +#define PULSEVIEW_PV_VIEWS_TRACEVIEW_ANALOGSIGNAL_HPP #include "signal.hpp" @@ -35,7 +35,8 @@ class AnalogSegment; class SignalBase; } -namespace view { +namespace views { +namespace TraceView { class AnalogSignal : public Signal { @@ -53,14 +54,15 @@ private: public: AnalogSignal(pv::Session &session, - std::shared_ptr base, - std::shared_ptr data); + std::shared_ptr base); virtual ~AnalogSignal() = default; std::shared_ptr data() const; - std::shared_ptr 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. @@ -134,8 +136,6 @@ private Q_SLOTS: void on_resolution_changed(int index); private: - std::shared_ptr data_; - QComboBox *resolution_cb_; float scale_; @@ -147,7 +147,8 @@ private: float resolution_; // e.g. 10 for 10 V/div }; -} // namespace view +} // namespace TraceView +} // namespace views } // namespace pv -#endif // PULSEVIEW_PV_VIEW_ANALOGSIGNAL_HPP +#endif // PULSEVIEW_PV_VIEWS_TRACEVIEW_ANALOGSIGNAL_HPP