X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fview%2Fanalogsignal.hpp;h=32af0171399e0864143048f62654f1f7b8fb9567;hp=08edda36f0dcc818135747189dc76ff8ada121c2;hb=b8c4a95bc26d2976ea80001846d1ab7eb15cd3d5;hpb=f4e57597347e47a4ea58fbdc7b0a22e07f1c0ede

diff --git a/pv/view/analogsignal.hpp b/pv/view/analogsignal.hpp
index 08edda36..32af0171 100644
--- a/pv/view/analogsignal.hpp
+++ b/pv/view/analogsignal.hpp
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef PULSEVIEW_PV_VIEWS_TRACEVIEW_ANALOGSIGNAL_HPP
@@ -27,6 +26,9 @@
 
 #include <QComboBox>
 
+using std::pair;
+using std::shared_ptr;
+
 namespace pv {
 
 namespace data {
@@ -45,6 +47,7 @@ class AnalogSignal : public Signal
 private:
 	static const QColor SignalColours[4];
 	static const QColor GridMajorColor, GridMinorColor;
+	static const QColor SamplingPointColour;
 
 	static const float EnvelopeThreshold;
 
@@ -52,13 +55,18 @@ private:
 	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 +76,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.
@@ -111,15 +119,22 @@ 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, const 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,24 +142,41 @@ private:
 
 	void update_scale();
 
+	void update_conversion_type();
+
+	void perform_autoranging(bool force_update = false);
+
 protected:
 	void populate_popup_form(QWidget *parent, QFormLayout *form);
 
 private Q_SLOTS:
-	void on_vdivs_changed(int vdivs);
+	void on_samples_added();
+
+	void on_pos_vdivs_changed(int vdivs);
+	void on_neg_vdivs_changed(int vdivs);
 
 	void on_resolution_changed(int index);
 
+	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_;
 
 	float scale_;
 	int scale_index_;
 	int scale_index_drag_offset_;
 
 	int div_height_;
-	int vdivs_;  // divs per positive/negative side
+	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_;
 };
 
 } // namespace TraceView