X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=pv%2Fview%2Fanalogsignal.hpp;h=5ea24039108908c6b2425146854b7488bfe8fd9a;hb=b8f1cdeba7cf6c2b749ff60102ce4e260fa1309e;hp=5283a2c5e569d949ad9112da048432eeb7c87120;hpb=a970015f3aac1e13a5ed2e19a60ac304b1397d1c;p=pulseview.git diff --git a/pv/view/analogsignal.hpp b/pv/view/analogsignal.hpp index 5283a2c..5ea2403 100644 --- a/pv/view/analogsignal.hpp +++ b/pv/view/analogsignal.hpp @@ -49,6 +49,7 @@ private: static const QColor GridMajorColor, GridMinorColor; static const QColor SamplingPointColour; + static const int64_t TracePaintBlockSize; static const float EnvelopeThreshold; static const int MaximumVDivs; @@ -128,6 +129,13 @@ private: int y, int left, const int64_t start, const int64_t end, const double pixels_offset, const double samples_per_pixel); + void paint_logic_mid(QPainter &p, const ViewItemPaintParams &pp); + + void paint_logic_caps(QPainter &p, QLineF *const lines, + vector< pair > &edges, + bool level, double samples_per_pixel, double pixels_offset, + float x_offset, float y_offset); + /** * Computes the scale factor from the scale index and vdiv settings. */ @@ -135,6 +143,8 @@ private: void update_scale(); + void update_conversion_type(); + void perform_autoranging(bool force_update = false); protected: @@ -152,6 +162,8 @@ private Q_SLOTS: void on_conversion_changed(int index); + void on_display_type_changed(int index); + private: QComboBox *resolution_cb_, *conversion_cb_, *display_type_cb_;