Change namespace for the trace view and implement ViewBase

[pulseview.git] / pv / view / analogsignal.cpp

diff --git a/pv/view/analogsignal.cpp b/pv/view/analogsignal.cpp
index cd57da06b6073e0143f3f859bad2b70a8120a426..20004777cac2eda854cd4d97fcb3f1a327081f16 100644 (file)
--- a/pv/view/analogsignal.cpp
+++ b/pv/view/analogsignal.cpp
@@ -48,7 +48,8 @@ using std::shared_ptr;
 using std::deque;
 
 namespace pv {
-namespace view {
+namespace views {
+namespace TraceView {
 
 const QColor AnalogSignal::SignalColours[4] = {
        QColor(0xC4, 0xA0, 0x00),       // Yellow
@@ -71,10 +72,8 @@ const int AnalogSignal::InfoTextMarginBottom = 5;
 
 AnalogSignal::AnalogSignal(
        pv::Session &session,
-       shared_ptr<data::SignalBase> base,
-       shared_ptr<data::Analog> data) :
+       shared_ptr<data::SignalBase> base) :
        Signal(session, base),
-       data_(data),
        scale_index_(4), // 20 per div
        scale_index_drag_offset_(0),
        div_height_(3 * QFontMetrics(QApplication::font()).height()),
@@ -87,12 +86,24 @@ AnalogSignal::AnalogSignal(
 
 shared_ptr<pv::data::SignalData> AnalogSignal::data() const
 {
-       return data_;
+       return base_->analog_data();
 }
 
-shared_ptr<pv::data::Analog> AnalogSignal::analog_data() const
+void AnalogSignal::save_settings(QSettings &settings) const
 {
-       return data_;
+       settings.setValue("vdivs", vdivs_);
+       settings.setValue("scale_index", scale_index_);
+}
+
+void AnalogSignal::restore_settings(QSettings &settings)
+{
+       if (settings.contains("vdivs"))
+               vdivs_ = settings.value("vdivs").toInt();
+
+       if (settings.contains("scale_index")) {
+               scale_index_ = settings.value("scale_index").toInt();
+               update_scale();
+       }
 }
 
 std::pair<int, int> AnalogSignal::v_extents() const
@@ -135,7 +146,7 @@ void AnalogSignal::paint_back(QPainter &p, const ViewItemPaintParams &pp)
 
 void AnalogSignal::paint_mid(QPainter &p, const ViewItemPaintParams &pp)
 {
-       assert(data_);
+       assert(base_->analog_data());
        assert(owner_);
 
        const int y = get_visual_y();
@@ -146,7 +157,7 @@ void AnalogSignal::paint_mid(QPainter &p, const ViewItemPaintParams &pp)
        paint_grid(p, y, pp.left(), pp.right());
 
        const deque< shared_ptr<pv::data::AnalogSegment> > &segments =
-               data_->analog_segments();
+               base_->analog_data()->analog_segments();
        if (segments.empty())
                return;
 
@@ -375,5 +386,6 @@ void AnalogSignal::on_resolution_changed(int index)
                owner_->row_item_appearance_changed(false, true);
 }
 
-} // namespace view
+} // namespace TraceView
+} // namespace views
 } // namespace pv