X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fview%2Flogicsignal.cpp;h=ea8fd510d9401e98324f5e0daefcc15ffb8e1614;hp=52a2d22dab76050dfdf4345801dd74724dcf198b;hb=051ba3b399abbd83fea8b7ef6f8876884ac0786c;hpb=73a25a6e488f1813c1cd12da085a16e4f91ed4da

diff --git a/pv/view/logicsignal.cpp b/pv/view/logicsignal.cpp
index 52a2d22d..ea8fd510 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
@@ -99,12 +101,10 @@ QCache<QString, const QPixmap> LogicSignal::pixmap_cache_;
 LogicSignal::LogicSignal(
 	pv::Session &session,
 	shared_ptr<devices::Device> device,
-	shared_ptr<data::SignalBase> base,
-	shared_ptr<data::Logic> data) :
+	shared_ptr<data::SignalBase> base) :
 	Signal(session, base),
 	signal_height_(QFontMetrics(QApplication::font()).height() * 2),
 	device_(device),
-	data_(data),
 	trigger_none_(nullptr),
 	trigger_rising_(nullptr),
 	trigger_high_(nullptr),
@@ -128,17 +128,12 @@ LogicSignal::LogicSignal(
 
 shared_ptr<pv::data::SignalData> LogicSignal::data() const
 {
-	return data_;
+	return base_->logic_data();
 }
 
 shared_ptr<pv::data::Logic> LogicSignal::logic_data() const
 {
-	return data_;
-}
-
-void LogicSignal::set_logic_data(std::shared_ptr<pv::data::Logic> data)
-{
-	data_ = data;
+	return base_->logic_data();
 }
 
 std::pair<int, int> LogicSignal::v_extents() const
@@ -167,7 +162,6 @@ void LogicSignal::paint_mid(QPainter &p, const ViewItemPaintParams &pp)
 	vector< pair<int64_t, bool> > edges;
 
 	assert(base_);
-	assert(data_);
 	assert(owner_);
 
 	const int y = get_visual_y();
@@ -179,7 +173,7 @@ void LogicSignal::paint_mid(QPainter &p, const ViewItemPaintParams &pp)
 	const float low_offset = y + 0.5f;
 
 	const deque< shared_ptr<pv::data::LogicSegment> > &segments =
-		data_->logic_segments();
+		base_->logic_data()->logic_segments();
 	if (segments.empty())
 		return;
 
@@ -235,6 +229,29 @@ 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)
+		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)
@@ -493,5 +510,6 @@ void LogicSignal::on_trigger()
 	modify_trigger();
 }
 
-} // namespace view
+} // namespace TraceView
+} // namespace views
 } // namespace pv