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 e0add7aaedc64e7a116ea2bc4229dd4e25ab6583..20004777cac2eda854cd4d97fcb3f1a327081f16 100644 (file)
--- a/pv/view/analogsignal.cpp
+++ b/pv/view/analogsignal.cpp
@@ -36,6 +36,7 @@
 #include "analogsignal.hpp"
 #include "pv/data/analog.hpp"
 #include "pv/data/analogsegment.hpp"
+#include "pv/data/signalbase.hpp"
 #include "pv/view/view.hpp"
 
 #include <libsigrokcxx/libsigrokcxx.hpp>
@@ -46,10 +47,9 @@ using std::min;
 using std::shared_ptr;
 using std::deque;
 
-using sigrok::Channel;
-
 namespace pv {
-namespace view {
+namespace views {
+namespace TraceView {
 
 const QColor AnalogSignal::SignalColours[4] = {
        QColor(0xC4, 0xA0, 0x00),       // Yellow
@@ -72,28 +72,38 @@ const int AnalogSignal::InfoTextMarginBottom = 5;
 
 AnalogSignal::AnalogSignal(
        pv::Session &session,
-       shared_ptr<Channel> channel,
-       shared_ptr<data::Analog> data) :
-       Signal(session, channel),
-       data_(data),
+       shared_ptr<data::SignalBase> base) :
+       Signal(session, base),
        scale_index_(4), // 20 per div
        scale_index_drag_offset_(0),
        div_height_(3 * QFontMetrics(QApplication::font()).height()),
        vdivs_(1),
        resolution_(0)
 {
-       set_colour(SignalColours[channel_->index() % countof(SignalColours)]);
+       base_->set_colour(SignalColours[base_->index() % countof(SignalColours)]);
        update_scale();
 }
 
 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
@@ -128,7 +138,7 @@ void AnalogSignal::scale_handle_drag_release()
 
 void AnalogSignal::paint_back(QPainter &p, const ViewItemPaintParams &pp)
 {
-       if (channel_->enabled()) {
+       if (base_->enabled()) {
                Trace::paint_back(p, pp);
                paint_axis(p, pp, get_visual_y());
        }
@@ -136,18 +146,18 @@ 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();
 
-       if (!channel_->enabled())
+       if (!base_->enabled())
                return;
 
        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;
 
@@ -187,7 +197,7 @@ void AnalogSignal::paint_fore(QPainter &p, const ViewItemPaintParams &pp)
        // Show the info section on the right side of the trace
        const QString infotext = QString("%1 V/div").arg(resolution_);
 
-       p.setPen(colour_);
+       p.setPen(base_->colour());
        p.setFont(QApplication::font());
 
        const QRectF bounding_rect = QRectF(pp.left(),
@@ -236,7 +246,7 @@ void AnalogSignal::paint_trace(QPainter &p,
        const float *const samples = segment->get_samples(start, end);
        assert(samples);
 
-       p.setPen(colour_);
+       p.setPen(base_->colour());
 
        QPointF *points = new QPointF[sample_count];
        QPointF *point = points;
@@ -268,7 +278,7 @@ void AnalogSignal::paint_envelope(QPainter &p,
                return;
 
        p.setPen(QPen(Qt::NoPen));
-       p.setBrush(colour_);
+       p.setBrush(base_->colour());
 
        QRectF *const rects = new QRectF[e.length];
        QRectF *rect = rects;
@@ -360,8 +370,11 @@ void AnalogSignal::on_vdivs_changed(int vdivs)
 {
        vdivs_ = vdivs;
 
-       if (owner_)
+       if (owner_) {
+               // Call order is important, otherwise the lazy event handler won't work
                owner_->extents_changed(false, true);
+               owner_->row_item_appearance_changed(false, true);
+       }
 }
 
 void AnalogSignal::on_resolution_changed(int index)
@@ -373,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