X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fview%2Fanalogsignal.cpp;h=5777628747cd550b8b3624567b3a65407c8fe07f;hp=4479885da72589eb678b45ad7f45d16830b8fc18;hb=6c0df7c482e0351f7b0cb0b8cbe0d92f77f08980;hpb=fdfd5b3e246a4d4a8bcf7dbb25a6179cc86c9569

diff --git a/pv/view/analogsignal.cpp b/pv/view/analogsignal.cpp
index 4479885d..57776287 100644
--- a/pv/view/analogsignal.cpp
+++ b/pv/view/analogsignal.cpp
@@ -40,9 +40,9 @@
 #include "pv/data/logic.hpp"
 #include "pv/data/logicsegment.hpp"
 #include "pv/data/signalbase.hpp"
-#include "pv/view/view.hpp"
-#include "pv/view/logicsignal.hpp"
 #include "pv/globalsettings.hpp"
+#include "pv/view/logicsignal.hpp"
+#include "pv/view/view.hpp"
 
 #include <libsigrokcxx/libsigrokcxx.hpp>
 
@@ -176,7 +176,7 @@ void AnalogSignal::scale_handle_drag_release()
 	update_scale();
 }
 
-void AnalogSignal::paint_back(QPainter &p, const ViewItemPaintParams &pp)
+void AnalogSignal::paint_back(QPainter &p, ViewItemPaintParams &pp)
 {
 	if (base_->enabled()) {
 		Trace::paint_back(p, pp);
@@ -184,7 +184,7 @@ void AnalogSignal::paint_back(QPainter &p, const ViewItemPaintParams &pp)
 	}
 }
 
-void AnalogSignal::paint_mid(QPainter &p, const ViewItemPaintParams &pp)
+void AnalogSignal::paint_mid(QPainter &p, ViewItemPaintParams &pp)
 {
 	assert(base_->analog_data());
 	assert(owner_);
@@ -237,7 +237,7 @@ void AnalogSignal::paint_mid(QPainter &p, const ViewItemPaintParams &pp)
 	}
 }
 
-void AnalogSignal::paint_fore(QPainter &p, const ViewItemPaintParams &pp)
+void AnalogSignal::paint_fore(QPainter &p, ViewItemPaintParams &pp)
 {
 	if (!enabled())
 		return;
@@ -264,13 +264,19 @@ void AnalogSignal::paint_grid(QPainter &p, int y, int left, int right)
 {
 	p.setRenderHint(QPainter::Antialiasing, false);
 
+	GlobalSettings settings;
+	const bool show_analog_minor_grid =
+		settings.value(GlobalSettings::Key_View_ShowAnalogMinorGrid).toBool();
+
 	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));
 		}
+	}
 
+	if ((pos_vdivs_ > 0) && show_analog_minor_grid) {
 		p.setPen(QPen(GridMinorColor, 1, Qt::DashLine));
 		for (int i = 0; i < pos_vdivs_; i++) {
 			const float dy = i * div_height_;
@@ -289,7 +295,9 @@ void AnalogSignal::paint_grid(QPainter &p, int y, int left, int right)
 			const float dy = i * div_height_;
 			p.drawLine(QLineF(left, y + dy, right, y + dy));
 		}
+	}
 
+	if ((pos_vdivs_ > 0) && show_analog_minor_grid) {
 		p.setPen(QPen(GridMinorColor, 1, Qt::DashLine));
 		for (int i = 0; i < neg_vdivs_; i++) {
 			const float dy = i * div_height_;
@@ -412,7 +420,7 @@ void AnalogSignal::paint_envelope(QPainter &p,
 	delete[] e.samples;
 }
 
-void AnalogSignal::paint_logic_mid(QPainter &p, const ViewItemPaintParams &pp)
+void AnalogSignal::paint_logic_mid(QPainter &p, ViewItemPaintParams &pp)
 {
 	QLineF *line;
 
@@ -422,7 +430,7 @@ void AnalogSignal::paint_logic_mid(QPainter &p, const ViewItemPaintParams &pp)
 
 	const int y = get_visual_y();
 
-	if (!base_->enabled())
+	if (!base_->enabled() || !base_->logic_data())
 		return;
 
 	const int signal_margin =
@@ -435,6 +443,7 @@ void AnalogSignal::paint_logic_mid(QPainter &p, const ViewItemPaintParams &pp)
 
 	const deque< shared_ptr<pv::data::LogicSegment> > &segments =
 		base_->logic_data()->logic_segments();
+
 	if (segments.empty())
 		return;