From: Soeren Apel <redacted>
Date: Thu, 19 Jul 2018 17:00:31 +0000 (+0200)
Subject: Remove non-functional remains of the scale drag handle
X-Git-Url: https://sigrok.org/gitaction?a=commitdiff_plain;h=cc844e861276b56837c345d69975c50f009d57af;p=pulseview.git

Remove non-functional remains of the scale drag handle
---

diff --git a/pv/views/trace/analogsignal.cpp b/pv/views/trace/analogsignal.cpp
index d8dbf6f1..2a2e2305 100644
--- a/pv/views/trace/analogsignal.cpp
+++ b/pv/views/trace/analogsignal.cpp
@@ -105,7 +105,6 @@ AnalogSignal::AnalogSignal(
 	shared_ptr<data::SignalBase> base) :
 	Signal(session, base),
 	scale_index_(4), // 20 per div
-	scale_index_drag_offset_(0),
 	pos_vdivs_(1),
 	neg_vdivs_(1),
 	resolution_(0),
@@ -183,28 +182,6 @@ pair<int, int> AnalogSignal::v_extents() const
 	return make_pair(-ph, nh);
 }
 
-int AnalogSignal::scale_handle_offset() const
-{
-	const int h = (pos_vdivs_ + neg_vdivs_) * div_height_;
-
-	return ((scale_index_drag_offset_ - scale_index_) * h / 4) - h / 2;
-}
-
-void AnalogSignal::scale_handle_dragged(int offset)
-{
-	const int h = (pos_vdivs_ + neg_vdivs_) * div_height_;
-
-	scale_index_ = scale_index_drag_offset_ - (offset + h / 2) / (h / 4);
-
-	update_scale();
-}
-
-void AnalogSignal::scale_handle_drag_release()
-{
-	scale_index_drag_offset_ = scale_index_;
-	update_scale();
-}
-
 void AnalogSignal::on_setting_changed(const QString &key, const QVariant &value)
 {
 	Signal::on_setting_changed(key, value);
diff --git a/pv/views/trace/analogsignal.hpp b/pv/views/trace/analogsignal.hpp
index 19334ee2..885856df 100644
--- a/pv/views/trace/analogsignal.hpp
+++ b/pv/views/trace/analogsignal.hpp
@@ -86,22 +86,6 @@ public:
 	 */
 	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();
-
 	virtual void on_setting_changed(const QString &key, const QVariant &value);
 
 	/**
@@ -193,7 +177,6 @@ private:
 
 	float scale_;
 	int scale_index_;
-	int scale_index_drag_offset_;
 
 	int div_height_;
 	int pos_vdivs_, neg_vdivs_;  // divs per positive/negative side
diff --git a/pv/views/trace/logicsignal.cpp b/pv/views/trace/logicsignal.cpp
index c1295591..8396323f 100644
--- a/pv/views/trace/logicsignal.cpp
+++ b/pv/views/trace/logicsignal.cpp
@@ -164,18 +164,6 @@ pair<int, int> LogicSignal::v_extents() const
 	return make_pair(-signal_height_ - signal_margin, signal_margin);
 }
 
-int LogicSignal::scale_handle_offset() const
-{
-	return -signal_height_;
-}
-
-void LogicSignal::scale_handle_dragged(int offset)
-{
-	const int font_height = QFontMetrics(QApplication::font()).height();
-	const int units = (-offset / font_height);
-	signal_height_ = ((units < 1) ? 1 : units) * font_height;
-}
-
 void LogicSignal::paint_mid(QPainter &p, ViewItemPaintParams &pp)
 {
 	QLineF *line;
diff --git a/pv/views/trace/logicsignal.hpp b/pv/views/trace/logicsignal.hpp
index 45e815ba..04ba1305 100644
--- a/pv/views/trace/logicsignal.hpp
+++ b/pv/views/trace/logicsignal.hpp
@@ -89,17 +89,6 @@ public:
 	 */
 	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);
-
 	/**
 	 * Paints the mid-layer of the signal with a QPainter
 	 * @param p the QPainter to paint into.