X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fview%2Fanalogsignal.hpp;h=aa53f9ddb25ab49c500a93c56f6c4660c879eab5;hp=c048371eeadd1973149017bd7f21f06abf79a1a7;hb=812c0e3592e51946947b55c54b906bf4a0cb30e9;hpb=3eb29afdb641606c2e2e059289d8cc103d027a25

diff --git a/pv/view/analogsignal.hpp b/pv/view/analogsignal.hpp
index c048371e..aa53f9dd 100644
--- a/pv/view/analogsignal.hpp
+++ b/pv/view/analogsignal.hpp
@@ -18,8 +18,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
-#ifndef PULSEVIEW_PV_VIEW_ANALOGSIGNAL_H
-#define PULSEVIEW_PV_VIEW_ANALOGSIGNAL_H
+#ifndef PULSEVIEW_PV_VIEW_ANALOGSIGNAL_HPP
+#define PULSEVIEW_PV_VIEW_ANALOGSIGNAL_HPP
 
 #include "signal.hpp"
 
@@ -29,7 +29,7 @@ namespace pv {
 
 namespace data {
 class Analog;
-class AnalogSnapshot;
+class AnalogSegment;
 }
 
 namespace view {
@@ -53,45 +53,66 @@ public:
 
 	std::shared_ptr<pv::data::Analog> analog_data() const;
 
-	void set_scale(float scale);
-
 	/**
 	 * 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;
 
+	/**
+	 * 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();
+
 	/**
 	 * 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, const RowItemPaintParams &pp);
+	void paint_back(QPainter &p, const 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 RowItemPaintParams &pp);
+	void paint_mid(QPainter &p, const ViewItemPaintParams &pp);
 
 private:
 	void paint_trace(QPainter &p,
-		const std::shared_ptr<pv::data::AnalogSnapshot> &snapshot,
+		const std::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::AnalogSnapshot> &snapshot,
+		const std::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);
 
+	/**
+	 * Computes the scale factor from the scale index.
+	 */
+	float scale() const;
+
 private:
 	std::shared_ptr<pv::data::Analog> data_;
-	float scale_;
+
+	int scale_index_;
+	int scale_index_drag_offset_;
 };
 
 } // namespace view
 } // namespace pv
 
-#endif // PULSEVIEW_PV_VIEW_ANALOGSIGNAL_H
+#endif // PULSEVIEW_PV_VIEW_ANALOGSIGNAL_HPP