#include <libsigrokcxx/libsigrokcxx.hpp>
#include "analogsignal.hpp"
-#include "decodetrace.hpp"
#include "header.hpp"
#include "logicsignal.hpp"
#include "ruler.hpp"
#include "pv/data/logicsegment.hpp"
#include "pv/util.hpp"
+#ifdef ENABLE_DECODE
+#include "decodetrace.hpp"
+#endif
+
using boost::shared_lock;
using boost::shared_mutex;
return viewport_;
}
-const QSize View::header_size() const
-{
- return header_->sizeHint();
-}
-
vector< shared_ptr<TimeItem> > View::time_items() const
{
const vector<shared_ptr<Flag>> f(flags());
if (l)
l->set_coloured_bg(state);
+#ifdef ENABLE_DECODE
shared_ptr<DecodeTrace> d = dynamic_pointer_cast<DecodeTrace>(i);
if (d)
d->set_coloured_bg(state);
+#endif
}
viewport_->update();
return QObject::eventFilter(object, event);
}
-bool View::viewportEvent(QEvent *e)
+bool View::viewportEvent(QEvent *event)
{
- switch (e->type()) {
+ switch (event->type()) {
case QEvent::Paint:
case QEvent::MouseButtonPress:
case QEvent::MouseButtonRelease:
case QEvent::TouchEnd:
return false;
default:
- return QAbstractScrollArea::viewportEvent(e);
+ return QAbstractScrollArea::viewportEvent(event);
}
}
vector< shared_ptr<TraceTreeItem> > new_top_level_items;
- const auto device = session_.device();
- if (!device)
+ if (!session_.device())
return;
- shared_ptr<sigrok::Device> sr_dev = device->device();
+ shared_ptr<sigrok::Device> sr_dev = session_.device()->device();
assert(sr_dev);
-
const vector< shared_ptr<Channel> > channels(
sr_dev->channels());
offset += extents.second;
}
+ // Assign proper vertical offsets to each channel in the group
+ new_trace_group->restack_items();
+
// If this is a new group, enqueue it in the new top level
// items list
if (!new_traces_in_group.empty() && new_trace_group)
copy_if(channels.begin(), channels.end(), back_inserter(logic_channels),
[](const shared_ptr<Channel>& c) {
return c->type() == sigrok::ChannelType::LOGIC; });
+
const vector< shared_ptr<Trace> > non_grouped_logic_signals =
- extract_new_traces_for_channels(logic_channels,
- signal_map, add_traces);
- const shared_ptr<TraceGroup> non_grouped_trace_group(
- make_shared<TraceGroup>());
- for (shared_ptr<Trace> trace : non_grouped_logic_signals)
- non_grouped_trace_group->add_child_item(trace);
- new_top_level_items.push_back(non_grouped_trace_group);
+ extract_new_traces_for_channels(logic_channels, signal_map, add_traces);
+
+ if (non_grouped_logic_signals.size() > 0) {
+ const shared_ptr<TraceGroup> non_grouped_trace_group(
+ make_shared<TraceGroup>());
+ for (shared_ptr<Trace> trace : non_grouped_logic_signals)
+ non_grouped_trace_group->add_child_item(trace);
+
+ non_grouped_trace_group->restack_items();
+ new_top_level_items.push_back(non_grouped_trace_group);
+ }
// Enqueue the remaining channels as free ungrouped traces
const vector< shared_ptr<Trace> > new_top_level_signals =
- extract_new_traces_for_channels(channels,
- signal_map, add_traces);
+ extract_new_traces_for_channels(channels, signal_map, add_traces);
new_top_level_items.insert(new_top_level_items.end(),
new_top_level_signals.begin(), new_top_level_signals.end());
// Add and position the pending top levels items
for (auto item : new_top_level_items) {
+ // Position the item after the last item or at the top if there is none
+ int offset = v_extents().second;
+
add_child_item(item);
+ item->force_to_v_offset(offset);
- // Position the item after the last present item
- int offset = v_extents().second;
const pair<int, int> extents = item->v_extents();
if (item->enabled())
- offset += -extents.first;
- item->force_to_v_offset(offset);
- if (item->enabled())
- offset += extents.second;
+ offset += (extents.second - extents.first);
}
update_layout();