X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=pv%2Ftoolbars%2Fmainbar.cpp;h=1797e0a43e7de836b3695cfde24cf09647b6d150;hb=348bae08c18c66974533dde20ba3c426e881f929;hp=529f25f46a1baf7bae3c4270d92c588ee052cd69;hpb=0e0b6b3e3425f730c8ae0a36b5fb50c02ce0ba54;p=pulseview.git
diff --git a/pv/toolbars/mainbar.cpp b/pv/toolbars/mainbar.cpp
index 529f25f..1797e0a 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
@@ -25,29 +24,47 @@
#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
#include
#include
+#ifdef ENABLE_DECODE
+#include
+#endif
#include
using std::back_inserter;
using std::copy;
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;
@@ -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,19 @@ const uint64_t MainBar::MinSampleCount = 100ULL;
const uint64_t MainBar::MaxSampleCount = 1000000000000ULL;
const uint64_t MainBar::DefaultSampleCount = 1000000;
-MainBar::MainBar(Session &session, MainWindow &main_window) :
- QToolBar("Sampling Bar", &main_window),
- session_(session),
- main_window_(main_window),
- device_selector_(this, session.device_manager(),
- main_window.action_connect()),
+const char *MainBar::SettingOpenDirectory = "MainWindow/OpenDirectory";
+const char *MainBar::SettingSaveDirectory = "MainWindow/SaveDirectory";
+
+MainBar::MainBar(Session &session, QWidget *parent, pv::views::trace::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)),
+ open_button_(new QToolButton()),
+ save_button_(new QToolButton()),
+ device_selector_(parent, session.device_manager(), action_connect_),
configure_button_(this),
configure_button_action_(nullptr),
channels_button_(this),
@@ -78,49 +105,83 @@ 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
+ , 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);
- // Open button
- QToolButton *const open_button = new QToolButton(this);
+ // 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));
+ 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(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(shared_ptr)),
+ this, SLOT(import_file(shared_ptr)));
+
+ action_connect_->setText(tr("&Connect to Device..."));
+ connect(action_connect_, SIGNAL(triggered(bool)),
+ this, SLOT(on_actionConnect_triggered()));
+ // Open button
widgets::ImportMenu *import_menu = new widgets::ImportMenu(this,
- session.device_manager().context(),
- main_window.action_open());
- connect(import_menu,
- SIGNAL(format_selected(std::shared_ptr)),
- &main_window_,
- SLOT(import_file(std::shared_ptr)));
+ session.device_manager().context(), action_open_);
+ connect(import_menu, SIGNAL(format_selected(shared_ptr)),
+ this, SLOT(import_file(shared_ptr)));
- open_button->setMenu(import_menu);
- open_button->setDefaultAction(main_window.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_);
widgets::ExportMenu *export_menu = new widgets::ExportMenu(this,
- session.device_manager().context(),
- main_window.action_save_as());
- connect(export_menu,
- SIGNAL(format_selected(std::shared_ptr)),
- &main_window_,
- SLOT(export_file(std::shared_ptr)));
+ session.device_manager().context(), open_actions);
+ connect(export_menu, SIGNAL(format_selected(shared_ptr)),
+ this, SLOT(export_file(shared_ptr)));
- save_button->setMenu(export_menu);
- save_button->setDefaultAction(main_window.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()),
@@ -128,43 +189,16 @@ MainBar::MainBar(Session &session, MainWindow &main_window) :
// Setup the decoder button
#ifdef ENABLE_DECODE
- 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());
+ menu_decoders_add_->setTitle(tr("&Add"));
+ connect(menu_decoders_add_, SIGNAL(decoder_selected(srd_decoder*)),
+ this, SLOT(add_decoder(srd_decoder*)));
+
+ add_decoder_button_->setIcon(QIcon(":/icons/add-decoder.svg"));
+ add_decoder_button_->setPopupMode(QToolButton::InstantPopup);
+ add_decoder_button_->setMenu(menu_decoders_add_);
+ add_decoder_button_->setToolTip(tr("Add low-level, non-stacked protocol decoder"));
#endif
- // Setup the menu
- QMenu *const menu = new QMenu(this);
-
- QMenu *const menu_help = new QMenu;
- menu_help->setTitle(tr("&Help"));
- menu_help->addAction(main_window.action_about());
-
- 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
- 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());
- addSeparator();
- addAction(main_window.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()),
@@ -174,33 +208,25 @@ MainBar::MainBar(Session &session, MainWindow &main_window) :
set_capture_state(pv::Session::Stopped);
- configure_button_.setIcon(QIcon::fromTheme("configure",
- QIcon(":/icons/configure.png")));
-
- 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
+ configure_button_.setToolTip(tr("Configure Device"));
+ configure_button_.setIcon(QIcon::fromTheme("preferences-system",
+ QIcon(":/icons/preferences-system.png")));
- QWidget *const spacer = new QWidget();
- spacer->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding);
- addWidget(spacer);
+ channels_button_.setToolTip(tr("Configure Channels"));
+ channels_button_.setIcon(QIcon(":/icons/channels.svg"));
- 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(on_capture_state_changed(int)));
+ connect(&session, SIGNAL(device_changed()),
+ this, SLOT(on_device_changed()));
+
+ update_device_list();
}
void MainBar::update_device_list()
@@ -218,14 +244,40 @@ 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);
+ configure_button_.setEnabled(ui_enabled);
+ channels_button_.setEnabled(ui_enabled);
+ sample_count_.setEnabled(ui_enabled);
+ sample_rate_.setEnabled(ui_enabled);
+}
+
+void MainBar::reset_device_selector()
+{
+ device_selector_.reset();
+}
+
+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_;
}
void MainBar::update_sample_rate_selector()
@@ -234,15 +286,14 @@ void MainBar::update_sample_rate_selector()
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();
return;
}
- const shared_ptr device =
- device_selector_.selected_device();
+ const shared_ptr device = device_selector_.selected_device();
if (!device)
return;
@@ -251,32 +302,22 @@ void MainBar::update_sample_rate_selector()
const shared_ptr sr_dev = device->device();
- try {
- keys = sr_dev->config_keys(ConfigKey::DEVICE_OPTIONS);
- } catch (Error) {}
-
- const auto iter = keys.find(ConfigKey::SAMPLERATE);
- if (iter != keys.end() &&
- (*iter).second.find(sigrok::LIST) != (*iter).second.end()) {
+ if (sr_dev->config_check(ConfigKey::SAMPLERATE, Capability::LIST)) {
try {
gvar_dict = sr_dev->config_list(ConfigKey::SAMPLERATE);
- } catch(const sigrok::Error &e) {
- // Failed to enunmerate samplerate
- (void)e;
+ } catch (Error& error) {
+ qDebug() << tr("Failed to get sample rate list:") << error.what();
}
- }
-
- if (!gvar_dict.gobj()) {
+ } else {
sample_rate_.show_none();
updating_sample_rate_ = false;
return;
}
if ((gvar_list = g_variant_lookup_value(gvar_dict.gobj(),
- "samplerate-steps", G_VARIANT_TYPE("at"))))
- {
+ "samplerate-steps", G_VARIANT_TYPE("at")))) {
elements = (const uint64_t *)g_variant_get_fixed_array(
- gvar_list, &num_elements, sizeof(uint64_t));
+ gvar_list, &num_elements, sizeof(uint64_t));
const uint64_t min = elements[0];
const uint64_t max = elements[1];
@@ -291,20 +332,17 @@ void MainBar::update_sample_rate_selector()
if (step == 1)
sample_rate_.show_125_list(min, max);
- else
- {
+ else {
// When the step is not 1, we cam't make a 1-2-5-10
// list of sample rates, because we may not be able to
// make round numbers. Therefore in this case, show a
// spin box.
sample_rate_.show_min_max_step(min, max, step);
}
- }
- else if ((gvar_list = g_variant_lookup_value(gvar_dict.gobj(),
- "samplerates", G_VARIANT_TYPE("at"))))
- {
+ } else if ((gvar_list = g_variant_lookup_value(gvar_dict.gobj(),
+ "samplerates", G_VARIANT_TYPE("at")))) {
elements = (const uint64_t *)g_variant_get_fixed_array(
- gvar_list, &num_elements, sizeof(uint64_t));
+ gvar_list, &num_elements, sizeof(uint64_t));
sample_rate_.show_list(elements, num_elements);
g_variant_unref(gvar_list);
}
@@ -318,8 +356,7 @@ void MainBar::update_sample_rate_selector_value()
if (updating_sample_rate_)
return;
- const shared_ptr device =
- device_selector_.selected_device();
+ const shared_ptr device = device_selector_.selected_device();
if (!device)
return;
@@ -331,9 +368,8 @@ void MainBar::update_sample_rate_selector_value()
updating_sample_rate_ = true;
sample_rate_.set_value(samplerate);
updating_sample_rate_ = false;
- } catch (Error error) {
- qDebug() << "WARNING: Failed to get value of sample rate";
- return;
+ } catch (Error& error) {
+ qDebug() << tr("Failed to get value of sample rate:") << error.what();
}
}
@@ -342,8 +378,7 @@ void MainBar::update_sample_count_selector()
if (updating_sample_count_)
return;
- const shared_ptr device =
- device_selector_.selected_device();
+ const shared_ptr device = device_selector_.selected_device();
if (!device)
return;
@@ -352,8 +387,7 @@ void MainBar::update_sample_count_selector()
assert(!updating_sample_count_);
updating_sample_count_ = true;
- if (!sample_count_supported_)
- {
+ if (!sample_count_supported_) {
sample_count_.show_none();
updating_sample_count_ = false;
return;
@@ -362,56 +396,57 @@ 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;
+ }
- const auto keys = sr_dev->config_keys(ConfigKey::DEVICE_OPTIONS);
- const auto iter = keys.find(ConfigKey::LIMIT_SAMPLES);
- if (iter != keys.end() &&
- (*iter).second.find(sigrok::LIST) != (*iter).second.end()) {
+ if (sr_dev->config_check(ConfigKey::LIMIT_SAMPLES, Capability::LIST)) {
try {
- auto gvar =
- sr_dev->config_list(ConfigKey::LIMIT_SAMPLES);
+ auto gvar = sr_dev->config_list(ConfigKey::LIMIT_SAMPLES);
if (gvar.gobj())
g_variant_get(gvar.gobj(), "(tt)",
&min_sample_count, &max_sample_count);
- } catch(const sigrok::Error &e) {
- // Failed to query sample limit
- (void)e;
+ } catch (Error& error) {
+ qDebug() << tr("Failed to get sample limit list:") << error.what();
}
}
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);
- try {
+ 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);
- } catch (Error error) {}
+ }
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()
{
using namespace pv::popups;
- const shared_ptr device =
- device_selector_.selected_device();
+ const shared_ptr device = device_selector_.selected_device();
// 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();
@@ -425,8 +460,7 @@ void MainBar::update_device_config_widgets()
// Update the configure popup
DeviceOptions *const opts = new DeviceOptions(sr_dev, this);
- configure_button_action_->setVisible(
- !opts->binding().properties().empty());
+ configure_button_action_->setVisible(!opts->binding().properties().empty());
configure_button_.set_popup(opts);
// Update the channels popup
@@ -436,29 +470,8 @@ void MainBar::update_device_config_widgets()
// Update supported options.
sample_count_supported_ = false;
- try {
- for (auto entry : sr_dev->config_keys(ConfigKey::DEVICE_OPTIONS))
- {
- auto key = entry.first;
- auto capabilities = entry.second;
- switch (key->id()) {
- case SR_CONF_LIMIT_SAMPLES:
- if (capabilities.count(Capability::SET))
- sample_count_supported_ = true;
- break;
- case SR_CONF_LIMIT_FRAMES:
- if (capabilities.count(Capability::SET))
- {
- sr_dev->config_set(ConfigKey::LIMIT_FRAMES,
- Glib::Variant::create(1));
- on_config_changed();
- }
- break;
- default:
- break;
- }
- }
- } catch (Error error) {}
+ if (sr_dev->config_check(ConfigKey::LIMIT_SAMPLES, Capability::SET))
+ sample_count_supported_ = true;
// Add notification of reconfigure events
disconnect(this, SLOT(on_config_changed()));
@@ -470,78 +483,249 @@ void MainBar::update_device_config_widgets()
update_sample_rate_selector();
}
-void MainBar::commit_sample_count()
+void MainBar::commit_sample_rate()
{
- uint64_t sample_count = 0;
+ uint64_t sample_rate = 0;
- if (updating_sample_count_)
+ const shared_ptr device = device_selector_.selected_device();
+ if (!device)
return;
- const shared_ptr device =
- device_selector_.selected_device();
+ 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() << tr("Failed to configure samplerate:") << error.what();
+ 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;
+
+ const shared_ptr device = device_selector_.selected_device();
if (!device)
return;
const shared_ptr sr_dev = device->device();
sample_count = sample_count_.value();
-
- // Set the sample count
- assert(!updating_sample_count_);
- updating_sample_count_ = true;
- if (sample_count_supported_)
- {
+ if (sample_count_supported_) {
try {
sr_dev->config_set(ConfigKey::LIMIT_SAMPLES,
Glib::Variant::create(sample_count));
- on_config_changed();
- } catch (Error error) {
- qDebug() << "Failed to configure sample count.";
+ update_sample_count_selector();
+ } catch (Error& error) {
+ qDebug() << tr("Failed to configure sample count:") << error.what();
return;
}
}
- updating_sample_count_ = false;
+
+ // Devices with built-in memory might impose limits on certain
+ // configurations, so let's check what sample rate the driver
+ // lets us use now.
+ 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::add_decoder(srd_decoder *decoder)
+{
+#ifdef ENABLE_DECODE
+ assert(decoder);
+ shared_ptr signal = session_.add_decode_signal();
+ if (signal)
+ signal->stack_decoder(decoder);
+#else
+ (void)decoder;
+#endif
+}
- sample_rate = sample_rate_.value();
- if (sample_rate == 0)
+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();
+
+ pair sample_range;
+
+ // Selection only? Verify that the cursors are active and fetch their values
+ if (selection_only) {
+ views::trace::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 the Show Cursors button)."));
+ 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 = (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);
+
+ if ((start_sample == 0) && (end_sample == 0)) {
+ // Both cursors are negative and were clamped to 0
+ show_session_error(tr("Invalid Range"), tr("The cursors don't " \
+ "define a valid range of samples."));
+ return;
+ }
+
+ sample_range = make_pair(start_sample, end_sample);
+ } else {
+ sample_range = 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();
+ }
+
+ if (!selection_only)
+ 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 = exts.empty() ? "" : QString::fromStdString("%1 (%2)").arg(
+ tr("%1 files").arg(QString::fromStdString(format->description())),
+ QString::fromStdString("*.%1").arg(QString::fromStdString(join(exts, " *."))));
+ const QString filter_all = QString::fromStdString("%1 (%2)").arg(
+ tr("All Files"), QString::fromStdString("*"));
+ const QString filter = QString::fromStdString("%1%2%3").arg(
+ exts.empty() ? "" : filter_exts,
+ exts.empty() ? "" : ";;",
+ filter_all);
+
+ // Show the file dialog
+ const QString file_name = QFileDialog::getOpenFileName(
+ this, tr("Import File"), dir, filter);
+
+ 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();
}
+
+ session_.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)
- return;
- main_window_.select_device(device);
+ if (device)
+ session_.select_device(device);
+ else
+ reset_device_selector();
+}
+void MainBar::on_device_changed()
+{
+ update_device_list();
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()
{
- commit_sample_count();
+ if (!updating_sample_count_)
+ commit_sample_count();
}
void MainBar::on_sample_rate_changed()
@@ -550,28 +734,93 @@ 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();
- main_window_.run_stop();
+ commit_sample_rate();
}
-void MainBar::on_config_changed()
+void MainBar::on_actionNewView_triggered()
{
- commit_sample_count();
- update_sample_count_selector();
- commit_sample_rate();
+ 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()) {
+ session_.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())
+ session_.select_device(dlg.get_selected_device());
+
+ update_device_list();
+}
+
+void MainBar::add_toolbar_widgets()
+{
+ addAction(action_new_view_);
+ addSeparator();
+ addWidget(open_button_);
+ addWidget(save_button_);
+ addSeparator();
+
+ StandardBar::add_toolbar_widgets();
+
+ 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)
{
- if ((watched == &sample_count_ || watched == &sample_rate_) &&
+ if (sample_count_supported_ && (watched == &sample_count_ ||
+ watched == &sample_rate_) &&
(event->type() == QEvent::ToolTip)) {
- double sec = (double)sample_count_.value() / sample_rate_.value();
+
+ auto sec = pv::util::Timestamp(sample_count_.value()) / sample_rate_.value();
QHelpEvent *help_event = static_cast(event);
- QString str = tr("Total sampling time: %1").arg(pv::util::format_second(sec));
+ QString str = tr("Total sampling time: %1").arg(
+ pv::util::format_time_si(sec, pv::util::SIPrefix::unspecified, 0, "s", false));
QToolTip::showText(help_event->globalPos(), str);
return true;