projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
manual: install manual conversion result files generated by cmake
[pulseview.git]
/
pv
/
toolbars
/
mainbar.cpp
diff --git
a/pv/toolbars/mainbar.cpp
b/pv/toolbars/mainbar.cpp
index d78a153f160d0f14e45969572cfe671269ba07f0..e6beb2b3ba704e198c8aff0076787a9d96798fe9 100644
(file)
--- a/
pv/toolbars/mainbar.cpp
+++ b/
pv/toolbars/mainbar.cpp
@@
-384,7
+384,7
@@
void MainBar::update_sample_rate_selector_value()
sample_rate_.set_value(samplerate);
updating_sample_rate_ = false;
} catch (Error& error) {
sample_rate_.set_value(samplerate);
updating_sample_rate_ = false;
} catch (Error& error) {
- qDebug() << tr("Failed to get
value of
sample rate:") << error.what();
+ qDebug() << tr("Failed to get sample rate:") << error.what();
}
}
}
}
@@
-509,8
+509,6
@@
void MainBar::commit_sample_rate()
const shared_ptr<sigrok::Device> sr_dev = device->device();
sample_rate = sample_rate_.value();
const shared_ptr<sigrok::Device> sr_dev = device->device();
sample_rate = sample_rate_.value();
- if (sample_rate == 0)
- return;
try {
sr_dev->config_set(ConfigKey::SAMPLERATE,
try {
sr_dev->config_set(ConfigKey::SAMPLERATE,
@@
-607,9
+605,9
@@
void MainBar::export_file(shared_ptr<OutputFormat> format, bool selection_only)
const pv::util::Timestamp& end_time = trace_view->cursors()->second()->time();
const uint64_t start_sample = (uint64_t)max(
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<double>() * samplerate);
+
0.
0, start_time.convert_to<double>() * samplerate);
const uint64_t end_sample = (uint64_t)max(
const uint64_t end_sample = (uint64_t)max(
-
(double)
0, end_time.convert_to<double>() * samplerate);
+
0.
0, end_time.convert_to<double>() * samplerate);
if ((start_sample == 0) && (end_sample == 0)) {
// Both cursors are negative and were clamped to 0
if ((start_sample == 0) && (end_sample == 0)) {
// Both cursors are negative and were clamped to 0