Switch segment storage from single vector to vector of arrays

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

diff --git a/pv/view/analogsignal.cpp b/pv/view/analogsignal.cpp
index cd57da06b6073e0143f3f859bad2b70a8120a426..41f46dfcc75b414e47fbf8dd6bf47d2d7ff8502a 100644 (file)
--- a/pv/view/analogsignal.cpp
+++ b/pv/view/analogsignal.cpp
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <extdef.h>
@@ -48,7 +47,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 +71,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 +85,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 +145,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 +156,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;
 
@@ -230,26 +240,25 @@ void AnalogSignal::paint_trace(QPainter &p,
        int y, int left, const int64_t start, const int64_t end,
        const double pixels_offset, const double samples_per_pixel)
 {
-       const int64_t sample_count = end - start;
-
-       const float *const samples = segment->get_samples(start, end);
-       assert(samples);
-
        p.setPen(base_->colour());
 
-       QPointF *points = new QPointF[sample_count];
+       QPointF *points = new QPointF[end - start];
        QPointF *point = points;
 
+       pv::data::SegmentAnalogDataIterator* it =
+               segment->begin_sample_iteration(start);
+
        for (int64_t sample = start; sample != end; sample++) {
                const float x = (sample / samples_per_pixel -
                        pixels_offset) + left;
-               *point++ = QPointF(x,
-                       y - samples[sample - start] * scale_);
+
+               *point++ = QPointF(x, y - *((float*)it->value) * scale_);
+               segment->continue_sample_iteration(it, 1);
        }
+       segment->end_sample_iteration(it);
 
        p.drawPolyline(points, point - points);
 
-       delete[] samples;
        delete[] points;
 }
 
@@ -375,5 +384,6 @@ void AnalogSignal::on_resolution_changed(int index)
                owner_->row_item_appearance_changed(false, true);
 }
 
-} // namespace view
+} // namespace TraceView
+} // namespace views
 } // namespace pv