projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix the build - catch exceptions by reference
[pulseview.git]
/
pv
/
views
/
trace
/
view.cpp
diff --git
a/pv/views/trace/view.cpp
b/pv/views/trace/view.cpp
index 3cb26ec400be3028d005b4c3b8d3b61d1c7a2a50..98fd46d2ad4684fb81051956c0995f579abc49d0 100644
(file)
--- a/
pv/views/trace/view.cpp
+++ b/
pv/views/trace/view.cpp
@@
-385,7
+385,7
@@
void View::restore_settings(QSettings &settings)
boost::archive::text_iarchive ia(ss);
ia >> boost::serialization::make_nvp("ruler_shift", shift);
ruler_shift_ = shift;
boost::archive::text_iarchive ia(ss);
ia >> boost::serialization::make_nvp("ruler_shift", shift);
ruler_shift_ = shift;
- } catch (boost::archive::archive_exception) {
+ } catch (boost::archive::archive_exception
&
) {
qDebug() << "Could not restore the view ruler shift";
}
}
qDebug() << "Could not restore the view ruler shift";
}
}
@@
-400,7
+400,7
@@
void View::restore_settings(QSettings &settings)
ia >> boost::serialization::make_nvp("offset", offset);
// This also updates ruler_offset_
set_offset(offset);
ia >> boost::serialization::make_nvp("offset", offset);
// This also updates ruler_offset_
set_offset(offset);
- } catch (boost::archive::archive_exception) {
+ } catch (boost::archive::archive_exception
&
) {
qDebug() << "Could not restore the view offset";
}
}
qDebug() << "Could not restore the view offset";
}
}
@@
-619,8
+619,6
@@
Trace::SegmentDisplayMode View::segment_display_mode() const
void View::set_segment_display_mode(Trace::SegmentDisplayMode mode)
{
void View::set_segment_display_mode(Trace::SegmentDisplayMode mode)
{
- trigger_markers_.clear();
-
segment_display_mode_ = mode;
for (shared_ptr<Signal> signal : signals_)
segment_display_mode_ = mode;
for (shared_ptr<Signal> signal : signals_)
@@
-1055,8
+1053,10
@@
void View::update_scroll()
vscrollbar->setRange(extents.first - areaSize.height(),
extents.second);
vscrollbar->setRange(extents.first - areaSize.height(),
extents.second);
- if (scroll_needs_defaults_)
+ if (scroll_needs_defaults_)
{
set_scroll_default();
set_scroll_default();
+ scroll_needs_defaults_ = false;
+ }
}
void View::reset_scroll()
}
void View::reset_scroll()