projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Session: Don't reset session name for file devices
[pulseview.git]
/
pv
/
view
/
view.cpp
diff --git
a/pv/view/view.cpp
b/pv/view/view.cpp
index d460e8686c3e22decc8f0b9d11e3f0ab32d59bd9..cc0ceb79cabfadaa68fa1396997de3ba79930b78 100644
(file)
--- a/
pv/view/view.cpp
+++ b/
pv/view/view.cpp
@@
-136,8
+136,8
@@
bool CustomAbstractScrollArea::viewportEvent(QEvent *event)
}
}
}
}
-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)),
viewport_(new Viewport(*this)),
ruler_(new Ruler(*this)),
header_(new Header(*this)),
@@
-567,7
+567,7
@@
void View::enable_sticky_scrolling(bool state)
sticky_scrolling_ = state;
}
sticky_scrolling_ = state;
}
-void View::toggle_sticky_scrolling(
void
)
+void View::toggle_sticky_scrolling()
{
sticky_scrolling_ = !sticky_scrolling_;
}
{
sticky_scrolling_ = !sticky_scrolling_;
}
@@
-627,8
+627,8
@@
std::shared_ptr<CursorPair> View::cursors() const
void View::add_flag(const Timestamp& time)
{
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);
next_flag_text_ = (next_flag_text_ >= 'Z') ? 'A' :
(next_flag_text_ + 1);
@@
-676,7
+676,7
@@
void View::restack_all_trace_tree_items()
o->restack_items();
// Re-assign background colors
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);
for (auto &o : sorted_owners)
next_bgcolour_state = o->reassign_bgcolour_states(next_bgcolour_state);
@@
-688,8
+688,7
@@
void View::restack_all_trace_tree_items()
void View::trigger_event(util::Timestamp location)
{
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
}
void View::get_scroll_layout(double &length, Timestamp &offset) const
@@
-1233,10
+1232,12
@@
void View::capture_state_updated(int state)
trigger_markers_.clear();
trigger_markers_.clear();
- // Activate "always zoom to fit" if the setting is enabled
+ // 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();
GlobalSettings settings;
bool state = settings.value(GlobalSettings::Key_View_AlwaysZoomToFit).toBool();
- if (state) {
+ if (
is_main_view_ &&
state) {
always_zoom_to_fit_ = true;
always_zoom_to_fit_changed(always_zoom_to_fit_);
}
always_zoom_to_fit_ = true;
always_zoom_to_fit_changed(always_zoom_to_fit_);
}
@@
-1249,6
+1250,8
@@
void View::capture_state_updated(int state)
// Reset "always zoom to fit", the acquisition has stopped
if (always_zoom_to_fit_) {
// 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(always_zoom_to_fit_);
}
always_zoom_to_fit_ = false;
always_zoom_to_fit_changed(always_zoom_to_fit_);
}
@@
-1270,10
+1273,9
@@
void View::data_updated()
void View::perform_delayed_view_update()
{
void View::perform_delayed_view_update()
{
- if (always_zoom_to_fit_)
+ if (always_zoom_to_fit_)
{
zoom_fit(true);
zoom_fit(true);
-
- if (sticky_scrolling_) {
+ } else if (sticky_scrolling_) {
// Make right side of the view sticky
double length = 0;
Timestamp offset;
// Make right side of the view sticky
double length = 0;
Timestamp offset;