X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fviews%2Ftrace%2Flogicsignal.hpp;h=45e815bae79e0d4e3fc8a68916be14a39183a9cd;hp=2f5c66baa219fb69dcb8e9e42e08de1c01ad1849;hb=2795de2e7fdaeb6e9f672e0dc73dea328f35e585;hpb=1573bf16ba50d1c023ad3a9ce596f0ab6eaeacff

diff --git a/pv/views/trace/logicsignal.hpp b/pv/views/trace/logicsignal.hpp
index 2f5c66ba..45e815ba 100644
--- a/pv/views/trace/logicsignal.hpp
+++ b/pv/views/trace/logicsignal.hpp
@@ -21,6 +21,8 @@
 #define PULSEVIEW_PV_VIEWS_TRACEVIEW_LOGICSIGNAL_HPP
 
 #include <QCache>
+#include <QDebug>
+#include <QSpinBox>
 
 #include "signal.hpp"
 
@@ -57,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];
 
@@ -78,6 +80,9 @@ public:
 
 	shared_ptr<pv::data::Logic> logic_data() const;
 
+	virtual void save_settings(QSettings &settings) const;
+	virtual void restore_settings(QSettings &settings);
+
 	/**
 	 * Computes the vertical extents of the contents of this row item.
 	 * @return A pair containing the minimum and maximum y-values.
@@ -115,6 +120,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;
@@ -130,12 +137,17 @@ private:
 private Q_SLOTS:
 	void on_trigger();
 
+	void on_signal_height_changed(int height);
+
 private:
 	int signal_height_;
 
 	shared_ptr<pv::devices::Device> device_;
 
+	QSpinBox *signal_height_sb_;
+
 	const sigrok::TriggerMatchType *trigger_match_;
+	const vector<int32_t> trigger_types_;
 	QToolBar *trigger_bar_;
 	QAction *trigger_none_;
 	QAction *trigger_rising_;