X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=pv%2Fviews%2Ftrace%2Fanalogsignal.hpp;h=4c42e579b662e596289b65828b9a3c6edf4e3f56;hb=d1b479f74c9d1eb61b56cc4980d7328ec50216df;hp=60acc2eb68ccebe0eba775bc3c141122f02eac20;hpb=eeceee9955e7db4ac777d49d1b7a766069476b08;p=pulseview.git
diff --git a/pv/views/trace/analogsignal.hpp b/pv/views/trace/analogsignal.hpp
index 60acc2eb..4c42e579 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
@@ -47,7 +48,6 @@ class AnalogSignal : public Signal
private:
static const QPen AxisPen;
- static const QColor SignalColors[4];
static const QColor GridMajorColor, GridMinorColor;
static const QColor SamplingPointColor;
static const QColor SamplingPointColorLo;
@@ -76,9 +76,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 +85,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.
@@ -161,6 +158,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);
@@ -177,22 +176,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_;
@@ -200,10 +194,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