* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
+#include <cassert>
+
#ifdef ENABLE_DECODE
#include <libsigrokdecode/libsigrokdecode.h>
#endif
-#include <boost/bind.hpp>
-#include <boost/foreach.hpp>
-
#include <algorithm>
#include <iterator>
#include <QAction>
#include <QApplication>
#include <QButtonGroup>
+#include <QCloseEvent>
#include <QFileDialog>
#include <QMessageBox>
#include <QMenu>
#include <QMenuBar>
+#include <QSettings>
#include <QStatusBar>
#include <QVBoxLayout>
#include <QWidget>
#include <glib.h>
#include <libsigrok/libsigrok.h>
-using boost::shared_ptr;
using std::list;
+using std::map;
+using std::shared_ptr;
+using std::string;
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) :
_session(device_manager)
{
setup_ui();
+ restore_ui_settings();
if (open_file_name) {
const QString s(QString::fromUtf8(open_file_name));
QMetaObject::invokeMethod(this, "load_file",
{
setObjectName(QString::fromUtf8("MainWindow"));
- resize(1024, 768);
-
// Set the window icon
QIcon icon;
icon.addFile(QString::fromUtf8(":/icons/sigrok-logo-notext.png"),
// File Menu
QMenu *const menu_file = new QMenu;
- menu_file->setTitle(QApplication::translate(
- "MainWindow", "&File", 0, QApplication::UnicodeUTF8));
+ menu_file->setTitle(tr("&File"));
QAction *const action_open = new QAction(this);
- action_open->setText(QApplication::translate(
- "MainWindow", "&Open...", 0, QApplication::UnicodeUTF8));
+ action_open->setText(tr("&Open..."));
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);
QAction *const action_save_as = new QAction(this);
- action_save_as->setText(QApplication::translate(
- "MainWindow", "&Save As...", 0, QApplication::UnicodeUTF8));
+ action_save_as->setText(tr("&Save As..."));
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);
menu_file->addSeparator();
QAction *const action_connect = new QAction(this);
- action_connect->setText(QApplication::translate(
- "MainWindow", "&Connect to Device...", 0,
- QApplication::UnicodeUTF8));
+ action_connect->setText(tr("&Connect to Device..."));
action_connect->setObjectName(QString::fromUtf8("actionConnect"));
menu_file->addAction(action_connect);
menu_file->addSeparator();
QAction *action_quit = new QAction(this);
- action_quit->setText(QApplication::translate(
- "MainWindow", "&Quit", 0, QApplication::UnicodeUTF8));
+ action_quit->setText(tr("&Quit"));
action_quit->setIcon(QIcon::fromTheme("application-exit",
QIcon(":/icons/application-exit.png")));
action_quit->setShortcut(QKeySequence(Qt::CTRL + Qt::Key_Q));
// View Menu
QMenu *menu_view = new QMenu;
- menu_view->setTitle(QApplication::translate(
- "MainWindow", "&View", 0, QApplication::UnicodeUTF8));
+ menu_view->setTitle(tr("&View"));
QAction *const action_view_zoom_in = new QAction(this);
- action_view_zoom_in->setText(QApplication::translate(
- "MainWindow", "Zoom &In", 0, QApplication::UnicodeUTF8));
+ action_view_zoom_in->setText(tr("Zoom &In"));
action_view_zoom_in->setIcon(QIcon::fromTheme("zoom-in",
QIcon(":/icons/zoom-in.png")));
// simply using Qt::Key_Plus shows no + in the menu
menu_view->addAction(action_view_zoom_in);
QAction *const action_view_zoom_out = new QAction(this);
- action_view_zoom_out->setText(QApplication::translate(
- "MainWindow", "Zoom &Out", 0, QApplication::UnicodeUTF8));
+ action_view_zoom_out->setText(tr("Zoom &Out"));
action_view_zoom_out->setIcon(QIcon::fromTheme("zoom-out",
QIcon(":/icons/zoom-out.png")));
action_view_zoom_out->setShortcut(QKeySequence::ZoomOut);
menu_view->addAction(action_view_zoom_out);
QAction *const action_view_zoom_fit = new QAction(this);
- action_view_zoom_fit->setText(QApplication::translate(
- "MainWindow", "Zoom to &Fit", 0, QApplication::UnicodeUTF8));
+ action_view_zoom_fit->setText(tr("Zoom to &Fit"));
action_view_zoom_fit->setIcon(QIcon::fromTheme("zoom-fit",
QIcon(":/icons/zoom-fit.png")));
action_view_zoom_fit->setShortcut(QKeySequence(Qt::Key_F));
menu_view->addAction(action_view_zoom_fit);
QAction *const action_view_zoom_one_to_one = new QAction(this);
- action_view_zoom_one_to_one->setText(QApplication::translate(
- "MainWindow", "Zoom to &One-to-One", 0,
- QApplication::UnicodeUTF8));
+ action_view_zoom_one_to_one->setText(tr("Zoom to &One-to-One"));
action_view_zoom_one_to_one->setIcon(QIcon::fromTheme("zoom-original",
QIcon(":/icons/zoom-original.png")));
action_view_zoom_one_to_one->setShortcut(QKeySequence(Qt::Key_O));
action_view_show_cursors->setShortcut(QKeySequence(Qt::Key_C));
action_view_show_cursors->setObjectName(
QString::fromUtf8("actionViewShowCursors"));
- action_view_show_cursors->setText(QApplication::translate(
- "MainWindow", "Show &Cursors", 0, QApplication::UnicodeUTF8));
+ action_view_show_cursors->setText(tr("Show &Cursors"));
menu_view->addAction(action_view_show_cursors);
// Decoders Menu
#ifdef ENABLE_DECODE
QMenu *const menu_decoders = new QMenu;
- menu_decoders->setTitle(QApplication::translate(
- "MainWindow", "&Decoders", 0, QApplication::UnicodeUTF8));
+ menu_decoders->setTitle(tr("&Decoders"));
pv::widgets::DecoderMenu *const menu_decoders_add =
new pv::widgets::DecoderMenu(menu_decoders, true);
- menu_decoders_add->setTitle(QApplication::translate(
- "MainWindow", "&Add", 0, QApplication::UnicodeUTF8));
+ menu_decoders_add->setTitle(tr("&Add"));
connect(menu_decoders_add, SIGNAL(decoder_selected(srd_decoder*)),
this, SLOT(add_decoder(srd_decoder*)));
// Help Menu
QMenu *const menu_help = new QMenu;
- menu_help->setTitle(QApplication::translate(
- "MainWindow", "&Help", 0, QApplication::UnicodeUTF8));
+ menu_help->setTitle(tr("&Help"));
QAction *const action_about = new QAction(this);
action_about->setObjectName(QString::fromUtf8("actionAbout"));
- action_about->setText(QApplication::translate(
- "MainWindow", "&About...", 0, QApplication::UnicodeUTF8));
+ action_about->setText(tr("&About..."));
menu_help->addAction(action_about);
menu_bar->addAction(menu_file->menuAction());
// Setup the toolbar
QToolBar *const toolbar = new QToolBar(tr("Main Toolbar"), this);
+ toolbar->setObjectName(QString::fromUtf8("MainToolbar"));
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
addToolBar(_sampling_bar);
// Set the title
- setWindowTitle(QApplication::translate("MainWindow", "PulseView", 0,
- QApplication::UnicodeUTF8));
+ setWindowTitle(tr("PulseView"));
// Setup _session events
connect(&_session, SIGNAL(capture_state_changed(int)), this,
SLOT(capture_state_changed(int)));
+}
+
+void MainWindow::save_ui_settings()
+{
+ QSettings settings;
+
+ map<string, string> dev_info;
+ list<string> key_list;
+
+ settings.beginGroup("MainWindow");
+ settings.setValue("state", saveState());
+ settings.setValue("geometry", saveGeometry());
+ settings.endGroup();
+
+ if (_session.get_device()) {
+ settings.beginGroup("Device");
+ key_list.push_back("vendor");
+ key_list.push_back("model");
+ key_list.push_back("version");
+ key_list.push_back("serial_num");
+ key_list.push_back("connection_id");
+
+ dev_info = _session.get_device()->get_device_info();
+ for (string key : key_list) {
+
+ if (dev_info.count(key))
+ settings.setValue(QString::fromUtf8(key.c_str()),
+ QString::fromUtf8(dev_info.at(key).c_str()));
+ else
+ settings.remove(QString::fromUtf8(key.c_str()));
+ }
+
+ settings.endGroup();
+ }
+}
+
+void MainWindow::restore_ui_settings()
+{
+ QSettings settings;
+
+ shared_ptr<pv::device::DevInst> device;
+
+ map<string, string> dev_info;
+ list<string> key_list;
+ string value;
+
+ settings.beginGroup("MainWindow");
+
+ if (settings.contains("geometry")) {
+ restoreGeometry(settings.value("geometry").toByteArray());
+ restoreState(settings.value("state").toByteArray());
+ } else
+ resize(1000, 720);
+
+ settings.endGroup();
+
+ // Re-select last used device if possible.
+ settings.beginGroup("Device");
+ key_list.push_back("vendor");
+ key_list.push_back("model");
+ key_list.push_back("version");
+ key_list.push_back("serial_num");
+ key_list.push_back("connection_id");
+
+ for (string key : key_list) {
+ if (!settings.contains(QString::fromUtf8(key.c_str())))
+ continue;
+
+ value = settings.value(QString::fromUtf8(key.c_str())).toString().toStdString();
+
+ if (value.size() > 0)
+ dev_info.insert(std::make_pair(key, value));
+ }
+
+ device = _device_manager.find_device_from_info(dev_info);
+
+ if (device) {
+ _session.set_device(device);
+ update_device_list();
+ }
+
+ settings.endGroup();
}
void MainWindow::session_error(
shared_ptr<pv::device::DevInst> selected_device = _session.get_device();
list< shared_ptr<device::DevInst> > devices;
+
+ if (_device_manager.devices().size() == 0)
+ return;
+
std::copy(_device_manager.devices().begin(),
_device_manager.devices().end(), std::back_inserter(devices));
if (std::find(devices.begin(), devices.end(), selected_device) ==
devices.end())
devices.push_back(selected_device);
+ assert(selected_device);
- _sampling_bar->set_device_list(devices);
+ _sampling_bar->set_device_list(devices, selected_device);
+}
- if (selected_device)
- _sampling_bar->set_selected_device(selected_device);
+void MainWindow::closeEvent(QCloseEvent *event)
+{
+ save_ui_settings();
+ event->accept();
}
void MainWindow::load_file(QString file_name)
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::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();
}
{
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: