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;
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
sticky_scrolling_(false), // Default setting is set in MainWindow::setup_ui()
always_zoom_to_fit_(false),
tick_period_(0.0),
- tick_prefix_(0),
+ tick_prefix_(pv::util::SIPrefix::yocto),
tick_precision_(0),
- time_unit_(util::Time),
+ time_unit_(util::TimeUnit::Time),
show_cursors_(false),
cursors_(new CursorPair(*this)),
next_flag_text_('A'),
return scale_;
}
-double View::offset() const
+const Timestamp& View::offset() const
{
return offset_;
}
return 0;
}
-unsigned int View::tick_prefix() const
+pv::util::SIPrefix View::tick_prefix() const
{
return tick_prefix_;
}
always_zoom_to_fit_changed(gui_state);
}
- const pair<double, double> extents = get_time_extents();
- const double delta = extents.second - extents.first;
- if (delta < 1e-12)
+ const pair<Timestamp, Timestamp> extents = get_time_extents();
+ const Timestamp delta = extents.second - extents.first;
+ if (delta < Timestamp("1e-12"))
return;
assert(viewport_);
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<double>(), extents.first);
}
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
return visible_data;
}
-pair<double, double> View::get_time_extents() const
+pair<Timestamp, Timestamp> View::get_time_extents() const
{
- double left_time = DBL_MAX, right_time = DBL_MIN;
+ boost::optional<Timestamp> left_time, right_time;
const set< shared_ptr<SignalData> > visible_data = get_visible_data();
for (const shared_ptr<SignalData> d : visible_data)
{
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)
return cursors_;
}
-void View::add_flag(double time)
+void View::add_flag(const Timestamp& time)
{
flags_.push_back(shared_ptr<Flag>(new Flag(*this, time,
QString("%1").arg(next_flag_text_))));
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<double, double> extents = get_time_extents();
- length = (extents.second - extents.first) / scale_;
+ const pair<Timestamp, Timestamp> extents = get_time_extents();
+ length = ((extents.second - extents.first) / scale_).convert_to<double>();
offset = offset_ / scale_;
}
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<double>(), new_offset);
}
void View::calculate_tick_spacing()
{
const double SpacingIncrement = 10.0f;
- const double MinValueSpacing = 25.0f;
+ const double MinValueSpacing = 40.0f;
// Figure out the highest numeric value visible on a label
const QSize areaSize = viewport_->size();
- const double max_time = max(fabs(offset_),
+ const Timestamp max_time = max(fabs(offset_),
fabs(offset_ + scale_ * areaSize.width()));
double min_width = SpacingIncrement;
} while (tp_with_margin < min_period && unit < countof(ScaleUnits));
tick_period_ = order_decimal * ScaleUnits[unit - 1];
- tick_prefix_ = (order - pv::util::FirstSIPrefixPower) / 3;
+ tick_prefix_ = static_cast<pv::util::SIPrefix>(
+ (order - pv::util::exponent(pv::util::SIPrefix::yocto)) / 3);
// Precision is the number of fractional digits required, not
// taking the prefix into account (and it must never be negative)
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);
if (length < MaxScrollValue) {
horizontalScrollBar()->setRange(0, length);
- horizontalScrollBar()->setSliderPosition(offset);
+ horizontalScrollBar()->setSliderPosition(offset.convert_to<double>());
} else {
horizontalScrollBar()->setRange(0, MaxScrollValue);
horizontalScrollBar()->setSliderPosition(
- offset_ * MaxScrollValue / (scale_ * length));
+ (offset_ * MaxScrollValue / (scale_ * length)).convert_to<double>());
}
updating_scroll_ = false;
void View::determine_time_unit()
{
// Check whether we know the sample rate and hence can use time as the unit
- if (time_unit_ == util::Samples) {
+ if (time_unit_ == util::TimeUnit::Samples) {
shared_lock<shared_mutex> lock(session().signals_mutex());
const unordered_set< shared_ptr<Signal> > &sigs(session().signals());
const vector< shared_ptr<Segment> > segments = data->segments();
if (!segments.empty())
if (segments[0]->samplerate()) {
- time_unit_ = util::Time;
+ time_unit_ = util::TimeUnit::Time;
break;
}
}
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;
}
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;
+ time_unit_ = util::TimeUnit::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()
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();