X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fviews%2Ftrace%2Flogicsignal.hpp;h=04ba1305fc455a8addd8f75236e529ebd04dc5d1;hp=9899260a8cfc503f342802020a17e6db56d11a8e;hb=cc844e861276b56837c345d69975c50f009d57af;hpb=526c8c00a61aa5f6ac7e3ee56991db957b45828d

diff --git a/pv/views/trace/logicsignal.hpp b/pv/views/trace/logicsignal.hpp
index 9899260a..04ba1305 100644
--- a/pv/views/trace/logicsignal.hpp
+++ b/pv/views/trace/logicsignal.hpp
@@ -59,14 +59,14 @@ class LogicSignal : public Signal
 public:
 	static const float Oversampling;
 
-	static const QColor EdgeColour;
-	static const QColor HighColour;
-	static const QColor LowColour;
-	static const QColor SamplingPointColour;
+	static const QColor EdgeColor;
+	static const QColor HighColor;
+	static const QColor LowColor;
+	static const QColor SamplingPointColor;
 
-	static const QColor SignalColours[10];
+	static const QColor SignalColors[10];
 
-	static QColor TriggerMarkerBackgroundColour;
+	static QColor TriggerMarkerBackgroundColor;
 	static const int TriggerMarkerPadding;
 	static const char* TriggerMarkerIcons[8];
 
@@ -89,17 +89,6 @@ public:
 	 */
 	pair<int, int> v_extents() const;
 
-	/**
-	 * Returns the offset to show the drag handle.
-	 */
-	int scale_handle_offset() const;
-
-	/**
-	 * Handles the scale handle being dragged to an offset.
-	 * @param offset the offset the scale handle was dragged to.
-	 */
-	void scale_handle_dragged(int offset);
-
 	/**
 	 * Paints the mid-layer of the signal with a QPainter
 	 * @param p the QPainter to paint into.
@@ -120,6 +109,8 @@ private:
 		bool level, double samples_per_pixel, double pixels_offset,
 		float x_offset, float y_offset);
 
+	shared_ptr<pv::data::LogicSegment> get_logic_segment_to_paint() const;
+
 	void init_trigger_actions(QWidget *parent);
 
 	const vector<int32_t> get_trigger_types() const;
@@ -145,6 +136,7 @@ private:
 	QSpinBox *signal_height_sb_;
 
 	const sigrok::TriggerMatchType *trigger_match_;
+	const vector<int32_t> trigger_types_;
 	QToolBar *trigger_bar_;
 	QAction *trigger_none_;
 	QAction *trigger_rising_;