X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=pv%2Fviews%2Ftrace%2Fanalogsignal.cpp;h=f94a70f80f92e6322996969324d149016a8bc06d;hb=b82243f74a175f621af26aabbc0f32e2ecb125fa;hp=c52379534166e1b6bfd37ab35271b99a3241c912;hpb=1573bf16ba50d1c023ad3a9ce596f0ab6eaeacff;p=pulseview.git

diff --git a/pv/views/trace/analogsignal.cpp b/pv/views/trace/analogsignal.cpp
index c523795..f94a70f 100644
--- a/pv/views/trace/analogsignal.cpp
+++ b/pv/views/trace/analogsignal.cpp
@@ -341,16 +341,16 @@ void AnalogSignal::paint_trace(QPainter &p,
 
 	int64_t sample_count = min(points_count, TracePaintBlockSize);
 	int64_t block_sample = 0;
-	const float *sample_block = segment->get_samples(start, start + sample_count);
+	float *sample_block = new float[TracePaintBlockSize];
+	segment->get_samples(start, start + sample_count, sample_block);
 
 	const int w = 2;
 	for (int64_t sample = start; sample != end; sample++, block_sample++) {
 
 		if (block_sample == TracePaintBlockSize) {
 			block_sample = 0;
-			delete[] sample_block;
 			sample_count = min(points_count - sample, TracePaintBlockSize);
-			sample_block = segment->get_samples(sample, sample + sample_count);
+			segment->get_samples(sample, sample + sample_count, sample_block);
 		}
 
 		const float x = (sample / samples_per_pixel -
@@ -720,7 +720,7 @@ void AnalogSignal::populate_popup_form(QWidget *parent, QFormLayout *form)
 	cur_idx = conversion_cb_->findData(QVariant(conversion_type_));
 	conversion_cb_->setCurrentIndex(cur_idx);
 
-//	layout->addRow(tr("Conversion"), conversion_cb_);
+	layout->addRow(tr("Conversion"), conversion_cb_);
 
 	connect(conversion_cb_, SIGNAL(currentIndexChanged(int)),
 		this, SLOT(on_conversion_changed(int)));
@@ -735,7 +735,7 @@ void AnalogSignal::populate_popup_form(QWidget *parent, QFormLayout *form)
 	cur_idx = display_type_cb_->findData(QVariant(display_type_));
 	display_type_cb_->setCurrentIndex(cur_idx);
 
-//	layout->addRow(tr("Traces to show:"), display_type_cb_);
+	layout->addRow(tr("Traces to show:"), display_type_cb_);
 
 	connect(display_type_cb_, SIGNAL(currentIndexChanged(int)),
 		this, SLOT(on_display_type_changed(int)));