X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fview%2Flogicsignal.h;h=958abd8f1890c26f7661ee75884b9d3cc096b3ed;hp=dd4a030ac1fa2de62cb5690b8a5db3490bf9426b;hb=640bd149b1e66bf2d4687a7efc6ab326bdf9d61f;hpb=8d634081d8b0cc741dd34d8c646474ff6754aea8

diff --git a/pv/view/logicsignal.h b/pv/view/logicsignal.h
index dd4a030a..958abd8f 100644
--- a/pv/view/logicsignal.h
+++ b/pv/view/logicsignal.h
@@ -18,65 +18,100 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
-#ifndef PULSEVIEW_PV_LOGICSIGNAL_H
-#define PULSEVIEW_PV_LOGICSIGNAL_H
+#ifndef PULSEVIEW_PV_VIEW_LOGICSIGNAL_H
+#define PULSEVIEW_PV_VIEW_LOGICSIGNAL_H
 
 #include "signal.h"
 
-#include <boost/shared_ptr.hpp>
+#include <memory>
+
+class QToolBar;
+
+namespace sigrok {
+	class Device;
+	class TriggerMatchType;
+}
 
 namespace pv {
 
-class LogicData;
+namespace data {
+class Logic;
+}
 
 namespace view {
 
 class LogicSignal : public Signal
 {
+	Q_OBJECT
+
 private:
-	static const float Margin;
 	static const float Oversampling;
 
 	static const QColor EdgeColour;
 	static const QColor HighColour;
 	static const QColor LowColour;
 
-	static const QColor LogicSignalColours[10];
+	static const QColor SignalColours[10];
 
 public:
-	LogicSignal(QString name,
-		boost::shared_ptr<pv::LogicData> data,
-		int probe_index);
+	LogicSignal(pv::SigSession &session,
+		std::shared_ptr<sigrok::Device> device,
+		std::shared_ptr<sigrok::Channel> channel,
+		std::shared_ptr<pv::data::Logic> data);
+
+	virtual ~LogicSignal();
+
+	std::shared_ptr<pv::data::SignalData> data() const;
+
+	std::shared_ptr<pv::data::Logic> logic_data() const;
 
 	/**
-	 * Paints the signal with a QPainter
+	 * Paints the background layer of the signal with a QPainter
 	 * @param p the QPainter to paint into.
-	 * @param rect the rectangular area to draw the trace into.
-	 * @param scale the scale in seconds per pixel.
-	 * @param offset the time to show at the left hand edge of
-	 *   the view in seconds.
+	 * @param left the x-coordinate of the left edge of the signal.
+	 * @param right the x-coordinate of the right edge of the signal.
 	 **/
-	void paint(QPainter &p, const QRect &rect, double scale, double offset);
+	void paint_back(QPainter &p, int left, int right);
 
-private:
+	/**
+	 * Paints the mid-layer of the signal with a QPainter
+	 * @param p the QPainter to paint into.
+	 * @param left the x-coordinate of the left edge of the signal.
+	 * @param right the x-coordinate of the right edge of the signal.
+	 **/
+	void paint_mid(QPainter &p, int left, int right);
 
+private:
 	void paint_caps(QPainter &p, QLineF *const lines,
 		std::vector< std::pair<int64_t, bool> > &edges,
 		bool level, double samples_per_pixel, double pixels_offset,
 		float x_offset, float y_offset);
 
-	/**
-	 * When painting into the rectangle, calculate the y
-	 * offset of the zero point.
-	 **/
-	int get_nominal_offset(const QRect &rect) const;
+	void init_trigger_actions(QWidget *parent);
+
+	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:
-	int _probe_index;
-	boost::shared_ptr<pv::LogicData> _data;
+	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
 } // namespace pv
 
-#endif // PULSEVIEW_PV_LOGICSIGNAL_H
+#endif // PULSEVIEW_PV_VIEW_LOGICSIGNAL_H