projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Channels popup: Use a more compact one-line button row.
[pulseview.git]
/
pv
/
session.cpp
diff --git
a/pv/session.cpp
b/pv/session.cpp
index b1ce14680bbec848f6ae92fd3ec4010094d8320c..87e9b3a5e1060223d27a67f0a17cab94db6e9fcc 100644
(file)
--- a/
pv/session.cpp
+++ b/
pv/session.cpp
@@
-28,6
+28,7
@@
#include <sys/stat.h>
#include "devicemanager.hpp"
#include <sys/stat.h>
#include "devicemanager.hpp"
+#include "mainwindow.hpp"
#include "session.hpp"
#include "data/analog.hpp"
#include "session.hpp"
#include "data/analog.hpp"
@@
-299,8
+300,8
@@
void Session::restore_settings(QSettings &settings)
filename.toStdString());
set_device(device);
filename.toStdString());
set_device(device);
- // TODO Perform error handling
-
start_capture([](QString infoMessage) { (void)
infoMessage; });
+ start_capture([](QString infoMessage) {
+
qDebug().noquote() << "Session error:" <<
infoMessage; });
set_name(QFileInfo(filename).fileName());
}
set_name(QFileInfo(filename).fileName());
}
@@
-352,7
+353,7
@@
void Session::select_device(shared_ptr<devices::Device> device)
else
set_default_device();
} catch (const QString &e) {
else
set_default_device();
} catch (const QString &e) {
-
main_bar_->
session_error(tr("Failed to select device"), e);
+
MainWindow::show_
session_error(tr("Failed to select device"), e);
}
}
}
}
@@
-400,7
+401,7
@@
void Session::set_device(shared_ptr<devices::Device> device)
device_->open();
} catch (const QString &e) {
device_.reset();
device_->open();
} catch (const QString &e) {
device_.reset();
-
main_bar_->
session_error(tr("Failed to open device"), e);
+
MainWindow::show_
session_error(tr("Failed to open device"), e);
}
if (device_) {
}
if (device_) {
@@
-490,7
+491,7
@@
void Session::load_init_file(const string &file_name, const string &format)
[&](const pair<string, shared_ptr<InputFormat> > f) {
return f.first == user_name; });
if (iter == formats.end()) {
[&](const pair<string, shared_ptr<InputFormat> > f) {
return f.first == user_name; });
if (iter == formats.end()) {
-
main_bar_->
session_error(tr("Error"),
+
MainWindow::show_
session_error(tr("Error"),
tr("Unexpected input format: %s").arg(QString::fromStdString(format)));
return;
}
tr("Unexpected input format: %s").arg(QString::fromStdString(format)));
return;
}
@@
-521,8
+522,8
@@
void Session::load_file(QString file_name,
new devices::SessionFile(
device_manager_.context(),
file_name.toStdString())));
new devices::SessionFile(
device_manager_.context(),
file_name.toStdString())));
- } catch (Error e) {
-
main_bar_->
session_error(tr("Failed to load ") + file_name, e.what());
+ } catch (Error
&
e) {
+
MainWindow::show_
session_error(tr("Failed to load ") + file_name, e.what());
set_default_device();
main_bar_->update_device_list();
return;
set_default_device();
main_bar_->update_device_list();
return;
@@
-531,7
+532,7
@@
void Session::load_file(QString file_name,
main_bar_->update_device_list();
start_capture([&, errorMessage](QString infoMessage) {
main_bar_->update_device_list();
start_capture([&, errorMessage](QString infoMessage) {
-
main_bar_->
session_error(errorMessage, infoMessage); });
+
MainWindow::show_
session_error(errorMessage, infoMessage); });
set_name(QFileInfo(file_name).fileName());
}
set_name(QFileInfo(file_name).fileName());
}
@@
-732,7
+733,7
@@
shared_ptr<data::DecodeSignal> Session::add_decode_signal()
// Add the decode signal to all views
for (shared_ptr<views::ViewBase> view : views_)
view->add_decode_signal(signal);
// Add the decode signal to all views
for (shared_ptr<views::ViewBase> view : views_)
view->add_decode_signal(signal);
- } catch (runtime_error e) {
+ } catch (runtime_error
&
e) {
remove_decode_signal(signal);
return nullptr;
}
remove_decode_signal(signal);
return nullptr;
}
@@
-934,7
+935,7
@@
void Session::sample_thread_proc(function<void (const QString)> error_handler)
try {
device_->start();
try {
device_->start();
- } catch (Error e) {
+ } catch (Error
&
e) {
error_handler(e.what());
return;
}
error_handler(e.what());
return;
}
@@
-944,7
+945,7
@@
void Session::sample_thread_proc(function<void (const QString)> error_handler)
try {
device_->run();
try {
device_->run();
- } catch (Error e) {
+ } catch (Error
&
e) {
error_handler(e.what());
set_capture_state(Stopped);
return;
error_handler(e.what());
set_capture_state(Stopped);
return;
@@
-953,10
+954,8
@@
void Session::sample_thread_proc(function<void (const QString)> error_handler)
set_capture_state(Stopped);
// Confirm that SR_DF_END was received
set_capture_state(Stopped);
// Confirm that SR_DF_END was received
- if (cur_logic_segment_) {
- qDebug("SR_DF_END was not received.");
- assert(false);
- }
+ if (cur_logic_segment_)
+ qDebug() << "WARNING: SR_DF_END was not received.";
// Optimize memory usage
free_unused_memory();
// Optimize memory usage
free_unused_memory();
@@
-1132,6
+1131,11
@@
void Session::feed_in_frame_end()
void Session::feed_in_logic(shared_ptr<Logic> logic)
{
void Session::feed_in_logic(shared_ptr<Logic> logic)
{
+ if (logic->data_length() == 0) {
+ qDebug() << "WARNING: Received logic packet with 0 samples.";
+ return;
+ }
+
if (!cur_samplerate_)
cur_samplerate_ = device_->read_config<uint64_t>(ConfigKey::SAMPLERATE);
if (!cur_samplerate_)
cur_samplerate_ = device_->read_config<uint64_t>(ConfigKey::SAMPLERATE);
@@
-1164,6
+1168,11
@@
void Session::feed_in_logic(shared_ptr<Logic> logic)
void Session::feed_in_analog(shared_ptr<Analog> analog)
{
void Session::feed_in_analog(shared_ptr<Analog> analog)
{
+ if (analog->num_samples() == 0) {
+ qDebug() << "WARNING: Received analog packet with 0 samples.";
+ return;
+ }
+
if (!cur_samplerate_)
cur_samplerate_ = device_->read_config<uint64_t>(ConfigKey::SAMPLERATE);
if (!cur_samplerate_)
cur_samplerate_ = device_->read_config<uint64_t>(ConfigKey::SAMPLERATE);
@@
-1253,7
+1262,7
@@
void Session::data_feed_in(shared_ptr<sigrok::Device> device,
case SR_DF_LOGIC:
try {
feed_in_logic(dynamic_pointer_cast<Logic>(packet->payload()));
case SR_DF_LOGIC:
try {
feed_in_logic(dynamic_pointer_cast<Logic>(packet->payload()));
- } catch (bad_alloc) {
+ } catch (bad_alloc
&
) {
out_of_memory_ = true;
device_->stop();
}
out_of_memory_ = true;
device_->stop();
}
@@
-1262,7
+1271,7
@@
void Session::data_feed_in(shared_ptr<sigrok::Device> device,
case SR_DF_ANALOG:
try {
feed_in_analog(dynamic_pointer_cast<Analog>(packet->payload()));
case SR_DF_ANALOG:
try {
feed_in_analog(dynamic_pointer_cast<Analog>(packet->payload()));
- } catch (bad_alloc) {
+ } catch (bad_alloc
&
) {
out_of_memory_ = true;
device_->stop();
}
out_of_memory_ = true;
device_->stop();
}
@@
-1282,6
+1291,15
@@
void Session::data_feed_in(shared_ptr<sigrok::Device> device,
// devices use frames, and for those devices, we need to do it here.
{
lock_guard<recursive_mutex> lock(data_mutex_);
// devices use frames, and for those devices, we need to do it here.
{
lock_guard<recursive_mutex> lock(data_mutex_);
+
+ if (cur_logic_segment_)
+ cur_logic_segment_->set_complete();
+
+ for (auto entry : cur_analog_segments_) {
+ shared_ptr<data::AnalogSegment> segment = entry.second;
+ segment->set_complete();
+ }
+
cur_logic_segment_.reset();
cur_analog_segments_.clear();
}
cur_logic_segment_.reset();
cur_analog_segments_.clear();
}