using pv::data::SignalData;
using pv::data::Segment;
-using pv::util::format_time;
using pv::util::TimeUnit;
using pv::util::Timestamp;
updating_scroll_(false),
sticky_scrolling_(false), // Default setting is set in MainWindow::setup_ui()
always_zoom_to_fit_(false),
- tick_period_(0.0),
+ tick_period_(0),
tick_prefix_(pv::util::SIPrefix::yocto),
tick_precision_(0),
time_unit_(util::TimeUnit::Time),
}
}
-double View::tick_period() const
+const pv::util::Timestamp& View::tick_period() const
{
return tick_period_;
}
-void View::set_tick_period(double tick_period)
+void View::set_tick_period(const pv::util::Timestamp& tick_period)
{
if (tick_period_ != tick_period) {
tick_period_ = tick_period;
header_->update();
}
-void View::restack_all_row_items()
+void View::restack_all_trace_tree_items()
{
// Make a list of owners that is sorted from deepest first
const auto owners = list_row_item_owners();
- vector< RowItemOwner* > sorted_owners(owners.begin(), owners.end());
+ vector< TraceTreeItemOwner* > sorted_owners(owners.begin(), owners.end());
sort(sorted_owners.begin(), sorted_owners.end(),
- [](const RowItemOwner* a, const RowItemOwner *b) {
+ [](const TraceTreeItemOwner* a, const TraceTreeItemOwner *b) {
return a->depth() > b->depth(); });
// Restack the items recursively
QFontMetrics m(QApplication::font());
+ // Copies of the member variables with the same name, used in the calculation
+ // and written back afterwards, so that we don't emit signals all the time
+ // during the calculation.
+ pv::util::Timestamp tick_period = tick_period_;
+ pv::util::SIPrefix tick_prefix = tick_prefix_;
+ unsigned tick_precision = tick_precision_;
+
do {
const double min_period = scale_ * min_width;
const int order = (int)floorf(log10f(min_period));
- const double order_decimal = pow(10.0, order);
+ const pv::util::Timestamp order_decimal =
+ pow(pv::util::Timestamp(10), 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
unsigned int unit = 0;
do {
- tp_with_margin = order_decimal * (ScaleUnits[unit++] + tp_margin);
+ tp_with_margin = order_decimal.convert_to<double>() *
+ (ScaleUnits[unit++] + tp_margin);
} while (tp_with_margin < min_period && unit < countof(ScaleUnits));
- set_tick_period(order_decimal * ScaleUnits[unit - 1]);
-
set_tick_prefix(static_cast<pv::util::SIPrefix>(
- (order - pv::util::exponent(pv::util::SIPrefix::yocto)) / 3));
+ tick_period = order_decimal * ScaleUnits[unit - 1];
+
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)
- set_tick_precision(std::max((int)ceil(log10f(1 / tick_period_)), 0));
+ tick_precision = std::max(ceil(log10(1 / tick_period)).convert_to<int>(), 0);
- tick_period_width = tick_period_ / scale_;
+ tick_period_width = (tick_period / scale_).convert_to<double>();
- const QString label_text =
- format_time(max_time, tick_prefix_, time_unit_, tick_precision_);
+ const QString label_text = Ruler::format_time_with_distance(
+ tick_period, 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() +
MinValueSpacing;
min_width += SpacingIncrement;
-
} while (tick_period_width < label_width);
+
+ set_tick_period(tick_period);
+ set_tick_prefix(tick_prefix);
+ set_tick_precision(tick_precision);
}
void View::update_scroll()
get_scroll_layout(length, offset);
length = max(length - areaSize.width(), 0.0);
- int major_tick_distance = tick_period_ / scale_;
+ int major_tick_distance = (tick_period_ / scale_).convert_to<int>();
horizontalScrollBar()->setPageStep(areaSize.width() / 2);
horizontalScrollBar()->setSingleStep(major_tick_distance);
return QRectF();
}
-RowItemOwner* View::find_prevalent_trace_group(
+TraceTreeItemOwner* View::find_prevalent_trace_group(
const shared_ptr<sigrok::ChannelGroup> &group,
const unordered_map<shared_ptr<sigrok::Channel>, shared_ptr<Signal> >
&signal_map)
{
assert(group);
- unordered_set<RowItemOwner*> owners;
- vector<RowItemOwner*> owner_list;
+ unordered_set<TraceTreeItemOwner*> owners;
+ vector<TraceTreeItemOwner*> owner_list;
// Make a set and a list of all the owners
for (const auto &channel : group->channels()) {
if (iter == signal_map.end())
continue;
- RowItemOwner *const o = (*iter).second->owner();
+ TraceTreeItemOwner *const o = (*iter).second->owner();
owner_list.push_back(o);
owners.insert(o);
}
// Iterate through the list of owners, and find the most prevalent
size_t max_prevalence = 0;
- RowItemOwner *prevalent_owner = nullptr;
- for (RowItemOwner *owner : owners) {
+ TraceTreeItemOwner *prevalent_owner = nullptr;
+ for (TraceTreeItemOwner *owner : owners) {
const size_t prevalence = std::count_if(
owner_list.begin(), owner_list.end(),
- [&](RowItemOwner *o) { return o == owner; });
+ [&](TraceTreeItemOwner *o) { return o == owner; });
if (prevalence > max_prevalence) {
max_prevalence = prevalence;
prevalent_owner = owner;
void View::extents_changed(bool horz, bool vert)
{
sticky_events_ |=
- (horz ? RowItemHExtentsChanged : 0) |
- (vert ? RowItemVExtentsChanged : 0);
+ (horz ? TraceTreeItemHExtentsChanged : 0) |
+ (vert ? TraceTreeItemVExtentsChanged : 0);
lazy_event_handler_.start();
}
void View::signals_changed()
{
- vector< shared_ptr<RowItem> > new_top_level_items;
+ vector< shared_ptr<TraceTreeItem> > new_top_level_items;
const auto device = session_.device();
if (!device)
continue;
// Find best trace group to add to
- RowItemOwner *owner = find_prevalent_trace_group(
+ TraceTreeItemOwner *owner = find_prevalent_trace_group(
group, signal_map);
// If there is no trace group, create one
// Remove any removed traces
for (shared_ptr<Trace> trace : remove_traces) {
- RowItemOwner *const owner = trace->owner();
+ TraceTreeItemOwner *const owner = trace->owner();
assert(owner);
owner->remove_child_item(trace);
}
void View::process_sticky_events()
{
- if (sticky_events_ & RowItemHExtentsChanged)
+ if (sticky_events_ & TraceTreeItemHExtentsChanged)
update_layout();
- if (sticky_events_ & RowItemVExtentsChanged) {
- restack_all_row_items();
+ if (sticky_events_ & TraceTreeItemVExtentsChanged) {
+ restack_all_trace_tree_items();
update_scroll();
}
void View::on_hover_point_changed()
{
- for (shared_ptr<RowItem> r : *this)
+ for (shared_ptr<TraceTreeItem> r : *this)
r->hover_point_changed();
}
projects / pulseview.git / blobdiff