X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=pv%2Fview%2Flogicsignal.h;h=79bbe396967bb0339b1f8eb8d9be67e654eccd8a;hb=8dbbc7f0b9ea59d0f0d62225772f8a56eee125f5;hp=481293808824e52be05173f09456363d77216968;hpb=b86aa8f4a22857a90bbfca6e7993b2deaf1157d4;p=pulseview.git

diff --git a/pv/view/logicsignal.h b/pv/view/logicsignal.h
index 4812938..79bbe39 100644
--- a/pv/view/logicsignal.h
+++ b/pv/view/logicsignal.h
@@ -45,6 +45,9 @@ class LogicSignal : public Signal
 	Q_OBJECT
 
 private:
+	static const int SignalHeight;
+	static const int SignalMargin;
+
 	static const float Oversampling;
 
 	static const QColor EdgeColour;
@@ -65,6 +68,12 @@ public:
 
 	std::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;
+
 	/**
 	 * Paints the background layer of the signal with a QPainter
 	 * @param p the QPainter to paint into.
@@ -92,22 +101,23 @@ private:
 	QAction* match_action(const sigrok::TriggerMatchType *match);
 	const sigrok::TriggerMatchType *action_match(QAction *action);
 	void populate_popup_form(QWidget *parent, QFormLayout *form);
+	void modify_trigger();
 
 private Q_SLOTS:
 	void on_trigger();
 
 private:
-	std::shared_ptr<sigrok::Device> _device;
-	std::shared_ptr<pv::data::Logic> _data;
-
-	const sigrok::TriggerMatchType *_trigger_match;
-	QToolBar *_trigger_bar;
-	QAction *_trigger_none;
-	QAction *_trigger_rising;
-	QAction *_trigger_high;
-	QAction *_trigger_falling;
-	QAction *_trigger_low;
-	QAction *_trigger_change;
+	std::shared_ptr<sigrok::Device> device_;
+	std::shared_ptr<pv::data::Logic> data_;
+
+	const sigrok::TriggerMatchType *trigger_match_;
+	QToolBar *trigger_bar_;
+	QAction *trigger_none_;
+	QAction *trigger_rising_;
+	QAction *trigger_high_;
+	QAction *trigger_falling_;
+	QAction *trigger_low_;
+	QAction *trigger_change_;
 };
 
 } // namespace view