X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=pv%2Fviews%2Ftrace%2Flogicsignal.hpp;h=eee6b9c4ce081f4b74d6ccf30ffe206e6aa6965b;hb=67784be7a0b4ab46ed566119d182d92695a40ae3;hp=10ede729d1b53b630613d56740ec6243339b9649;hpb=eeceee9955e7db4ac777d49d1b7a766069476b08;p=pulseview.git
diff --git a/pv/views/trace/logicsignal.hpp b/pv/views/trace/logicsignal.hpp
index 10ede729..eee6b9c4 100644
--- a/pv/views/trace/logicsignal.hpp
+++ b/pv/views/trace/logicsignal.hpp
@@ -17,10 +17,11 @@
* along with this program; if not, see .
*/
-#ifndef PULSEVIEW_PV_VIEWS_TRACEVIEW_LOGICSIGNAL_HPP
-#define PULSEVIEW_PV_VIEWS_TRACEVIEW_LOGICSIGNAL_HPP
+#ifndef PULSEVIEW_PV_VIEWS_TRACE_LOGICSIGNAL_HPP
+#define PULSEVIEW_PV_VIEWS_TRACE_LOGICSIGNAL_HPP
#include
+#include
#include
#include
@@ -64,37 +65,29 @@ public:
static const QColor LowColor;
static const QColor SamplingPointColor;
- static const QColor SignalColors[10];
-
static QColor TriggerMarkerBackgroundColor;
static const int TriggerMarkerPadding;
static const char* TriggerMarkerIcons[8];
- LogicSignal(pv::Session &session,
- shared_ptr device,
- shared_ptr base);
+ LogicSignal(pv::Session &session, shared_ptr base);
virtual ~LogicSignal() = default;
- shared_ptr data() const;
-
- shared_ptr logic_data() const;
-
- virtual void save_settings(QSettings &settings) const;
- virtual void restore_settings(QSettings &settings);
+ virtual std::map save_settings() const;
+ virtual void restore_settings(std::map settings);
/**
* Computes the vertical extents of the contents of this row item.
* @return A pair containing the minimum and maximum y-values.
*/
- pair v_extents() const;
+ virtual pair v_extents() const;
/**
* Paints the mid-layer of the signal with a QPainter
* @param p the QPainter to paint into.
* @param pp the painting parameters object to paint with..
*/
- void paint_mid(QPainter &p, ViewItemPaintParams &pp);
+ virtual void paint_mid(QPainter &p, ViewItemPaintParams &pp);
/**
* Paints the foreground layer of the signal with a QPainter
@@ -112,7 +105,7 @@ public:
*/
virtual vector get_nearest_level_changes(uint64_t sample_pos);
-private:
+protected:
void paint_caps(QPainter &p, QLineF *const lines,
vector< pair > &edges,
bool level, double samples_per_pixel, double pixels_offset,
@@ -132,15 +125,19 @@ private:
static const QIcon* get_icon(const char *path);
static const QPixmap* get_pixmap(const char *path);
-private Q_SLOTS:
+ virtual void update_logic_level_offsets();
+
+protected Q_SLOTS:
+ void on_setting_changed(const QString &key, const QVariant &value);
+
void on_trigger();
void on_signal_height_changed(int height);
-private:
- int signal_height_;
-
- shared_ptr device_;
+protected:
+ QColor high_fill_color_;
+ bool show_sampling_points_, fill_high_areas_;
+ float high_level_offset_, low_level_offset_; // y offsets relative to trace
QSpinBox *signal_height_sb_;
@@ -156,10 +153,15 @@ private:
static QCache icon_cache_;
static QCache pixmap_cache_;
+
+ // ---------------------------------------------------------------------------
+ // Note: Make sure to update save_settings() and restore_settings() when
+ // adding a trace-configurable variable here
+ int signal_height_;
};
} // namespace trace
} // namespace views
} // namespace pv
-#endif // PULSEVIEW_PV_VIEWS_TRACEVIEW_LOGICSIGNAL_HPP
+#endif // PULSEVIEW_PV_VIEWS_TRACE_LOGICSIGNAL_HPP