X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fview%2Flogicsignal.cpp;h=8a36afaf116f9d76fca1154ca53cac9d558090b0;hp=bc0961f6a685afa15ffd7b1bd95732682d9fa0b9;hb=124be547578fe32c0a1af118f0108a88e613363b;hpb=f4e57597347e47a4ea58fbdc7b0a22e07f1c0ede

diff --git a/pv/view/logicsignal.cpp b/pv/view/logicsignal.cpp
index bc0961f6..8a36afaf 100644
--- a/pv/view/logicsignal.cpp
+++ b/pv/view/logicsignal.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>
@@ -32,12 +31,13 @@
 #include "logicsignal.hpp"
 #include "view.hpp"
 
-#include <pv/session.hpp>
-#include <pv/devicemanager.hpp>
-#include <pv/devices/device.hpp>
 #include <pv/data/logic.hpp>
 #include <pv/data/logicsegment.hpp>
 #include <pv/data/signalbase.hpp>
+#include <pv/devicemanager.hpp>
+#include <pv/devices/device.hpp>
+#include <pv/globalsettings.hpp>
+#include <pv/session.hpp>
 #include <pv/view/view.hpp>
 
 #include <libsigrokcxx/libsigrokcxx.hpp>
@@ -46,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;
 
@@ -67,6 +66,7 @@ const float LogicSignal::Oversampling = 2.0f;
 const QColor LogicSignal::EdgeColour(0x80, 0x80, 0x80);
 const QColor LogicSignal::HighColour(0x00, 0xC0, 0x00);
 const QColor LogicSignal::LowColour(0xC0, 0x00, 0x00);
+const QColor LogicSignal::SamplingPointColour(0x77, 0x77, 0x77);
 
 const QColor LogicSignal::SignalColours[10] = {
 	QColor(0x16, 0x19, 0x1A),	// Black
@@ -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;
@@ -154,7 +154,7 @@ void LogicSignal::scale_handle_dragged(int offset)
 	signal_height_ = ((units < 1) ? 1 : units) * font_height;
 }
 
-void LogicSignal::paint_mid(QPainter &p, const ViewItemPaintParams &pp)
+void LogicSignal::paint_mid(QPainter &p, ViewItemPaintParams &pp)
 {
 	QLineF *line;
 
@@ -176,8 +176,7 @@ void LogicSignal::paint_mid(QPainter &p, const ViewItemPaintParams &pp)
 	if (segments.empty())
 		return;
 
-	const shared_ptr<pv::data::LogicSegment> &segment =
-		segments.front();
+	const shared_ptr<pv::data::LogicSegment> &segment = segments.front();
 
 	double samplerate = segment->samplerate();
 
@@ -189,6 +188,7 @@ void LogicSignal::paint_mid(QPainter &p, const ViewItemPaintParams &pp)
 	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 double pixels_per_sample = 1 / samples_per_pixel;
 	const pv::util::Timestamp start = samplerate * (pp.offset() - start_time);
 	const pv::util::Timestamp end = start + samples_per_pixel * pp.width();
 
@@ -201,6 +201,22 @@ void LogicSignal::paint_mid(QPainter &p, const ViewItemPaintParams &pp)
 		samples_per_pixel / Oversampling, base_->index());
 	assert(edges.size() >= 2);
 
+	// Check whether we need to paint the sampling points
+	GlobalSettings settings;
+	const bool show_sampling_points =
+		settings.value(GlobalSettings::Key_View_ShowSamplingPoints).toBool() &&
+		(samples_per_pixel < 0.25);
+
+	vector<QRectF> sampling_points;
+	float sampling_point_x = 0.0f;
+	int64_t sampling_point_sample = start_sample;
+	const int w = 2;
+
+	if (show_sampling_points) {
+		sampling_points.reserve(end_sample - start_sample + 1);
+		sampling_point_x = (edges.cbegin()->first / samples_per_pixel - pixels_offset) + pp.left();
+	}
+
 	// Paint the edges
 	const unsigned int edge_count = edges.size() - 2;
 	QLineF *const edge_lines = new QLineF[edge_count];
@@ -210,8 +226,28 @@ void LogicSignal::paint_mid(QPainter &p, const ViewItemPaintParams &pp)
 		const float x = ((*i).first / samples_per_pixel -
 			pixels_offset) + pp.left();
 		*line++ = QLineF(x, high_offset, x, low_offset);
+
+		if (show_sampling_points)
+			while (sampling_point_sample < (*i).first) {
+				const float y = (*i).second ? low_offset : high_offset;
+				sampling_points.emplace_back(
+					QRectF(sampling_point_x - (w / 2), y - (w / 2), w, w));
+				sampling_point_sample++;
+				sampling_point_x += pixels_per_sample;
+			};
 	}
 
+	// Calculate the sample points from the last edge to the end of the trace
+	if (show_sampling_points)
+		while ((uint64_t)sampling_point_sample <= end_sample) {
+			// Signal changed after the last edge, so the level is inverted
+			const float y = (edges.cend() - 1)->second ? high_offset : low_offset;
+			sampling_points.emplace_back(
+				QRectF(sampling_point_x - (w / 2), y - (w / 2), w, w));
+			sampling_point_sample++;
+			sampling_point_x += pixels_per_sample;
+		};
+
 	p.setPen(EdgeColour);
 	p.drawLines(edge_lines, edge_count);
 	delete[] edge_lines;
@@ -228,9 +264,15 @@ void LogicSignal::paint_mid(QPainter &p, const ViewItemPaintParams &pp)
 		pixels_offset, pp.left(), low_offset);
 
 	delete[] cap_lines;
+
+	// Paint the sampling points
+	if (show_sampling_points) {
+		p.setPen(SamplingPointColour);
+		p.drawRects(sampling_points.data(), sampling_points.size());
+	}
 }
 
-void LogicSignal::paint_fore(QPainter &p, const ViewItemPaintParams &pp)
+void LogicSignal::paint_fore(QPainter &p, ViewItemPaintParams &pp)
 {
 	// Draw the trigger marker
 	if (!trigger_match_ || !base_->enabled())
@@ -321,6 +363,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 =
@@ -367,7 +413,7 @@ QAction* LogicSignal::action_from_trigger_type(const TriggerMatchType *type)
 			action = trigger_change_;
 			break;
 		default:
-			assert(0);
+			assert(false);
 		}
 	}
 
@@ -421,7 +467,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;