X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=pv%2Ftoolbars%2Fmainbar.cpp;h=114e6fd72cb7c5ac44d71577f7b491b0085800b6;hb=75ab6b87f1184630a03cdef015f8010d2faf4653;hp=2c64867f89ca3f4d566814ec7be90262bf2bea05;hpb=f4ce3e772e3dad5b59f1ab27a6a3c01fdbfb8e1d;p=pulseview.git
diff --git a/pv/toolbars/mainbar.cpp b/pv/toolbars/mainbar.cpp
index 2c64867..114e6fd 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
@@ -44,8 +43,8 @@
#include
#include
#include
-#include
#include
+#include
#include
#include
#include
@@ -57,13 +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;
@@ -114,6 +114,8 @@ MainBar::MainBar(Session &session, QWidget *parent,
{
setObjectName(QString::fromUtf8("MainBar"));
+ setContextMenuPolicy(Qt::PreventContextMenu);
+
// Actions
action_new_view_->setText(tr("New &View"));
action_new_view_->setIcon(QIcon::fromTheme("window-new",
@@ -146,15 +148,15 @@ MainBar::MainBar(Session &session, QWidget *parent,
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..."));
connect(action_connect_, SIGNAL(triggered(bool)),
@@ -164,9 +166,9 @@ MainBar::MainBar(Session &session, QWidget *parent,
widgets::ImportMenu *import_menu = new widgets::ImportMenu(this,
session.device_manager().context(), action_open_);
connect(import_menu,
- SIGNAL(format_selected(std::shared_ptr)),
+ SIGNAL(format_selected(shared_ptr)),
this,
- SLOT(import_file(std::shared_ptr)));
+ SLOT(import_file(shared_ptr)));
open_button_->setMenu(import_menu);
open_button_->setDefaultAction(action_open_);
@@ -181,9 +183,9 @@ MainBar::MainBar(Session &session, QWidget *parent,
session.device_manager().context(),
open_actions);
connect(export_menu,
- SIGNAL(format_selected(std::shared_ptr)),
+ SIGNAL(format_selected(shared_ptr)),
this,
- SLOT(export_file(std::shared_ptr)));
+ SLOT(export_file(shared_ptr)));
save_button_->setMenu(export_menu);
save_button_->setDefaultAction(action_save_as_);
@@ -199,10 +201,10 @@ MainBar::MainBar(Session &session, QWidget *parent,
connect(menu_decoders_add_, SIGNAL(decoder_selected(srd_decoder*)),
this, SLOT(add_decoder(srd_decoder*)));
- add_decoder_button_->setIcon(QIcon::fromTheme("add-decoder",
- QIcon(":/icons/add-decoder.svg")));
+ 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
connect(&sample_count_, SIGNAL(value_changed()),
@@ -214,11 +216,12 @@ MainBar::MainBar(Session &session, QWidget *parent,
set_capture_state(pv::Session::Stopped);
- configure_button_.setIcon(QIcon::fromTheme("configure",
- QIcon(":/icons/configure.png")));
+ configure_button_.setToolTip(tr("Configure Device"));
+ configure_button_.setIcon(QIcon::fromTheme("preferences-system",
+ QIcon(":/icons/preferences-system.png")));
- channels_button_.setIcon(QIcon::fromTheme("channels",
- QIcon(":/icons/channels.svg")));
+ channels_button_.setToolTip(tr("Configure Channels"));
+ channels_button_.setIcon(QIcon(":/icons/channels.svg"));
add_toolbar_widgets();
@@ -249,7 +252,6 @@ void MainBar::update_device_list()
update_device_config_widgets();
}
-
void MainBar::set_capture_state(pv::Session::capture_state state)
{
bool ui_enabled = (state == pv::Session::Stopped) ? true : false;
@@ -292,7 +294,7 @@ 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();
@@ -402,9 +404,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);
@@ -416,14 +421,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);
}
@@ -431,6 +437,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()
@@ -571,8 +581,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;
@@ -582,7 +591,7 @@ 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) {
@@ -592,7 +601,7 @@ void MainBar::export_file(shared_ptr format,
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)."));
+ "to a session file (e.g. using the Show Cursors button)."));
return;
}
@@ -601,13 +610,14 @@ void MainBar::export_file(shared_ptr format,
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
@@ -616,9 +626,9 @@ void MainBar::export_file(shared_ptr format,
QString::fromStdString(format->description()));
if (exts.empty())
- filter += "(*.*)";
+ filter += "(*)";
else
- filter += QString("(*.%1);;%2 (*.*)").arg(
+ filter += QString("(*.%1);;%2 (*)").arg(
QString::fromStdString(join(exts, ", *.")),
tr("All Files"));
@@ -669,7 +679,7 @@ void MainBar::import_file(shared_ptr format)
// Show the file dialog
const QString file_name = QFileDialog::getOpenFileName(
this, tr("Import File"), dir, tr(
- "%1 files (*.*);;All Files (*.*)").arg(
+ "%1 files (*);;All Files (*)").arg(
QString::fromStdString(format->description())));
if (file_name.isEmpty())
@@ -730,7 +740,7 @@ void MainBar::on_sample_rate_changed()
void MainBar::on_config_changed()
{
commit_sample_count();
- commit_sample_rate();
+ commit_sample_rate();
}
void MainBar::on_actionNewView_triggered()
@@ -747,7 +757,7 @@ void MainBar::on_actionOpen_triggered()
const QString file_name = QFileDialog::getOpenFileName(
this, tr("Open File"), dir, tr(
"Sigrok Sessions (*.sr);;"
- "All Files (*.*)"));
+ "All Files (*)"));
if (!file_name.isEmpty()) {
session_.load_file(file_name);