projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
MainWindow: Remember directory of last file that was opened/saved.
[pulseview.git]
/
pv
/
mainwindow.cpp
diff --git
a/pv/mainwindow.cpp
b/pv/mainwindow.cpp
index 2689060347c19bb186f728fa5b9b16fd66b0fdd9..165d3a705db17551fcc1070da6a559c1daea2577 100644
(file)
--- a/
pv/mainwindow.cpp
+++ b/
pv/mainwindow.cpp
@@
-22,8
+22,6
@@
#include <libsigrokdecode/libsigrokdecode.h>
#endif
#include <libsigrokdecode/libsigrokdecode.h>
#endif
-#include <boost/bind.hpp>
-
#include <algorithm>
#include <iterator>
#include <algorithm>
#include <iterator>
@@
-34,6
+32,7
@@
#include <QMessageBox>
#include <QMenu>
#include <QMenuBar>
#include <QMessageBox>
#include <QMenu>
#include <QMenuBar>
+#include <QSettings>
#include <QStatusBar>
#include <QVBoxLayout>
#include <QWidget>
#include <QStatusBar>
#include <QVBoxLayout>
#include <QWidget>
@@
-60,8
+59,8
@@
#include <glib.h>
#include <libsigrok/libsigrok.h>
#include <glib.h>
#include <libsigrok/libsigrok.h>
-using boost::shared_ptr;
using std::list;
using std::list;
+using std::shared_ptr;
namespace pv {
namespace pv {
@@
-69,6
+68,9
@@
namespace view {
class SelectableItem;
}
class SelectableItem;
}
+const char *MainWindow::SettingOpenDirectory = "MainWindow/OpenDirectory";
+const char *MainWindow::SettingSaveDirectory = "MainWindow/SaveDirectory";
+
MainWindow::MainWindow(DeviceManager &device_manager,
const char *open_file_name,
QWidget *parent) :
MainWindow::MainWindow(DeviceManager &device_manager,
const char *open_file_name,
QWidget *parent) :
@@
-324,8
+326,8
@@
void MainWindow::load_file(QString file_name)
update_device_list();
update_device_list();
- _session.start_capture(
boost::bind(&MainWindow::session_error, this,
-
errorMessage, infoMessage)
);
+ _session.start_capture(
[&, errorMessage, infoMessage](QString) {
+
session_error(errorMessage, infoMessage); }
);
}
void MainWindow::show_session_error(
}
void MainWindow::show_session_error(
@@
-341,13
+343,21
@@
void MainWindow::show_session_error(
void MainWindow::on_actionOpen_triggered()
{
void MainWindow::on_actionOpen_triggered()
{
+ QSettings settings;
+ const QString dir = settings.value(SettingOpenDirectory).toString();
+
// Show the dialog
const QString file_name = QFileDialog::getOpenFileName(
// Show the dialog
const QString file_name = QFileDialog::getOpenFileName(
- this, tr("Open File"),
""
, tr(
+ this, tr("Open File"),
dir
, tr(
"Sigrok Sessions (*.sr);;"
"All Files (*.*)"));
"Sigrok Sessions (*.sr);;"
"All Files (*.*)"));
- if (!file_name.isEmpty())
+
+ if (!file_name.isEmpty()) {
load_file(file_name);
load_file(file_name);
+
+ const QString abs_path = QFileInfo(file_name).absolutePath();
+ settings.setValue(SettingOpenDirectory, abs_path);
+ }
}
void MainWindow::on_actionSaveAs_triggered()
}
void MainWindow::on_actionSaveAs_triggered()
@@
-357,13
+367,19
@@
void MainWindow::on_actionSaveAs_triggered()
// Stop any currently running capture session
_session.stop_capture();
// Stop any currently running capture session
_session.stop_capture();
+ QSettings settings;
+ const QString dir = settings.value(SettingSaveDirectory).toString();
+
// Show the dialog
const QString file_name = QFileDialog::getSaveFileName(
// Show the dialog
const QString file_name = QFileDialog::getSaveFileName(
- this, tr("Save File"),
""
, tr("Sigrok Sessions (*.sr)"));
+ this, tr("Save File"),
dir
, tr("Sigrok Sessions (*.sr)"));
if (file_name.isEmpty())
return;
if (file_name.isEmpty())
return;
+ const QString abs_path = QFileInfo(file_name).absolutePath();
+ settings.setValue(SettingSaveDirectory, abs_path);
+
StoreProgress *dlg = new StoreProgress(file_name, _session, this);
dlg->run();
}
StoreProgress *dlg = new StoreProgress(file_name, _session, this);
dlg->run();
}
@@
-439,9
+455,8
@@
void MainWindow::run_stop()
{
switch(_session.get_capture_state()) {
case SigSession::Stopped:
{
switch(_session.get_capture_state()) {
case SigSession::Stopped:
- _session.start_capture(
- boost::bind(&MainWindow::session_error, this,
- QString("Capture failed"), _1));
+ _session.start_capture([&](QString message) {
+ session_error("Capture failed", message); });
break;
case SigSession::AwaitingTrigger:
break;
case SigSession::AwaitingTrigger: