X-Git-Url: http://git.code-monkey.de/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fmainwindow.cpp;h=d693ddc35e6c7b5ecc8cfc444d2cdc9754e5b937;hp=aca5acf3dde3c72c2935e181e7dae147ecd2f18f;hb=2ad82c2e40b6865481733913a2c32735602f63c4;hpb=7d6984a5ccd1c7fee225240d7cfd5685796cfea0 diff --git a/pv/mainwindow.cpp b/pv/mainwindow.cpp index aca5acf..d693ddc 100644 --- a/pv/mainwindow.cpp +++ b/pv/mainwindow.cpp @@ -116,6 +116,8 @@ MainWindow::MainWindow(DeviceManager &device_manager, , menu_decoders_add_(new pv::widgets::DecoderMenu(this, true)) #endif { + qRegisterMetaType("util::Timestamp"); + setup_ui(); restore_ui_settings(); if (open_file_name.empty()) @@ -193,12 +195,11 @@ QMenu* MainWindow::menu_decoder_add() const void MainWindow::run_stop() { - switch(session_.get_capture_state()) { + 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(); @@ -213,7 +214,7 @@ void MainWindow::select_device(shared_ptr device) session_.set_device(device); else session_.set_default_device(); - } catch(const QString &e) { + } catch (const QString &e) { QMessageBox msg(this); msg.setText(e); msg.setInformativeText(tr("Failed to Select Device")); @@ -228,14 +229,36 @@ void MainWindow::export_file(shared_ptr format, { using pv::dialogs::StoreProgress; - (void)selection_only; - // 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) { + if (!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 = view_->cursors()->first()->time(); + const pv::util::Timestamp& end_time = view_->cursors()->second()->time(); + + const uint64_t start_sample = 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( @@ -270,8 +293,6 @@ void MainWindow::export_file(shared_ptr format, options = dlg.options(); } - const std::pair sample_range = std::make_pair(0, 0); - StoreProgress *dlg = new StoreProgress(file_name, format, options, sample_range, session_, this); dlg->run(); @@ -512,15 +533,19 @@ void MainWindow::setup_ui() SLOT(capture_state_changed(int))); connect(&session_, SIGNAL(device_selected()), this, SLOT(device_selected())); + connect(&session_, SIGNAL(trigger_event(util::Timestamp)), view_, + SLOT(trigger_event(util::Timestamp))); // Setup view_ events connect(view_, SIGNAL(sticky_scrolling_changed(bool)), this, SLOT(sticky_scrolling_changed(bool))); connect(view_, SIGNAL(always_zoom_to_fit_changed(bool)), this, SLOT(always_zoom_to_fit_changed(bool))); + } -void MainWindow::select_init_device() { +void MainWindow::select_init_device() +{ QSettings settings; map dev_info; list key_list; @@ -552,7 +577,8 @@ void MainWindow::select_init_device() { } void MainWindow::load_init_file(const std::string &file_name, - const std::string &format) { + const std::string &format) +{ shared_ptr input_format; if (!format.empty()) { @@ -597,7 +623,6 @@ void MainWindow::save_ui_settings() 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())); @@ -656,7 +681,7 @@ void MainWindow::load_file(QString file_name, new devices::SessionFile( device_manager_.context(), file_name.toStdString()))); - } catch(Error e) { + } catch (Error e) { show_session_error(tr("Failed to load ") + file_name, e.what()); session_.set_default_device(); update_device_list(); @@ -669,75 +694,6 @@ void MainWindow::load_file(QString file_name, session_error(errorMessage, infoMessage); }); } -void MainWindow::save_selection_to_file() -{ - // Stop any currently running capture session - session_.stop_capture(); - - // Verify that the cursors are active and fetch their values - if (!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 = view_->cursors()->first()->time(); - const pv::util::Timestamp& end_time = view_->cursors()->second()->time(); - - const uint64_t start_sample = start_time.convert_to() * samplerate; - const uint64_t end_sample = end_time.convert_to() * samplerate; - - const std::pair sample_range = - std::make_pair(start_sample, end_sample); - - // Ask for output file name - QSettings settings; - const QString dir = settings.value(SettingSaveDirectory).toString(); - - shared_ptr format = - device_manager_.context()->output_formats()["srzip"]; - - 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, ", *."))).arg( - tr("All Files")); - - const QString file_name = QFileDialog::getSaveFileName( - this, tr("Save File"), dir, filter); - - if (file_name.isEmpty()) - return; - - 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(); - } - - // Save - pv::dialogs::StoreProgress *dlg = new pv::dialogs::StoreProgress(file_name, - format, options, sample_range, session_, this); - dlg->run(); -} - void MainWindow::closeEvent(QCloseEvent *event) { save_ui_settings(); @@ -790,7 +746,7 @@ void MainWindow::on_actionSaveAs_triggered() void MainWindow::on_actionSaveSelectionAs_triggered() { - save_selection_to_file(); + export_file(device_manager_.context()->output_formats()["srzip"], true); } void MainWindow::on_actionConnect_triggered()