X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fviews%2Ftrace%2Fanalogsignal.hpp;h=4c42e579b662e596289b65828b9a3c6edf4e3f56;hp=19334ee289e08ee049736ff2218da59308cebff5;hb=HEAD;hpb=99c4952654ae218a6b45ca61066deb4f81f68416
diff --git a/pv/views/trace/analogsignal.hpp b/pv/views/trace/analogsignal.hpp
index 19334ee2..6fbcc24b 100644
--- a/pv/views/trace/analogsignal.hpp
+++ b/pv/views/trace/analogsignal.hpp
@@ -17,15 +17,17 @@
* 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
#include
+#include
using std::pair;
using std::shared_ptr;
@@ -41,15 +43,13 @@ class SignalBase;
namespace views {
namespace trace {
-class AnalogSignal : public Signal
+class AnalogSignal : public LogicSignal
{
Q_OBJECT
private:
static const QPen AxisPen;
- static const QColor SignalColors[4];
static const QColor GridMajorColor, GridMinorColor;
- static const QColor SamplingPointColor;
static const QColor SamplingPointColorLo;
static const QColor SamplingPointColorNe;
static const QColor SamplingPointColorHi;
@@ -74,56 +74,35 @@ private:
public:
AnalogSignal(pv::Session &session, shared_ptr base);
- 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.
* @return A pair containing the minimum and maximum y-values.
*/
- pair v_extents() const;
-
- /**
- * 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);
-
- /**
- * @copydoc pv::view::Signal::signal_scale_handle_drag_release()
- */
- void scale_handle_drag_release();
-
- virtual void on_setting_changed(const QString &key, const QVariant &value);
+ virtual pair v_extents() const;
/**
* Paints the background 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_back(QPainter &p, ViewItemPaintParams &pp);
+ virtual void paint_back(QPainter &p, ViewItemPaintParams &pp);
/**
* 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 item with a QPainter
* @param p the QPainter to paint into.
* @param pp the painting parameters object to paint with.
*/
- void paint_fore(QPainter &p, ViewItemPaintParams &pp);
+ virtual void paint_fore(QPainter &p, ViewItemPaintParams &pp);
private:
void paint_grid(QPainter &p, int y, int left, int right);
@@ -138,15 +117,7 @@ private:
int y, int left, const int64_t start, const int64_t end,
const double pixels_offset, const double samples_per_pixel);
- void paint_logic_mid(QPainter &p, ViewItemPaintParams &pp);
-
- void paint_logic_caps(QPainter &p, QLineF *const lines,
- vector< pair > &edges,
- bool level, double samples_per_pixel, double pixels_offset,
- float x_offset, float y_offset);
-
shared_ptr get_analog_segment_to_paint() const;
- shared_ptr get_logic_segment_to_paint() const;
/**
* Computes the scale factor from the scale index and vdiv settings.
@@ -154,9 +125,19 @@ private:
float get_resolution(int scale_index);
void update_scale();
+ virtual void update_logic_level_offsets();
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();
@@ -168,6 +149,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);
@@ -184,23 +167,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_;
- int scale_index_drag_offset_;
+ 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_;
@@ -208,10 +185,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