projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
View: Fully integrate the "zero trigger time" setting
[pulseview.git]
/
pv
/
mainwindow.cpp
diff --git
a/pv/mainwindow.cpp
b/pv/mainwindow.cpp
index 119ce0a791ba22a2aa1d6b1702a387fd6bef9caf..91e38729167d98135b8d9755ecdc315042820217 100644
(file)
--- a/
pv/mainwindow.cpp
+++ b/
pv/mainwindow.cpp
@@
-53,7
+53,6
@@
using std::bind;
using std::dynamic_pointer_cast;
using std::make_shared;
using std::bind;
using std::dynamic_pointer_cast;
using std::make_shared;
-using std::map;
using std::placeholders::_1;
using std::shared_ptr;
using std::string;
using std::placeholders::_1;
using std::shared_ptr;
using std::string;
@@
-175,9
+174,9
@@
shared_ptr<views::ViewBase> MainWindow::add_view(const QString &title,
connect(close_btn, SIGNAL(clicked(bool)),
this, SLOT(on_view_close_clicked()));
connect(close_btn, SIGNAL(clicked(bool)),
this, SLOT(on_view_close_clicked()));
- connect(&session, SIGNAL(trigger_event(util::Timestamp)),
+ connect(&session, SIGNAL(trigger_event(
int,
util::Timestamp)),
qobject_cast<views::ViewBase*>(v.get()),
qobject_cast<views::ViewBase*>(v.get()),
- SLOT(trigger_event(util::Timestamp)));
+ SLOT(trigger_event(
int,
util::Timestamp)));
if (type == views::ViewTypeTrace) {
views::trace::View *tv =
if (type == views::ViewTypeTrace) {
views::trace::View *tv =