X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fview%2Fanalogsignal.cpp;h=c393bc7cdc00adc9a5b0062530e53cfba1a98a02;hp=e3f51aabc6d787b00f10955432a1c53e73d5a179;hb=76ce6c7ae29059774c36bee27f6e09bfec94b358;hpb=6ac6242b25cfbd4df14abe7580adc9d0f4cffe43

diff --git a/pv/view/analogsignal.cpp b/pv/view/analogsignal.cpp
index e3f51aab..c393bc7c 100644
--- a/pv/view/analogsignal.cpp
+++ b/pv/view/analogsignal.cpp
@@ -14,27 +14,42 @@
  * 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>
 
 #include <cassert>
 #include <cmath>
-
-#include "analogsignal.h"
-#include "pv/data/analog.h"
-#include "pv/data/analogsnapshot.h"
-#include "pv/view/view.h"
+#include <cstdlib>
+#include <limits>
+
+#include <QApplication>
+#include <QCheckBox>
+#include <QComboBox>
+#include <QFormLayout>
+#include <QGridLayout>
+#include <QLabel>
+#include <QSpinBox>
+#include <QString>
+
+#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>
 
 using std::max;
+using std::make_pair;
 using std::min;
 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
@@ -43,151 +58,281 @@ const QColor AnalogSignal::SignalColours[4] = {
 	QColor(0x4E, 0x9A, 0x06)	// Green
 };
 
+const QColor AnalogSignal::GridMajorColor = QColor(0, 0, 0, 40*256/100);
+const QColor AnalogSignal::GridMinorColor = QColor(0, 0, 0, 20*256/100);
+
 const float AnalogSignal::EnvelopeThreshold = 256.0f;
 
-AnalogSignal::AnalogSignal(shared_ptr<pv::device::DevInst> dev_inst,
-	const sr_channel *const channel, shared_ptr<data::Analog> data) :
-	Signal(dev_inst, channel),
-	_data(data),
-	_scale(1.0f)
+const int AnalogSignal::MaximumVDivs = 10;
+const int AnalogSignal::MinScaleIndex = -6;
+const int AnalogSignal::MaxScaleIndex = 7;
+
+const int AnalogSignal::InfoTextMarginRight = 20;
+const int AnalogSignal::InfoTextMarginBottom = 5;
+
+AnalogSignal::AnalogSignal(
+	pv::Session &session,
+	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()),
+	pos_vdivs_(1),
+	neg_vdivs_(1),
+	resolution_(0),
+	autoranging_(true)
 {
-	_colour = SignalColours[channel->index % countof(SignalColours)];
+	pv::data::Analog* analog_data =
+		dynamic_cast<pv::data::Analog*>(data().get());
+
+	connect(analog_data, SIGNAL(samples_added(QObject*, uint64_t, uint64_t)),
+		this, SLOT(on_samples_added()));
+
+	base_->set_colour(SignalColours[base_->index() % countof(SignalColours)]);
+	update_scale();
 }
 
-AnalogSignal::~AnalogSignal()
+shared_ptr<pv::data::SignalData> AnalogSignal::data() const
 {
+	return base_->analog_data();
 }
 
-shared_ptr<pv::data::SignalData> AnalogSignal::data() const
+void AnalogSignal::save_settings(QSettings &settings) const
 {
-	return _data;
+	settings.setValue("pos_vdivs", pos_vdivs_);
+	settings.setValue("neg_vdivs", neg_vdivs_);
+	settings.setValue("scale_index", scale_index_);
+	settings.setValue("autoranging", autoranging_);
 }
 
-shared_ptr<pv::data::Analog> AnalogSignal::analog_data() const
+void AnalogSignal::restore_settings(QSettings &settings)
 {
-	return _data;
+	if (settings.contains("pos_vdivs"))
+		pos_vdivs_ = settings.value("pos_vdivs").toInt();
+
+	if (settings.contains("neg_vdivs"))
+		neg_vdivs_ = settings.value("neg_vdivs").toInt();
+
+	if (settings.contains("scale_index")) {
+		scale_index_ = settings.value("scale_index").toInt();
+		update_scale();
+	}
+
+	if (settings.contains("autoranging"))
+		autoranging_ = settings.value("autoranging").toBool();
 }
 
-void AnalogSignal::set_scale(float scale)
+std::pair<int, int> AnalogSignal::v_extents() const
 {
-	_scale = scale;
+	const int ph = pos_vdivs_ * div_height_;
+	const int nh = neg_vdivs_ * div_height_;
+	return make_pair(-ph, nh);
 }
 
-void AnalogSignal::paint_back(QPainter &p, int left, int right)
+int AnalogSignal::scale_handle_offset() const
 {
-	if (_channel->enabled)
-		paint_axis(p, get_y(), left, right);
+	const int h = (pos_vdivs_ + neg_vdivs_) * div_height_;
+
+	return ((scale_index_drag_offset_ - scale_index_) *
+		h / 4) - h / 2;
 }
 
-void AnalogSignal::paint_mid(QPainter &p, int left, int right)
+void AnalogSignal::scale_handle_dragged(int offset)
 {
-	assert(_data);
-	assert(right >= left);
+	const int h = (pos_vdivs_ + neg_vdivs_) * div_height_;
 
-	assert(_view);
-	const int y = _v_offset - _view->v_offset();
+	scale_index_ = scale_index_drag_offset_ -
+		(offset + h / 2) / (h / 4);
 
-	const double scale = _view->scale();
-	assert(scale > 0);
+	update_scale();
+}
 
-	const double offset = _view->offset();
+void AnalogSignal::scale_handle_drag_release()
+{
+	scale_index_drag_offset_ = scale_index_;
+	update_scale();
+}
 
-	if (!_channel->enabled)
+void AnalogSignal::paint_back(QPainter &p, const ViewItemPaintParams &pp)
+{
+	if (base_->enabled()) {
+		Trace::paint_back(p, pp);
+		paint_axis(p, pp, get_visual_y());
+	}
+}
+
+void AnalogSignal::paint_mid(QPainter &p, const ViewItemPaintParams &pp)
+{
+	assert(base_->analog_data());
+	assert(owner_);
+
+	const int y = get_visual_y();
+
+	if (!base_->enabled())
 		return;
 
-	const deque< shared_ptr<pv::data::AnalogSnapshot> > &snapshots =
-		_data->get_snapshots();
-	if (snapshots.empty())
+	paint_grid(p, y, pp.left(), pp.right());
+
+	const deque< shared_ptr<pv::data::AnalogSegment> > &segments =
+		base_->analog_data()->analog_segments();
+	if (segments.empty())
 		return;
 
-	const shared_ptr<pv::data::AnalogSnapshot> &snapshot =
-		snapshots.front();
+	const shared_ptr<pv::data::AnalogSegment> &segment =
+		segments.front();
 
-	const double pixels_offset = offset / scale;
-	const double samplerate = _data->samplerate();
-	const double start_time = _data->get_start_time();
-	const int64_t last_sample = snapshot->get_sample_count() - 1;
-	const double samples_per_pixel = samplerate * scale;
-	const double start = samplerate * (offset - start_time);
-	const double end = start + samples_per_pixel * (right - left);
+	const double pixels_offset = pp.pixels_offset();
+	const double samplerate = max(1.0, segment->samplerate());
+	const pv::util::Timestamp& start_time = segment->start_time();
+	const int64_t last_sample = segment->get_sample_count() - 1;
+	const double samples_per_pixel = samplerate * pp.scale();
+	const pv::util::Timestamp start = samplerate * (pp.offset() - start_time);
+	const pv::util::Timestamp end = start + samples_per_pixel * pp.width();
 
-	const int64_t start_sample = min(max((int64_t)floor(start),
+	const int64_t start_sample = min(max(floor(start).convert_to<int64_t>(),
 		(int64_t)0), last_sample);
-	const int64_t end_sample = min(max((int64_t)ceil(end) + 1,
+	const int64_t end_sample = min(max((ceil(end) + 1).convert_to<int64_t>(),
 		(int64_t)0), last_sample);
 
 	if (samples_per_pixel < EnvelopeThreshold)
-		paint_trace(p, snapshot, y, left,
+		paint_trace(p, segment, y, pp.left(),
 			start_sample, end_sample,
 			pixels_offset, samples_per_pixel);
 	else
-		paint_envelope(p, snapshot, y, left,
+		paint_envelope(p, segment, y, pp.left(),
 			start_sample, end_sample,
 			pixels_offset, samples_per_pixel);
 }
 
+void AnalogSignal::paint_fore(QPainter &p, const ViewItemPaintParams &pp)
+{
+	if (!enabled())
+		return;
+
+	const int y = get_visual_y();
+
+	// Show the info section on the right side of the trace
+	const QString infotext = QString("%1 V/div").arg(resolution_);
+
+	p.setPen(base_->colour());
+	p.setFont(QApplication::font());
+
+	const QRectF bounding_rect = QRectF(pp.left(),
+			y + v_extents().first,
+			pp.width() - InfoTextMarginRight,
+			v_extents().second - v_extents().first - InfoTextMarginBottom);
+
+	p.drawText(bounding_rect, Qt::AlignRight | Qt::AlignBottom, infotext);
+}
+
+void AnalogSignal::paint_grid(QPainter &p, int y, int left, int right)
+{
+	p.setRenderHint(QPainter::Antialiasing, false);
+
+	if (pos_vdivs_ > 0) {
+		p.setPen(QPen(GridMajorColor, 1, Qt::DashLine));
+		for (int i = 1; i <= pos_vdivs_; i++) {
+			const float dy = i * div_height_;
+			p.drawLine(QLineF(left, y - dy, right, y - dy));
+		}
+
+		p.setPen(QPen(GridMinorColor, 1, Qt::DashLine));
+		for (int i = 0; i < pos_vdivs_; i++) {
+			const float dy = i * div_height_;
+			const float dy25 = dy + (0.25 * div_height_);
+			const float dy50 = dy + (0.50 * div_height_);
+			const float dy75 = dy + (0.75 * div_height_);
+			p.drawLine(QLineF(left, y - dy25, right, y - dy25));
+			p.drawLine(QLineF(left, y - dy50, right, y - dy50));
+			p.drawLine(QLineF(left, y - dy75, right, y - dy75));
+		}
+	}
+
+	if (neg_vdivs_ > 0) {
+		p.setPen(QPen(GridMajorColor, 1, Qt::DashLine));
+		for (int i = 1; i <= neg_vdivs_; i++) {
+			const float dy = i * div_height_;
+			p.drawLine(QLineF(left, y + dy, right, y + dy));
+		}
+
+		p.setPen(QPen(GridMinorColor, 1, Qt::DashLine));
+		for (int i = 0; i < neg_vdivs_; i++) {
+			const float dy = i * div_height_;
+			const float dy25 = dy + (0.25 * div_height_);
+			const float dy50 = dy + (0.50 * div_height_);
+			const float dy75 = dy + (0.75 * div_height_);
+			p.drawLine(QLineF(left, y + dy25, right, y + dy25));
+			p.drawLine(QLineF(left, y + dy50, right, y + dy50));
+			p.drawLine(QLineF(left, y + dy75, right, y + dy75));
+		}
+	}
+
+	p.setRenderHint(QPainter::Antialiasing, true);
+}
+
 void AnalogSignal::paint_trace(QPainter &p,
-	const shared_ptr<pv::data::AnalogSnapshot> &snapshot,
+	const shared_ptr<pv::data::AnalogSegment> &segment,
 	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;
+	p.setPen(base_->colour());
 
-	const float *const samples = snapshot->get_samples(start, end);
-	assert(samples);
+	const int64_t points_count = end - start;
 
-	p.setPen(_colour);
-
-	QPointF *points = new QPointF[sample_count];
+	QPointF *points = new QPointF[points_count];
 	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);
+	p.drawPolyline(points, points_count);
 
-	delete[] samples;
 	delete[] points;
 }
 
 void AnalogSignal::paint_envelope(QPainter &p,
-	const shared_ptr<pv::data::AnalogSnapshot> &snapshot,
+	const shared_ptr<pv::data::AnalogSegment> &segment,
 	int y, int left, const int64_t start, const int64_t end,
 	const double pixels_offset, const double samples_per_pixel)
 {
-	using pv::data::AnalogSnapshot;
+	using pv::data::AnalogSegment;
 
-	AnalogSnapshot::EnvelopeSection e;
-	snapshot->get_envelope_section(e, start, end, samples_per_pixel);
+	AnalogSegment::EnvelopeSection e;
+	segment->get_envelope_section(e, start, end, samples_per_pixel);
 
 	if (e.length < 2)
 		return;
 
 	p.setPen(QPen(Qt::NoPen));
-	p.setBrush(_colour);
+	p.setBrush(base_->colour());
 
 	QRectF *const rects = new QRectF[e.length];
 	QRectF *rect = rects;
 
-	for(uint64_t sample = 0; sample < e.length-1; sample++) {
+	for (uint64_t sample = 0; sample < e.length-1; sample++) {
 		const float x = ((e.scale * sample + e.start) /
 			samples_per_pixel - pixels_offset) + left;
-		const AnalogSnapshot::EnvelopeSample *const s =
+		const AnalogSegment::EnvelopeSample *const s =
 			e.samples + sample;
 
 		// We overlap this sample with the next so that vertical
 		// gaps do not appear during steep rising or falling edges
-		const float b = y - max(s->max, (s+1)->min) * _scale;
-		const float t = y - min(s->min, (s+1)->max) * _scale;
+		const float b = y - max(s->max, (s+1)->min) * scale_;
+		const float t = y - min(s->min, (s+1)->max) * scale_;
 
 		float h = b - t;
-		if(h >= 0.0f && h <= 1.0f)
+		if (h >= 0.0f && h <= 1.0f)
 			h = 1.0f;
-		if(h <= 0.0f && h >= -1.0f)
+		if (h <= 0.0f && h >= -1.0f)
 			h = -1.0f;
 
 		*rect++ = QRectF(x, t, 1.0f, h);
@@ -199,5 +344,194 @@ void AnalogSignal::paint_envelope(QPainter &p,
 	delete[] e.samples;
 }
 
-} // namespace view
+float AnalogSignal::get_resolution(int scale_index)
+{
+	const float seq[] = {1.0f, 2.0f, 5.0f};
+
+	const int offset = std::numeric_limits<int>::max() / (2 * countof(seq));
+	const std::div_t d = std::div(
+		(int)(scale_index + countof(seq) * offset),
+		countof(seq));
+
+	return powf(10.0f, d.quot - offset) * seq[d.rem];
+}
+
+void AnalogSignal::update_scale()
+{
+	resolution_ = get_resolution(scale_index_);
+	scale_ = div_height_ / resolution_;
+}
+
+void AnalogSignal::perform_autoranging(bool force_update)
+{
+	const deque< shared_ptr<pv::data::AnalogSegment> > &segments =
+		base_->analog_data()->analog_segments();
+
+	if (segments.empty())
+		return;
+
+	static double prev_min = 0, prev_max = 0;
+	double min = 0, max = 0;
+
+	for (shared_ptr<pv::data::AnalogSegment> segment : segments) {
+		std::pair<double, double> mm = segment->get_min_max();
+		min = std::min(min, mm.first);
+		max = std::max(max, mm.second);
+	}
+
+	if ((min == prev_min) && (max == prev_max) && !force_update)
+		return;
+
+	prev_min = min;
+	prev_max = max;
+
+	// Use all divs for the positive range if there are no negative values
+	if ((min == 0) && (neg_vdivs_ > 0)) {
+		pos_vdivs_ += neg_vdivs_;
+		neg_vdivs_ = 0;
+	}
+
+	// Split up the divs if there are negative values but no negative divs
+	if ((min < 0) && (neg_vdivs_ == 0)) {
+		neg_vdivs_ = pos_vdivs_ / 2;
+		pos_vdivs_ -= neg_vdivs_;
+	}
+
+	double min_value_per_div;
+	if ((pos_vdivs_ > 0) && (neg_vdivs_ >  0))
+		min_value_per_div = std::max(max / pos_vdivs_, -min / neg_vdivs_);
+	else if (pos_vdivs_ > 0)
+		min_value_per_div = max / pos_vdivs_;
+	else
+		min_value_per_div = -min / neg_vdivs_;
+
+	// Find first scale value that is bigger than the value we need
+	for (int i = MinScaleIndex; i < MaxScaleIndex; i++)
+		if (get_resolution(i) > min_value_per_div) {
+			scale_index_ = i;
+			break;
+		}
+
+	update_scale();
+}
+
+void AnalogSignal::populate_popup_form(QWidget *parent, QFormLayout *form)
+{
+	// Add the standard options
+	Signal::populate_popup_form(parent, form);
+
+	QFormLayout *const layout = new QFormLayout;
+
+	// Add the number of vdivs
+	QSpinBox *pvdiv_sb = new QSpinBox(parent);
+	pvdiv_sb->setRange(0, MaximumVDivs);
+	pvdiv_sb->setValue(pos_vdivs_);
+	connect(pvdiv_sb, SIGNAL(valueChanged(int)),
+		this, SLOT(on_pos_vdivs_changed(int)));
+	layout->addRow(tr("Number of pos vertical divs"), pvdiv_sb);
+
+	QSpinBox *nvdiv_sb = new QSpinBox(parent);
+	nvdiv_sb->setRange(0, MaximumVDivs);
+	nvdiv_sb->setValue(neg_vdivs_);
+	connect(nvdiv_sb, SIGNAL(valueChanged(int)),
+		this, SLOT(on_neg_vdivs_changed(int)));
+	layout->addRow(tr("Number of neg vertical divs"), nvdiv_sb);
+
+	// Add the vertical resolution
+	resolution_cb_ = new QComboBox(parent);
+
+	for (int i = MinScaleIndex; i < MaxScaleIndex; i++) {
+		const QString label = QString("%1").arg(get_resolution(i));
+		resolution_cb_->insertItem(0, label, QVariant(i));
+	}
+
+	const int cur_idx = resolution_cb_->findData(QVariant(scale_index_));
+	resolution_cb_->setCurrentIndex(cur_idx);
+
+	connect(resolution_cb_, SIGNAL(currentIndexChanged(int)),
+		this, SLOT(on_resolution_changed(int)));
+
+	QGridLayout *const vdiv_layout = new QGridLayout;
+	QLabel *const vdiv_unit = new QLabel(tr("V/div"));
+	vdiv_layout->addWidget(resolution_cb_, 0, 0);
+	vdiv_layout->addWidget(vdiv_unit, 0, 1);
+
+	layout->addRow(tr("Vertical resolution"), vdiv_layout);
+
+	// Add the autoranging checkbox
+	QCheckBox* autoranging_cb = new QCheckBox();
+	autoranging_cb->setCheckState(autoranging_ ? Qt::Checked : Qt::Unchecked);
+
+	connect(autoranging_cb, SIGNAL(stateChanged(int)),
+		this, SLOT(on_autoranging_changed(int)));
+
+	layout->addRow(tr("Autoranging"), autoranging_cb);
+
+	form->addRow(layout);
+}
+
+void AnalogSignal::on_samples_added()
+{
+	perform_autoranging();
+
+	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_pos_vdivs_changed(int vdivs)
+{
+	pos_vdivs_ = vdivs;
+
+	if (autoranging_)
+		perform_autoranging(true);
+
+	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_neg_vdivs_changed(int vdivs)
+{
+	neg_vdivs_ = vdivs;
+
+	if (autoranging_)
+		perform_autoranging(true);
+
+	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)
+{
+	scale_index_ = resolution_cb_->itemData(index).toInt();
+	update_scale();
+
+	if (owner_)
+		owner_->row_item_appearance_changed(false, true);
+}
+
+void AnalogSignal::on_autoranging_changed(int state)
+{
+	autoranging_ = (state == Qt::Checked);
+
+	if (autoranging_)
+		perform_autoranging(true);
+
+	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);
+	}
+}
+
+} // namespace TraceView
+} // namespace views
 } // namespace pv