X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Ftoolbars%2Fmainbar.cpp;h=838fefcaaa101f5612f6d57ee1170a0f6d5b5f2d;hp=1875d3c415a34fab1cb8d2c0e65c5e486c16e7cd;hb=c063290ac7189bdd15221450f598504f43286b43;hpb=91f8fe8c30131fb438dbdb1b58d69ede7ba9247b diff --git a/pv/toolbars/mainbar.cpp b/pv/toolbars/mainbar.cpp index 1875d3c4..838fefca 100644 --- a/pv/toolbars/mainbar.cpp +++ b/pv/toolbars/mainbar.cpp @@ -14,8 +14,7 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + * along with this program; if not, see . */ #include @@ -57,14 +56,14 @@ #include using std::back_inserter; -using std::cerr; using std::copy; -using std::endl; using std::list; +using std::make_pair; using std::map; using std::max; using std::min; using std::pair; +using std::set; using std::shared_ptr; using std::string; using std::vector; @@ -87,19 +86,17 @@ 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), +MainBar::MainBar(Session &session, QWidget *parent, + pv::views::TraceView::View *view) : + StandardBar(session, parent, view, false), + 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), - device_selector_(&main_window, session.device_manager(), + open_button_(new QToolButton()), + save_button_(new QToolButton()), + device_selector_(parent, session.device_manager(), action_connect_), configure_button_(this), configure_button_action_(nullptr), @@ -109,114 +106,73 @@ MainBar::MainBar(Session &session, MainWindow &main_window) : sample_rate_("Hz", this), updating_sample_rate_(false), updating_sample_count_(false), - sample_count_supported_(false), - icon_red_(":/icons/status-red.svg"), - icon_green_(":/icons/status-green.svg"), - icon_grey_(":/icons/status-grey.svg"), - run_stop_button_(this), - run_stop_button_action_(nullptr), - menu_button_(this) + sample_count_supported_(false) #ifdef ENABLE_DECODE - , menu_decoders_add_(new pv::widgets::DecoderMenu(this, true)) + , add_decoder_button_(new QToolButton()), + menu_decoders_add_(new pv::widgets::DecoderMenu(this, true)) #endif { setObjectName(QString::fromUtf8("MainBar")); - setMovable(false); - setFloatable(false); - setContextMenuPolicy(Qt::PreventContextMenu); - // Actions + 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)); - action_open_->setObjectName(QString::fromUtf8("actionOpen")); + 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)); - action_save_as_->setObjectName(QString::fromUtf8("actionSaveAs")); + 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)); - action_save_selection_as_->setObjectName(QString::fromUtf8("actionSaveSelectionAs")); + 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))); + SIGNAL(format_selected(shared_ptr)), + this, SLOT(export_file(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))); + SIGNAL(format_selected(shared_ptr)), + this, SLOT(import_file(shared_ptr))); action_connect_->setText(tr("&Connect to Device...")); - action_connect_->setObjectName(QString::fromUtf8("actionConnect")); - - 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")); - - 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")); - - 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)); - action_view_zoom_fit_->setObjectName( - QString::fromUtf8("actionViewZoomFit")); - - 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( - QString::fromUtf8("actionViewZoomOneToOne")); - - 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)); - action_view_show_cursors_->setObjectName( - QString::fromUtf8("actionViewShowCursors")); - action_view_show_cursors_->setText(tr("Show &Cursors")); + connect(action_connect_, SIGNAL(triggered(bool)), + this, SLOT(on_actionConnect_triggered())); // Open button - QToolButton *const open_button = new QToolButton(this); - widgets::ImportMenu *import_menu = new widgets::ImportMenu(this, session.device_manager().context(), action_open_); connect(import_menu, - SIGNAL(format_selected(std::shared_ptr)), - &main_window, - SLOT(import_file(std::shared_ptr))); + SIGNAL(format_selected(shared_ptr)), + this, + SLOT(import_file(shared_ptr))); - open_button->setMenu(import_menu); - open_button->setDefaultAction(action_open_); - open_button->setPopupMode(QToolButton::MenuButtonPopup); + open_button_->setMenu(import_menu); + 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(action_save_as_); open_actions.push_back(action_save_selection_as_); @@ -225,19 +181,17 @@ MainBar::MainBar(Session &session, MainWindow &main_window) : session.device_manager().context(), open_actions); connect(export_menu, - SIGNAL(format_selected(std::shared_ptr)), - &main_window, - SLOT(export_file(std::shared_ptr))); + SIGNAL(format_selected(shared_ptr)), + this, + SLOT(export_file(shared_ptr))); - save_button->setMenu(export_menu); - save_button->setDefaultAction(action_save_as_); - save_button->setPopupMode(QToolButton::MenuButtonPopup); + save_button_->setMenu(export_menu); + save_button_->setDefaultAction(action_save_as_); + save_button_->setPopupMode(QToolButton::MenuButtonPopup); // Device selector menu connect(&device_selector_, SIGNAL(device_selected()), this, SLOT(on_device_selected())); - connect(&session, SIGNAL(device_changed()), - this, SLOT(on_device_changed())); // Setup the decoder button #ifdef ENABLE_DECODE @@ -245,27 +199,12 @@ MainBar::MainBar(Session &session, MainWindow &main_window) : 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", + add_decoder_button_->setIcon(QIcon::fromTheme("add-decoder", QIcon(":/icons/add-decoder.svg"))); - add_decoder_button->setPopupMode(QToolButton::InstantPopup); - add_decoder_button->setMenu(menu_decoders_add_); + add_decoder_button_->setPopupMode(QToolButton::InstantPopup); + add_decoder_button_->setMenu(menu_decoders_add_); #endif - // Setup the toolbar - addWidget(open_button); - addWidget(save_button); - addSeparator(); - addAction(action_view_zoom_in_); - addAction(action_view_zoom_out_); - addAction(action_view_zoom_fit_); - addAction(action_view_zoom_one_to_one_); - addSeparator(); - addAction(action_view_show_cursors_); - addSeparator(); - - connect(&run_stop_button_, SIGNAL(clicked()), - this, SLOT(on_run_stop())); connect(&sample_count_, SIGNAL(value_changed()), this, SLOT(on_sample_count_changed())); connect(&sample_rate_, SIGNAL(value_changed()), @@ -275,48 +214,28 @@ MainBar::MainBar(Session &session, MainWindow &main_window) : set_capture_state(pv::Session::Stopped); + configure_button_.setToolTip(tr("Configure Device")); configure_button_.setIcon(QIcon::fromTheme("configure", QIcon(":/icons/configure.png"))); + channels_button_.setToolTip(tr("Configure Channels")); channels_button_.setIcon(QIcon::fromTheme("channels", QIcon(":/icons/channels.svg"))); - run_stop_button_.setToolButtonStyle(Qt::ToolButtonTextBesideIcon); - - addWidget(&device_selector_); - configure_button_action_ = addWidget(&configure_button_); - channels_button_action_ = addWidget(&channels_button_); - addWidget(&sample_count_); - addWidget(&sample_rate_); - run_stop_button_action_ = addWidget(&run_stop_button_); -#ifdef ENABLE_DECODE - addSeparator(); - addWidget(add_decoder_button); -#endif - - QWidget *const spacer = new QWidget(); - spacer->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding); - addWidget(spacer); - - addWidget(&menu_button_); + add_toolbar_widgets(); 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_selected()), this, - SLOT(device_selected())); + connect(&session_, SIGNAL(capture_state_changed(int)), + this, SLOT(on_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() { DeviceManager &mgr = session_.device_manager(); @@ -332,15 +251,8 @@ void MainBar::update_device_list() update_device_config_widgets(); } - void MainBar::set_capture_state(pv::Session::capture_state state) { - const QIcon *icons[] = {&icon_grey_, &icon_red_, &icon_green_}; - run_stop_button_.setIcon(*icons[state]); - run_stop_button_.setText((state == pv::Session::Stopped) ? - tr("Run") : tr("Stop")); - run_stop_button_.setShortcut(QKeySequence(Qt::Key_Space)); - bool ui_enabled = (state == pv::Session::Stopped) ? true : false; device_selector_.setEnabled(ui_enabled); @@ -355,47 +267,6 @@ 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_; @@ -416,88 +287,13 @@ 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; - } - - session_.set_name(QFileInfo(file_name).fileName()); - - update_device_list(); - - session_.start_capture([&, errorMessage](QString infoMessage) { - session_error(errorMessage, infoMessage); }); -} - void MainBar::update_sample_rate_selector() { Glib::VariantContainerBase gvar_dict; GVariant *gvar_list; const uint64_t *elements = nullptr; gsize num_elements; - map< const ConfigKey*, std::set > keys; + map< const ConfigKey*, set > keys; if (updating_sample_rate_) { sample_rate_.show_none(); @@ -607,9 +403,12 @@ void MainBar::update_sample_count_selector() uint64_t sample_count = sample_count_.value(); uint64_t min_sample_count = 0; uint64_t max_sample_count = MaxSampleCount; + bool default_count_set = false; - if (sample_count == 0) + if (sample_count == 0) { sample_count = DefaultSampleCount; + default_count_set = true; + } if (sr_dev->config_check(ConfigKey::LIMIT_SAMPLES, Capability::LIST)) { auto gvar = sr_dev->config_list(ConfigKey::LIMIT_SAMPLES); @@ -621,14 +420,15 @@ void MainBar::update_sample_count_selector() min_sample_count = min(max(min_sample_count, MinSampleCount), max_sample_count); - sample_count_.show_125_list( - min_sample_count, max_sample_count); + sample_count_.show_125_list(min_sample_count, max_sample_count); if (sr_dev->config_check(ConfigKey::LIMIT_SAMPLES, Capability::GET)) { auto gvar = sr_dev->config_get(ConfigKey::LIMIT_SAMPLES); sample_count = g_variant_get_uint64(gvar.gobj()); - if (sample_count == 0) + if (sample_count == 0) { sample_count = DefaultSampleCount; + default_count_set = true; + } sample_count = min(max(sample_count, MinSampleCount), max_sample_count); } @@ -636,6 +436,10 @@ void MainBar::update_sample_count_selector() sample_count_.set_value(sample_count); updating_sample_count_ = false; + + // If we show the default rate then make sure the device uses the same + if (default_count_set) + commit_sample_count(); } void MainBar::update_device_config_widgets() @@ -647,7 +451,6 @@ void MainBar::update_device_config_widgets() // Hide the widgets if no device is selected channels_button_action_->setVisible(!!device); - run_stop_button_action_->setVisible(!!device); if (!device) { configure_button_action_->setVisible(false); sample_count_.show_none(); @@ -767,11 +570,6 @@ void MainBar::show_session_error(const QString text, const QString info_text) msg.exec(); } -void MainBar::capture_state_changed(int state) -{ - set_capture_state((pv::Session::capture_state)state); -} - void MainBar::add_decoder(srd_decoder *decoder) { #ifdef ENABLE_DECODE @@ -782,8 +580,7 @@ void MainBar::add_decoder(srd_decoder *decoder) #endif } -void MainBar::export_file(shared_ptr format, - bool selection_only) +void MainBar::export_file(shared_ptr format, bool selection_only) { using pv::dialogs::StoreProgress; @@ -793,11 +590,14 @@ void MainBar::export_file(shared_ptr format, QSettings settings; const QString dir = settings.value(SettingSaveDirectory).toString(); - std::pair sample_range; + pair sample_range; // Selection only? Verify that the cursors are active and fetch their values if (selection_only) { - if (!session_.main_view()->cursors()->enabled()) { + 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).")); @@ -806,16 +606,17 @@ void MainBar::export_file(shared_ptr format, const double samplerate = session_.get_samplerate(); - const pv::util::Timestamp& start_time = session_.main_view()->cursors()->first()->time(); - const pv::util::Timestamp& end_time = session_.main_view()->cursors()->second()->time(); + 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; + const uint64_t start_sample = (uint64_t)max( + (double)0, start_time.convert_to() * samplerate); + const uint64_t end_sample = (uint64_t)max( + (double)0, end_time.convert_to() * samplerate); - sample_range = std::make_pair(start_sample, end_sample); + sample_range = make_pair(start_sample, end_sample); } else { - sample_range = std::make_pair(0, 0); + sample_range = make_pair(0, 0); } // Construct the filter @@ -852,7 +653,8 @@ void MainBar::export_file(shared_ptr format, options = dlg.options(); } - session_.set_name(QFileInfo(file_name).fileName()); + if (!selection_only) + session_.set_name(QFileInfo(file_name).fileName()); StoreProgress *dlg = new StoreProgress(file_name, format, options, sample_range, session_, this); @@ -894,7 +696,7 @@ void MainBar::import_file(shared_ptr format) options = dlg.options(); } - load_file(file_name, format, options); + session_.load_file(file_name, format, options); const QString abs_path = QFileInfo(file_name).absolutePath(); settings.setValue(SettingOpenDirectory, abs_path); @@ -908,7 +710,7 @@ void MainBar::on_device_selected() return; } - select_device(device); + session_.select_device(device); } void MainBar::on_device_changed() @@ -917,6 +719,11 @@ void MainBar::on_device_changed() update_device_config_widgets(); } +void MainBar::on_capture_state_changed(int state) +{ + set_capture_state((pv::Session::capture_state)state); +} + void MainBar::on_sample_count_changed() { if (!updating_sample_count_) @@ -929,17 +736,15 @@ void MainBar::on_sample_rate_changed() commit_sample_rate(); } -void MainBar::on_run_stop() +void MainBar::on_config_changed() { commit_sample_count(); - commit_sample_rate(); - run_stop(); + commit_sample_rate(); } -void MainBar::on_config_changed() +void MainBar::on_actionNewView_triggered() { - commit_sample_count(); - commit_sample_rate(); + new_view(&session_); } void MainBar::on_actionOpen_triggered() @@ -954,7 +759,7 @@ void MainBar::on_actionOpen_triggered() "All Files (*.*)")); if (!file_name.isEmpty()) { - load_file(file_name); + session_.load_file(file_name); const QString abs_path = QFileInfo(file_name).absolutePath(); settings.setValue(SettingOpenDirectory, abs_path); @@ -981,38 +786,30 @@ void MainBar::on_actionConnect_triggered() // 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()); + session_.select_device(dlg.get_selected_device()); update_device_list(); } -void MainBar::on_actionViewZoomIn_triggered() -{ - session_.main_view()->zoom(1); -} - -void MainBar::on_actionViewZoomOut_triggered() +void MainBar::add_toolbar_widgets() { - session_.main_view()->zoom(-1); -} - -void MainBar::on_actionViewZoomFit_triggered() -{ - session_.main_view()->zoom_fit(action_view_zoom_fit_->isChecked()); -} - -void MainBar::on_actionViewZoomOneToOne_triggered() -{ - session_.main_view()->zoom_one_to_one(); -} + addAction(action_new_view_); + addSeparator(); + addWidget(open_button_); + addWidget(save_button_); + addSeparator(); -void MainBar::on_actionViewShowCursors_triggered() -{ - const bool show = !session_.main_view()->cursors_shown(); - if (show) - session_.main_view()->centre_cursors(); + StandardBar::add_toolbar_widgets(); - session_.main_view()->show_cursors(show); + addWidget(&device_selector_); + configure_button_action_ = addWidget(&configure_button_); + channels_button_action_ = addWidget(&channels_button_); + addWidget(&sample_count_); + addWidget(&sample_rate_); +#ifdef ENABLE_DECODE + addSeparator(); + addWidget(add_decoder_button_); +#endif } bool MainBar::eventFilter(QObject *watched, QEvent *event)