X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=pv%2Fview%2Fview.cpp;h=652c4f8087e637c32e1a94068b8dabdb6fbd6ab3;hb=60d9b99a32e551cffd2b537d3e157d578a761c9b;hp=032546dba034eda4cea63cc3f60489127cd28d9d;hpb=d40f4db76fc8120fcd54ace8c6fce63387e025ca;p=pulseview.git diff --git a/pv/view/view.cpp b/pv/view/view.cpp index 032546d..652c4f8 100644 --- a/pv/view/view.cpp +++ b/pv/view/view.cpp @@ -62,6 +62,7 @@ using pv::data::SignalData; using pv::data::Segment; using pv::util::format_time; using pv::util::TimeUnit; +using pv::util::Timestamp; using std::deque; using std::dynamic_pointer_cast; @@ -83,8 +84,8 @@ using std::weak_ptr; namespace pv { namespace view { -const double View::MaxScale = 1e9; -const double View::MinScale = 1e-15; +const Timestamp View::MaxScale("1e9"); +const Timestamp View::MinScale("1e-12"); const int View::MaxScrollValue = INT_MAX / 2; const int View::MaxViewAutoUpdateRate = 25; // No more than 25 Hz with sticky scrolling @@ -210,7 +211,7 @@ double View::scale() const return scale_; } -double View::offset() const +const Timestamp& View::offset() const { return offset_; } @@ -273,9 +274,9 @@ void View::zoom_fit(bool gui_state) always_zoom_to_fit_changed(gui_state); } - const pair extents = get_time_extents(); - const double delta = extents.second - extents.first; - if (delta < 1e-12) + const pair extents = get_time_extents(); + const Timestamp delta = extents.second - extents.first; + if (delta < Timestamp("1e-12")) return; assert(viewport_); @@ -283,8 +284,8 @@ void View::zoom_fit(bool gui_state) if (w <= 0) return; - const double scale = max(min(delta / w, MaxScale), MinScale); - set_scale_offset(scale, extents.first); + const Timestamp scale = max(min(delta / w, MaxScale), MinScale); + set_scale_offset(scale.convert_to(), extents.first); } void View::zoom_one_to_one() @@ -316,7 +317,7 @@ void View::zoom_one_to_one() set_zoom(1.0 / samplerate, w / 2); } -void View::set_scale_offset(double scale, double offset) +void View::set_scale_offset(double scale, const Timestamp& offset) { // Disable sticky scrolling / always zoom to fit when acquisition runs // and user drags the viewport @@ -359,9 +360,9 @@ set< shared_ptr > View::get_visible_data() const return visible_data; } -pair View::get_time_extents() const +pair View::get_time_extents() const { - double left_time = DBL_MAX, right_time = DBL_MIN; + boost::optional left_time, right_time; const set< shared_ptr > visible_data = get_visible_data(); for (const shared_ptr d : visible_data) { @@ -371,18 +372,21 @@ pair View::get_time_extents() const double samplerate = s->samplerate(); samplerate = (samplerate <= 0.0) ? 1.0 : samplerate; - const double start_time = s->start_time(); - left_time = min(left_time, start_time); - right_time = max(right_time, start_time + - d->max_sample_count() / samplerate); + const Timestamp start_time = s->start_time(); + left_time = left_time ? + min(*left_time, start_time) : + start_time; + right_time = right_time ? + max(*right_time, start_time + d->max_sample_count() / samplerate) : + start_time + d->max_sample_count() / samplerate; } } - if (left_time == DBL_MAX && right_time == DBL_MIN) - return make_pair(0.0, 0.0); + if (!left_time || !right_time) + return make_pair(0, 0); - assert(left_time < right_time); - return make_pair(left_time, right_time); + assert(*left_time < *right_time); + return make_pair(*left_time, *right_time); } void View::enable_sticky_scrolling(bool state) @@ -416,7 +420,7 @@ std::shared_ptr View::cursors() const return cursors_; } -void View::add_flag(double time) +void View::add_flag(const Timestamp& time) { flags_.push_back(shared_ptr(new Flag(*this, time, QString("%1").arg(next_flag_text_)))); @@ -472,10 +476,10 @@ void View::restack_all_row_items() r->animate_to_layout_v_offset(); } -void View::get_scroll_layout(double &length, double &offset) const +void View::get_scroll_layout(double &length, Timestamp &offset) const { - const pair extents = get_time_extents(); - length = (extents.second - extents.first) / scale_; + const pair extents = get_time_extents(); + length = ((extents.second - extents.first) / scale_).convert_to(); offset = offset_ / scale_; } @@ -485,16 +489,21 @@ void View::set_zoom(double scale, int offset) always_zoom_to_fit_ = false; always_zoom_to_fit_changed(false); - const double cursor_offset = offset_ + scale_ * offset; - const double new_scale = max(min(scale, MaxScale), MinScale); - const double new_offset = cursor_offset - new_scale * offset; - set_scale_offset(new_scale, new_offset); + const Timestamp cursor_offset = offset_ + scale_ * offset; + const Timestamp new_scale = max(min(Timestamp(scale), MaxScale), MinScale); + const Timestamp new_offset = cursor_offset - new_scale * offset; + set_scale_offset(new_scale.convert_to(), new_offset); } void View::calculate_tick_spacing() { - const double SpacingIncrement = 32.0f; - const double MinValueSpacing = 32.0f; + const double SpacingIncrement = 10.0f; + const double MinValueSpacing = 40.0f; + + // Figure out the highest numeric value visible on a label + const QSize areaSize = viewport_->size(); + const Timestamp max_time = max(fabs(offset_), + fabs(offset_ + scale_ * areaSize.width())); double min_width = SpacingIncrement; double label_width, tick_period_width; @@ -507,13 +516,19 @@ void View::calculate_tick_spacing() const int order = (int)floorf(log10f(min_period)); const double order_decimal = pow(10.0, order); + // Allow for a margin of error so that a scale unit of 1 can be used. + // Otherwise, for a SU of 1 the tick period will almost always be below + // the min_period by a small amount - and thus skipped in favor of 2. + // Note: margin assumes that SU[0] and SU[1] contain the smallest values + double tp_margin = (ScaleUnits[0] + ScaleUnits[1]) / 2.0; + double tp_with_margin; unsigned int unit = 0; do { - tick_period_ = order_decimal * ScaleUnits[unit++]; - } while (tick_period_ < min_period && - unit < countof(ScaleUnits)); + tp_with_margin = order_decimal * (ScaleUnits[unit++] + tp_margin); + } while (tp_with_margin < min_period && unit < countof(ScaleUnits)); + tick_period_ = order_decimal * ScaleUnits[unit - 1]; tick_prefix_ = (order - pv::util::FirstSIPrefixPower) / 3; // Precision is the number of fractional digits required, not @@ -523,7 +538,7 @@ void View::calculate_tick_spacing() tick_period_width = tick_period_ / scale_; const QString label_text = - format_time(offset_, tick_prefix_, time_unit_, tick_precision_); + format_time(max_time, tick_prefix_, time_unit_, tick_precision_); label_width = m.boundingRect(0, 0, INT_MAX, INT_MAX, Qt::AlignLeft | Qt::AlignTop, label_text).width() + @@ -541,7 +556,8 @@ void View::update_scroll() const QSize areaSize = viewport_->size(); // Set the horizontal scroll bar - double length = 0, offset = 0; + double length = 0; + Timestamp offset; get_scroll_layout(length, offset); length = max(length - areaSize.width(), 0.0); @@ -554,11 +570,11 @@ void View::update_scroll() if (length < MaxScrollValue) { horizontalScrollBar()->setRange(0, length); - horizontalScrollBar()->setSliderPosition(offset); + horizontalScrollBar()->setSliderPosition(offset.convert_to()); } else { horizontalScrollBar()->setRange(0, MaxScrollValue); horizontalScrollBar()->setSliderPosition( - offset_ * MaxScrollValue / (scale_ * length)); + (offset_ * MaxScrollValue / (scale_ * length)).convert_to()); } updating_scroll_ = false; @@ -771,7 +787,8 @@ void View::h_scroll_value_changed(int value) if (range < MaxScrollValue) offset_ = scale_ * value; else { - double length = 0, offset; + double length = 0; + Timestamp offset; get_scroll_layout(length, offset); offset_ = scale_ * length * value / MaxScrollValue; } @@ -914,14 +931,20 @@ void View::signals_changed() void View::capture_state_updated(int state) { - // Reset "always zoom to fit" when we change to the stopped state - if (always_zoom_to_fit_ && (state == Session::Stopped)) { - always_zoom_to_fit_ = false; - always_zoom_to_fit_changed(false); - } - if (state == Session::Running) time_unit_ = util::Samples; + + if (state == Session::Stopped) { + // After acquisition has stopped we need to re-calculate the ticks once + // as it's otherwise done when the user pans or zooms, which is too late + calculate_tick_spacing(); + + // Reset "always zoom to fit", the acquisition has stopped + if (always_zoom_to_fit_) { + always_zoom_to_fit_ = false; + always_zoom_to_fit_changed(false); + } + } } void View::data_updated() @@ -944,7 +967,8 @@ void View::perform_delayed_view_update() if (sticky_scrolling_) { // Make right side of the view sticky - double length = 0, offset; + double length = 0; + Timestamp offset; get_scroll_layout(length, offset); const QSize areaSize = viewport_->size();