X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=pv%2Fviews%2Ftrace%2Fanalogsignal.hpp;h=1dd9893f1b9812f78c0a8d7c442491d1252107f5;hb=0bb3dd25421a8638afb881d46799a13378d3f00b;hp=885856dff999a84d5428cff55eeb43de8a102d97;hpb=cc844e861276b56837c345d69975c50f009d57af;p=pulseview.git
diff --git a/pv/views/trace/analogsignal.hpp b/pv/views/trace/analogsignal.hpp
index 885856df..1dd9893f 100644
--- a/pv/views/trace/analogsignal.hpp
+++ b/pv/views/trace/analogsignal.hpp
@@ -17,11 +17,12 @@
* along with this program; if not, see .
*/
-#ifndef PULSEVIEW_PV_VIEWS_TRACEVIEW_ANALOGSIGNAL_HPP
-#define PULSEVIEW_PV_VIEWS_TRACEVIEW_ANALOGSIGNAL_HPP
+#ifndef PULSEVIEW_PV_VIEWS_TRACE_ANALOGSIGNAL_HPP
+#define PULSEVIEW_PV_VIEWS_TRACE_ANALOGSIGNAL_HPP
#include
+#include
#include
#include
@@ -76,9 +77,8 @@ public:
shared_ptr 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.
@@ -86,8 +86,6 @@ public:
*/
pair v_extents() const;
- virtual void on_setting_changed(const QString &key, const QVariant &value);
-
/**
* Paints the background layer of the signal with a QPainter
* @param p the QPainter to paint into.
@@ -141,6 +139,15 @@ private:
void update_conversion_widgets();
+ /**
+ * Determines the closest level change (i.e. edge) to a given sample, which
+ * is useful for e.g. the "snap to edge" functionality.
+ *
+ * @param sample_pos Sample to use
+ * @return The changes left and right of the given position
+ */
+ virtual vector get_nearest_level_changes(uint64_t sample_pos);
+
void perform_autoranging(bool keep_divs, bool force_update);
void reset_pixel_values();
@@ -152,6 +159,8 @@ protected:
virtual void hover_point_changed(const QPoint &hp);
private Q_SLOTS:
+ virtual void on_setting_changed(const QString &key, const QVariant &value);
+
void on_min_max_changed(float min, float max);
void on_pos_vdivs_changed(int vdivs);
@@ -168,22 +177,17 @@ private Q_SLOTS:
void on_display_type_changed(int index);
- void on_settingViewConversionThresholdDispMode_changed(const QVariant new_value);
-
private:
QComboBox *resolution_cb_, *conversion_cb_, *conv_threshold_cb_,
*display_type_cb_;
QSpinBox *pvdiv_sb_, *nvdiv_sb_, *div_height_sb_;
- float scale_;
- int scale_index_;
+ double signal_min_, signal_max_; // Min/max values of this signal's analog data
- int div_height_;
- int pos_vdivs_, neg_vdivs_; // divs per positive/negative side
- float resolution_; // e.g. 10 for 10 V/div
+ bool show_analog_minor_grid_;
+ QColor high_fill_color_;
+ bool show_sampling_points_, fill_high_areas_;
- DisplayType display_type_;
- bool autoranging_;
int conversion_threshold_disp_mode_;
vector value_at_pixel_pos_;
@@ -191,10 +195,23 @@ private:
float prev_value_at_pixel_; // Only used during lookup table update
float min_value_at_pixel_, max_value_at_pixel_; // Only used during lookup table update
int current_pixel_pos_; // Only used during lookup table update
+
+ // ---------------------------------------------------------------------------
+ // Note: Make sure to update save_settings() and restore_settings() when
+ // adding a trace-configurable variable here
+ float scale_;
+ int scale_index_;
+
+ int div_height_;
+ int pos_vdivs_, neg_vdivs_; // divs per positive/negative side
+ float resolution_; // e.g. 10 for 10 V/div
+
+ DisplayType display_type_;
+ bool autoranging_;
};
} // namespace trace
} // namespace views
} // namespace pv
-#endif // PULSEVIEW_PV_VIEWS_TRACEVIEW_ANALOGSIGNAL_HPP
+#endif // PULSEVIEW_PV_VIEWS_TRACE_ANALOGSIGNAL_HPP