#include "mainwindow.hpp"
#include "devicemanager.hpp"
+#include "util.hpp"
+#include "data/segment.hpp"
#include "devices/hardwaredevice.hpp"
#include "devices/inputfile.hpp"
#include "devices/sessionfile.hpp"
session_(device_manager),
action_open_(new QAction(this)),
action_save_as_(new QAction(this)),
+ action_save_selection_as_(new QAction(this)),
action_connect_(new QAction(this)),
action_quit_(new QAction(this)),
action_view_zoom_in_(new QAction(this)),
, menu_decoders_add_(new pv::widgets::DecoderMenu(this, true))
#endif
{
+ qRegisterMetaType<util::Timestamp>("util::Timestamp");
+
setup_ui();
restore_ui_settings();
if (open_file_name.empty())
return action_save_as_;
}
+QAction* MainWindow::action_save_selection_as() const
+{
+ return action_save_selection_as_;
+}
+
QAction* MainWindow::action_connect() const
{
return action_connect_;
}
}
-void MainWindow::export_file(shared_ptr<OutputFormat> format)
+void MainWindow::export_file(shared_ptr<OutputFormat> format,
+ bool selection_only)
{
using pv::dialogs::StoreProgress;
QSettings settings;
const QString dir = settings.value(SettingSaveDirectory).toString();
+ std::pair<uint64_t, uint64_t> 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<double>() * samplerate;
+ const uint64_t end_sample = end_time.convert_to<double>() * samplerate;
+
+ sample_range = std::make_pair(start_sample, end_sample);
+ } else {
+ sample_range = std::make_pair(0, 0);
+ }
+
// Construct the filter
const vector<string> exts = format->extensions();
QString filter = tr("%1 files ").arg(
}
StoreProgress *dlg = new StoreProgress(file_name, format, options,
- session_, this);
+ sample_range, session_, this);
dlg->run();
}
action_save_as_->setObjectName(QString::fromUtf8("actionSaveAs"));
menu_file->addAction(action_save_as_);
+ 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"));
+ menu_file->addAction(action_save_selection_as_);
+
menu_file->addSeparator();
widgets::ExportMenu *menu_file_export = new widgets::ExportMenu(this,
QString::fromUtf8("actionViewZoomOut"));
menu_view->addAction(action_view_zoom_out_);
+ 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_sticky_scrolling_->setCheckable(true);
action_view_sticky_scrolling_->setChecked(true);
- action_view_sticky_scrolling_->setShortcut(QKeySequence(Qt::Key_R));
+ action_view_sticky_scrolling_->setShortcut(QKeySequence(Qt::Key_S));
action_view_sticky_scrolling_->setObjectName(
QString::fromUtf8("actionViewStickyScrolling"));
- action_view_sticky_scrolling_->setText(tr("Sticky Sc&rolling"));
+ action_view_sticky_scrolling_->setText(tr("&Sticky Scrolling"));
menu_view->addAction(action_view_sticky_scrolling_);
view_->enable_sticky_scrolling(action_view_sticky_scrolling_->isChecked());
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)));
}
{
const QString errorMessage(
QString("Failed to load file %1").arg(file_name));
- const QString infoMessage;
try {
if (format)
update_device_list();
- session_.start_capture([&, errorMessage, infoMessage](QString) {
+ session_.start_capture([&, errorMessage](QString infoMessage) {
session_error(errorMessage, infoMessage); });
}
export_file(device_manager_.context()->output_formats()["srzip"]);
}
+void MainWindow::on_actionSaveSelectionAs_triggered()
+{
+ export_file(device_manager_.context()->output_formats()["srzip"], true);
+}
+
void MainWindow::on_actionConnect_triggered()
{
// Stop any currently running capture session
void MainWindow::on_actionViewZoomFit_triggered()
{
- view_->zoom_fit();
+ view_->zoom_fit(action_view_zoom_fit_->isChecked());
}
void MainWindow::on_actionViewZoomOneToOne_triggered()
assert(view_);
const bool show = !view_->cursors_shown();
- if(show)
+ if (show)
view_->centre_cursors();
view_->show_cursors(show);
action_view_sticky_scrolling_->setChecked(state);
}
+void MainWindow::always_zoom_to_fit_changed(bool state)
+{
+ action_view_zoom_fit_->setChecked(state);
+}
+
void MainWindow::add_decoder(srd_decoder *decoder)
{
#ifdef ENABLE_DECODE