#include <libsigrokdecode/libsigrokdecode.h>
#endif
-#include <boost/bind.hpp>
-#include <boost/foreach.hpp>
+#include <algorithm>
+#include <iterator>
#include <QAction>
#include <QApplication>
#include <QMessageBox>
#include <QMenu>
#include <QMenuBar>
+#include <QSettings>
#include <QStatusBar>
#include <QVBoxLayout>
#include <QWidget>
#include "mainwindow.h"
#include "devicemanager.h"
-#include "device/devinst.h"
+#include "device/device.h"
#include "dialogs/about.h"
#include "dialogs/connect.h"
#include "dialogs/storeprogress.h"
#include <glib.h>
#include <libsigrok/libsigrok.h>
-using boost::shared_ptr;
using std::list;
+using std::shared_ptr;
namespace pv {
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", "&Open...", 0, QApplication::UnicodeUTF8));
action_open->setIcon(QIcon::fromTheme("document-open",
QIcon(":/icons/document-open.png")));
+ action_open->setShortcut(QKeySequence(Qt::CTRL + Qt::Key_O));
action_open->setObjectName(QString::fromUtf8("actionOpen"));
menu_file->addAction(action_open);
"MainWindow", "&Save As...", 0, QApplication::UnicodeUTF8));
action_save_as->setIcon(QIcon::fromTheme("document-save-as",
QIcon(":/icons/document-save-as.png")));
+ action_save_as->setShortcut(QKeySequence(Qt::CTRL + Qt::Key_S));
action_save_as->setObjectName(QString::fromUtf8("actionSaveAs"));
menu_file->addAction(action_save_as);
"MainWindow", "&Decoders", 0, QApplication::UnicodeUTF8));
pv::widgets::DecoderMenu *const menu_decoders_add =
- new pv::widgets::DecoderMenu(menu_decoders);
+ new pv::widgets::DecoderMenu(menu_decoders, true);
menu_decoders_add->setTitle(QApplication::translate(
"MainWindow", "&Add", 0, QApplication::UnicodeUTF8));
connect(menu_decoders_add, SIGNAL(decoder_selected(srd_decoder*)),
// Setup the toolbar
QToolBar *const toolbar = new QToolBar(tr("Main Toolbar"), this);
toolbar->addAction(action_open);
+ toolbar->addAction(action_save_as);
toolbar->addSeparator();
toolbar->addAction(action_view_zoom_in);
toolbar->addAction(action_view_zoom_out);
toolbar->addAction(action_view_zoom_fit);
+ toolbar->addAction(action_view_zoom_one_to_one);
addToolBar(toolbar);
// Setup the sampling bar
Q_ARG(QString, info_text));
}
-void MainWindow::update_device_list(
- shared_ptr<pv::device::DevInst> selected_device)
+void MainWindow::update_device_list()
{
assert(_sampling_bar);
- const list< shared_ptr<device::DevInst> > &devices =
- _device_manager.devices();
- _sampling_bar->set_device_list(devices);
-
- if (!selected_device && !devices.empty()) {
- // Fall back to the first device in the list.
- selected_device = devices.front();
+ shared_ptr<pv::device::DevInst> selected_device = _session.get_device();
+ list< shared_ptr<device::DevInst> > devices;
+ std::copy(_device_manager.devices().begin(),
+ _device_manager.devices().end(), std::back_inserter(devices));
- // Try and find the demo device and select that by default
- BOOST_FOREACH (shared_ptr<pv::device::DevInst> dev_inst, devices)
- if (strcmp(dev_inst->dev_inst()->driver->name,
- "demo") == 0) {
- selected_device = dev_inst;
- }
- }
+ if (std::find(devices.begin(), devices.end(), selected_device) ==
+ devices.end())
+ devices.push_back(selected_device);
+ assert(selected_device);
- if (selected_device) {
- _sampling_bar->set_selected_device(selected_device);
- _session.set_device(selected_device);
- }
+ _sampling_bar->set_device_list(devices, selected_device);
}
void MainWindow::load_file(QString file_name)
const QString errorMessage(
QString("Failed to load file %1").arg(file_name));
const QString infoMessage;
- _session.load_file(file_name.toStdString(),
- boost::bind(&MainWindow::session_error, this,
- errorMessage, infoMessage));
+
+ try {
+ _session.set_file(file_name.toStdString());
+ } catch(QString e) {
+ show_session_error(tr("Failed to load ") + file_name, e);
+ _session.set_default_device();
+ update_device_list();
+ return;
+ }
+
+ update_device_list();
+
+ _session.start_capture([&, errorMessage, infoMessage](QString) {
+ session_error(errorMessage, infoMessage); });
}
void MainWindow::show_session_error(
void MainWindow::on_actionOpen_triggered()
{
+ QSettings settings;
+ const QString dir = settings.value(SettingOpenDirectory).toString();
+
// 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 (*.*)"));
- if (!file_name.isEmpty())
+
+ if (!file_name.isEmpty()) {
load_file(file_name);
+
+ const QString abs_path = QFileInfo(file_name).absolutePath();
+ settings.setValue(SettingOpenDirectory, abs_path);
+ }
}
void MainWindow::on_actionSaveAs_triggered()
// 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(
- this, tr("Save File"), "", tr("Sigrok Sessions (*.sr)"));
+ this, tr("Save File"), dir, tr("Sigrok Sessions (*.sr)"));
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();
}
// If the user selected a device, select it in the device list. Select the
// current device otherwise.
- shared_ptr<device::DevInst> dev_inst = dlg.exec() ?
- dlg.get_selected_device() : _session.get_device();
+ if (dlg.exec())
+ _session.set_device(dlg.get_selected_device());
- update_device_list(dev_inst);
+ update_device_list();
}
void MainWindow::on_actionQuit_triggered()
{
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: