Remove non-functional remains of the scale drag handle

diff --git a/pv/views/trace/analogsignal.cpp b/pv/views/trace/analogsignal.cpp
index d8dbf6f1a08222fe71c1ed047316e3644d05dfd1..2a2e2305b1b7e9b05c6ab4ed0240c7e61d010bcc 100644 (file)
--- 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
        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),
        pos_vdivs_(1),
        neg_vdivs_(1),
        resolution_(0),


@@ -183,28 +182,6 @@ pair<int, int> AnalogSignal::v_extents() const
        return make_pair(-ph, nh);
 }
 
        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);
 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 19334ee289e08ee049736ff2218da59308cebff5..885856dff999a84d5428cff55eeb43de8a102d97 100644 (file)
--- a/pv/views/trace/analogsignal.hpp
+++ b/pv/views/trace/analogsignal.hpp
@@ -86,22 +86,6 @@ public:
         */
        pair<int, int> v_extents() const;
 
         */
        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);
 
        /**
        virtual void on_setting_changed(const QString &key, const QVariant &value);
 
        /**


@@ -193,7 +177,6 @@ private:
 
        float scale_;
        int scale_index_;
 
        float scale_;
        int scale_index_;

-       int scale_index_drag_offset_;

 
        int div_height_;
        int pos_vdivs_, neg_vdivs_;  // divs per positive/negative side
 
        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 c129559185437879bee31bb51b530f5ad125e586..8396323f4ee05623c3e49d747ef9b44caf47cc15 100644 (file)
--- 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);
 }
 
        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;
 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 45e815bae79e0d4e3fc8a68916be14a39183a9cd..04ba1305fc455a8addd8f75236e529ebd04dc5d1 100644 (file)
--- a/pv/views/trace/logicsignal.hpp
+++ b/pv/views/trace/logicsignal.hpp
@@ -89,17 +89,6 @@ public:
         */
        pair<int, int> v_extents() const;
 
         */
        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.
        /**
         * Paints the mid-layer of the signal with a QPainter
         * @param p the QPainter to paint into.