X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fmainwindow.cpp;h=924e70581fa442d064413b2a9b6e5f862d8553aa;hp=ddaeeda977c5ba8ad42769179fd084fa78d889c0;hb=7c65709437184b09753d1bcacc02467b8f6171f1;hpb=0fbda3c2dda9357776afa15e99c037eb0cc97214 diff --git a/pv/mainwindow.cpp b/pv/mainwindow.cpp index ddaeeda9..924e7058 100644 --- a/pv/mainwindow.cpp +++ b/pv/mainwindow.cpp @@ -18,61 +18,74 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ +#include + #ifdef ENABLE_DECODE #include #endif -#include -#include +#include +#include #include #include #include +#include #include #include #include #include +#include #include #include #include -#include "mainwindow.h" +#include "mainwindow.hpp" -#include "devicemanager.h" -#include "dialogs/about.h" -#include "dialogs/connect.h" -#include "dialogs/storeprogress.h" -#include "toolbars/samplingbar.h" -#include "view/logicsignal.h" -#include "view/view.h" +#include "devicemanager.hpp" +#include "dialogs/about.hpp" +#include "dialogs/connect.hpp" +#include "dialogs/storeprogress.hpp" +#include "toolbars/mainbar.hpp" +#include "view/logicsignal.hpp" +#include "view/view.hpp" #ifdef ENABLE_DECODE -#include "widgets/decodermenu.h" +#include "widgets/decodermenu.hpp" #endif -/* __STDC_FORMAT_MACROS is required for PRIu64 and friends (in C++). */ -#define __STDC_FORMAT_MACROS #include #include #include #include -#include +#include using std::list; +using std::map; +using std::shared_ptr; +using std::string; + +using sigrok::Device; +using sigrok::Error; +using sigrok::HardwareDevice; namespace pv { namespace view { -class SelectableItem; +class ViewItem; } +const char *MainWindow::SettingOpenDirectory = "MainWindow/OpenDirectory"; +const char *MainWindow::SettingSaveDirectory = "MainWindow/SaveDirectory"; + MainWindow::MainWindow(DeviceManager &device_manager, const char *open_file_name, QWidget *parent) : QMainWindow(parent), - _device_manager(device_manager), - _session(device_manager) + device_manager_(device_manager), + 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", @@ -81,12 +94,39 @@ MainWindow::MainWindow(DeviceManager &device_manager, } } +void MainWindow::run_stop() +{ + switch(session_.get_capture_state()) { + case Session::Stopped: + session_.start_capture([&](QString message) { + session_error("Capture failed", message); }); + break; + + case Session::AwaitingTrigger: + case Session::Running: + session_.stop_capture(); + break; + } +} + +void MainWindow::select_device(shared_ptr device) +{ + try { + session_.set_device(device); + } catch(const QString &e) { + QMessageBox msg(this); + msg.setText(e); + msg.setInformativeText(tr("Failed to Select Device")); + msg.setStandardButtons(QMessageBox::Ok); + msg.setIcon(QMessageBox::Warning); + msg.exec(); + } +} + void MainWindow::setup_ui() { setObjectName(QString::fromUtf8("MainWindow")); - resize(1024, 768); - // Set the window icon QIcon icon; icon.addFile(QString::fromUtf8(":/icons/sigrok-logo-notext.png"), @@ -94,15 +134,15 @@ void MainWindow::setup_ui() setWindowIcon(icon); // Setup the central widget - _central_widget = new QWidget(this); - _vertical_layout = new QVBoxLayout(_central_widget); - _vertical_layout->setSpacing(6); - _vertical_layout->setContentsMargins(0, 0, 0, 0); - setCentralWidget(_central_widget); + central_widget_ = new QWidget(this); + vertical_layout_ = new QVBoxLayout(central_widget_); + vertical_layout_->setSpacing(6); + vertical_layout_->setContentsMargins(0, 0, 0, 0); + setCentralWidget(central_widget_); - _view = new pv::view::View(_session, this); + view_ = new pv::view::View(session_, this); - _vertical_layout->addWidget(_view); + vertical_layout_->addWidget(view_); // Setup the menu bar QMenuBar *const menu_bar = new QMenuBar(this); @@ -110,39 +150,35 @@ void MainWindow::setup_ui() // 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)); @@ -151,30 +187,29 @@ void MainWindow::setup_ui() // 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 + action_view_zoom_in->setShortcut(QKeySequence::ZoomIn); action_view_zoom_in->setObjectName( QString::fromUtf8("actionViewZoomIn")); 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); action_view_zoom_out->setObjectName( QString::fromUtf8("actionViewZoomOut")); 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)); @@ -183,9 +218,7 @@ void MainWindow::setup_ui() 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)); @@ -197,24 +230,21 @@ void MainWindow::setup_ui() QAction *action_view_show_cursors = new QAction(this); action_view_show_cursors->setCheckable(true); - action_view_show_cursors->setChecked(_view->cursors_shown()); + action_view_show_cursors->setChecked(view_->cursors_shown()); 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); - menu_decoders_add->setTitle(QApplication::translate( - "MainWindow", "&Add", 0, QApplication::UnicodeUTF8)); + new pv::widgets::DecoderMenu(menu_decoders, true); + menu_decoders_add->setTitle(tr("&Add")); connect(menu_decoders_add, SIGNAL(decoder_selected(srd_decoder*)), this, SLOT(add_decoder(srd_decoder*))); @@ -223,13 +253,11 @@ void MainWindow::setup_ui() // 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()); @@ -244,31 +272,116 @@ void MainWindow::setup_ui() // 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 - _sampling_bar = new toolbars::SamplingBar(_session, this); + main_bar_ = new toolbars::MainBar(session_, *this); // Populate the device list and select the initially selected device update_device_list(); - connect(_sampling_bar, SIGNAL(run_stop()), this, - SLOT(run_stop())); - addToolBar(_sampling_bar); + addToolBar(main_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, + // Setup session_ events + connect(&session_, SIGNAL(capture_state_changed(int)), this, SLOT(capture_state_changed(int))); + connect(&session_, SIGNAL(device_selected()), this, + SLOT(device_selected())); +} + +void MainWindow::save_ui_settings() +{ + QSettings settings; + + map dev_info; + list key_list; + + settings.beginGroup("MainWindow"); + settings.setValue("state", saveState()); + settings.setValue("geometry", saveGeometry()); + settings.endGroup(); + + if (session_.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 = device_manager_.get_device_info( + session_.device()); + 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 device; + + map dev_info; + list 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) { + select_device(device); + update_device_list(); + } + + settings.endGroup(); } void MainWindow::session_error( @@ -279,28 +392,31 @@ void MainWindow::session_error( Q_ARG(QString, info_text)); } -void MainWindow::update_device_list(struct sr_dev_inst *selected_device) +void MainWindow::update_device_list() { - assert(_sampling_bar); + assert(main_bar_); - const list &devices = _device_manager.devices(); - _sampling_bar->set_device_list(devices); + shared_ptr selected_device = session_.device(); + list< shared_ptr > devices; - if (!selected_device && !devices.empty()) { - // Fall back to the first device in the list. - selected_device = devices.front(); + if (device_manager_.devices().size() == 0) + return; - // Try and find the demo device and select that by default - BOOST_FOREACH (struct sr_dev_inst *sdi, devices) - if (strcmp(sdi->driver->name, "demo") == 0) { - selected_device = sdi; - } - } + std::copy(device_manager_.devices().begin(), + device_manager_.devices().end(), std::back_inserter(devices)); - if (selected_device) { - _sampling_bar->set_selected_device(selected_device); - _session.set_device(selected_device); - } + if (std::find(devices.begin(), devices.end(), selected_device) == + devices.end()) + devices.push_back(selected_device); + assert(selected_device); + + main_bar_->set_device_list(devices, selected_device); +} + +void MainWindow::closeEvent(QCloseEvent *event) +{ + save_ui_settings(); + event->accept(); } void MainWindow::load_file(QString file_name) @@ -308,9 +424,20 @@ 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(Error e) { + show_session_error(tr("Failed to load ") + file_name, e.what()); + 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( @@ -326,15 +453,21 @@ void MainWindow::show_session_error( void MainWindow::on_actionOpen_triggered() { - // Enumerate the file formats - QString filters(tr("Sigrok Sessions (*.sr)")); - filters.append(tr(";;All Files (*.*)")); + QSettings settings; + const QString dir = settings.value(SettingOpenDirectory).toString(); // Show the dialog const QString file_name = QFileDialog::getOpenFileName( - this, tr("Open File"), "", filters); - if (!file_name.isEmpty()) + this, tr("Open File"), dir, tr( + "Sigrok Sessions (*.sr);;" + "All Files (*.*)")); + + 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() @@ -342,32 +475,38 @@ void MainWindow::on_actionSaveAs_triggered() using pv::dialogs::StoreProgress; // Stop any currently running capture session - _session.stop_capture(); + 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; - StoreProgress *dlg = new StoreProgress(file_name, _session, this); + const QString abs_path = QFileInfo(file_name).absolutePath(); + settings.setValue(SettingSaveDirectory, abs_path); + + StoreProgress *dlg = new StoreProgress(file_name, session_, this); dlg->run(); } void MainWindow::on_actionConnect_triggered() { // Stop any currently running capture session - _session.stop_capture(); + session_.stop_capture(); - dialogs::Connect dlg(this, _device_manager); + dialogs::Connect dlg(this, device_manager_); // If the user selected a device, select it in the device list. Select the // current device otherwise. - struct sr_dev_inst *const sdi = dlg.exec() ? - dlg.get_selected_device() : _session.get_device(); + if (dlg.exec()) + select_device(dlg.get_selected_device()); - update_device_list(sdi); + update_device_list(); } void MainWindow::on_actionQuit_triggered() @@ -377,38 +516,38 @@ void MainWindow::on_actionQuit_triggered() void MainWindow::on_actionViewZoomIn_triggered() { - _view->zoom(1); + view_->zoom(1); } void MainWindow::on_actionViewZoomOut_triggered() { - _view->zoom(-1); + view_->zoom(-1); } void MainWindow::on_actionViewZoomFit_triggered() { - _view->zoom_fit(); + view_->zoom_fit(); } void MainWindow::on_actionViewZoomOneToOne_triggered() { - _view->zoom_one_to_one(); + view_->zoom_one_to_one(); } void MainWindow::on_actionViewShowCursors_triggered() { - assert(_view); + assert(view_); - const bool show = !_view->cursors_shown(); + const bool show = !view_->cursors_shown(); if(show) - _view->centre_cursors(); + view_->centre_cursors(); - _view->show_cursors(show); + view_->show_cursors(show); } void MainWindow::on_actionAbout_triggered() { - dialogs::About dlg(this); + dialogs::About dlg(device_manager_.context(), this); dlg.exec(); } @@ -416,31 +555,26 @@ void MainWindow::add_decoder(srd_decoder *decoder) { #ifdef ENABLE_DECODE assert(decoder); - _session.add_decoder(decoder); + session_.add_decoder(decoder); #else (void)decoder; #endif } -void MainWindow::run_stop() +void MainWindow::capture_state_changed(int state) { - switch(_session.get_capture_state()) { - case SigSession::Stopped: - _session.start_capture(_sampling_bar->get_record_length(), - boost::bind(&MainWindow::session_error, this, - QString("Capture failed"), _1)); - break; - - case SigSession::AwaitingTrigger: - case SigSession::Running: - _session.stop_capture(); - break; - } + main_bar_->set_capture_state((pv::Session::capture_state)state); } -void MainWindow::capture_state_changed(int state) +void MainWindow::device_selected() { - _sampling_bar->set_capture_state((pv::SigSession::capture_state)state); + // Set the title to include the device/file name + const shared_ptr device = session_.device(); + if (!device) + return; + + const string display_name = device_manager_.get_display_name(device); + setWindowTitle(tr("%1 - PulseView").arg(display_name.c_str())); } } // namespace pv