X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fmainwindow.cpp;h=21b66b534f59119b492b6be69bb049c094389768;hp=165d3a705db17551fcc1070da6a559c1daea2577;hb=1c4c23b87cde3778792caa1400030075b0504129;hpb=643f65f96d3996c32569e9ee7cd4aa29adc2819a diff --git a/pv/mainwindow.cpp b/pv/mainwindow.cpp index 165d3a70..21b66b53 100644 --- a/pv/mainwindow.cpp +++ b/pv/mainwindow.cpp @@ -18,6 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ +#include + #ifdef ENABLE_DECODE #include #endif @@ -28,6 +30,7 @@ #include #include #include +#include #include #include #include @@ -37,35 +40,39 @@ #include #include -#include "mainwindow.h" +#include "mainwindow.hpp" -#include "devicemanager.h" -#include "device/device.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 +#include "widgets/hidingmenubar.hpp" -/* __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"; @@ -75,10 +82,22 @@ 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), + action_open_(new QAction(this)), + action_save_as_(new QAction(this)), + action_connect_(new QAction(this)), + action_quit_(new QAction(this)), + action_view_zoom_in_(new QAction(this)), + action_view_zoom_out_(new QAction(this)), + action_view_zoom_fit_(new QAction(this)), + action_view_zoom_one_to_one_(new QAction(this)), + action_view_show_cursors_(new QAction(this)), + action_about_(new QAction(this)), + menu_decoders_add_(new pv::widgets::DecoderMenu(this, true)) { setup_ui(); + restore_ui_settings(); if (open_file_name) { const QString s(QString::fromUtf8(open_file_name)); QMetaObject::invokeMethod(this, "load_file", @@ -87,12 +106,94 @@ MainWindow::MainWindow(DeviceManager &device_manager, } } +QAction* MainWindow::action_open() const +{ + return action_open_; +} + +QAction* MainWindow::action_save_as() const +{ + return action_save_as_; +} + +QAction* MainWindow::action_connect() const +{ + return action_connect_; +} + +QAction* MainWindow::action_quit() const +{ + return action_quit_; +} + +QAction* MainWindow::action_view_zoom_in() const +{ + return action_view_zoom_in_; +} + +QAction* MainWindow::action_view_zoom_out() const +{ + return action_view_zoom_out_; +} + +QAction* MainWindow::action_view_zoom_fit() const +{ + return action_view_zoom_fit_; +} + +QAction* MainWindow::action_view_zoom_one_to_one() const +{ + return action_view_zoom_one_to_one_; +} + +QAction* MainWindow::action_view_show_cursors() const +{ + return action_view_show_cursors_; +} + +QAction* MainWindow::action_about() const +{ + return action_about_; +} + +QMenu* MainWindow::menu_decoder_add() const +{ + return menu_decoders_add_; +} + +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"), @@ -100,148 +201,121 @@ 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); - menu_bar->setGeometry(QRect(0, 0, 400, 25)); + pv::widgets::HidingMenuBar *const menu_bar = + new pv::widgets::HidingMenuBar(this); // 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->setIcon(QIcon::fromTheme("document-open", + 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->setIcon(QIcon::fromTheme("document-save-as", + action_open_->setShortcut(QKeySequence(Qt::CTRL + Qt::Key_O)); + action_open_->setObjectName(QString::fromUtf8("actionOpen")); + menu_file->addAction(action_open_); + + 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); + 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->setObjectName(QString::fromUtf8("actionConnect")); - menu_file->addAction(action_connect); + 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->setIcon(QIcon::fromTheme("application-exit", + 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)); - action_quit->setObjectName(QString::fromUtf8("actionQuit")); - menu_file->addAction(action_quit); + action_quit_->setShortcut(QKeySequence(Qt::CTRL + Qt::Key_Q)); + action_quit_->setObjectName(QString::fromUtf8("actionQuit")); + menu_file->addAction(action_quit_); // 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->setIcon(QIcon::fromTheme("zoom-in", + 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( + action_view_zoom_in_->setShortcut(QKeySequence::ZoomIn); + action_view_zoom_in_->setObjectName( QString::fromUtf8("actionViewZoomIn")); - menu_view->addAction(action_view_zoom_in); + 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->setIcon(QIcon::fromTheme("zoom-out", + 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( + action_view_zoom_out_->setShortcut(QKeySequence::ZoomOut); + action_view_zoom_out_->setObjectName( QString::fromUtf8("actionViewZoomOut")); - menu_view->addAction(action_view_zoom_out); + 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->setIcon(QIcon::fromTheme("zoom-fit", + 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)); - action_view_zoom_fit->setObjectName( + action_view_zoom_fit_->setShortcut(QKeySequence(Qt::Key_F)); + action_view_zoom_fit_->setObjectName( QString::fromUtf8("actionViewZoomFit")); - menu_view->addAction(action_view_zoom_fit); + 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->setIcon(QIcon::fromTheme("zoom-original", + action_view_zoom_one_to_one_->setText(tr("Zoom to O&ne-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_zoom_one_to_one->setObjectName( + action_view_zoom_one_to_one_->setShortcut(QKeySequence(Qt::Key_O)); + action_view_zoom_one_to_one_->setObjectName( QString::fromUtf8("actionViewZoomOneToOne")); - menu_view->addAction(action_view_zoom_one_to_one); + menu_view->addAction(action_view_zoom_one_to_one_); menu_view->addSeparator(); - 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->setShortcut(QKeySequence(Qt::Key_C)); - action_view_show_cursors->setObjectName( + action_view_show_cursors_->setCheckable(true); + action_view_show_cursors_->setChecked(view_->cursors_shown()); + action_view_show_cursors_->setIcon(QIcon::fromTheme("show-cursors", + QIcon(":/icons/show-cursors.svg"))); + 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)); - menu_view->addAction(action_view_show_cursors); + 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)); - - 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)); - connect(menu_decoders_add, SIGNAL(decoder_selected(srd_decoder*)), + menu_decoders->setTitle(tr("&Decoders")); + + menu_decoders_add_->setTitle(tr("&Add")); + connect(menu_decoders_add_, SIGNAL(decoder_selected(srd_decoder*)), this, SLOT(add_decoder(srd_decoder*))); - menu_decoders->addMenu(menu_decoders_add); + menu_decoders->addMenu(menu_decoders_add_); #endif // 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)); - menu_help->addAction(action_about); + action_about_->setObjectName(QString::fromUtf8("actionAbout")); + action_about_->setText(tr("&About...")); + menu_help->addAction(action_about_); menu_bar->addAction(menu_file->menuAction()); menu_bar->addAction(menu_view->menuAction()); @@ -253,35 +327,106 @@ void MainWindow::setup_ui() setMenuBar(menu_bar); QMetaObject::connectSlotsByName(this); - // 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 - _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( @@ -294,19 +439,22 @@ void MainWindow::session_error( void MainWindow::update_device_list() { - assert(_sampling_bar); - - shared_ptr selected_device = _session.get_device(); - list< shared_ptr > devices; - std::copy(_device_manager.devices().begin(), - _device_manager.devices().end(), std::back_inserter(devices)); + main_bar_->update_device_list(); +} - if (std::find(devices.begin(), devices.end(), selected_device) == - devices.end()) - devices.push_back(selected_device); - assert(selected_device); +void MainWindow::closeEvent(QCloseEvent *event) +{ + save_ui_settings(); + event->accept(); +} - _sampling_bar->set_device_list(devices, selected_device); +void MainWindow::keyReleaseEvent(QKeyEvent *event) +{ + if (event->key() == Qt::Key_Alt) { + menuBar()->setHidden(!menuBar()->isHidden()); + menuBar()->setFocus(); + } + QMainWindow::keyReleaseEvent(event); } void MainWindow::load_file(QString file_name) @@ -316,17 +464,17 @@ void MainWindow::load_file(QString file_name) const QString 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(); + 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_.start_capture([&, errorMessage, infoMessage](QString) { session_error(errorMessage, infoMessage); }); } @@ -365,7 +513,7 @@ 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(); @@ -380,21 +528,21 @@ void MainWindow::on_actionSaveAs_triggered() const QString abs_path = QFileInfo(file_name).absolutePath(); settings.setValue(SettingSaveDirectory, abs_path); - StoreProgress *dlg = new StoreProgress(file_name, _session, this); + 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. if (dlg.exec()) - _session.set_device(dlg.get_selected_device()); + select_device(dlg.get_selected_device()); update_device_list(); } @@ -406,38 +554,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(); } @@ -445,30 +593,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([&](QString message) { - session_error("Capture failed", message); }); - 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