X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=pv%2Fview%2Fanalogsignal.hpp;h=109cdd374782a906d34ed558403b8e0a9d00f94b;hb=4c7a19d3d7049bcc9fb3185ce2bc91333a7ca9e1;hp=fa1058311f08a8f1ab906584ba65be2b75769983;hpb=8de1e1b2fb1bcaaa21f08b7bba412b0839d6c4d2;p=pulseview.git

diff --git a/pv/view/analogsignal.hpp b/pv/view/analogsignal.hpp
index fa10583..109cdd3 100644
--- a/pv/view/analogsignal.hpp
+++ b/pv/view/analogsignal.hpp
@@ -25,6 +25,10 @@
 #include <memory>
 
 #include <QComboBox>
+#include <QSpinBox>
+
+using std::pair;
+using std::shared_ptr;
 
 namespace pv {
 
@@ -46,19 +50,25 @@ private:
 	static const QColor GridMajorColor, GridMinorColor;
 	static const QColor SamplingPointColour;
 
+	static const int64_t TracePaintBlockSize;
 	static const float EnvelopeThreshold;
 
 	static const int MaximumVDivs;
 	static const int MaxScaleIndex, MinScaleIndex;
 	static const int InfoTextMarginRight, InfoTextMarginBottom;
 
+	enum DisplayType {
+		DisplayAnalog = 0,
+		DisplayConverted = 1,
+		DisplayBoth = 2
+	};
+
 public:
-	AnalogSignal(pv::Session &session,
-		std::shared_ptr<data::SignalBase> base);
+	AnalogSignal(pv::Session &session, shared_ptr<data::SignalBase> base);
 
 	virtual ~AnalogSignal() = default;
 
-	std::shared_ptr<pv::data::SignalData> data() const;
+	shared_ptr<pv::data::SignalData> data() const;
 
 	virtual void save_settings(QSettings &settings) const;
 
@@ -68,7 +78,7 @@ public:
 	 * Computes the vertical extents of the contents of this row item.
 	 * @return A pair containing the minimum and maximum y-values.
 	 */
-	std::pair<int, int> v_extents() const;
+	pair<int, int> v_extents() const;
 
 	/**
 	 * Returns the offset to show the drag handle.
@@ -91,35 +101,42 @@ public:
 	 * @param p the QPainter to paint into.
 	 * @param pp the painting parameters object to paint with..
 	 */
-	void paint_back(QPainter &p, const ViewItemPaintParams &pp);
+	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, const ViewItemPaintParams &pp);
+	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, const ViewItemPaintParams &pp);
+	void paint_fore(QPainter &p, ViewItemPaintParams &pp);
 
 private:
 	void paint_grid(QPainter &p, int y, int left, int right);
 
 	void paint_trace(QPainter &p,
-		const std::shared_ptr<pv::data::AnalogSegment> &segment,
+		const shared_ptr<pv::data::AnalogSegment> &segment,
 		int y, int left, const int64_t start, const int64_t end,
 		const double pixels_offset, const double samples_per_pixel);
 
 	void paint_envelope(QPainter &p,
-		const std::shared_ptr<pv::data::AnalogSegment> &segment,
+		const shared_ptr<pv::data::AnalogSegment> &segment,
 		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<int64_t, bool> > &edges,
+		bool level, double samples_per_pixel, double pixels_offset,
+		float x_offset, float y_offset);
+
 	/**
 	 * Computes the scale factor from the scale index and vdiv settings.
 	 */
@@ -127,7 +144,9 @@ private:
 
 	void update_scale();
 
-	void perform_autoranging(bool force_update = false);
+	void update_conversion_type();
+
+	void perform_autoranging(bool keep_divs, bool force_update);
 
 protected:
 	void populate_popup_form(QWidget *parent, QFormLayout *form);
@@ -142,8 +161,13 @@ private Q_SLOTS:
 
 	void on_autoranging_changed(int state);
 
+	void on_conversion_changed(int index);
+
+	void on_display_type_changed(int index);
+
 private:
-	QComboBox *resolution_cb_;
+	QComboBox *resolution_cb_, *conversion_cb_, *display_type_cb_;
+	QSpinBox *pvdiv_sb_, *nvdiv_sb_;
 
 	float scale_;
 	int scale_index_;
@@ -153,6 +177,8 @@ private:
 	int pos_vdivs_, neg_vdivs_;  // divs per positive/negative side
 	float resolution_; // e.g. 10 for 10 V/div
 
+	data::SignalBase::ConversionType conversion_type_;
+	DisplayType display_type_;
 	bool autoranging_;
 };