* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
*/
#ifdef ENABLE_DECODE
#include <cassert>
#include <climits>
#include <cmath>
+#include <iostream>
#include <iterator>
-#include <mutex>
#include <unordered_set>
+#include <boost/archive/text_iarchive.hpp>
+#include <boost/archive/text_oarchive.hpp>
+#include <boost/serialization/serialization.hpp>
+
#include <QApplication>
#include <QEvent>
#include <QFontMetrics>
+#include <QHBoxLayout>
#include <QMouseEvent>
#include <QScrollBar>
#include <libsigrokcxx/libsigrokcxx.hpp>
-#include "decodetrace.hpp"
+#include "analogsignal.hpp"
#include "header.hpp"
#include "logicsignal.hpp"
#include "ruler.hpp"
#include "signal.hpp"
#include "tracegroup.hpp"
+#include "triggermarker.hpp"
#include "view.hpp"
#include "viewport.hpp"
-#include "pv/session.hpp"
-#include "pv/devices/device.hpp"
#include "pv/data/logic.hpp"
#include "pv/data/logicsegment.hpp"
+#include "pv/devices/device.hpp"
+#include "pv/globalsettings.hpp"
+#include "pv/session.hpp"
#include "pv/util.hpp"
-using boost::shared_lock;
-using boost::shared_mutex;
+#ifdef ENABLE_DECODE
+#include "decodetrace.hpp"
+#endif
using pv::data::SignalData;
using pv::data::Segment;
using pv::util::TimeUnit;
using pv::util::Timestamp;
-using std::deque;
+using std::back_inserter;
+using std::copy_if;
+using std::count_if;
using std::dynamic_pointer_cast;
using std::inserter;
-using std::list;
-using std::lock_guard;
using std::max;
using std::make_pair;
+using std::make_shared;
using std::min;
using std::pair;
using std::set;
using std::set_difference;
using std::shared_ptr;
+using std::stringstream;
using std::unordered_map;
using std::unordered_set;
using std::vector;
-using std::weak_ptr;
namespace pv {
-namespace view {
+namespace views {
+namespace TraceView {
const Timestamp View::MaxScale("1e9");
const Timestamp View::MinScale("1e-12");
const int View::ScaleUnits[3] = {1, 2, 5};
-View::View(Session &session, QWidget *parent) :
- QAbstractScrollArea(parent),
- session_(session),
+
+CustomAbstractScrollArea::CustomAbstractScrollArea(QWidget *parent) :
+ QAbstractScrollArea(parent)
+{
+}
+
+void CustomAbstractScrollArea::setViewportMargins(int left, int top, int right, int bottom)
+{
+ QAbstractScrollArea::setViewportMargins(left, top, right, bottom);
+}
+
+bool CustomAbstractScrollArea::viewportEvent(QEvent *event)
+{
+ switch (event->type()) {
+ case QEvent::Paint:
+ case QEvent::MouseButtonPress:
+ case QEvent::MouseButtonRelease:
+ case QEvent::MouseButtonDblClick:
+ case QEvent::MouseMove:
+ case QEvent::Wheel:
+ case QEvent::TouchBegin:
+ case QEvent::TouchUpdate:
+ case QEvent::TouchEnd:
+ return false;
+ default:
+ return QAbstractScrollArea::viewportEvent(event);
+ }
+}
+
+View::View(Session &session, bool is_main_view, QWidget *parent) :
+ ViewBase(session, is_main_view, parent),
viewport_(new Viewport(*this)),
ruler_(new Ruler(*this)),
header_(new Header(*this)),
+ scrollarea_(this),
scale_(1e-3),
offset_(0),
updating_scroll_(false),
show_cursors_(false),
cursors_(new CursorPair(*this)),
next_flag_text_('A'),
- hover_point_(-1, -1)
+ trigger_markers_(),
+ hover_point_(-1, -1),
+ scroll_needs_defaults_(false),
+ saved_v_offset_(0),
+ size_finalized_(false)
{
- connect(horizontalScrollBar(), SIGNAL(valueChanged(int)),
+ GlobalSettings settings;
+ coloured_bg_ = settings.value(GlobalSettings::Key_View_ColouredBG).toBool();
+
+ connect(scrollarea_.horizontalScrollBar(), SIGNAL(valueChanged(int)),
this, SLOT(h_scroll_value_changed(int)));
- connect(verticalScrollBar(), SIGNAL(valueChanged(int)),
+ connect(scrollarea_.verticalScrollBar(), SIGNAL(valueChanged(int)),
this, SLOT(v_scroll_value_changed()));
- connect(&session_, SIGNAL(signals_changed()),
- this, SLOT(signals_changed()));
- connect(&session_, SIGNAL(capture_state_changed(int)),
- this, SLOT(capture_state_updated(int)));
- connect(&session_, SIGNAL(data_received()),
- this, SLOT(data_updated()));
- connect(&session_, SIGNAL(frame_ended()),
- this, SLOT(data_updated()));
-
connect(header_, SIGNAL(selection_changed()),
ruler_, SLOT(clear_selection()));
connect(ruler_, SIGNAL(selection_changed()),
delayed_view_updater_.setSingleShot(true);
delayed_view_updater_.setInterval(1000 / MaxViewAutoUpdateRate);
- setViewport(viewport_);
+ /* To let the scroll area fill up the parent QWidget (this), we need a layout */
+ QHBoxLayout *layout = new QHBoxLayout(this);
+ setLayout(layout);
+ layout->setContentsMargins(0, 0, 0, 0);
+ layout->addWidget(&scrollarea_);
+
+ scrollarea_.setViewport(viewport_);
viewport_->installEventFilter(this);
ruler_->installEventFilter(this);
return session_;
}
+unordered_set< shared_ptr<Signal> > View::signals() const
+{
+ return signals_;
+}
+
+void View::clear_signals()
+{
+ signals_.clear();
+}
+
+void View::add_signal(const shared_ptr<Signal> signal)
+{
+ signals_.insert(signal);
+}
+
+#ifdef ENABLE_DECODE
+void View::clear_decode_signals()
+{
+ decode_traces_.clear();
+}
+
+void View::add_decode_signal(shared_ptr<data::SignalBase> signalbase)
+{
+ shared_ptr<DecodeTrace> d(
+ new DecodeTrace(session_, signalbase, decode_traces_.size()));
+ decode_traces_.push_back(d);
+}
+
+void View::remove_decode_signal(shared_ptr<data::SignalBase> signalbase)
+{
+ for (auto i = decode_traces_.begin(); i != decode_traces_.end(); i++)
+ if ((*i)->base() == signalbase) {
+ decode_traces_.erase(i);
+ signals_changed();
+ return;
+ }
+}
+#endif
+
View* View::view()
{
return this;
return viewport_;
}
+void View::save_settings(QSettings &settings) const
+{
+ settings.setValue("scale", scale_);
+ settings.setValue("v_offset",
+ scrollarea_.verticalScrollBar()->sliderPosition());
+
+ stringstream ss;
+ boost::archive::text_oarchive oa(ss);
+ oa << boost::serialization::make_nvp("offset", offset_);
+ settings.setValue("offset", QString::fromStdString(ss.str()));
+
+ for (shared_ptr<Signal> signal : signals_) {
+ settings.beginGroup(signal->base()->internal_name());
+ signal->save_settings(settings);
+ settings.endGroup();
+ }
+}
+
+void View::restore_settings(QSettings &settings)
+{
+ // Note: It is assumed that this function is only called once,
+ // immediately after restoring a previous session.
+
+ if (settings.contains("scale"))
+ set_scale(settings.value("scale").toDouble());
+
+ if (settings.contains("offset")) {
+ util::Timestamp offset;
+ stringstream ss;
+ ss << settings.value("offset").toString().toStdString();
+
+ boost::archive::text_iarchive ia(ss);
+ ia >> boost::serialization::make_nvp("offset", offset);
+
+ set_offset(offset);
+ }
+
+ for (shared_ptr<Signal> signal : signals_) {
+ settings.beginGroup(signal->base()->internal_name());
+ signal->restore_settings(settings);
+ settings.endGroup();
+ }
+
+ if (settings.contains("v_offset")) {
+ saved_v_offset_ = settings.value("v_offset").toInt();
+ set_v_offset(saved_v_offset_);
+ scroll_needs_defaults_ = false;
+ // Note: see resizeEvent() for additional information
+ }
+}
+
vector< shared_ptr<TimeItem> > View::time_items() const
{
const vector<shared_ptr<Flag>> f(flags());
items.push_back(cursors_);
items.push_back(cursors_->first());
items.push_back(cursors_->second());
+
+ for (auto trigger_marker : trigger_markers_)
+ items.push_back(trigger_marker);
+
return items;
}
int View::owner_visual_v_offset() const
{
- return -verticalScrollBar()->sliderPosition();
+ return -scrollarea_.verticalScrollBar()->sliderPosition();
}
void View::set_v_offset(int offset)
{
- verticalScrollBar()->setSliderPosition(offset);
+ scrollarea_.verticalScrollBar()->setSliderPosition(offset);
header_->update();
viewport_->update();
}
void View::zoom(double steps, int offset)
{
- set_zoom(scale_ * pow(3.0/2.0, -steps), offset);
+ set_zoom(scale_ * pow(3.0 / 2.0, -steps), offset);
}
void View::zoom_fit(bool gui_state)
if (visible_data.empty())
return;
- double samplerate = 0.0;
- for (const shared_ptr<SignalData> d : visible_data) {
- assert(d);
- const vector< shared_ptr<Segment> > segments =
- d->segments();
- for (const shared_ptr<Segment> &s : segments)
- samplerate = max(samplerate, s->samplerate());
- }
-
- if (samplerate == 0.0)
- return;
-
assert(viewport_);
const int w = viewport_->width();
if (w <= 0)
return;
- set_zoom(1.0 / samplerate, w / 2);
+ set_zoom(1.0 / session_.get_samplerate(), w / 2);
}
void View::set_scale_offset(double scale, const Timestamp& offset)
set< shared_ptr<SignalData> > View::get_visible_data() const
{
- shared_lock<shared_mutex> lock(session().signals_mutex());
- const unordered_set< shared_ptr<Signal> > &sigs(session().signals());
-
// Make a set of all the visible data objects
set< shared_ptr<SignalData> > visible_data;
- for (const shared_ptr<Signal> sig : sigs)
+ for (const shared_ptr<Signal> sig : signals_)
if (sig->enabled())
visible_data.insert(sig->data());
{
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)
- {
- const vector< shared_ptr<Segment> > segments =
- d->segments();
+ for (const shared_ptr<SignalData> d : visible_data) {
+ const vector< shared_ptr<Segment> > segments = d->segments();
for (const shared_ptr<Segment> &s : segments) {
double samplerate = s->samplerate();
samplerate = (samplerate <= 0.0) ? 1.0 : samplerate;
return make_pair(*left_time, *right_time);
}
-void View::enable_sticky_scrolling(bool state)
+void View::enable_show_sampling_points(bool state)
+{
+ (void)state;
+
+ viewport_->update();
+}
+
+void View::enable_show_analog_minor_grid(bool state)
+{
+ (void)state;
+
+ viewport_->update();
+}
+
+void View::enable_coloured_bg(bool state)
+{
+ coloured_bg_ = state;
+ viewport_->update();
+}
+
+bool View::coloured_bg() const
{
- sticky_scrolling_ = state;
+ return coloured_bg_;
}
bool View::cursors_shown() const
viewport_->update();
}
-std::shared_ptr<CursorPair> View::cursors() const
+shared_ptr<CursorPair> View::cursors() const
{
return cursors_;
}
void View::add_flag(const Timestamp& time)
{
- flags_.push_back(shared_ptr<Flag>(new Flag(*this, time,
- QString("%1").arg(next_flag_text_))));
+ flags_.push_back(make_shared<Flag>(*this, time,
+ QString("%1").arg(next_flag_text_)));
+
next_flag_text_ = (next_flag_text_ >= 'Z') ? 'A' :
(next_flag_text_ + 1);
+
time_item_appearance_changed(true, true);
}
-void View::remove_flag(std::shared_ptr<Flag> flag)
+void View::remove_flag(shared_ptr<Flag> flag)
{
flags_.remove(flag);
time_item_appearance_changed(true, true);
}
-vector< std::shared_ptr<Flag> > View::flags() const
+vector< shared_ptr<Flag> > View::flags() const
{
- vector< std::shared_ptr<Flag> > flags(flags_.begin(), flags_.end());
+ vector< shared_ptr<Flag> > flags(flags_.begin(), flags_.end());
stable_sort(flags.begin(), flags.end(),
[](const shared_ptr<Flag> &a, const shared_ptr<Flag> &b) {
return a->time() < b->time();
return hover_point_;
}
-void View::update_viewport()
-{
- assert(viewport_);
- viewport_->update();
- header_->update();
-}
-
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();
+ const vector<shared_ptr<TraceTreeItem>> items(
+ list_by_type<TraceTreeItem>());
+ set< TraceTreeItemOwner* > owners;
+ for (const auto &r : items)
+ owners.insert(r->owner());
vector< TraceTreeItemOwner* > sorted_owners(owners.begin(), owners.end());
sort(sorted_owners.begin(), sorted_owners.end(),
[](const TraceTreeItemOwner* a, const TraceTreeItemOwner *b) {
for (auto &o : sorted_owners)
o->restack_items();
+ // Re-assign background colors
+ bool next_bgcolour_state = false;
+
+ for (auto &o : sorted_owners)
+ next_bgcolour_state = o->reassign_bgcolour_states(next_bgcolour_state);
+
// Animate the items to their destination
- for (const auto &r : *this)
- r->animate_to_layout_v_offset();
+ for (const auto &i : items)
+ i->animate_to_layout_v_offset();
+}
+
+void View::trigger_event(util::Timestamp location)
+{
+ trigger_markers_.push_back(make_shared<TriggerMarker>(*this, location));
}
void View::get_scroll_layout(double &length, Timestamp &offset) const
// Precision is the number of fractional digits required, not
// taking the prefix into account (and it must never be negative)
- tick_precision = std::max(ceil(log10(1 / tick_period)).convert_to<int>(), 0);
+ tick_precision = max(ceil(log10(1 / tick_period)).convert_to<int>(), 0);
tick_period_width = (tick_period / scale_).convert_to<double>();
void View::update_scroll()
{
assert(viewport_);
+ QScrollBar *hscrollbar = scrollarea_.horizontalScrollBar();
+ QScrollBar *vscrollbar = scrollarea_.verticalScrollBar();
const QSize areaSize = viewport_->size();
int major_tick_distance = (tick_period_ / scale_).convert_to<int>();
- horizontalScrollBar()->setPageStep(areaSize.width() / 2);
- horizontalScrollBar()->setSingleStep(major_tick_distance);
+ hscrollbar->setPageStep(areaSize.width() / 2);
+ hscrollbar->setSingleStep(major_tick_distance);
updating_scroll_ = true;
if (length < MaxScrollValue) {
- horizontalScrollBar()->setRange(0, length);
- horizontalScrollBar()->setSliderPosition(offset.convert_to<double>());
+ hscrollbar->setRange(0, length);
+ hscrollbar->setSliderPosition(offset.convert_to<double>());
} else {
- horizontalScrollBar()->setRange(0, MaxScrollValue);
- horizontalScrollBar()->setSliderPosition(
+ hscrollbar->setRange(0, MaxScrollValue);
+ hscrollbar->setSliderPosition(
(offset_ * MaxScrollValue / (scale_ * length)).convert_to<double>());
}
updating_scroll_ = false;
// Set the vertical scrollbar
- verticalScrollBar()->setPageStep(areaSize.height());
- verticalScrollBar()->setSingleStep(areaSize.height() / 8);
+ vscrollbar->setPageStep(areaSize.height());
+ vscrollbar->setSingleStep(areaSize.height() / 8);
const pair<int, int> extents = v_extents();
- verticalScrollBar()->setRange(extents.first - (areaSize.height() / 2),
- extents.second - (areaSize.height() / 2));
+
+ // Don't change the scrollbar range if there are no traces
+ if (extents.first != extents.second)
+ vscrollbar->setRange(extents.first - areaSize.height(),
+ extents.second);
+
+ if (scroll_needs_defaults_)
+ set_scroll_default();
+}
+
+void View::reset_scroll()
+{
+ scrollarea_.verticalScrollBar()->setRange(0, 0);
+}
+
+void View::set_scroll_default()
+{
+ assert(viewport_);
+
+ const QSize areaSize = viewport_->size();
+
+ const pair<int, int> extents = v_extents();
+ const int trace_height = extents.second - extents.first;
+
+ // Do all traces fit in the view?
+ if (areaSize.height() >= trace_height)
+ // Center all traces vertically
+ set_v_offset(extents.first -
+ ((areaSize.height() - trace_height) / 2));
+ else
+ // Put the first trace at the top, letting the bottom ones overflow
+ set_v_offset(extents.first);
+
+ // If we're not sure whether setting the defaults worked as
+ // the window wasn't set up entirely yet, we want to be called
+ // again later to make sure
+ scroll_needs_defaults_ = !size_finalized_;
}
void View::update_layout()
{
- setViewportMargins(
- header_->sizeHint().width() - pv::view::Header::BaselineOffset,
+ scrollarea_.setViewportMargins(
+ header_->sizeHint().width() - Header::BaselineOffset,
ruler_->sizeHint().height(), 0, 0);
ruler_->setGeometry(viewport_->x(), 0,
viewport_->width(), ruler_->extended_size_hint().height());
update_scroll();
}
-void View::paint_label(QPainter &p, const QRect &rect, bool hover)
-{
- (void)p;
- (void)rect;
- (void)hover;
-}
-
-QRectF View::label_rect(const QRectF &rect)
-{
- (void)rect;
- return QRectF();
-}
-
TraceTreeItemOwner* View::find_prevalent_trace_group(
const shared_ptr<sigrok::ChannelGroup> &group,
- const unordered_map<shared_ptr<sigrok::Channel>, shared_ptr<Signal> >
+ const unordered_map<shared_ptr<data::SignalBase>, shared_ptr<Signal> >
&signal_map)
{
assert(group);
// Make a set and a list of all the owners
for (const auto &channel : group->channels()) {
- const auto iter = signal_map.find(channel);
- if (iter == signal_map.end())
- continue;
-
- TraceTreeItemOwner *const o = (*iter).second->owner();
- owner_list.push_back(o);
- owners.insert(o);
+ for (auto entry : signal_map) {
+ if (entry.first->channel() == channel) {
+ TraceTreeItemOwner *const o = (entry.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;
TraceTreeItemOwner *prevalent_owner = nullptr;
for (TraceTreeItemOwner *owner : owners) {
- const size_t prevalence = std::count_if(
+ const size_t prevalence = count_if(
owner_list.begin(), owner_list.end(),
[&](TraceTreeItemOwner *o) { return o == owner; });
if (prevalence > max_prevalence) {
vector< shared_ptr<Trace> > View::extract_new_traces_for_channels(
const vector< shared_ptr<sigrok::Channel> > &channels,
- const unordered_map<shared_ptr<sigrok::Channel>, shared_ptr<Signal> >
+ const unordered_map<shared_ptr<data::SignalBase>, shared_ptr<Signal> >
&signal_map,
set< shared_ptr<Trace> > &add_list)
{
vector< shared_ptr<Trace> > filtered_traces;
- for (const auto &channel : channels)
- {
- const auto map_iter = signal_map.find(channel);
- if (map_iter == signal_map.end())
- continue;
-
- shared_ptr<Trace> trace = (*map_iter).second;
- const auto list_iter = add_list.find(trace);
- if (list_iter == add_list.end())
- continue;
-
- filtered_traces.push_back(trace);
- add_list.erase(list_iter);
+ for (const auto &channel : channels) {
+ for (auto entry : signal_map) {
+ if (entry.first->channel() == channel) {
+ shared_ptr<Trace> trace = entry.second;
+ const auto list_iter = add_list.find(trace);
+ if (list_iter == add_list.end())
+ continue;
+
+ filtered_traces.push_back(trace);
+ add_list.erase(list_iter);
+ }
+ }
}
return filtered_traces;
{
// Check whether we know the sample rate and hence can use time as the unit
if (time_unit_ == util::TimeUnit::Samples) {
- shared_lock<shared_mutex> lock(session().signals_mutex());
- const unordered_set< shared_ptr<Signal> > &sigs(session().signals());
-
// Check all signals but...
- for (const shared_ptr<Signal> signal : sigs) {
+ for (const shared_ptr<Signal> signal : signals_) {
const shared_ptr<SignalData> data = signal->data();
// ...only check first segment of each
return QObject::eventFilter(object, event);
}
-bool View::viewportEvent(QEvent *e)
+void View::resizeEvent(QResizeEvent*)
{
- switch(e->type()) {
- case QEvent::Paint:
- case QEvent::MouseButtonPress:
- case QEvent::MouseButtonRelease:
- case QEvent::MouseButtonDblClick:
- case QEvent::MouseMove:
- case QEvent::Wheel:
- case QEvent::TouchBegin:
- case QEvent::TouchUpdate:
- case QEvent::TouchEnd:
- return false;
+ update_layout();
- default:
- return QAbstractScrollArea::viewportEvent(e);
+ // This is somewhat of a hack, unfortunately. We cannot use
+ // set_v_offset() from within restore_settings() as the view
+ // at that point is neither visible nor properly sized.
+ // This is the least intrusive workaround I could come up
+ // with: set the vertical offset (or scroll defaults) when
+ // the view is visible and resized to its final size.
+ // Resize events that are sent when the view is not visible
+ // must be ignored as they have wrong sizes, potentially
+ // preventing the v offset from being set successfully.
+
+ if (isVisible())
+ size_finalized_ = true;
+
+ if (size_finalized_ && saved_v_offset_) {
+ set_v_offset(saved_v_offset_);
+ saved_v_offset_ = 0;
}
-}
-void View::resizeEvent(QResizeEvent*)
-{
- update_layout();
+ if (size_finalized_ && scroll_needs_defaults_)
+ set_scroll_default();
}
void View::row_item_appearance_changed(bool label, bool content)
sticky_scrolling_changed(false);
}
- const int range = horizontalScrollBar()->maximum();
+ const int range = scrollarea_.horizontalScrollBar()->maximum();
if (range < MaxScrollValue)
set_offset(scale_ * value);
else {
void View::signals_changed()
{
- vector< shared_ptr<TraceTreeItem> > new_top_level_items;
+ using sigrok::Channel;
- const auto device = session_.device();
- if (!device)
- return;
+ vector< shared_ptr<Channel> > channels;
+ shared_ptr<sigrok::Device> sr_dev;
- shared_ptr<sigrok::Device> sr_dev = device->device();
- assert(sr_dev);
+ // Do we need to set the vertical scrollbar to its default position later?
+ // We do if there are no traces, i.e. the scroll bar has no range set
+ bool reset_scrollbar =
+ (scrollarea_.verticalScrollBar()->minimum() ==
+ scrollarea_.verticalScrollBar()->maximum());
+
+ if (!session_.device()) {
+ reset_scroll();
+ signals_.clear();
+ } else {
+ sr_dev = session_.device()->device();
+ assert(sr_dev);
+ channels = sr_dev->channels();
+ }
+
+ vector< shared_ptr<TraceTreeItem> > new_top_level_items;
// Make a list of traces that are being added, and a list of traces
// that are being removed
const set<shared_ptr<Trace>> prev_traces(
prev_trace_list.begin(), prev_trace_list.end());
- shared_lock<shared_mutex> lock(session_.signals_mutex());
- const unordered_set< shared_ptr<Signal> > &sigs(session_.signals());
-
- set< shared_ptr<Trace> > traces(sigs.begin(), sigs.end());
+ set< shared_ptr<Trace> > traces(signals_.begin(), signals_.end());
#ifdef ENABLE_DECODE
- const vector< shared_ptr<DecodeTrace> > decode_traces(
- session().get_decode_signals());
- traces.insert(decode_traces.begin(), decode_traces.end());
+ traces.insert(decode_traces_.begin(), decode_traces_.end());
#endif
set< shared_ptr<Trace> > add_traces;
inserter(remove_traces, remove_traces.begin()));
// Make a look-up table of sigrok Channels to pulseview Signals
- unordered_map<shared_ptr<sigrok::Channel>, shared_ptr<Signal> >
+ unordered_map<shared_ptr<data::SignalBase>, shared_ptr<Signal> >
signal_map;
- for (const shared_ptr<Signal> &sig : sigs)
- signal_map[sig->channel()] = sig;
+ for (const shared_ptr<Signal> &sig : signals_)
+ signal_map[sig->base()] = sig;
// Populate channel groups
- for (auto entry : sr_dev->channel_groups())
- {
- const shared_ptr<sigrok::ChannelGroup> &group = entry.second;
-
- if (group->channels().size() <= 1)
- continue;
-
- // Find best trace group to add to
- TraceTreeItemOwner *owner = find_prevalent_trace_group(
- group, signal_map);
-
- // If there is no trace group, create one
- shared_ptr<TraceGroup> new_trace_group;
- if (!owner) {
- new_trace_group.reset(new TraceGroup());
- owner = new_trace_group.get();
+ if (sr_dev)
+ for (auto entry : sr_dev->channel_groups()) {
+ const shared_ptr<sigrok::ChannelGroup> &group = entry.second;
+
+ if (group->channels().size() <= 1)
+ continue;
+
+ // Find best trace group to add to
+ TraceTreeItemOwner *owner = find_prevalent_trace_group(
+ group, signal_map);
+
+ // If there is no trace group, create one
+ shared_ptr<TraceGroup> new_trace_group;
+ if (!owner) {
+ new_trace_group.reset(new TraceGroup());
+ owner = new_trace_group.get();
+ }
+
+ // Extract traces for the trace group, removing them from
+ // the add list
+ const vector< shared_ptr<Trace> > new_traces_in_group =
+ extract_new_traces_for_channels(group->channels(),
+ signal_map, add_traces);
+
+ // Add the traces to the group
+ const pair<int, int> prev_v_extents = owner->v_extents();
+ int offset = prev_v_extents.second - prev_v_extents.first;
+ for (shared_ptr<Trace> trace : new_traces_in_group) {
+ assert(trace);
+ owner->add_child_item(trace);
+
+ const pair<int, int> extents = trace->v_extents();
+ if (trace->enabled())
+ offset += -extents.first;
+ trace->force_to_v_offset(offset);
+ if (trace->enabled())
+ offset += extents.second;
+ }
+
+ if (new_trace_group) {
+ // 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_top_level_items.push_back(new_trace_group);
+ }
}
- // Extract traces for the trace group, removing them from
- // the add list
- const vector< shared_ptr<Trace> > new_traces_in_group =
- extract_new_traces_for_channels(group->channels(),
- signal_map, add_traces);
-
- // Add the traces to the group
- const pair<int, int> prev_v_extents = owner->v_extents();
- int offset = prev_v_extents.second - prev_v_extents.first;
- for (shared_ptr<Trace> trace : new_traces_in_group) {
- assert(trace);
- owner->add_child_item(trace);
-
- const pair<int, int> extents = trace->v_extents();
- if (trace->enabled())
- offset += -extents.first;
- trace->force_to_v_offset(offset);
- if (trace->enabled())
- offset += extents.second;
- }
+ // Enqueue the remaining logic channels in a group
+ vector< shared_ptr<Channel> > logic_channels;
+ 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);
+
+ 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);
- // If this is a new group, enqueue it in the new top level
- // items list
- if (!new_traces_in_group.empty() && new_trace_group)
- new_top_level_items.push_back(new_trace_group);
+ 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(sr_dev->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());
owner->remove_child_item(trace);
}
+ // Remove any empty trace groups
+ for (shared_ptr<TraceGroup> group : list_by_type<TraceGroup>())
+ if (group->child_items().size() == 0) {
+ remove_child_item(group);
+ group.reset();
+ }
+
// Add and position the pending top levels items
+ int offset = v_extents().second;
for (auto item : new_top_level_items) {
add_child_item(item);
- // Position the item after the last present item
- int offset = v_extents().second;
+ // Position the item after the last item or at the top if there is none
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;
}
header_->update();
viewport_->update();
+
+ if (reset_scrollbar)
+ set_scroll_default();
}
void View::capture_state_updated(int state)
{
- if (state == Session::Running)
+ if (state == Session::Running) {
set_time_unit(util::TimeUnit::Samples);
+ trigger_markers_.clear();
+
+ // Activate "always zoom to fit" if the setting is enabled and we're
+ // the main view of this session (other trace views may be used for
+ // zooming and we don't want to mess them up)
+ GlobalSettings settings;
+ bool state = settings.value(GlobalSettings::Key_View_AlwaysZoomToFit).toBool();
+ if (is_main_view_ && state) {
+ always_zoom_to_fit_ = true;
+ always_zoom_to_fit_changed(always_zoom_to_fit_);
+ }
+
+ // Enable sticky scrolling if the setting is enabled
+ sticky_scrolling_ = settings.value(GlobalSettings::Key_View_StickyScrolling).toBool();
+ }
+
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
// Reset "always zoom to fit", the acquisition has stopped
if (always_zoom_to_fit_) {
+ // Perform a final zoom-to-fit before disabling
+ zoom_fit(always_zoom_to_fit_);
always_zoom_to_fit_ = false;
- always_zoom_to_fit_changed(false);
+ always_zoom_to_fit_changed(always_zoom_to_fit_);
}
}
}
void View::perform_delayed_view_update()
{
- if (always_zoom_to_fit_)
+ if (always_zoom_to_fit_) {
zoom_fit(true);
-
- if (sticky_scrolling_) {
+ } else if (sticky_scrolling_) {
// Make right side of the view sticky
double length = 0;
Timestamp offset;
void View::on_hover_point_changed()
{
- for (shared_ptr<TraceTreeItem> r : *this)
+ const vector<shared_ptr<TraceTreeItem>> trace_tree_items(
+ list_by_type<TraceTreeItem>());
+ for (shared_ptr<TraceTreeItem> r : trace_tree_items)
r->hover_point_changed();
}
-} // namespace view
+} // namespace TraceView
+} // namespace views
} // namespace pv
projects / pulseview.git / blobdiff