X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fview%2Flogicsignal.hpp;h=ce843df9af37ad2d4df189435943733847a7546b;hp=a4f64e6bddc83b09da242b85b94d9ee23d629775;hb=f4e57597347e47a4ea58fbdc7b0a22e07f1c0ede;hpb=2acdb232d6bb452cfdfaea3ef5218fb4da592329

diff --git a/pv/view/logicsignal.hpp b/pv/view/logicsignal.hpp
index a4f64e6b..ce843df9 100644
--- a/pv/view/logicsignal.hpp
+++ b/pv/view/logicsignal.hpp
@@ -18,36 +18,40 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
-#ifndef PULSEVIEW_PV_VIEW_LOGICSIGNAL_H
-#define PULSEVIEW_PV_VIEW_LOGICSIGNAL_H
+#ifndef PULSEVIEW_PV_VIEWS_TRACEVIEW_LOGICSIGNAL_HPP
+#define PULSEVIEW_PV_VIEWS_TRACEVIEW_LOGICSIGNAL_HPP
+
+#include <QCache>
 
 #include "signal.hpp"
 
 #include <memory>
 
+class QIcon;
 class QToolBar;
 
 namespace sigrok {
-	class Device;
-	class TriggerMatchType;
+class TriggerMatchType;
 }
 
 namespace pv {
 
+namespace devices {
+class Device;
+}
+
 namespace data {
 class Logic;
 }
 
-namespace view {
+namespace views {
+namespace TraceView {
 
 class LogicSignal : public Signal
 {
 	Q_OBJECT
 
 private:
-	static const int SignalHeight;
-	static const int SignalMargin;
-
 	static const float Oversampling;
 
 	static const QColor EdgeColour;
@@ -56,13 +60,16 @@ private:
 
 	static const QColor SignalColours[10];
 
+	static QColor TriggerMarkerBackgroundColour;
+	static const int TriggerMarkerPadding;
+	static const char* TriggerMarkerIcons[8];
+
 public:
-	LogicSignal(pv::SigSession &session,
-		std::shared_ptr<sigrok::Device> device,
-		std::shared_ptr<sigrok::Channel> channel,
-		std::shared_ptr<pv::data::Logic> data);
+	LogicSignal(pv::Session &session,
+		std::shared_ptr<devices::Device> device,
+		std::shared_ptr<data::SignalBase> base);
 
-	virtual ~LogicSignal();
+	virtual ~LogicSignal() = default;
 
 	std::shared_ptr<pv::data::SignalData> data() const;
 
@@ -75,20 +82,29 @@ public:
 	std::pair<int, int> v_extents() const;
 
 	/**
-	 * Paints the background 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_back(QPainter &p, int left, int right);
+	 * 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.
-	 * @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);
+	 * @param pp the painting parameters object to paint with..
+	 */
+	void paint_mid(QPainter &p, const ViewItemPaintParams &pp);
+
+	/**
+	 * Paints the foreground layer of the signal with a QPainter
+	 * @param p the QPainter to paint into.
+	 * @param pp the painting parameters object to paint with.
+	 */
+	virtual void paint_fore(QPainter &p, const ViewItemPaintParams &pp);
 
 private:
 	void paint_caps(QPainter &p, QLineF *const lines,
@@ -98,17 +114,24 @@ private:
 
 	void init_trigger_actions(QWidget *parent);
 
-	QAction* match_action(const sigrok::TriggerMatchType *match);
-	const sigrok::TriggerMatchType *action_match(QAction *action);
+	const std::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);
 	void modify_trigger();
 
+	static const QIcon* get_icon(const char *path);
+	static const QPixmap* get_pixmap(const char *path);
+
 private Q_SLOTS:
 	void on_trigger();
 
 private:
-	std::shared_ptr<sigrok::Device> device_;
-	std::shared_ptr<pv::data::Logic> data_;
+	int signal_height_;
+
+	std::shared_ptr<pv::devices::Device> device_;
 
 	const sigrok::TriggerMatchType *trigger_match_;
 	QToolBar *trigger_bar_;
@@ -118,9 +141,13 @@ private:
 	QAction *trigger_falling_;
 	QAction *trigger_low_;
 	QAction *trigger_change_;
+
+	static QCache<QString, const QIcon> icon_cache_;
+	static QCache<QString, const QPixmap> pixmap_cache_;
 };
 
-} // namespace view
+} // namespace TraceView
+} // namespace views
 } // namespace pv
 
-#endif // PULSEVIEW_PV_VIEW_LOGICSIGNAL_H
+#endif // PULSEVIEW_PV_VIEWS_TRACEVIEW_LOGICSIGNAL_HPP