X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=pv%2Fview%2Flogicsignal.cpp;h=251190ece03b789df3c568c99fdba35fe905affa;hb=00f6bae935837b38b0d03a5928ba8175d460413f;hp=b8be8bbad0eb4a7c2ab438291f131b436e559263;hpb=0aa57689a8abc7eb313de50774b8d0cf271bc61f;p=pulseview.git

diff --git a/pv/view/logicsignal.cpp b/pv/view/logicsignal.cpp
index b8be8bba..251190ec 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>
@@ -39,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>
 
@@ -59,13 +59,15 @@ using sigrok::TriggerMatch;
 using sigrok::TriggerMatchType;
 
 namespace pv {
-namespace view {
+namespace views {
+namespace TraceView {
 
 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
@@ -227,6 +229,30 @@ void LogicSignal::paint_mid(QPainter &p, const ViewItemPaintParams &pp)
 		pixels_offset, pp.left(), low_offset);
 
 	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];
+	QRectF *sampling_point = sampling_points;
+
+	const int w = 1;
+	const float y_middle = high_offset - ((high_offset - low_offset) / 2);
+	for (uint64_t i = start_sample; i < end_sample + 1; ++i) {
+		const float x = (i / samples_per_pixel - pixels_offset) + pp.left();
+		*sampling_point++ = QRectF(x - (w / 2), y_middle - (w / 2), w, w);
+	}
+
+	p.setPen(SamplingPointColour);
+	p.drawRects(sampling_points, sampling_points_count);
+	delete[] sampling_points;
 }
 
 void LogicSignal::paint_fore(QPainter &p, const ViewItemPaintParams &pp)
@@ -485,5 +511,6 @@ void LogicSignal::on_trigger()
 	modify_trigger();
 }
 
-} // namespace view
+} // namespace TraceView
+} // namespace views
 } // namespace pv