X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fview%2Fanalogsignal.cpp;h=3c3e5d0571a36a896c91441fe9ef27321bd83cbe;hp=e0add7aaedc64e7a116ea2bc4229dd4e25ab6583;hb=8de1e1b2fb1bcaaa21f08b7bba412b0839d6c4d2;hpb=46a0cadc74ca39a7bb8b3a4a4622ab7788a28f3b

diff --git a/pv/view/analogsignal.cpp b/pv/view/analogsignal.cpp
index e0add7aa..3c3e5d05 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>
@@ -26,6 +25,7 @@
 #include <limits>
 
 #include <QApplication>
+#include <QCheckBox>
 #include <QComboBox>
 #include <QFormLayout>
 #include <QGridLayout>
@@ -36,7 +36,9 @@
 #include "analogsignal.hpp"
 #include "pv/data/analog.hpp"
 #include "pv/data/analogsegment.hpp"
+#include "pv/data/signalbase.hpp"
 #include "pv/view/view.hpp"
+#include "pv/globalsettings.hpp"
 
 #include <libsigrokcxx/libsigrokcxx.hpp>
 
@@ -46,10 +48,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
@@ -61,6 +62,8 @@ const QColor AnalogSignal::SignalColours[4] = {
 const QColor AnalogSignal::GridMajorColor = QColor(0, 0, 0, 40*256/100);
 const QColor AnalogSignal::GridMinorColor = QColor(0, 0, 0, 20*256/100);
 
+const QColor AnalogSignal::SamplingPointColour(0x77, 0x77, 0x77);
+
 const float AnalogSignal::EnvelopeThreshold = 256.0f;
 
 const int AnalogSignal::MaximumVDivs = 10;
@@ -72,39 +75,66 @@ 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)
+	pos_vdivs_(1),
+	neg_vdivs_(1),
+	resolution_(0),
+	autoranging_(true)
 {
-	set_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();
 }
 
 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("pos_vdivs", pos_vdivs_);
+	settings.setValue("neg_vdivs", neg_vdivs_);
+	settings.setValue("scale_index", scale_index_);
+	settings.setValue("autoranging", autoranging_);
+}
+
+void AnalogSignal::restore_settings(QSettings &settings)
+{
+	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();
 }
 
 std::pair<int, int> AnalogSignal::v_extents() const
 {
-	const int h = vdivs_ * div_height_;
-	return make_pair(-h, h);
+	const int ph = pos_vdivs_ * div_height_;
+	const int nh = neg_vdivs_ * div_height_;
+	return make_pair(-ph, nh);
 }
 
 int AnalogSignal::scale_handle_offset() const
 {
-	const int h = vdivs_ * div_height_;
+	const int h = (pos_vdivs_ + neg_vdivs_) * div_height_;
 
 	return ((scale_index_drag_offset_ - scale_index_) *
 		h / 4) - h / 2;
@@ -112,7 +142,7 @@ int AnalogSignal::scale_handle_offset() const
 
 void AnalogSignal::scale_handle_dragged(int offset)
 {
-	const int h = vdivs_ * div_height_;
+	const int h = (pos_vdivs_ + neg_vdivs_) * div_height_;
 
 	scale_index_ = scale_index_drag_offset_ -
 		(offset + h / 2) / (h / 4);
@@ -128,7 +158,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 +166,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 +217,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(),
@@ -202,25 +232,42 @@ void AnalogSignal::paint_grid(QPainter &p, int y, int left, int right)
 {
 	p.setRenderHint(QPainter::Antialiasing, false);
 
-	p.setPen(QPen(GridMajorColor, 1, Qt::DashLine));
-	for (int i = 1; i <= vdivs_; i++) {
-		const float dy = i * div_height_;
-		p.drawLine(QLineF(left, y - dy, right, y - dy));
-		p.drawLine(QLineF(left, y + dy, right, y + dy));
+	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));
+		}
 	}
 
-	p.setPen(QPen(GridMinorColor, 1, Qt::DashLine));
-	for (int i = 0; i < 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 + dy25, right, y + dy25));
-		p.drawLine(QLineF(left, y - dy50, right, y - dy50));
-		p.drawLine(QLineF(left, y + dy50, right, y + dy50));
-		p.drawLine(QLineF(left, y - dy75, right, y - dy75));
-		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);
@@ -231,27 +278,44 @@ 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());
 
-	p.setPen(colour_);
+	const int64_t points_count = end - start;
 
-	QPointF *points = new QPointF[sample_count];
+	QPointF *points = new QPointF[points_count];
 	QPointF *point = points;
 
+	QRectF *const sampling_points = new QRectF[points_count];
+	QRectF *sampling_point = sampling_points;
+
+	pv::data::SegmentAnalogDataIterator* it =
+		segment->begin_sample_iteration(start);
+
+	const int w = 2;
 	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_);
+		*sampling_point++ = QRectF(x - (w / 2), y - *((float*)it->value) * scale_ - (w / 2), w, w);
+
+		segment->continue_sample_iteration(it, 1);
 	}
+	segment->end_sample_iteration(it);
 
-	p.drawPolyline(points, point - points);
+	p.drawPolyline(points, points_count);
+
+	// Paint the sampling points if enabled
+	GlobalSettings settings;
+	const bool show_sampling_points =
+		settings.value(GlobalSettings::Key_View_ShowSamplingPoints).toBool();
+	if (show_sampling_points) {
+		p.setPen(SamplingPointColour);
+		p.drawRects(sampling_points, points_count);
+	}
 
-	delete[] samples;
 	delete[] points;
+	delete[] sampling_points;
 }
 
 void AnalogSignal::paint_envelope(QPainter &p,
@@ -268,7 +332,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;
@@ -317,6 +381,59 @@ void AnalogSignal::update_scale()
 	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
@@ -325,12 +442,19 @@ void AnalogSignal::populate_popup_form(QWidget *parent, QFormLayout *form)
 	QFormLayout *const layout = new QFormLayout;
 
 	// Add the number of vdivs
-	QSpinBox *vdiv_sb = new QSpinBox(parent);
-	vdiv_sb->setRange(1, MaximumVDivs);
-	vdiv_sb->setValue(vdivs_);
-	connect(vdiv_sb, SIGNAL(valueChanged(int)),
-		this, SLOT(on_vdivs_changed(int)));
-	layout->addRow(tr("Number of vertical divs"), vdiv_sb);
+	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);
@@ -353,15 +477,55 @@ void AnalogSignal::populate_popup_form(QWidget *parent, QFormLayout *form)
 
 	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_vdivs_changed(int vdivs)
+void AnalogSignal::on_samples_added()
 {
-	vdivs_ = vdivs;
+	perform_autoranging();
 
-	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_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)
@@ -373,5 +537,20 @@ void AnalogSignal::on_resolution_changed(int index)
 		owner_->row_item_appearance_changed(false, true);
 }
 
-} // namespace view
+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