X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Ftoolbars%2Fmainbar.cpp;h=ea36a77e90957609158017775c9a01bfae694247;hp=b437b4d1152618b01d6c8defc04f834617e9daa5;hb=f4e57597347e47a4ea58fbdc7b0a22e07f1c0ede;hpb=7bb0fbf4d3809dbbd0fe5b35fc7e475b1065ae20 diff --git a/pv/toolbars/mainbar.cpp b/pv/toolbars/mainbar.cpp index b437b4d1..ea36a77e 100644 --- a/pv/toolbars/mainbar.cpp +++ b/pv/toolbars/mainbar.cpp @@ -25,29 +25,46 @@ #include #include +#include #include #include +#include +#include #include #include "mainbar.hpp" +#include + #include #include +#include +#include +#include +#include +#include #include #include #include #include +#include #include #include +#ifdef ENABLE_DECODE +#include +#endif #include using std::back_inserter; +using std::cerr; using std::copy; +using std::endl; using std::list; using std::map; using std::max; using std::min; +using std::pair; using std::shared_ptr; using std::string; using std::vector; @@ -56,6 +73,9 @@ using sigrok::Capability; using sigrok::ConfigKey; using sigrok::Error; using sigrok::InputFormat; +using sigrok::OutputFormat; + +using boost::algorithm::join; namespace pv { namespace toolbars { @@ -64,12 +84,25 @@ const uint64_t MainBar::MinSampleCount = 100ULL; const uint64_t MainBar::MaxSampleCount = 1000000000000ULL; const uint64_t MainBar::DefaultSampleCount = 1000000; +const char *MainBar::SettingOpenDirectory = "MainWindow/OpenDirectory"; +const char *MainBar::SettingSaveDirectory = "MainWindow/SaveDirectory"; + MainBar::MainBar(Session &session, MainWindow &main_window) : QToolBar("Sampling Bar", &main_window), + action_new_session_(new QAction(this)), + action_new_view_(new QAction(this)), + action_open_(new QAction(this)), + action_save_as_(new QAction(this)), + action_save_selection_as_(new QAction(this)), + action_connect_(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)), session_(session), - main_window_(main_window), - device_selector_(this, session.device_manager(), - main_window.action_connect()), + device_selector_(&main_window, session.device_manager(), + action_connect_), configure_button_(this), configure_button_action_(nullptr), channels_button_(this), @@ -83,8 +116,10 @@ MainBar::MainBar(Session &session, MainWindow &main_window) : icon_green_(":/icons/status-green.svg"), icon_grey_(":/icons/status-grey.svg"), run_stop_button_(this), - run_stop_button_action_(nullptr), - menu_button_(this) + run_stop_button_action_(nullptr) +#ifdef ENABLE_DECODE + , menu_decoders_add_(new pv::widgets::DecoderMenu(this, true)) +#endif { setObjectName(QString::fromUtf8("MainBar")); @@ -92,38 +127,127 @@ MainBar::MainBar(Session &session, MainWindow &main_window) : setFloatable(false); setContextMenuPolicy(Qt::PreventContextMenu); + // Actions + action_new_session_->setText(tr("New &Session")); + action_new_session_->setIcon(QIcon::fromTheme("document-new", + QIcon(":/icons/document-new.png"))); + connect(action_new_session_, SIGNAL(triggered(bool)), + this, SLOT(on_actionNewSession_triggered())); + + action_new_view_->setText(tr("New &View")); + action_new_view_->setIcon(QIcon::fromTheme("window-new", + QIcon(":/icons/window-new.png"))); + connect(action_new_view_, SIGNAL(triggered(bool)), + this, SLOT(on_actionNewView_triggered())); + + 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)); + connect(action_open_, SIGNAL(triggered(bool)), + this, SLOT(on_actionOpen_triggered())); + + 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)); + connect(action_save_as_, SIGNAL(triggered(bool)), + this, SLOT(on_actionSaveAs_triggered())); + + action_save_selection_as_->setText(tr("Save Selected &Range As...")); + action_save_selection_as_->setIcon(QIcon::fromTheme("document-save-as", + QIcon(":/icons/document-save-as.png"))); + action_save_selection_as_->setShortcut(QKeySequence(Qt::CTRL + Qt::Key_R)); + connect(action_save_selection_as_, SIGNAL(triggered(bool)), + this, SLOT(on_actionSaveSelectionAs_triggered())); + + widgets::ExportMenu *menu_file_export = new widgets::ExportMenu(this, + session.device_manager().context()); + menu_file_export->setTitle(tr("&Export")); + connect(menu_file_export, + SIGNAL(format_selected(std::shared_ptr)), + this, SLOT(export_file(std::shared_ptr))); + + widgets::ImportMenu *menu_file_import = new widgets::ImportMenu(this, + session.device_manager().context()); + menu_file_import->setTitle(tr("&Import")); + connect(menu_file_import, + SIGNAL(format_selected(std::shared_ptr)), + this, SLOT(import_file(std::shared_ptr))); + + action_connect_->setText(tr("&Connect to Device...")); + connect(action_connect_, SIGNAL(triggered(bool)), + this, SLOT(on_actionConnect_triggered())); + + 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); + connect(action_view_zoom_in_, SIGNAL(triggered(bool)), + this, SLOT(on_actionViewZoomIn_triggered())); + + 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); + connect(action_view_zoom_out_, SIGNAL(triggered(bool)), + this, SLOT(on_actionViewZoomOut_triggered())); + + action_view_zoom_fit_->setCheckable(true); + 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)); + connect(action_view_zoom_fit_, SIGNAL(triggered(bool)), + this, SLOT(on_actionViewZoomFit_triggered())); + + 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)); + connect(action_view_zoom_one_to_one_, SIGNAL(triggered(bool)), + this, SLOT(on_actionViewZoomOneToOne_triggered())); + + action_view_show_cursors_->setCheckable(true); + action_view_show_cursors_->setIcon(QIcon::fromTheme("show-cursors", + QIcon(":/icons/show-cursors.svg"))); + action_view_show_cursors_->setShortcut(QKeySequence(Qt::Key_C)); + connect(action_view_show_cursors_, SIGNAL(triggered(bool)), + this, SLOT(on_actionViewShowCursors_triggered())); + action_view_show_cursors_->setText(tr("Show &Cursors")); + // Open button QToolButton *const open_button = new QToolButton(this); widgets::ImportMenu *import_menu = new widgets::ImportMenu(this, - session.device_manager().context(), - main_window.action_open()); + session.device_manager().context(), action_open_); connect(import_menu, SIGNAL(format_selected(std::shared_ptr)), - &main_window_, + this, SLOT(import_file(std::shared_ptr))); open_button->setMenu(import_menu); - open_button->setDefaultAction(main_window.action_open()); + open_button->setDefaultAction(action_open_); open_button->setPopupMode(QToolButton::MenuButtonPopup); // Save button QToolButton *const save_button = new QToolButton(this); vector open_actions; - open_actions.push_back(main_window.action_save_as()); - open_actions.push_back(main_window.action_save_selection_as()); + open_actions.push_back(action_save_as_); + open_actions.push_back(action_save_selection_as_); widgets::ExportMenu *export_menu = new widgets::ExportMenu(this, session.device_manager().context(), open_actions); connect(export_menu, SIGNAL(format_selected(std::shared_ptr)), - &main_window_, + this, SLOT(export_file(std::shared_ptr))); save_button->setMenu(export_menu); - save_button->setDefaultAction(main_window.action_save_as()); + save_button->setDefaultAction(action_save_as_); save_button->setPopupMode(QToolButton::MenuButtonPopup); // Device selector menu @@ -132,45 +256,30 @@ MainBar::MainBar(Session &session, MainWindow &main_window) : // Setup the decoder button #ifdef ENABLE_DECODE + menu_decoders_add_->setTitle(tr("&Add")); + connect(menu_decoders_add_, SIGNAL(decoder_selected(srd_decoder*)), + this, SLOT(add_decoder(srd_decoder*))); + QToolButton *add_decoder_button = new QToolButton(this); add_decoder_button->setIcon(QIcon::fromTheme("add-decoder", QIcon(":/icons/add-decoder.svg"))); add_decoder_button->setPopupMode(QToolButton::InstantPopup); - add_decoder_button->setMenu(main_window_.menu_decoder_add()); + add_decoder_button->setMenu(menu_decoders_add_); #endif - // Setup the burger menu - QMenu *const menu = new QMenu(this); - - QMenu *const menu_view = new QMenu; - menu_view->setTitle(tr("&View")); - menu_view->addAction(main_window.action_view_sticky_scrolling()); - - QMenu *const menu_help = new QMenu; - menu_help->setTitle(tr("&Help")); - menu_help->addAction(main_window.action_about()); - - menu->addAction(menu_view->menuAction()); - menu->addSeparator(); - menu->addAction(menu_help->menuAction()); - menu->addSeparator(); - menu->addAction(main_window.action_quit()); - - menu_button_.setMenu(menu); - menu_button_.setPopupMode(QToolButton::InstantPopup); - menu_button_.setIcon(QIcon::fromTheme("menu", - QIcon(":/icons/menu.svg"))); - // Setup the toolbar + addAction(action_new_session_); + addAction(action_new_view_); + addSeparator(); addWidget(open_button); addWidget(save_button); addSeparator(); - addAction(main_window.action_view_zoom_in()); - addAction(main_window.action_view_zoom_out()); - addAction(main_window.action_view_zoom_fit()); - addAction(main_window.action_view_zoom_one_to_one()); + addAction(action_view_zoom_in_); + addAction(action_view_zoom_out_); + addAction(action_view_zoom_fit_); + addAction(action_view_zoom_one_to_one_); addSeparator(); - addAction(main_window.action_view_show_cursors()); + addAction(action_view_show_cursors_); addSeparator(); connect(&run_stop_button_, SIGNAL(clicked()), @@ -203,14 +312,21 @@ MainBar::MainBar(Session &session, MainWindow &main_window) : addWidget(add_decoder_button); #endif - QWidget *const spacer = new QWidget(); - spacer->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding); - addWidget(spacer); - - addWidget(&menu_button_); - sample_count_.installEventFilter(this); sample_rate_.installEventFilter(this); + + // Setup session_ events + connect(&session_, SIGNAL(capture_state_changed(int)), + this, SLOT(capture_state_changed(int))); + connect(&session, SIGNAL(device_changed()), + this, SLOT(on_device_changed())); + + update_device_list(); +} + +Session &MainBar::session(void) const +{ + return session_; } void MainBar::update_device_list() @@ -246,6 +362,147 @@ void MainBar::set_capture_state(pv::Session::capture_state state) sample_rate_.setEnabled(ui_enabled); } +void MainBar::reset_device_selector() +{ + device_selector_.reset(); +} + +void MainBar::select_device(shared_ptr device) +{ + try { + if (device) + session_.set_device(device); + else + session_.set_default_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 MainBar::load_init_file(const std::string &file_name, + const std::string &format) +{ + shared_ptr input_format; + + DeviceManager& device_manager = session_.device_manager(); + + if (!format.empty()) { + const map > formats = + device_manager.context()->input_formats(); + const auto iter = find_if(formats.begin(), formats.end(), + [&](const pair > f) { + return f.first == format; }); + if (iter == formats.end()) { + cerr << "Unexpected input format: " << format << endl; + return; + } + + input_format = (*iter).second; + } + + load_file(QString::fromStdString(file_name), input_format); +} + +QAction* MainBar::action_open() const +{ + return action_open_; +} + +QAction* MainBar::action_save_as() const +{ + return action_save_as_; +} + +QAction* MainBar::action_save_selection_as() const +{ + return action_save_selection_as_; +} + +QAction* MainBar::action_connect() const +{ + return action_connect_; +} + +QAction* MainBar::action_view_zoom_in() const +{ + return action_view_zoom_in_; +} + +QAction* MainBar::action_view_zoom_out() const +{ + return action_view_zoom_out_; +} + +QAction* MainBar::action_view_zoom_fit() const +{ + return action_view_zoom_fit_; +} + +QAction* MainBar::action_view_zoom_one_to_one() const +{ + return action_view_zoom_one_to_one_; +} + +QAction* MainBar::action_view_show_cursors() const +{ + return action_view_show_cursors_; +} + +void MainBar::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 MainBar::load_file(QString file_name, + std::shared_ptr format, + const std::map &options) +{ + DeviceManager& device_manager = session_.device_manager(); + + const QString errorMessage( + QString("Failed to load file %1").arg(file_name)); + + try { + if (format) + session_.set_device(shared_ptr( + new devices::InputFile( + device_manager.context(), + file_name.toStdString(), + format, options))); + else + session_.set_device(shared_ptr( + new devices::SessionFile( + device_manager.context(), + 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](QString infoMessage) { + session_error(errorMessage, infoMessage); }); + + session_.set_name(QFileInfo(file_name).fileName()); +} + void MainBar::update_sample_rate_selector() { Glib::VariantContainerBase gvar_dict; @@ -446,6 +703,36 @@ void MainBar::update_device_config_widgets() update_sample_rate_selector(); } +void MainBar::commit_sample_rate() +{ + uint64_t sample_rate = 0; + + const shared_ptr device = + device_selector_.selected_device(); + if (!device) + return; + + const shared_ptr sr_dev = device->device(); + + sample_rate = sample_rate_.value(); + if (sample_rate == 0) + return; + + try { + sr_dev->config_set(ConfigKey::SAMPLERATE, + Glib::Variant::create(sample_rate)); + update_sample_rate_selector(); + } catch (Error error) { + qDebug() << "Failed to configure samplerate."; + return; + } + + // Devices with built-in memory might impose limits on certain + // configurations, so let's check what sample count the driver + // lets us use now. + update_sample_count_selector(); +} + void MainBar::commit_sample_count() { uint64_t sample_count = 0; @@ -475,44 +762,173 @@ void MainBar::commit_sample_count() update_sample_rate_selector(); } -void MainBar::commit_sample_rate() +void MainBar::session_error(const QString text, const QString info_text) { - uint64_t sample_rate = 0; + QMetaObject::invokeMethod(this, "show_session_error", + Qt::QueuedConnection, Q_ARG(QString, text), + Q_ARG(QString, info_text)); +} - const shared_ptr device = - device_selector_.selected_device(); - if (!device) - return; +void MainBar::show_session_error(const QString text, const QString info_text) +{ + QMessageBox msg(this); + msg.setText(text); + msg.setInformativeText(info_text); + msg.setStandardButtons(QMessageBox::Ok); + msg.setIcon(QMessageBox::Warning); + msg.exec(); +} - const shared_ptr sr_dev = device->device(); +void MainBar::capture_state_changed(int state) +{ + set_capture_state((pv::Session::capture_state)state); +} - sample_rate = sample_rate_.value(); - if (sample_rate == 0) +void MainBar::add_decoder(srd_decoder *decoder) +{ +#ifdef ENABLE_DECODE + assert(decoder); + session_.add_decoder(decoder); +#else + (void)decoder; +#endif +} + +void MainBar::export_file(shared_ptr format, + bool selection_only) +{ + using pv::dialogs::StoreProgress; + + // Stop any currently running capture session + session_.stop_capture(); + + QSettings settings; + const QString dir = settings.value(SettingSaveDirectory).toString(); + + std::pair sample_range; + + // Selection only? Verify that the cursors are active and fetch their values + if (selection_only) { + views::TraceView::View *trace_view = + qobject_cast(session_.main_view().get()); + + if (!trace_view->cursors()->enabled()) { + show_session_error(tr("Missing Cursors"), tr("You need to set the " \ + "cursors before you can save the data enclosed by them " \ + "to a session file (e.g. using ALT-V - Show Cursors).")); + return; + } + + const double samplerate = session_.get_samplerate(); + + const pv::util::Timestamp& start_time = trace_view->cursors()->first()->time(); + const pv::util::Timestamp& end_time = trace_view->cursors()->second()->time(); + + const uint64_t start_sample = + std::max((double)0, start_time.convert_to() * samplerate); + const uint64_t end_sample = end_time.convert_to() * samplerate; + + sample_range = std::make_pair(start_sample, end_sample); + } else { + sample_range = std::make_pair(0, 0); + } + + // Construct the filter + const vector exts = format->extensions(); + QString filter = tr("%1 files ").arg( + QString::fromStdString(format->description())); + + if (exts.empty()) + filter += "(*.*)"; + else + filter += QString("(*.%1);;%2 (*.*)").arg( + QString::fromStdString(join(exts, ", *.")), + tr("All Files")); + + // Show the file dialog + const QString file_name = QFileDialog::getSaveFileName( + this, tr("Save File"), dir, filter); + + if (file_name.isEmpty()) return; - try { - sr_dev->config_set(ConfigKey::SAMPLERATE, - Glib::Variant::create(sample_rate)); - update_sample_rate_selector(); - } catch (Error error) { - qDebug() << "Failed to configure samplerate."; + const QString abs_path = QFileInfo(file_name).absolutePath(); + settings.setValue(SettingSaveDirectory, abs_path); + + // Show the options dialog + map options; + if (!format->options().empty()) { + dialogs::InputOutputOptions dlg( + tr("Export %1").arg(QString::fromStdString( + format->description())), + format->options(), this); + if (!dlg.exec()) + return; + options = dlg.options(); + } + + session_.set_name(QFileInfo(file_name).fileName()); + + StoreProgress *dlg = new StoreProgress(file_name, format, options, + sample_range, session_, this); + dlg->run(); +} + +void MainBar::import_file(shared_ptr format) +{ + assert(format); + + QSettings settings; + const QString dir = settings.value(SettingOpenDirectory).toString(); + + // Construct the filter + const vector exts = format->extensions(); + const QString filter = exts.empty() ? "" : + tr("%1 files (*.%2)").arg( + QString::fromStdString(format->description()), + QString::fromStdString(join(exts, ", *."))); + + // Show the file dialog + const QString file_name = QFileDialog::getOpenFileName( + this, tr("Import File"), dir, tr( + "%1 files (*.*);;All Files (*.*)").arg( + QString::fromStdString(format->description()))); + + if (file_name.isEmpty()) return; + + // Show the options dialog + map options; + if (!format->options().empty()) { + dialogs::InputOutputOptions dlg( + tr("Import %1").arg(QString::fromStdString( + format->description())), + format->options(), this); + if (!dlg.exec()) + return; + options = dlg.options(); } - // Devices with built-in memory might impose limits on certain - // configurations, so let's check what sample count the driver - // lets us use now. - update_sample_count_selector(); + load_file(file_name, format, options); + + const QString abs_path = QFileInfo(file_name).absolutePath(); + settings.setValue(SettingOpenDirectory, abs_path); } void MainBar::on_device_selected() { shared_ptr device = device_selector_.selected_device(); - if (!device) + if (!device) { + reset_device_selector(); return; + } - main_window_.select_device(device); + select_device(device); +} +void MainBar::on_device_changed() +{ + update_device_list(); update_device_config_widgets(); } @@ -532,7 +948,7 @@ void MainBar::on_run_stop() { commit_sample_count(); commit_sample_rate(); - main_window_.run_stop(); + run_stop(); } void MainBar::on_config_changed() @@ -541,6 +957,109 @@ void MainBar::on_config_changed() commit_sample_rate(); } +void MainBar::on_actionNewSession_triggered() +{ + new_session(); +} + +void MainBar::on_actionNewView_triggered() +{ + new_view(&session_); +} + +void MainBar::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"), 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 MainBar::on_actionSaveAs_triggered() +{ + export_file(session_.device_manager().context()->output_formats()["srzip"]); +} + +void MainBar::on_actionSaveSelectionAs_triggered() +{ + export_file(session_.device_manager().context()->output_formats()["srzip"], true); +} + +void MainBar::on_actionConnect_triggered() +{ + // Stop any currently running capture session + session_.stop_capture(); + + dialogs::Connect dlg(this, session_.device_manager()); + + // If the user selected a device, select it in the device list. Select the + // current device otherwise. + if (dlg.exec()) + select_device(dlg.get_selected_device()); + + update_device_list(); +} + +void MainBar::on_actionViewZoomIn_triggered() +{ + views::TraceView::View *trace_view = + qobject_cast(session_.main_view().get()); + + trace_view->zoom(1); +} + +void MainBar::on_actionViewZoomOut_triggered() +{ + views::TraceView::View *trace_view = + qobject_cast(session_.main_view().get()); + + trace_view->zoom(-1); +} + +void MainBar::on_actionViewZoomFit_triggered() +{ + views::TraceView::View *trace_view = + qobject_cast(session_.main_view().get()); + + trace_view->zoom_fit(action_view_zoom_fit_->isChecked()); +} + +void MainBar::on_actionViewZoomOneToOne_triggered() +{ + views::TraceView::View *trace_view = + qobject_cast(session_.main_view().get()); + + trace_view->zoom_one_to_one(); +} + +void MainBar::on_actionViewShowCursors_triggered() +{ + views::TraceView::View *trace_view = + qobject_cast(session_.main_view().get()); + + const bool show = !trace_view->cursors_shown(); + if (show) + trace_view->centre_cursors(); + + trace_view->show_cursors(show); +} + +void MainBar::on_always_zoom_to_fit_changed(bool state) +{ + action_view_zoom_fit_->setChecked(state); +} + bool MainBar::eventFilter(QObject *watched, QEvent *event) { if (sample_count_supported_ && (watched == &sample_count_ ||