X-Git-Url: http://git.code-monkey.de/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fview%2Flogicsignal.cpp;h=f78170b01a30a0028a95befaf7665e7d8a33e649;hp=ea8fd510d9401e98324f5e0daefcc15ffb8e1614;hb=6f925ba9d6faf1077b73c5a5808259576081716a;hpb=051ba3b399abbd83fea8b7ef6f8876884ac0786c

diff --git a/pv/view/logicsignal.cpp b/pv/view/logicsignal.cpp
index ea8fd51..f78170b 100644
--- a/pv/view/logicsignal.cpp
+++ b/pv/view/logicsignal.cpp
@@ -46,6 +46,7 @@ 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;
@@ -136,7 +137,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;
@@ -234,7 +235,8 @@ void LogicSignal::paint_mid(QPainter &p, const ViewItemPaintParams &pp)
 	GlobalSettings settings;
 	const bool show_sampling_points =
 		settings.value(GlobalSettings::Key_View_ShowSamplingPoints).toBool();
-	if (!show_sampling_points)
+
+	if (!show_sampling_points || (samples_per_pixel >= 0.25))
 		return;
 
 	// Paint the sampling points
@@ -445,7 +447,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;