#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 <boost/thread/locks.hpp>
#include <QApplication>
-#include <QHBoxLayout>
#include <QEvent>
#include <QFontMetrics>
+#include <QHBoxLayout>
#include <QMouseEvent>
#include <QScrollBar>
#include "view.hpp"
#include "viewport.hpp"
-#include "pv/session.hpp"
-#include "pv/globalsettings.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"
#ifdef ENABLE_DECODE
#include "decodetrace.hpp"
#endif
-using boost::shared_lock;
-using boost::shared_mutex;
-
using pv::data::SignalData;
using pv::data::Segment;
using pv::util::TimeUnit;
using std::back_inserter;
using std::copy_if;
-using std::deque;
+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::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 views {
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
const int View::ScaleUnits[3] = {1, 2, 5};
trigger_markers_(),
hover_point_(-1, -1),
scroll_needs_defaults_(false),
- saved_v_offset_(0),
- size_finalized_(false)
+ saved_v_offset_(0)
{
GlobalSettings settings;
coloured_bg_ = settings.value(GlobalSettings::Key_View_ColouredBG).toBool();
this, SLOT(process_sticky_events()));
lazy_event_handler_.setSingleShot(true);
- connect(&delayed_view_updater_, SIGNAL(timeout()),
- this, SLOT(perform_delayed_view_update()));
- delayed_view_updater_.setSingleShot(true);
- delayed_view_updater_.setInterval(1000 / MaxViewAutoUpdateRate);
-
/* To let the scroll area fill up the parent QWidget (this), we need a layout */
QHBoxLayout *layout = new QHBoxLayout(this);
setLayout(layout);
return session_;
}
-std::unordered_set< std::shared_ptr<Signal> > View::signals() const
+unordered_set< shared_ptr<Signal> > View::signals() const
{
return signals_;
}
void View::clear_signals()
{
+ ViewBase::clear_signalbases();
signals_.clear();
}
void View::add_signal(const shared_ptr<Signal> signal)
{
+ ViewBase::add_signalbase(signal->base());
signals_.insert(signal);
}
settings.setValue("v_offset",
scrollarea_.verticalScrollBar()->sliderPosition());
- std::stringstream ss;
+ stringstream ss;
boost::archive::text_oarchive oa(ss);
oa << boost::serialization::make_nvp("offset", offset_);
settings.setValue("offset", QString::fromStdString(ss.str()));
if (settings.contains("offset")) {
util::Timestamp offset;
- std::stringstream ss;
+ stringstream ss;
ss << settings.value("offset").toString().toStdString();
boost::archive::text_iarchive ia(ss);
saved_v_offset_ = settings.value("v_offset").toInt();
set_v_offset(saved_v_offset_);
scroll_needs_defaults_ = false;
- // Note: see resizeEvent() for additional information
+ // Note: see eventFilter() for additional information
}
}
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)
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();
+ 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)
{
- sticky_scrolling_ = state;
+ (void)state;
+
+ viewport_->update();
}
-void View::toggle_sticky_scrolling()
+void View::enable_show_analog_minor_grid(bool state)
{
- sticky_scrolling_ = !sticky_scrolling_;
+ (void)state;
+
+ viewport_->update();
}
void View::enable_coloured_bg(bool state)
{
- const vector<shared_ptr<TraceTreeItem>> items(
- list_by_type<TraceTreeItem>());
-
- for (shared_ptr<TraceTreeItem> i : items) {
- // Can't cast to Trace because it's abstract, so we need to
- // check for any derived classes individually
-
- shared_ptr<AnalogSignal> a = dynamic_pointer_cast<AnalogSignal>(i);
- if (a)
- a->set_coloured_bg(state);
-
- shared_ptr<LogicSignal> l = dynamic_pointer_cast<LogicSignal>(i);
- 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
- }
-
+ coloured_bg_ = state;
viewport_->update();
}
+bool View::coloured_bg() const
+{
+ return coloured_bg_;
+}
+
bool View::cursors_shown() const
{
return show_cursors_;
viewport_->update();
}
-std::shared_ptr<CursorPair> View::cursors() const
+shared_ptr<CursorPair> View::cursors() const
{
return cursors_;
}
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();
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 &i : items)
i->animate_to_layout_v_offset();
// 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>();
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()
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) {
} else if (type == QEvent::Leave) {
hover_point_ = QPoint(-1, -1);
hover_point_changed();
+ } else if (type == QEvent::Show) {
+
+ // 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 shown, which happens after all widgets were
+ // resized to their final sizes.
+ update_layout();
+
+ if (scroll_needs_defaults_) {
+ set_scroll_default();
+ scroll_needs_defaults_ = false;
+ }
+
+ if (saved_v_offset_) {
+ set_v_offset(saved_v_offset_);
+ saved_v_offset_ = 0;
+ }
}
return QObject::eventFilter(object, event);
void View::resizeEvent(QResizeEvent*)
{
update_layout();
-
- // 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;
- }
-
- if (size_finalized_ && scroll_needs_defaults_)
- set_scroll_default();
}
void View::row_item_appearance_changed(bool label, bool content)
sticky_events_ |=
(horz ? TraceTreeItemHExtentsChanged : 0) |
(vert ? TraceTreeItemVExtentsChanged : 0);
+
lazy_event_handler_.start();
}
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) {
}
}
-void View::data_updated()
-{
- if (always_zoom_to_fit_ || sticky_scrolling_) {
- if (!delayed_view_updater_.isActive())
- delayed_view_updater_.start();
- } else {
- determine_time_unit();
- update_scroll();
- ruler_->update();
- viewport_->update();
- }
-}
-
void View::perform_delayed_view_update()
{
if (always_zoom_to_fit_) {
projects / pulseview.git / blobdiff