From: Soeren Apel Date: Fri, 4 Dec 2020 22:54:03 +0000 (+0100) Subject: Make AnalogSignal inherit LogicSignal X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=commitdiff_plain;h=66a43b4f9cf76853e99e7f5fc2f9df49ec58bd34 Make AnalogSignal inherit LogicSignal This way, we can re-use the logic drawing methods and don't have them duplicated in two different trace types. --- diff --git a/pv/data/signalbase.cpp b/pv/data/signalbase.cpp index 46ed8783..3ce22ba2 100644 --- a/pv/data/signalbase.cpp +++ b/pv/data/signalbase.cpp @@ -124,6 +124,7 @@ SignalBase::SignalBase(shared_ptr channel, ChannelType channel_ conversion_type_(NoConversion), min_value_(0), max_value_(0), + index_(0), error_message_("") { if (channel_) { @@ -318,15 +319,22 @@ shared_ptr SignalBase::logic_data() const if (!data_) return nullptr; - shared_ptr result = dynamic_pointer_cast(data_); + shared_ptr result; if (((conversion_type_ == A2LConversionByThreshold) || (conversion_type_ == A2LConversionBySchmittTrigger))) result = dynamic_pointer_cast(converted_data_); + else + result = dynamic_pointer_cast(data_); return result; } +shared_ptr SignalBase::data() const +{ + return data_; +} + bool SignalBase::segment_is_complete(uint32_t segment_id) const { bool result = true; diff --git a/pv/data/signalbase.hpp b/pv/data/signalbase.hpp index e50b9e96..2223abaf 100644 --- a/pv/data/signalbase.hpp +++ b/pv/data/signalbase.hpp @@ -251,6 +251,11 @@ public: */ shared_ptr logic_data() const; + /** + * Get the primary internal data object, i.e. the data that was acquired from the device. + */ + shared_ptr data() const; + /** * Determines whether a given segment is complete (i.e. end-of-frame has * been seen). It only considers the original data, not the converted data. diff --git a/pv/views/trace/analogsignal.cpp b/pv/views/trace/analogsignal.cpp index e6b6d496..53eeaf13 100644 --- a/pv/views/trace/analogsignal.cpp +++ b/pv/views/trace/analogsignal.cpp @@ -75,7 +75,6 @@ const QPen AnalogSignal::AxisPen(QColor(0, 0, 0, 30 * 256 / 100), 2); const QColor AnalogSignal::GridMajorColor = QColor(0, 0, 0, 40 * 256 / 100); const QColor AnalogSignal::GridMinorColor = QColor(0, 0, 0, 20 * 256 / 100); -const QColor AnalogSignal::SamplingPointColor(0x77, 0x77, 0x77); const QColor AnalogSignal::SamplingPointColorLo = QColor(200, 0, 0, 80 * 256 / 100); const QColor AnalogSignal::SamplingPointColorNe = QColor(0, 0, 0, 80 * 256 / 100); const QColor AnalogSignal::SamplingPointColorHi = QColor(0, 200, 0, 80 * 256 / 100); @@ -95,10 +94,8 @@ const int AnalogSignal::MaxScaleIndex = 10; // 1000 units/div const int AnalogSignal::InfoTextMarginRight = 20; const int AnalogSignal::InfoTextMarginBottom = 5; -AnalogSignal::AnalogSignal( - pv::Session &session, - shared_ptr base) : - Signal(session, base), +AnalogSignal::AnalogSignal(pv::Session &session, shared_ptr base) : + LogicSignal(session, base), value_at_hover_pos_(std::numeric_limits::quiet_NaN()), scale_index_(4), // 20 per div pos_vdivs_(1), @@ -110,7 +107,7 @@ AnalogSignal::AnalogSignal( axis_pen_ = AxisPen; pv::data::Analog* analog_data = - dynamic_cast(data().get()); + dynamic_cast(base_->analog_data().get()); connect(analog_data, SIGNAL(min_max_changed(float, float)), this, SLOT(on_min_max_changed(float, float))); @@ -128,16 +125,14 @@ AnalogSignal::AnalogSignal( settings.value(GlobalSettings::Key_View_ConversionThresholdDispMode).toInt(); div_height_ = settings.value(GlobalSettings::Key_View_DefaultDivHeight).toInt(); + update_logic_level_offsets(); update_scale(); } -shared_ptr AnalogSignal::data() const -{ - return base_->analog_data(); -} - std::map AnalogSignal::save_settings() const { + LogicSignal::save_settings(); + std::map result; result["pos_vdivs"] = pos_vdivs_; @@ -152,6 +147,8 @@ std::map AnalogSignal::save_settings() const void AnalogSignal::restore_settings(std::map settings) { + LogicSignal::restore_settings(settings); + auto entry = settings.find("pos_vdivs"); if (entry != settings.end()) pos_vdivs_ = settings["pos_vdivs"].toInt(); @@ -179,6 +176,8 @@ void AnalogSignal::restore_settings(std::map settings) const int old_height = div_height_; div_height_ = settings["div_height"].toInt(); + update_logic_level_offsets(); + if ((div_height_ != old_height) && owner_) { // Call order is important, otherwise the lazy event handler won't work owner_->extents_changed(false, true); @@ -282,7 +281,8 @@ void AnalogSignal::paint_mid(QPainter &p, ViewItemPaintParams &pp) } if ((display_type_ == DisplayConverted) || (display_type_ == DisplayBoth)) - paint_logic_mid(p, pp); + if (base_->logic_data()) + LogicSignal::paint_mid(p, pp); const QString err = base_->get_error_message(); if (!err.isEmpty()) @@ -324,10 +324,13 @@ void AnalogSignal::paint_fore(QPainter &p, ViewItemPaintParams &pp) v_extents().second - v_extents().first - InfoTextMarginBottom); p.drawText(bounding_rect, Qt::AlignRight | Qt::AlignBottom, infotext); + + if (show_hover_marker_) + paint_hover_marker(p); } - if (show_hover_marker_) - paint_hover_marker(p); + if ((display_type_ == DisplayConverted) || (display_type_ == DisplayBoth)) + LogicSignal::paint_fore(p, pp); } void AnalogSignal::paint_grid(QPainter &p, int y, int left, int right) @@ -527,186 +530,6 @@ void AnalogSignal::paint_envelope(QPainter &p, delete[] e.samples; } -void AnalogSignal::paint_logic_mid(QPainter &p, ViewItemPaintParams &pp) -{ - QLineF *line; - - vector< pair > edges; - - assert(base_); - - const int y = get_visual_y(); - - if (!base_->enabled() || !base_->logic_data()) - return; - - const int signal_margin = - QFontMetrics(QApplication::font()).height() / 2; - - const int ph = min(pos_vdivs_, 1) * div_height_; - const int nh = min(neg_vdivs_, 1) * div_height_; - const float high_offset = y - ph + signal_margin + 0.5f; - const float low_offset = y + nh - signal_margin - 0.5f; - const float signal_height = low_offset - high_offset; - - shared_ptr segment = get_logic_segment_to_paint(); - if (!segment || (segment->get_sample_count() == 0)) - return; - - double samplerate = segment->samplerate(); - - // Show sample rate as 1Hz when it is unknown - if (samplerate == 0.0) - samplerate = 1.0; - - const double pixels_offset = pp.pixels_offset(); - const pv::util::Timestamp& start_time = segment->start_time(); - const int64_t last_sample = (int64_t)segment->get_sample_count() - 1; - const double samples_per_pixel = samplerate * pp.scale(); - const double pixels_per_sample = 1 / samples_per_pixel; - const pv::util::Timestamp start = samplerate * (pp.offset() - start_time); - const pv::util::Timestamp end = start + samples_per_pixel * pp.width(); - - const int64_t start_sample = min(max(floor(start).convert_to(), - (int64_t)0), last_sample); - const uint64_t end_sample = min(max(ceil(end).convert_to(), - (int64_t)0), last_sample); - - segment->get_subsampled_edges(edges, start_sample, end_sample, - samples_per_pixel / LogicSignal::Oversampling, 0); - assert(edges.size() >= 2); - - const float first_sample_x = - pp.left() + (edges.front().first / samples_per_pixel - pixels_offset); - const float last_sample_x = - pp.left() + (edges.back().first / samples_per_pixel - pixels_offset); - - // Check whether we need to paint the sampling points - 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; - const int w = 2; - - if (show_sampling_points) - sampling_points.reserve(end_sample - start_sample + 1); - - vector high_rects; - float rising_edge_x; - bool rising_edge_seen = false; - - // Paint the edges - const unsigned int edge_count = edges.size() - 2; - QLineF *const edge_lines = new QLineF[edge_count]; - line = edge_lines; - - if (edges.front().second) { - // Beginning of trace is high - rising_edge_x = first_sample_x; - rising_edge_seen = true; - } - - for (auto i = edges.cbegin() + 1; i != edges.cend() - 1; i++) { - // Note: multiple edges occupying a single pixel are represented by an edge - // with undefined logic level. This means that only the first falling edge - // after a rising edge corresponds to said rising edge - and vice versa. If - // more edges with the same logic level follow, they denote multiple edges. - - const float x = pp.left() + ((*i).first / samples_per_pixel - pixels_offset); - *line++ = QLineF(x, high_offset, x, low_offset); - - if (fill_high_areas_) { - // Any edge terminates a high area - if (rising_edge_seen) { - const int width = x - rising_edge_x; - if (width > 0) - high_rects.emplace_back(rising_edge_x, high_offset, - width, signal_height); - rising_edge_seen = false; - } - - // Only rising edges start high areas - if ((*i).second) { - rising_edge_x = x; - rising_edge_seen = true; - } - } - - if (show_sampling_points) - while (sampling_point_sample < (*i).first) { - const float y = (*i).second ? low_offset : high_offset; - sampling_points.emplace_back( - QRectF(sampling_point_x - (w / 2), y - (w / 2), w, w)); - sampling_point_sample++; - sampling_point_x += pixels_per_sample; - }; - } - - // Calculate the sample points from the last edge to the end of the trace - if (show_sampling_points) - while ((uint64_t)sampling_point_sample <= end_sample) { - // Signal changed after the last edge, so the level is inverted - const float y = (edges.cend() - 1)->second ? high_offset : low_offset; - sampling_points.emplace_back( - QRectF(sampling_point_x - (w / 2), y - (w / 2), w, w)); - sampling_point_sample++; - sampling_point_x += pixels_per_sample; - }; - - 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); - - p.setPen(high_fill_color_); - p.setBrush(high_fill_color_); - p.drawRects((const QRectF*)(high_rects.data()), high_rects.size()); - } - - p.setPen(LogicSignal::EdgeColor); - p.drawLines(edge_lines, edge_count); - delete[] edge_lines; - - // Paint the caps - const unsigned int max_cap_line_count = edges.size(); - QLineF *const cap_lines = new QLineF[max_cap_line_count]; - - p.setPen(LogicSignal::HighColor); - paint_logic_caps(p, cap_lines, edges, true, samples_per_pixel, - pixels_offset, pp.left(), high_offset); - p.setPen(LogicSignal::LowColor); - paint_logic_caps(p, cap_lines, edges, false, samples_per_pixel, - pixels_offset, pp.left(), low_offset); - - delete[] cap_lines; - - // Paint the sampling points - if (show_sampling_points) { - p.setPen(SamplingPointColor); - p.drawRects(sampling_points.data(), sampling_points.size()); - } -} - -void AnalogSignal::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) -{ - QLineF *line = lines; - - for (auto i = edges.begin(); i != (edges.end() - 1); i++) - if ((*i).second == level) { - *line++ = QLineF( - ((*i).first / samples_per_pixel - - pixels_offset) + x_offset, y_offset, - ((*(i+1)).first / samples_per_pixel - - pixels_offset) + x_offset, y_offset); - } - - p.drawLines(lines, line - lines); -} - shared_ptr AnalogSignal::get_analog_segment_to_paint() const { shared_ptr segment; @@ -719,7 +542,7 @@ shared_ptr AnalogSignal::get_analog_segment_to_paint() segment = segments.back(); if ((segment_display_mode_ == ShowSingleSegmentOnly) || - (segment_display_mode_ == ShowLastCompleteSegmentOnly)) { + (segment_display_mode_ == ShowLastCompleteSegmentOnly)) { try { segment = segments.at(current_segment_); } catch (out_of_range&) { @@ -731,30 +554,6 @@ shared_ptr AnalogSignal::get_analog_segment_to_paint() return segment; } -shared_ptr AnalogSignal::get_logic_segment_to_paint() const -{ - shared_ptr segment; - - const deque< shared_ptr > &segments = - base_->logic_data()->logic_segments(); - - if (!segments.empty()) { - if (segment_display_mode_ == ShowLastSegmentOnly) - segment = segments.back(); - - if ((segment_display_mode_ == ShowSingleSegmentOnly) || - (segment_display_mode_ == ShowLastCompleteSegmentOnly)) { - try { - segment = segments.at(current_segment_); - } catch (out_of_range&) { - qDebug() << "Current logic segment out of range for signal" << base_->name() << ":" << current_segment_; - } - } - } - - return segment; -} - float AnalogSignal::get_resolution(int scale_index) { const float seq[] = {1.0f, 2.0f, 5.0f}; @@ -772,6 +571,17 @@ void AnalogSignal::update_scale() scale_ = div_height_ / resolution_; } +void AnalogSignal::update_logic_level_offsets() +{ + const int signal_margin = QFontMetrics(QApplication::font()).height() / 2; + + const int ph = min(pos_vdivs_, 1) * div_height_; + const int nh = min(neg_vdivs_, 1) * div_height_; + + high_level_offset_ = -ph + signal_margin + 0.5f; + low_level_offset_ = nh - signal_margin - 0.5f; +} + void AnalogSignal::update_conversion_widgets() { SignalBase::ConversionType conv_type = base_->get_conversion_type(); @@ -1156,6 +966,8 @@ void AnalogSignal::on_pos_vdivs_changed(int vdivs) } } + update_logic_level_offsets(); + if (owner_) { // Call order is important, otherwise the lazy event handler won't work owner_->extents_changed(false, true); @@ -1187,6 +999,8 @@ void AnalogSignal::on_neg_vdivs_changed(int vdivs) } } + update_logic_level_offsets(); + if (owner_) { // Call order is important, otherwise the lazy event handler won't work owner_->extents_changed(false, true); @@ -1197,6 +1011,7 @@ void AnalogSignal::on_neg_vdivs_changed(int vdivs) void AnalogSignal::on_div_height_changed(int height) { div_height_ = height; + update_logic_level_offsets(); update_scale(); if (owner_) { diff --git a/pv/views/trace/analogsignal.hpp b/pv/views/trace/analogsignal.hpp index 4c42e579..6fbcc24b 100644 --- a/pv/views/trace/analogsignal.hpp +++ b/pv/views/trace/analogsignal.hpp @@ -27,6 +27,7 @@ #include #include +#include using std::pair; using std::shared_ptr; @@ -42,14 +43,13 @@ class SignalBase; namespace views { namespace trace { -class AnalogSignal : public Signal +class AnalogSignal : public LogicSignal { Q_OBJECT private: static const QPen AxisPen; static const QColor GridMajorColor, GridMinorColor; - static const QColor SamplingPointColor; static const QColor SamplingPointColorLo; static const QColor SamplingPointColorNe; static const QColor SamplingPointColorHi; @@ -74,8 +74,6 @@ private: public: AnalogSignal(pv::Session &session, shared_ptr base); - shared_ptr data() const; - virtual std::map save_settings() const; virtual void restore_settings(std::map settings); @@ -83,28 +81,28 @@ public: * Computes the vertical extents of the contents of this row item. * @return A pair containing the minimum and maximum y-values. */ - pair v_extents() const; + virtual 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, ViewItemPaintParams &pp); + virtual void paint_back(QPainter &p, 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, ViewItemPaintParams &pp); + virtual void paint_mid(QPainter &p, ViewItemPaintParams &pp); /** * Paints the foreground layer of the item with a QPainter * @param p the QPainter to paint into. * @param pp the painting parameters object to paint with. */ - void paint_fore(QPainter &p, ViewItemPaintParams &pp); + virtual void paint_fore(QPainter &p, ViewItemPaintParams &pp); private: void paint_grid(QPainter &p, int y, int left, int right); @@ -119,15 +117,7 @@ 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, 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); - shared_ptr get_analog_segment_to_paint() const; - shared_ptr get_logic_segment_to_paint() const; /** * Computes the scale factor from the scale index and vdiv settings. @@ -135,6 +125,7 @@ private: float get_resolution(int scale_index); void update_scale(); + virtual void update_logic_level_offsets(); void update_conversion_widgets(); diff --git a/pv/views/trace/logicsignal.cpp b/pv/views/trace/logicsignal.cpp index 350f4950..732d46d2 100644 --- a/pv/views/trace/logicsignal.cpp +++ b/pv/views/trace/logicsignal.cpp @@ -86,12 +86,8 @@ const char* LogicSignal::TriggerMarkerIcons[8] = { QCache LogicSignal::icon_cache_; QCache LogicSignal::pixmap_cache_; -LogicSignal::LogicSignal( - pv::Session &session, - shared_ptr device, - shared_ptr base) : +LogicSignal::LogicSignal(pv::Session &session, shared_ptr base) : Signal(session, base), - device_(device), trigger_types_(get_trigger_types()), trigger_none_(nullptr), trigger_rising_(nullptr), @@ -100,8 +96,6 @@ LogicSignal::LogicSignal( trigger_low_(nullptr), trigger_change_(nullptr) { - shared_ptr trigger; - GlobalSettings settings; signal_height_ = settings.value(GlobalSettings::Key_View_DefaultLogicHeight).toInt(); show_sampling_points_ = @@ -111,26 +105,18 @@ LogicSignal::LogicSignal( high_fill_color_ = QColor::fromRgba(settings.value( GlobalSettings::Key_View_FillSignalHighAreaColor).value()); + update_logic_level_offsets(); + /* Populate this channel's trigger setting with whatever we * find in the current session trigger, if anything. */ trigger_match_ = nullptr; - if ((trigger = session_.session()->trigger())) + if (shared_ptr trigger = session_.session()->trigger()) for (auto stage : trigger->stages()) for (auto match : stage->matches()) if (match->channel() == base_->channel()) trigger_match_ = match->type(); } -shared_ptr LogicSignal::data() const -{ - return base_->logic_data(); -} - -shared_ptr LogicSignal::logic_data() const -{ - return base_->logic_data(); -} - std::map LogicSignal::save_settings() const { std::map result; @@ -148,6 +134,8 @@ void LogicSignal::restore_settings(std::map settings) signal_height_ = settings["trace_height"].toInt(); if ((signal_height_ != old_height) && owner_) { + update_logic_level_offsets(); + // Call order is important, otherwise the lazy event handler won't work owner_->extents_changed(false, true); owner_->row_item_appearance_changed(false, true); @@ -176,8 +164,9 @@ void LogicSignal::paint_mid(QPainter &p, ViewItemPaintParams &pp) if (!base_->enabled()) return; - const float low_offset = y + 0.5f; - const float high_offset = low_offset - signal_height_; + const float low_offset = y + low_level_offset_; + const float high_offset = y + high_level_offset_; + const float fill_height = low_offset - high_offset; shared_ptr segment = get_logic_segment_to_paint(); if (!segment || (segment->get_sample_count() == 0)) @@ -203,7 +192,7 @@ void LogicSignal::paint_mid(QPainter &p, ViewItemPaintParams &pp) (int64_t)0), last_sample); segment->get_subsampled_edges(edges, start_sample, end_sample, - samples_per_pixel / Oversampling, base_->index()); + samples_per_pixel / Oversampling, base_->logic_bit_index()); assert(edges.size() >= 2); const float first_sample_x = @@ -250,8 +239,7 @@ void LogicSignal::paint_mid(QPainter &p, ViewItemPaintParams &pp) if (rising_edge_seen) { const int width = x - rising_edge_x; if (width > 0) - high_rects.emplace_back(rising_edge_x, high_offset, - width, signal_height_); + high_rects.emplace_back(rising_edge_x, high_offset, width, fill_height); rising_edge_seen = false; } @@ -413,12 +401,11 @@ shared_ptr LogicSignal::get_logic_segment_to_paint() con base_->logic_data()->logic_segments(); if (!segments.empty()) { - if (segment_display_mode_ == ShowLastSegmentOnly) { + if (segment_display_mode_ == ShowLastSegmentOnly) segment = segments.back(); - } - if ((segment_display_mode_ == ShowSingleSegmentOnly) || - (segment_display_mode_ == ShowLastCompleteSegmentOnly)) { + if ((segment_display_mode_ == ShowSingleSegmentOnly) || + (segment_display_mode_ == ShowLastCompleteSegmentOnly)) { try { segment = segments.at(current_segment_); } catch (out_of_range&) { @@ -466,10 +453,10 @@ void LogicSignal::init_trigger_actions(QWidget *parent) const vector LogicSignal::get_trigger_types() const { // We may not be associated with a device - if (!device_) + if (!session_.device()) return vector(); - const auto sr_dev = device_->device(); + const auto sr_dev = session_.device()->device(); if (sr_dev->config_check(ConfigKey::TRIGGER_MATCH, Capability::LIST)) { const Glib::VariantContainerBase gvar = sr_dev->config_list(ConfigKey::TRIGGER_MATCH); @@ -637,6 +624,12 @@ const QPixmap* LogicSignal::get_pixmap(const char *path) return pixmap_cache_.take(path); } +void LogicSignal::update_logic_level_offsets() +{ + low_level_offset_ = 0.5f; + high_level_offset_ = low_level_offset_ - signal_height_; +} + void LogicSignal::on_setting_changed(const QString &key, const QVariant &value) { Signal::on_setting_changed(key, value); @@ -669,6 +662,8 @@ void LogicSignal::on_signal_height_changed(int height) signal_height_ = height; if (owner_) { + update_logic_level_offsets(); + // Call order is important, otherwise the lazy event handler won't work owner_->extents_changed(false, true); owner_->row_item_appearance_changed(false, true); diff --git a/pv/views/trace/logicsignal.hpp b/pv/views/trace/logicsignal.hpp index d316fd5d..eee6b9c4 100644 --- a/pv/views/trace/logicsignal.hpp +++ b/pv/views/trace/logicsignal.hpp @@ -69,16 +69,10 @@ public: static const int TriggerMarkerPadding; static const char* TriggerMarkerIcons[8]; - LogicSignal(pv::Session &session, - shared_ptr device, - shared_ptr base); + LogicSignal(pv::Session &session, shared_ptr base); virtual ~LogicSignal() = default; - shared_ptr data() const; - - shared_ptr logic_data() const; - virtual std::map save_settings() const; virtual void restore_settings(std::map settings); @@ -86,14 +80,14 @@ public: * Computes the vertical extents of the contents of this row item. * @return A pair containing the minimum and maximum y-values. */ - pair v_extents() const; + virtual pair v_extents() const; /** * 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, ViewItemPaintParams &pp); + virtual void paint_mid(QPainter &p, ViewItemPaintParams &pp); /** * Paints the foreground layer of the signal with a QPainter @@ -111,7 +105,7 @@ public: */ virtual vector get_nearest_level_changes(uint64_t sample_pos); -private: +protected: void paint_caps(QPainter &p, QLineF *const lines, vector< pair > &edges, bool level, double samples_per_pixel, double pixels_offset, @@ -131,18 +125,19 @@ private: static const QIcon* get_icon(const char *path); static const QPixmap* get_pixmap(const char *path); -private Q_SLOTS: + virtual void update_logic_level_offsets(); + +protected Q_SLOTS: void on_setting_changed(const QString &key, const QVariant &value); void on_trigger(); void on_signal_height_changed(int height); -private: +protected: QColor high_fill_color_; bool show_sampling_points_, fill_high_areas_; - - shared_ptr device_; + float high_level_offset_, low_level_offset_; // y offsets relative to trace QSpinBox *signal_height_sb_; diff --git a/pv/views/trace/signal.hpp b/pv/views/trace/signal.hpp index ca8eea2e..e10e93ea 100644 --- a/pv/views/trace/signal.hpp +++ b/pv/views/trace/signal.hpp @@ -70,8 +70,6 @@ public: */ virtual void set_name(QString name); - virtual shared_ptr data() const = 0; - /** * Determines the closest level change (i.e. edge) to a given sample, which * is useful for e.g. the "snap to edge" functionality. diff --git a/pv/views/trace/view.cpp b/pv/views/trace/view.cpp index 47cb96b2..2e4d147d 100644 --- a/pv/views/trace/view.cpp +++ b/pv/views/trace/view.cpp @@ -359,7 +359,7 @@ void View::add_signalbase(const shared_ptr signalbase) switch (signalbase->type()) { case SignalBase::LogicChannel: - signal = shared_ptr(new LogicSignal(session_, session_.device(), signalbase)); + signal = shared_ptr(new LogicSignal(session_, signalbase)); break; case SignalBase::AnalogChannel: @@ -920,7 +920,7 @@ vector< shared_ptr > View::get_visible_data() const vector< shared_ptr > visible_data; for (const shared_ptr& sig : signals_) if (sig->enabled()) - visible_data.push_back(sig->data()); + visible_data.push_back(sig->base()->data()); return visible_data; } @@ -934,8 +934,8 @@ pair View::get_time_extents() const return make_pair(0, 0); for (shared_ptr s : signals_) - if (s->data() && (s->data()->segments().size() > 0)) - data.push_back(s->data()); + if (s->base()->data() && (s->base()->data()->segments().size() > 0)) + data.push_back(s->base()->data()); for (const shared_ptr& d : data) { const vector< shared_ptr > segments = d->segments(); @@ -1502,7 +1502,7 @@ void View::determine_time_unit() if (time_unit_ == util::TimeUnit::Samples) { // Check all signals but... for (const shared_ptr& signal : signals_) { - const shared_ptr data = signal->data(); + const shared_ptr data = signal->base()->data(); // ...only check first segment of each const vector< shared_ptr > segments = data->segments(); diff --git a/pv/views/trace/viewport.cpp b/pv/views/trace/viewport.cpp index a2d0b99a..bf15e41c 100644 --- a/pv/views/trace/viewport.cpp +++ b/pv/views/trace/viewport.cpp @@ -244,10 +244,8 @@ void Viewport::wheelEvent(QWheelEvent *event) void Viewport::on_setting_changed(const QString &key, const QVariant &value) { - if (key == GlobalSettings::Key_View_AllowVerticalDragging) { - GlobalSettings settings; - allow_vertical_dragging_ = settings.value(GlobalSettings::Key_View_AllowVerticalDragging).toBool(); - } + if (key == GlobalSettings::Key_View_AllowVerticalDragging) + allow_vertical_dragging_ = value.toBool(); } } // namespace trace