X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fview%2Flogicsignal.hpp;h=d34b65e755a399540ff96ee965b1f73d93a930c5;hp=71dcc0361404648091532a767209b9d88e9170bc;hb=4fb5fb99ba0453af3080e82e4f3e2f295a55616b;hpb=214470fc17e73bbf4664f4c1678a7dd30c905bf2 diff --git a/pv/view/logicsignal.hpp b/pv/view/logicsignal.hpp index 71dcc036..d34b65e7 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; @@ -97,25 +94,18 @@ public: */ void scale_handle_dragged(int offset); - /** - * 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); - /** * 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: @@ -128,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); @@ -141,6 +131,8 @@ private Q_SLOTS: void on_trigger(); private: + int signal_height_; + std::shared_ptr device_; std::shared_ptr data_;