X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fview%2Flogicsignal.hpp;h=273120230d0b25f02af6b95d366f8ac633b31ed0;hp=e000a3cdf9b676536b451f25874833b1d776c9aa;hb=c063290ac7189bdd15221450f598504f43286b43;hpb=efdec55aec1a137460fa362a381ed1904182bfed

diff --git a/pv/view/logicsignal.hpp b/pv/view/logicsignal.hpp
index e000a3cd..27312023 100644
--- a/pv/view/logicsignal.hpp
+++ b/pv/view/logicsignal.hpp
@@ -26,6 +26,10 @@
 
 #include <memory>
 
+using std::pair;
+using std::shared_ptr;
+using std::vector;
+
 class QIcon;
 class QToolBar;
 
@@ -50,12 +54,13 @@ class LogicSignal : public Signal
 {
 	Q_OBJECT
 
-private:
+public:
 	static const float Oversampling;
 
 	static const QColor EdgeColour;
 	static const QColor HighColour;
 	static const QColor LowColour;
+	static const QColor SamplingPointColour;
 
 	static const QColor SignalColours[10];
 
@@ -63,22 +68,21 @@ private:
 	static const int TriggerMarkerPadding;
 	static const char* TriggerMarkerIcons[8];
 
-public:
 	LogicSignal(pv::Session &session,
-		std::shared_ptr<devices::Device> device,
-		std::shared_ptr<data::SignalBase> base);
+		shared_ptr<devices::Device> device,
+		shared_ptr<data::SignalBase> base);
 
 	virtual ~LogicSignal() = default;
 
-	std::shared_ptr<pv::data::SignalData> data() const;
+	shared_ptr<pv::data::SignalData> data() const;
 
-	std::shared_ptr<pv::data::Logic> logic_data() const;
+	shared_ptr<pv::data::Logic> logic_data() const;
 
 	/**
 	 * Computes the vertical extents of the contents of this row item.
 	 * @return A pair containing the minimum and maximum y-values.
 	 */
-	std::pair<int, int> v_extents() const;
+	pair<int, int> v_extents() const;
 
 	/**
 	 * Returns the offset to show the drag handle.
@@ -107,15 +111,14 @@ public:
 
 private:
 	void paint_caps(QPainter &p, QLineF *const lines,
-		std::vector< std::pair<int64_t, bool> > &edges,
+		vector< pair<int64_t, bool> > &edges,
 		bool level, double samples_per_pixel, double pixels_offset,
 		float x_offset, float y_offset);
 
 	void init_trigger_actions(QWidget *parent);
 
-	const std::vector<int32_t> get_trigger_types() const;
-	QAction* action_from_trigger_type(
-		const sigrok::TriggerMatchType *type);
+	const vector<int32_t> get_trigger_types() const;
+	QAction* action_from_trigger_type(const sigrok::TriggerMatchType *type);
 	const sigrok::TriggerMatchType* trigger_type_from_action(
 		QAction *action);
 	void populate_popup_form(QWidget *parent, QFormLayout *form);
@@ -130,7 +133,7 @@ private Q_SLOTS:
 private:
 	int signal_height_;
 
-	std::shared_ptr<pv::devices::Device> device_;
+	shared_ptr<pv::devices::Device> device_;
 
 	const sigrok::TriggerMatchType *trigger_match_;
 	QToolBar *trigger_bar_;