#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"
}
}
-View::View(Session &session, QWidget *parent) :
- ViewBase(session, parent),
+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)),
saved_v_offset_(0),
size_finalized_(false)
{
+ 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(scrollarea_.verticalScrollBar(), SIGNAL(valueChanged(int)),
sticky_scrolling_ = state;
}
+void View::toggle_sticky_scrolling()
+{
+ sticky_scrolling_ = !sticky_scrolling_;
+}
+
void View::enable_coloured_bg(bool state)
{
const vector<shared_ptr<TraceTreeItem>> items(
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);
o->restack_items();
// Re-assign background colors
- bool next_bgcolour_state = 0;
+ bool next_bgcolour_state = false;
for (auto &o : sorted_owners)
next_bgcolour_state = o->reassign_bgcolour_states(next_bgcolour_state);
void View::trigger_event(util::Timestamp location)
{
- trigger_markers_.push_back(shared_ptr<TriggerMarker>(
- new TriggerMarker(*this, location)));
+ trigger_markers_.push_back(make_shared<TriggerMarker>(*this, location));
}
void View::get_scroll_layout(double &length, Timestamp &offset) const
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_);
+ }
}
if (state == Session::Stopped) {
// 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;