X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fsession.cpp;h=97741ebf7b944a4c6507bd1a4e64c1d8128a5d5b;hp=99de77495307386a01be90099c6a6a28402871f5;hb=26a883ede0bcf68d087eda5dd2082890d36c7aef;hpb=101e7a9b40cc97fcd94aca7a1bed086b1f56f269
diff --git a/pv/session.cpp b/pv/session.cpp
index 99de7749..97741ebf 100644
--- a/pv/session.cpp
+++ b/pv/session.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 .
*/
#ifdef _WIN32
@@ -26,12 +25,15 @@
#include
#include
-#ifdef ENABLE_DECODE
-#include
-#endif
+#include
-#include "session.hpp"
+#include
+#include
+#include
+#include
+
+#include "session.hpp"
#include "devicemanager.hpp"
#include "data/analog.hpp"
@@ -43,6 +45,7 @@
#include "data/decode/decoder.hpp"
#include "devices/hardwaredevice.hpp"
+#include "devices/inputfile.hpp"
#include "devices/sessionfile.hpp"
#include "toolbars/mainbar.hpp"
@@ -53,16 +56,12 @@
#include "view/signal.hpp"
#include "view/view.hpp"
-#include
-#include
-#include
-
-#include
-
-#include
-
#include
+#ifdef ENABLE_DECODE
+#include
+#endif
+
using boost::shared_lock;
using boost::shared_mutex;
using boost::unique_lock;
@@ -73,6 +72,7 @@ using std::lock_guard;
using std::list;
using std::map;
using std::mutex;
+using std::pair;
using std::recursive_mutex;
using std::set;
using std::shared_ptr;
@@ -87,8 +87,10 @@ using sigrok::ConfigKey;
using sigrok::DatafeedCallbackFunction;
using sigrok::Error;
using sigrok::Header;
+using sigrok::InputFormat;
using sigrok::Logic;
using sigrok::Meta;
+using sigrok::OutputFormat;
using sigrok::Packet;
using sigrok::PacketPayload;
using sigrok::Session;
@@ -100,9 +102,11 @@ using Glib::Variant;
namespace pv {
Session::Session(DeviceManager &device_manager, QString name) :
device_manager_(device_manager),
+ default_name_(name),
name_(name),
capture_state_(Stopped),
- cur_samplerate_(0)
+ cur_samplerate_(0),
+ data_saved_(true)
{
}
@@ -149,7 +153,12 @@ void Session::set_name(QString name)
name_changed();
}
-std::shared_ptr Session::main_view() const
+const std::list< std::shared_ptr > Session::views() const
+{
+ return views_;
+}
+
+std::shared_ptr Session::main_view() const
{
return main_view_;
}
@@ -164,69 +173,202 @@ shared_ptr Session::main_bar() const
return main_bar_;
}
+bool Session::data_saved() const
+{
+ return data_saved_;
+}
+
void Session::save_settings(QSettings &settings) const
{
map dev_info;
list key_list;
+ int stacks = 0, views = 0;
if (device_) {
- settings.beginGroup("Device");
+ shared_ptr hw_device =
+ dynamic_pointer_cast< devices::HardwareDevice >(device_);
+
+ if (hw_device) {
+ settings.setValue("device_type", "hardware");
+ settings.beginGroup("device");
+
+ key_list.push_back("vendor");
+ key_list.push_back("model");
+ key_list.push_back("version");
+ key_list.push_back("serial_num");
+ key_list.push_back("connection_id");
+
+ dev_info = device_manager_.get_device_info(device_);
+
+ for (string key : key_list) {
+ if (dev_info.count(key))
+ settings.setValue(QString::fromUtf8(key.c_str()),
+ QString::fromUtf8(dev_info.at(key).c_str()));
+ else
+ settings.remove(QString::fromUtf8(key.c_str()));
+ }
+
+ settings.endGroup();
+ }
+
+ shared_ptr sessionfile_device =
+ dynamic_pointer_cast< devices::SessionFile >(device_);
+
+ if (sessionfile_device) {
+ settings.setValue("device_type", "sessionfile");
+ settings.beginGroup("device");
+ settings.setValue("filename", QString::fromStdString(
+ sessionfile_device->full_name()));
+ settings.endGroup();
+ }
+
+ // Save channels and decoders
+ for (shared_ptr base : signalbases_) {
+#ifdef ENABLE_DECODE
+ if (base->is_decode_signal()) {
+ shared_ptr decoder_stack =
+ base->decoder_stack();
+ std::shared_ptr top_decoder =
+ decoder_stack->stack().front();
+
+ settings.beginGroup("decoder_stack" + QString::number(stacks++));
+ settings.setValue("id", top_decoder->decoder()->id);
+ settings.setValue("name", top_decoder->decoder()->name);
+ settings.endGroup();
+ } else
+#endif
+ {
+ settings.beginGroup(base->internal_name());
+ base->save_settings(settings);
+ settings.endGroup();
+ }
+ }
+
+ settings.setValue("decoder_stacks", stacks);
+
+ // Save view states and their signal settings
+ // Note: main_view must be saved as view0
+ settings.beginGroup("view" + QString::number(views++));
+ main_view_->save_settings(settings);
+ settings.endGroup();
+
+ for (shared_ptr view : views_) {
+ if (view != main_view_) {
+ settings.beginGroup("view" + QString::number(views++));
+ view->save_settings(settings);
+ settings.endGroup();
+ }
+ }
+
+ settings.setValue("views", views);
+ }
+}
+
+void Session::restore_settings(QSettings &settings)
+{
+ shared_ptr device;
+
+ QString device_type = settings.value("device_type").toString();
+
+ if (device_type == "hardware") {
+ map dev_info;
+ list key_list;
+
+ // Re-select last used device if possible but only if it's not demo
+ settings.beginGroup("device");
key_list.push_back("vendor");
key_list.push_back("model");
key_list.push_back("version");
key_list.push_back("serial_num");
key_list.push_back("connection_id");
- dev_info = device_manager_.get_device_info(device_);
-
for (string key : key_list) {
- if (dev_info.count(key))
- settings.setValue(QString::fromUtf8(key.c_str()),
- QString::fromUtf8(dev_info.at(key).c_str()));
- else
- settings.remove(QString::fromUtf8(key.c_str()));
+ const QString k = QString::fromStdString(key);
+ if (!settings.contains(k))
+ continue;
+
+ const string value = settings.value(k).toString().toStdString();
+ if (!value.empty())
+ dev_info.insert(std::make_pair(key, value));
}
- // TODO Save channel settings and decoders
+ if (dev_info.count("model") > 0)
+ device = device_manager_.find_device_from_info(dev_info);
+
+ if (device)
+ set_device(device);
settings.endGroup();
}
-}
-void Session::restore_settings(QSettings &settings)
-{
- map dev_info;
- list key_list;
- shared_ptr device;
+ if (device_type == "sessionfile") {
+ settings.beginGroup("device");
+ QString filename = settings.value("filename").toString();
+ settings.endGroup();
- // Re-select last used device if possible but only if it's not demo
- settings.beginGroup("Device");
- key_list.push_back("vendor");
- key_list.push_back("model");
- key_list.push_back("version");
- key_list.push_back("serial_num");
- key_list.push_back("connection_id");
+ if (QFileInfo(filename).isReadable()) {
+ device = std::make_shared(device_manager_.context(),
+ filename.toStdString());
+ set_device(device);
- for (string key : key_list) {
- const QString k = QString::fromStdString(key);
- if (!settings.contains(k))
- continue;
+ // TODO Perform error handling
+ start_capture([](QString infoMessage) { (void)infoMessage; });
- const string value = settings.value(k).toString().toStdString();
- if (!value.empty())
- dev_info.insert(std::make_pair(key, value));
+ set_name(QFileInfo(filename).fileName());
+ }
}
- if (dev_info.count("model") > 0)
- device = device_manager_.find_device_from_info(dev_info);
-
if (device) {
- set_device(device);
+ // Restore channels
+ for (shared_ptr base : signalbases_) {
+ settings.beginGroup(base->internal_name());
+ base->restore_settings(settings);
+ settings.endGroup();
+ }
+
+ // Restore decoders
+#ifdef ENABLE_DECODE
+ int stacks = settings.value("decoder_stacks").toInt();
+
+ for (int i = 0; i < stacks; i++) {
+ settings.beginGroup("decoder_stack" + QString::number(i++));
+
+ QString id = settings.value("id").toString();
+ add_decoder(srd_decoder_get_by_id(id.toStdString().c_str()));
+
+ settings.endGroup();
+ }
+#endif
+
+ // Restore views
+ int views = settings.value("views").toInt();
+
+ for (int i = 0; i < views; i++) {
+ settings.beginGroup("view" + QString::number(i));
- // TODO Restore channel settings and decoders
+ if (i > 0) {
+ views::ViewType type = (views::ViewType)settings.value("type").toInt();
+ add_view(name_, type, this);
+ views_.back()->restore_settings(settings);
+ } else
+ main_view_->restore_settings(settings);
+
+ settings.endGroup();
+ }
}
+}
- settings.endGroup();
+void Session::select_device(shared_ptr device)
+{
+ try {
+ if (device)
+ set_device(device);
+ else
+ set_default_device();
+ } catch (const QString &e) {
+ main_bar_->session_error(tr("Failed to Select Device"),
+ tr("Failed to Select Device"));
+ }
}
void Session::set_device(shared_ptr device)
@@ -246,10 +388,10 @@ void Session::set_device(shared_ptr device)
name_changed();
// Remove all stored data
- for (std::shared_ptr view : views_) {
+ for (std::shared_ptr view : views_) {
view->clear_signals();
#ifdef ENABLE_DECODE
- view->clear_decode_traces();
+ view->clear_decode_signals();
#endif
}
for (const shared_ptr d : all_signal_data_)
@@ -273,7 +415,7 @@ void Session::set_device(shared_ptr device)
device_->open();
} catch (const QString &e) {
device_.reset();
- device_selected();
+ device_changed();
throw;
}
@@ -283,7 +425,7 @@ void Session::set_device(shared_ptr device)
});
update_signals();
- device_selected();
+ device_changed();
}
void Session::set_default_device()
@@ -302,6 +444,63 @@ void Session::set_default_device()
set_device((iter == devices.end()) ? devices.front() : *iter);
}
+void Session::load_init_file(const std::string &file_name,
+ const std::string &format)
+{
+ shared_ptr input_format;
+
+ if (!format.empty()) {
+ const map > formats =
+ device_manager_.context()->input_formats();
+ const auto iter = find_if(formats.begin(), formats.end(),
+ [&](const pair > f) {
+ return f.first == format; });
+ if (iter == formats.end()) {
+ main_bar_->session_error(tr("Error"),
+ tr("Unexpected input format: %s").arg(QString::fromStdString(format)));
+ return;
+ }
+
+ input_format = (*iter).second;
+ }
+
+ load_file(QString::fromStdString(file_name), input_format);
+}
+
+void Session::load_file(QString file_name,
+ std::shared_ptr format,
+ const std::map &options)
+{
+ const QString errorMessage(
+ QString("Failed to load file %1").arg(file_name));
+
+ try {
+ if (format)
+ set_device(shared_ptr(
+ new devices::InputFile(
+ device_manager_.context(),
+ file_name.toStdString(),
+ format, options)));
+ else
+ set_device(shared_ptr(
+ new devices::SessionFile(
+ device_manager_.context(),
+ file_name.toStdString())));
+ } catch (Error e) {
+ main_bar_->session_error(tr("Failed to load ") + file_name, e.what());
+ set_default_device();
+ main_bar_->update_device_list();
+ return;
+ }
+
+ main_bar_->update_device_list();
+
+ start_capture([&, errorMessage](QString infoMessage) {
+ main_bar_->session_error(errorMessage, infoMessage); });
+
+ set_name(QFileInfo(file_name).fileName());
+}
+
Session::capture_state Session::get_capture_state() const
{
lock_guard lock(sampling_mutex_);
@@ -352,18 +551,21 @@ void Session::stop_capture()
sampling_thread_.join();
}
-void Session::register_view(std::shared_ptr view)
+void Session::register_view(std::shared_ptr view)
{
if (views_.empty()) {
main_view_ = view;
}
- views_.insert(view);
+ views_.push_back(view);
+
+ update_signals();
}
-void Session::deregister_view(std::shared_ptr view)
+void Session::deregister_view(std::shared_ptr view)
{
- views_.erase(view);
+ views_.remove_if([&](std::shared_ptr v) {
+ return v == view; });
if (views_.empty()) {
main_view_.reset();
@@ -373,9 +575,13 @@ void Session::deregister_view(std::shared_ptr view)
}
}
-bool Session::has_view(std::shared_ptr view)
+bool Session::has_view(std::shared_ptr view)
{
- return views_.find(view) != views_.end();
+ for (std::shared_ptr v : views_)
+ if (v == view)
+ return true;
+
+ return false;
}
double Session::get_samplerate() const
@@ -440,9 +646,10 @@ bool Session::add_decoder(srd_decoder *const dec)
shared_ptr(new data::SignalBase(nullptr));
signalbase->set_decoder_stack(decoder_stack);
+ signalbases_.insert(signalbase);
- for (std::shared_ptr view : views_)
- view->add_decode_trace(signalbase);
+ for (std::shared_ptr view : views_)
+ view->add_decode_signal(signalbase);
} catch (std::runtime_error e) {
return false;
}
@@ -457,8 +664,12 @@ bool Session::add_decoder(srd_decoder *const dec)
void Session::remove_decode_signal(shared_ptr signalbase)
{
- for (std::shared_ptr view : views_)
- view->remove_decode_trace(signalbase);
+ signalbases_.erase(signalbase);
+
+ for (std::shared_ptr view : views_)
+ view->remove_decode_signal(signalbase);
+
+ signals_changed();
}
#endif
@@ -481,10 +692,10 @@ void Session::update_signals()
if (!device_) {
signalbases_.clear();
logic_data_.reset();
- for (std::shared_ptr view : views_) {
+ for (std::shared_ptr view : views_) {
view->clear_signals();
#ifdef ENABLE_DECODE
- view->clear_decode_traces();
+ view->clear_decode_signals();
#endif
}
return;
@@ -496,10 +707,10 @@ void Session::update_signals()
if (!sr_dev) {
signalbases_.clear();
logic_data_.reset();
- for (std::shared_ptr view : views_) {
+ for (std::shared_ptr view : views_) {
view->clear_signals();
#ifdef ENABLE_DECODE
- view->clear_decode_traces();
+ view->clear_decode_signals();
#endif
}
return;
@@ -527,69 +738,76 @@ void Session::update_signals()
}
// Make the signals list
- for (std::shared_ptr view : views_) {
- unordered_set< shared_ptr > prev_sigs(view->signals());
- view->clear_signals();
-
- for (auto channel : sr_dev->channels()) {
- shared_ptr signalbase;
- shared_ptr signal;
-
- // Find the channel in the old signals
- const auto iter = std::find_if(
- prev_sigs.cbegin(), prev_sigs.cend(),
- [&](const shared_ptr &s) {
- return s->base()->channel() == channel;
- });
- if (iter != prev_sigs.end()) {
- // Copy the signal from the old set to the new
- signal = *iter;
- } else {
- // Find the signalbase for this channel if possible
- signalbase.reset();
- for (const shared_ptr b : signalbases_)
- if (b->channel() == channel)
- signalbase = b;
-
- switch(channel->type()->id()) {
- case SR_CHANNEL_LOGIC:
- if (!signalbase) {
- signalbase = shared_ptr(
- new data::SignalBase(channel));
- signalbases_.insert(signalbase);
-
- all_signal_data_.insert(logic_data_);
- signalbase->set_data(logic_data_);
+ for (std::shared_ptr viewbase : views_) {
+ views::TraceView::View *trace_view =
+ qobject_cast(viewbase.get());
+
+ if (trace_view) {
+ unordered_set< shared_ptr >
+ prev_sigs(trace_view->signals());
+ trace_view->clear_signals();
+
+ for (auto channel : sr_dev->channels()) {
+ shared_ptr signalbase;
+ shared_ptr signal;
+
+ // Find the channel in the old signals
+ const auto iter = std::find_if(
+ prev_sigs.cbegin(), prev_sigs.cend(),
+ [&](const shared_ptr &s) {
+ return s->base()->channel() == channel;
+ });
+ if (iter != prev_sigs.end()) {
+ // Copy the signal from the old set to the new
+ signal = *iter;
+ trace_view->add_signal(signal);
+ } else {
+ // Find the signalbase for this channel if possible
+ signalbase.reset();
+ for (const shared_ptr b : signalbases_)
+ if (b->channel() == channel)
+ signalbase = b;
+
+ switch(channel->type()->id()) {
+ case SR_CHANNEL_LOGIC:
+ if (!signalbase) {
+ signalbase = shared_ptr(
+ new data::SignalBase(channel));
+ signalbases_.insert(signalbase);
+
+ all_signal_data_.insert(logic_data_);
+ signalbase->set_data(logic_data_);
+ }
+
+ signal = shared_ptr(
+ new views::TraceView::LogicSignal(*this,
+ device_, signalbase));
+ trace_view->add_signal(signal);
+ break;
+
+ case SR_CHANNEL_ANALOG:
+ {
+ if (!signalbase) {
+ signalbase = shared_ptr(
+ new data::SignalBase(channel));
+ signalbases_.insert(signalbase);
+
+ shared_ptr data(new data::Analog());
+ all_signal_data_.insert(data);
+ signalbase->set_data(data);
+ }
+
+ signal = shared_ptr(
+ new views::TraceView::AnalogSignal(
+ *this, signalbase));
+ trace_view->add_signal(signal);
+ break;
}
- signal = shared_ptr(
- new view::LogicSignal(*this,
- device_, signalbase));
- view->add_signal(signal);
- break;
-
- case SR_CHANNEL_ANALOG:
- {
- if (!signalbase) {
- signalbase = shared_ptr(
- new data::SignalBase(channel));
- signalbases_.insert(signalbase);
-
- shared_ptr data(new data::Analog());
- all_signal_data_.insert(data);
- signalbase->set_data(data);
+ default:
+ assert(0);
+ break;
}
-
- signal = shared_ptr(
- new view::AnalogSignal(
- *this, signalbase));
- view->add_signal(signal);
- break;
- }
-
- default:
- assert(0);
- break;
}
}
}
@@ -639,6 +857,13 @@ void Session::sample_thread_proc(function error_handler)
assert(0);
}
+ // We now have unsaved data unless we just "captured" from a file
+ shared_ptr file_device =
+ dynamic_pointer_cast(device_);
+
+ if (!file_device)
+ data_saved_ = false;
+
if (out_of_memory_)
error_handler(tr("Out of memory, acquisition stopped."));
}
@@ -702,8 +927,6 @@ void Session::feed_in_logic(shared_ptr logic)
{
lock_guard lock(data_mutex_);
- const size_t sample_count = logic->data_length() / logic->unit_size();
-
if (!logic_data_) {
// The only reason logic_data_ would not have been created is
// if it was not possible to determine the signals when the
@@ -717,8 +940,7 @@ void Session::feed_in_logic(shared_ptr logic)
// Create a new data segment
cur_logic_segment_ = shared_ptr(
- new data::LogicSegment(
- logic, cur_samplerate_, sample_count));
+ new data::LogicSegment(logic, cur_samplerate_));
logic_data_->push_segment(cur_logic_segment_);
// @todo Putting this here means that only listeners querying
@@ -763,8 +985,7 @@ void Session::feed_in_analog(shared_ptr analog)
// Create a segment, keep it in the maps of channels
segment = shared_ptr(
- new data::AnalogSegment(
- cur_samplerate_, sample_count));
+ new data::AnalogSegment(cur_samplerate_));
cur_analog_segments_[channel] = segment;
// Find the analog data associated with the channel
@@ -852,4 +1073,9 @@ void Session::data_feed_in(shared_ptr device,
}
}
+void Session::on_data_saved()
+{
+ data_saved_ = true;
+}
+
} // namespace pv