X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=pv%2Fview%2Flogicsignal.cpp;h=f7046ce5f5406e1c75b42e7cf1e82822c9477d08;hb=83b1c8d251386ac1980284c4668cbdd8e425550f;hp=d4fac8b567d5ee10b9a86626e0eeb77adfe36a7e;hpb=e9c8e87cf09ad9761bea1193b25d01a87f8e0dd6;p=pulseview.git

diff --git a/pv/view/logicsignal.cpp b/pv/view/logicsignal.cpp
index d4fac8b..f7046ce 100644
--- a/pv/view/logicsignal.cpp
+++ b/pv/view/logicsignal.cpp
@@ -38,6 +38,7 @@
 #include <pv/data/logicsegment.hpp>
 #include <pv/data/signalbase.hpp>
 #include <pv/view/view.hpp>
+#include <pv/globalsettings.hpp>
 
 #include <libsigrokcxx/libsigrokcxx.hpp>
 
@@ -45,15 +46,14 @@ using std::deque;
 using std::max;
 using std::make_pair;
 using std::min;
+using std::none_of;
 using std::pair;
 using std::shared_ptr;
 using std::vector;
 
 using sigrok::ConfigKey;
 using sigrok::Capability;
-using sigrok::Error;
 using sigrok::Trigger;
-using sigrok::TriggerStage;
 using sigrok::TriggerMatch;
 using sigrok::TriggerMatchType;
 
@@ -135,7 +135,7 @@ shared_ptr<pv::data::Logic> LogicSignal::logic_data() const
 	return base_->logic_data();
 }
 
-std::pair<int, int> LogicSignal::v_extents() const
+pair<int, int> LogicSignal::v_extents() const
 {
 	const int signal_margin =
 		QFontMetrics(QApplication::font()).height() / 2;
@@ -229,6 +229,14 @@ void LogicSignal::paint_mid(QPainter &p, const ViewItemPaintParams &pp)
 
 	delete[] cap_lines;
 
+	// Return if we don't need to paint the sampling points
+	GlobalSettings settings;
+	const bool show_sampling_points =
+		settings.value(GlobalSettings::Key_View_ShowSamplingPoints).toBool();
+
+	if (!show_sampling_points || (samples_per_pixel >= 0.25))
+		return;
+
 	// Paint the sampling points
 	const uint64_t sampling_points_count = end_sample - start_sample + 1;
 	QRectF *const sampling_points = new QRectF[sampling_points_count];
@@ -337,6 +345,10 @@ void LogicSignal::init_trigger_actions(QWidget *parent)
 
 const vector<int32_t> LogicSignal::get_trigger_types() const
 {
+	// We may not be associated with a device
+	if (!device_)
+		return vector<int32_t>();
+
 	const auto sr_dev = device_->device();
 	if (sr_dev->config_check(ConfigKey::TRIGGER_MATCH, Capability::LIST)) {
 		const Glib::VariantContainerBase gvar =
@@ -437,7 +449,7 @@ void LogicSignal::modify_trigger()
 	if (trigger) {
 		for (auto stage : trigger->stages()) {
 			const auto &matches = stage->matches();
-			if (std::none_of(matches.begin(), matches.end(),
+			if (none_of(matches.begin(), matches.end(),
 			    [&](shared_ptr<TriggerMatch> match) {
 					return match->channel() != base_->channel(); }))
 				continue;