projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add -s / --settings parameter to load a session setup file
[pulseview.git]
/
pv
/
mainwindow.cpp
diff --git
a/pv/mainwindow.cpp
b/pv/mainwindow.cpp
index aa0bf94894f156c303dd094e936cbed8d9704fc7..638d75b5179fbb63c2e0151d6c6d09ff215b95c5 100644
(file)
--- a/
pv/mainwindow.cpp
+++ b/
pv/mainwindow.cpp
@@
-399,10
+399,13
@@
void MainWindow::remove_session(shared_ptr<Session> session)
}
void MainWindow::add_session_with_file(string open_file_name,
}
void MainWindow::add_session_with_file(string open_file_name,
- string open_file_format)
+ string open_file_format,
+ string open_setup_file_name)
{
shared_ptr<Session> session = add_session();
{
shared_ptr<Session> session = add_session();
- session->load_init_file(open_file_name, open_file_format);
+ session->load_init_file(open_file_name,
+ open_file_format,
+ open_setup_file_name);
}
void MainWindow::add_default_session()
}
void MainWindow::add_default_session()