X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fview%2Flogicsignal.hpp;h=fc0dcabb26c15233eb4cce4f7b88fd2995f4045a;hp=0705613eb3b9252de57eb566d59505cba297ff1c;hb=834a4f1bb78a4098c59954500698bdd13060c219;hpb=da30ecb7e72bd2547e524258efa5ec642988b70b diff --git a/pv/view/logicsignal.hpp b/pv/view/logicsignal.hpp index 0705613e..fc0dcabb 100644 --- a/pv/view/logicsignal.hpp +++ b/pv/view/logicsignal.hpp @@ -51,9 +51,6 @@ class LogicSignal : public Signal Q_OBJECT private: - static const int SignalHeight; - static const int SignalMargin; - static const float Oversampling; static const QColor EdgeColour; @@ -72,7 +69,7 @@ public: std::shared_ptr channel, std::shared_ptr data); - virtual ~LogicSignal(); + virtual ~LogicSignal() = default; std::shared_ptr data() const; @@ -87,24 +84,28 @@ public: std::pair v_extents() const; /** - * 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 ViewItemPaintParams &pp); + * 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. * @param pp the painting parameters object to paint with.. - **/ + */ void paint_mid(QPainter &p, const ViewItemPaintParams &pp); /** * Paints the foreground layer of the signal with a QPainter * @param p the QPainter to paint into. * @param pp the painting parameters object to paint with. - **/ + */ virtual void paint_fore(QPainter &p, const ViewItemPaintParams &pp); private: @@ -117,7 +118,7 @@ private: const std::vector get_trigger_types() const; QAction* action_from_trigger_type( - const sigrok::TriggerMatchType *match); + const sigrok::TriggerMatchType *type); const sigrok::TriggerMatchType* trigger_type_from_action( QAction *action); void populate_popup_form(QWidget *parent, QFormLayout *form); @@ -130,6 +131,8 @@ private Q_SLOTS: void on_trigger(); private: + int signal_height_; + std::shared_ptr device_; std::shared_ptr data_;