From 3b2ead4fbeb899188564ec9c69c216708311a881 Mon Sep 17 00:00:00 2001 From: Soeren Apel Date: Sat, 27 Oct 2018 16:12:18 +0200 Subject: [PATCH] AnalogSignal/LogicSignal: Internally cache settings used for painting --- pv/views/trace/analogsignal.cpp | 85 +++++++++++++++++---------------- pv/views/trace/analogsignal.hpp | 13 +++-- pv/views/trace/logicsignal.cpp | 43 ++++++++++------- pv/views/trace/logicsignal.hpp | 5 ++ 4 files changed, 83 insertions(+), 63 deletions(-) diff --git a/pv/views/trace/analogsignal.cpp b/pv/views/trace/analogsignal.cpp index ae3fe8d2..cd680085 100644 --- a/pv/views/trace/analogsignal.cpp +++ b/pv/views/trace/analogsignal.cpp @@ -121,11 +121,18 @@ AnalogSignal::AnalogSignal( connect(analog_data, SIGNAL(min_max_changed(float, float)), this, SLOT(on_min_max_changed(float, float))); - GlobalSettings gs; + GlobalSettings settings; + show_sampling_points_ = + settings.value(GlobalSettings::Key_View_ShowSamplingPoints).toBool(); + fill_high_areas_ = + settings.value(GlobalSettings::Key_View_FillSignalHighAreas).toBool(); + high_fill_color_ = QColor::fromRgba(settings.value( + GlobalSettings::Key_View_FillSignalHighAreaColor).value()); + show_analog_minor_grid_ = + settings.value(GlobalSettings::Key_View_ShowAnalogMinorGrid).toBool(); conversion_threshold_disp_mode_ = - gs.value(GlobalSettings::Key_View_ConversionThresholdDispMode).toInt(); - - div_height_ = gs.value(GlobalSettings::Key_View_DefaultDivHeight).toInt(); + settings.value(GlobalSettings::Key_View_ConversionThresholdDispMode).toInt(); + div_height_ = settings.value(GlobalSettings::Key_View_DefaultDivHeight).toInt(); base_->set_color(SignalColors[base_->index() % countof(SignalColors)]); update_scale(); @@ -184,14 +191,6 @@ pair AnalogSignal::v_extents() const return make_pair(-ph, nh); } -void AnalogSignal::on_setting_changed(const QString &key, const QVariant &value) -{ - Signal::on_setting_changed(key, value); - - if (key == GlobalSettings::Key_View_ConversionThresholdDispMode) - on_settingViewConversionThresholdDispMode_changed(value); -} - void AnalogSignal::paint_back(QPainter &p, ViewItemPaintParams &pp) { if (!base_->enabled()) @@ -322,10 +321,6 @@ void AnalogSignal::paint_grid(QPainter &p, int y, int left, int right) { p.setRenderHint(QPainter::Antialiasing, false); - GlobalSettings settings; - const bool show_analog_minor_grid = - settings.value(GlobalSettings::Key_View_ShowAnalogMinorGrid).toBool(); - if (pos_vdivs_ > 0) { p.setPen(QPen(GridMajorColor, 1, Qt::DashLine)); for (int i = 1; i <= pos_vdivs_; i++) { @@ -334,7 +329,7 @@ void AnalogSignal::paint_grid(QPainter &p, int y, int left, int right) } } - if ((pos_vdivs_ > 0) && show_analog_minor_grid) { + if ((pos_vdivs_ > 0) && show_analog_minor_grid_) { p.setPen(QPen(GridMinorColor, 1, Qt::DashLine)); for (int i = 0; i < pos_vdivs_; i++) { const float dy = i * div_height_; @@ -355,7 +350,7 @@ void AnalogSignal::paint_grid(QPainter &p, int y, int left, int right) } } - if ((pos_vdivs_ > 0) && show_analog_minor_grid) { + if ((pos_vdivs_ > 0) && show_analog_minor_grid_) { p.setPen(QPen(GridMinorColor, 1, Qt::DashLine)); for (int i = 0; i < neg_vdivs_; i++) { const float dy = i * div_height_; @@ -390,8 +385,7 @@ void AnalogSignal::paint_trace(QPainter &p, // Calculate and paint the sampling points if enabled and useful GlobalSettings settings; const bool show_sampling_points = - (settings.value(GlobalSettings::Key_View_ShowSamplingPoints).toBool() || - paint_thr_dots) && (samples_per_pixel < 0.25); + (show_sampling_points_ || paint_thr_dots) && (samples_per_pixel < 0.25); p.setPen(base_->color()); @@ -572,11 +566,7 @@ void AnalogSignal::paint_logic_mid(QPainter &p, ViewItemPaintParams &pp) pp.left() + (edges.back().first / samples_per_pixel - pixels_offset); // Check whether we need to paint the sampling points - GlobalSettings settings; - const bool show_sampling_points = - settings.value(GlobalSettings::Key_View_ShowSamplingPoints).toBool() && - (samples_per_pixel < 0.25); - + const bool show_sampling_points = show_sampling_points_ && (samples_per_pixel < 0.25); vector sampling_points; float sampling_point_x = first_sample_x; int64_t sampling_point_sample = start_sample; @@ -585,9 +575,6 @@ void AnalogSignal::paint_logic_mid(QPainter &p, ViewItemPaintParams &pp) if (show_sampling_points) sampling_points.reserve(end_sample - start_sample + 1); - // Check whether we need to fill the high areas - const bool fill_high_areas = - settings.value(GlobalSettings::Key_View_FillSignalHighAreas).toBool(); vector high_rects; float rising_edge_x; bool rising_edge_seen = false; @@ -612,7 +599,7 @@ void AnalogSignal::paint_logic_mid(QPainter &p, ViewItemPaintParams &pp) const float x = pp.left() + ((*i).first / samples_per_pixel - pixels_offset); *line++ = QLineF(x, high_offset, x, low_offset); - if (fill_high_areas) { + if (fill_high_areas_) { // Any edge terminates a high area if (rising_edge_seen) { const int width = x - rising_edge_x; @@ -650,16 +637,14 @@ void AnalogSignal::paint_logic_mid(QPainter &p, ViewItemPaintParams &pp) sampling_point_x += pixels_per_sample; }; - if (fill_high_areas) { + if (fill_high_areas_) { // Add last high rectangle if the signal is still high at the end of the trace if (rising_edge_seen && (edges.cend() - 1)->second) high_rects.emplace_back(rising_edge_x, high_offset, last_sample_x - rising_edge_x, signal_height); - const QColor fill_color = QColor::fromRgba(settings.value( - GlobalSettings::Key_View_FillSignalHighAreaColor).value()); - p.setPen(fill_color); - p.setBrush(fill_color); + p.setPen(high_fill_color_); + p.setBrush(high_fill_color_); p.drawRects((const QRectF*)(high_rects.data()), high_rects.size()); } @@ -1103,6 +1088,30 @@ void AnalogSignal::hover_point_changed(const QPoint &hp) } } +void AnalogSignal::on_setting_changed(const QString &key, const QVariant &value) +{ + Signal::on_setting_changed(key, value); + + if (key == GlobalSettings::Key_View_ShowSamplingPoints) + show_sampling_points_ = value.toBool(); + + if (key == GlobalSettings::Key_View_FillSignalHighAreas) + fill_high_areas_ = value.toBool(); + + if (key == GlobalSettings::Key_View_FillSignalHighAreaColor) + high_fill_color_ = QColor::fromRgba(value.value()); + + if (key == GlobalSettings::Key_View_ShowAnalogMinorGrid) + show_analog_minor_grid_ = value.toBool(); + + if (key == GlobalSettings::Key_View_ConversionThresholdDispMode) { + conversion_threshold_disp_mode_ = value.toInt(); + + if (owner_) + owner_->row_item_appearance_changed(false, true); + } +} + void AnalogSignal::on_min_max_changed(float min, float max) { (void)min; @@ -1316,14 +1325,6 @@ void AnalogSignal::on_display_type_changed(int index) owner_->row_item_appearance_changed(false, true); } -void AnalogSignal::on_settingViewConversionThresholdDispMode_changed(const QVariant new_value) -{ - conversion_threshold_disp_mode_ = new_value.toInt(); - - if (owner_) - owner_->row_item_appearance_changed(false, true); -} - } // namespace trace } // namespace views } // namespace pv diff --git a/pv/views/trace/analogsignal.hpp b/pv/views/trace/analogsignal.hpp index 60acc2eb..fd724492 100644 --- a/pv/views/trace/analogsignal.hpp +++ b/pv/views/trace/analogsignal.hpp @@ -22,6 +22,7 @@ #include +#include #include #include @@ -86,8 +87,6 @@ public: */ pair v_extents() const; - virtual void on_setting_changed(const QString &key, const QVariant &value); - /** * Paints the background layer of the signal with a QPainter * @param p the QPainter to paint into. @@ -161,6 +160,8 @@ protected: virtual void hover_point_changed(const QPoint &hp); private Q_SLOTS: + virtual void on_setting_changed(const QString &key, const QVariant &value); + void on_min_max_changed(float min, float max); void on_pos_vdivs_changed(int vdivs); @@ -177,8 +178,6 @@ private Q_SLOTS: void on_display_type_changed(int index); - void on_settingViewConversionThresholdDispMode_changed(const QVariant new_value); - private: QComboBox *resolution_cb_, *conversion_cb_, *conv_threshold_cb_, *display_type_cb_; @@ -189,7 +188,11 @@ private: int div_height_; int pos_vdivs_, neg_vdivs_; // divs per positive/negative side - float resolution_; // e.g. 10 for 10 V/div + float resolution_; // e.g. 10 for 10 V/div + + bool show_analog_minor_grid_; + QColor high_fill_color_; + bool show_sampling_points_, fill_high_areas_; DisplayType display_type_; bool autoranging_; diff --git a/pv/views/trace/logicsignal.cpp b/pv/views/trace/logicsignal.cpp index 8c4c982c..f9ab16f1 100644 --- a/pv/views/trace/logicsignal.cpp +++ b/pv/views/trace/logicsignal.cpp @@ -117,8 +117,14 @@ LogicSignal::LogicSignal( base_->set_color(SignalColors[base->index() % countof(SignalColors)]); - GlobalSettings gs; - signal_height_ = gs.value(GlobalSettings::Key_View_DefaultLogicHeight).toInt(); + GlobalSettings settings; + signal_height_ = settings.value(GlobalSettings::Key_View_DefaultLogicHeight).toInt(); + show_sampling_points_ = + settings.value(GlobalSettings::Key_View_ShowSamplingPoints).toBool(); + fill_high_areas_ = + settings.value(GlobalSettings::Key_View_FillSignalHighAreas).toBool(); + high_fill_color_ = QColor::fromRgba(settings.value( + GlobalSettings::Key_View_FillSignalHighAreaColor).value()); /* Populate this channel's trigger setting with whatever we * find in the current session trigger, if anything. */ @@ -216,11 +222,7 @@ void LogicSignal::paint_mid(QPainter &p, ViewItemPaintParams &pp) pp.left() + (edges.back().first / samples_per_pixel - pixels_offset); // Check whether we need to paint the sampling points - GlobalSettings settings; - const bool show_sampling_points = - settings.value(GlobalSettings::Key_View_ShowSamplingPoints).toBool() && - (samples_per_pixel < 0.25); - + const bool show_sampling_points = show_sampling_points_ && (samples_per_pixel < 0.25); vector sampling_points; float sampling_point_x = first_sample_x; int64_t sampling_point_sample = start_sample; @@ -229,9 +231,6 @@ void LogicSignal::paint_mid(QPainter &p, ViewItemPaintParams &pp) if (show_sampling_points) sampling_points.reserve(end_sample - start_sample + 1); - // Check whether we need to fill the high areas - const bool fill_high_areas = - settings.value(GlobalSettings::Key_View_FillSignalHighAreas).toBool(); vector high_rects; float rising_edge_x; bool rising_edge_seen = false; @@ -256,7 +255,7 @@ void LogicSignal::paint_mid(QPainter &p, ViewItemPaintParams &pp) const float x = pp.left() + ((*i).first / samples_per_pixel - pixels_offset); *line++ = QLineF(x, high_offset, x, low_offset); - if (fill_high_areas) { + if (fill_high_areas_) { // Any edge terminates a high area if (rising_edge_seen) { const int width = x - rising_edge_x; @@ -294,16 +293,14 @@ void LogicSignal::paint_mid(QPainter &p, ViewItemPaintParams &pp) sampling_point_x += pixels_per_sample; }; - if (fill_high_areas) { + if (fill_high_areas_) { // Add last high rectangle if the signal is still high at the end of the trace if (rising_edge_seen && (edges.cend() - 1)->second) high_rects.emplace_back(rising_edge_x, high_offset, last_sample_x - rising_edge_x, signal_height_); - const QColor fill_color = QColor::fromRgba(settings.value( - GlobalSettings::Key_View_FillSignalHighAreaColor).value()); - p.setPen(fill_color); - p.setBrush(fill_color); + p.setPen(high_fill_color_); + p.setBrush(high_fill_color_); p.drawRects((const QRectF*)(high_rects.data()), high_rects.size()); } @@ -650,6 +647,20 @@ const QPixmap* LogicSignal::get_pixmap(const char *path) return pixmap_cache_.take(path); } +void LogicSignal::on_setting_changed(const QString &key, const QVariant &value) +{ + Signal::on_setting_changed(key, value); + + if (key == GlobalSettings::Key_View_ShowSamplingPoints) + show_sampling_points_ = value.toBool(); + + if (key == GlobalSettings::Key_View_FillSignalHighAreas) + fill_high_areas_ = value.toBool(); + + if (key == GlobalSettings::Key_View_FillSignalHighAreaColor) + high_fill_color_ = QColor::fromRgba(value.value()); +} + void LogicSignal::on_trigger() { QAction *action; diff --git a/pv/views/trace/logicsignal.hpp b/pv/views/trace/logicsignal.hpp index 10ede729..b170e2c0 100644 --- a/pv/views/trace/logicsignal.hpp +++ b/pv/views/trace/logicsignal.hpp @@ -21,6 +21,7 @@ #define PULSEVIEW_PV_VIEWS_TRACEVIEW_LOGICSIGNAL_HPP #include +#include #include #include @@ -133,12 +134,16 @@ private: static const QPixmap* get_pixmap(const char *path); private Q_SLOTS: + void on_setting_changed(const QString &key, const QVariant &value); + void on_trigger(); void on_signal_height_changed(int height); private: int signal_height_; + QColor high_fill_color_; + bool show_sampling_points_, fill_high_areas_; shared_ptr device_; -- 2.30.2