#include <pv/popups/channels.hpp>
#include <pv/util.hpp>
#include <pv/widgets/exportmenu.hpp>
+#include <pv/widgets/importmenu.hpp>
#include <libsigrokcxx/libsigrokcxx.hpp>
using sigrok::Capability;
using sigrok::ConfigKey;
using sigrok::Error;
+using sigrok::InputFormat;
namespace pv {
namespace toolbars {
device_selector_(this, session.device_manager(),
main_window.action_connect()),
configure_button_(this),
- configure_button_action_(NULL),
+ configure_button_action_(nullptr),
channels_button_(this),
+ channels_button_action_(nullptr),
sample_count_(" samples", this),
sample_rate_("Hz", this),
updating_sample_rate_(false),
icon_green_(":/icons/status-green.svg"),
icon_grey_(":/icons/status-grey.svg"),
run_stop_button_(this),
+ run_stop_button_action_(nullptr),
menu_button_(this)
{
setObjectName(QString::fromUtf8("MainBar"));
setFloatable(false);
setContextMenuPolicy(Qt::PreventContextMenu);
+ // 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());
+ connect(import_menu,
+ SIGNAL(format_selected(std::shared_ptr<sigrok::InputFormat>)),
+ &main_window_,
+ SLOT(import_file(std::shared_ptr<sigrok::InputFormat>)));
+
+ open_button->setMenu(import_menu);
+ open_button->setDefaultAction(main_window.action_open());
+ open_button->setPopupMode(QToolButton::MenuButtonPopup);
+
// Save button
QToolButton *const save_button = new QToolButton(this);
add_decoder_button->setMenu(main_window_.menu_decoder_add());
#endif
- // Setup the menu
+ // 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());
QIcon(":/icons/menu.svg")));
// Setup the toolbar
- addAction(main_window.action_open());
+ addWidget(open_button);
addWidget(save_button);
addSeparator();
addAction(main_window.action_view_zoom_in());
addWidget(&device_selector_);
configure_button_action_ = addWidget(&configure_button_);
- addWidget(&channels_button_);
+ channels_button_action_ = addWidget(&channels_button_);
addWidget(&sample_count_);
addWidget(&sample_rate_);
- addWidget(&run_stop_button_);
+ run_stop_button_action_ = addWidget(&run_stop_button_);
#ifdef ENABLE_DECODE
addSeparator();
addWidget(add_decoder_button);
if (std::find(devs.begin(), devs.end(), selected_device) == devs.end())
devs.push_back(selected_device);
- assert(selected_device);
device_selector_.set_device_list(devs, selected_device);
update_device_config_widgets();
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::update_sample_rate_selector()
{
Glib::VariantContainerBase gvar_dict;
GVariant *gvar_list;
- const uint64_t *elements = NULL;
+ const uint64_t *elements = nullptr;
gsize num_elements;
+ map< const ConfigKey*, std::set<Capability> > keys;
- if (updating_sample_rate_)
+ if (updating_sample_rate_) {
+ sample_rate_.show_none();
return;
+ }
const shared_ptr<devices::Device> device =
device_selector_.selected_device();
updating_sample_rate_ = true;
const shared_ptr<sigrok::Device> sr_dev = device->device();
- const auto keys = sr_dev->config_keys(ConfigKey::DEVICE_OPTIONS);
+
+ 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()) {
const shared_ptr<devices::Device> device =
device_selector_.selected_device();
- if (!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();
+ sample_rate_.show_none();
return;
+ }
const shared_ptr<sigrok::Device> sr_dev = device->device();
if (!sr_dev)
{
uint64_t sample_count = 0;
- if (updating_sample_count_)
- return;
-
const shared_ptr<devices::Device> device =
device_selector_.selected_device();
if (!device)
const shared_ptr<sigrok::Device> 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_)
{
try {
sr_dev->config_set(ConfigKey::LIMIT_SAMPLES,
Glib::Variant<guint64>::create(sample_count));
- on_config_changed();
+ update_sample_count_selector();
} catch (Error error) {
qDebug() << "Failed to configure sample count.";
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()
{
uint64_t sample_rate = 0;
- if (updating_sample_rate_)
- return;
-
const shared_ptr<devices::Device> device =
device_selector_.selected_device();
if (!device)
if (sample_rate == 0)
return;
- // Set the samplerate
- assert(!updating_sample_rate_);
- updating_sample_rate_ = true;
try {
sr_dev->config_set(ConfigKey::SAMPLERATE,
Glib::Variant<guint64>::create(sample_rate));
- on_config_changed();
+ update_sample_rate_selector();
} catch (Error error) {
qDebug() << "Failed to configure samplerate.";
return;
}
- updating_sample_rate_ = false;
+
+ // 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::on_device_selected()
void MainBar::on_sample_count_changed()
{
- commit_sample_count();
+ if (!updating_sample_count_)
+ commit_sample_count();
}
void MainBar::on_sample_rate_changed()
{
- commit_sample_rate();
+ if (!updating_sample_rate_)
+ commit_sample_rate();
}
void MainBar::on_run_stop()
void MainBar::on_config_changed()
{
commit_sample_count();
- update_sample_count_selector();
commit_sample_rate();
- update_sample_rate_selector();
}
bool MainBar::eventFilter(QObject *watched, QEvent *event)
projects / pulseview.git / blobdiff