Implement LogicSegment::get_surrounding_edges() and use it

[pulseview.git] / pv / views / trace / logicsignal.hpp

diff --git a/pv/views/trace/logicsignal.hpp b/pv/views/trace/logicsignal.hpp
index 4a52d379060523569e42628e94aa99d2aea6ee20..ca5ce3d4d2f38ba922971c4c67dc5f6248e6ab4f 100644 (file)
--- a/pv/views/trace/logicsignal.hpp
+++ b/pv/views/trace/logicsignal.hpp
@@ -59,14 +59,14 @@ class LogicSignal : public Signal
 public:
        static const float Oversampling;
 
-       static const QColor EdgeColour;
-       static const QColor HighColour;
-       static const QColor LowColour;
-       static const QColor SamplingPointColour;
+       static const QColor EdgeColor;
+       static const QColor HighColor;
+       static const QColor LowColor;
+       static const QColor SamplingPointColor;
 
-       static const QColor SignalColours[10];
+       static const QColor SignalColors[10];
 
-       static QColor TriggerMarkerBackgroundColour;
+       static QColor TriggerMarkerBackgroundColor;
        static const int TriggerMarkerPadding;
        static const char* TriggerMarkerIcons[8];
 
@@ -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.
@@ -114,6 +103,8 @@ public:
         */
        virtual void paint_fore(QPainter &p, ViewItemPaintParams &pp);
 
+       virtual void hover_point_changed(const QPoint &hp);
+
 private:
        void paint_caps(QPainter &p, QLineF *const lines,
                vector< pair<int64_t, bool> > &edges,
@@ -147,6 +138,7 @@ private:
        QSpinBox *signal_height_sb_;
 
        const sigrok::TriggerMatchType *trigger_match_;
+       const vector<int32_t> trigger_types_;
        QToolBar *trigger_bar_;
        QAction *trigger_none_;
        QAction *trigger_rising_;