X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fview%2Fanalogsignal.cpp;h=41f46dfcc75b414e47fbf8dd6bf47d2d7ff8502a;hp=9001924a687f4f301e63c4fcc1bec24aae4d7b69;hb=26a883ede0bcf68d087eda5dd2082890d36c7aef;hpb=75d0779e498595f3a957de79eedd97c0647a2b28

diff --git a/pv/view/analogsignal.cpp b/pv/view/analogsignal.cpp
index 9001924a..41f46dfc 100644
--- 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>
@@ -36,6 +35,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 +46,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 +71,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 +137,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 +145,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 +196,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(),
@@ -231,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(colour_);
+	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;
 }
 
@@ -268,7 +276,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;
@@ -376,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