X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=pv%2Fsession.cpp;h=fcd0e135b5a190972613e85ac79ada3f067b7023;hb=09f55d9665efb3b17ba7de4bae47be6989e884fe;hp=f6fb7085582a7ce19a1941c71e5effa3a040c91c;hpb=33e1afbe17cfa91c24adb775aba923f07fbeed01;p=pulseview.git
diff --git a/pv/session.cpp b/pv/session.cpp
index f6fb708..fcd0e13 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
@@ -46,6 +45,7 @@
#include "data/decode/decoder.hpp"
#include "devices/hardwaredevice.hpp"
+#include "devices/inputfile.hpp"
#include "devices/sessionfile.hpp"
#include "toolbars/mainbar.hpp"
@@ -72,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;
@@ -86,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;
@@ -102,7 +105,8 @@ Session::Session(DeviceManager &device_manager, QString name) :
default_name_(name),
name_(name),
capture_state_(Stopped),
- cur_samplerate_(0)
+ cur_samplerate_(0),
+ data_saved_(true)
{
}
@@ -149,12 +153,12 @@ void Session::set_name(QString name)
name_changed();
}
-const std::list< std::shared_ptr > Session::views() const
+const std::list< std::shared_ptr > Session::views() const
{
return views_;
}
-std::shared_ptr Session::main_view() const
+std::shared_ptr Session::main_view() const
{
return main_view_;
}
@@ -169,6 +173,11 @@ 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;
@@ -243,7 +252,7 @@ void Session::save_settings(QSettings &settings) const
main_view_->save_settings(settings);
settings.endGroup();
- for (shared_ptr view : views_) {
+ for (shared_ptr view : views_) {
if (view != main_view_) {
settings.beginGroup("view" + QString::number(views++));
view->save_settings(settings);
@@ -338,7 +347,7 @@ void Session::restore_settings(QSettings &settings)
settings.beginGroup("view" + QString::number(i));
if (i > 0) {
- view::ViewType type = (view::ViewType)settings.value("type").toInt();
+ views::ViewType type = (views::ViewType)settings.value("type").toInt();
add_view(name_, type, this);
views_.back()->restore_settings(settings);
} else
@@ -349,6 +358,19 @@ void Session::restore_settings(QSettings &settings)
}
}
+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)
{
assert(device);
@@ -366,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_)
@@ -422,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_);
@@ -472,7 +551,7 @@ 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;
@@ -483,9 +562,9 @@ void Session::register_view(std::shared_ptr view)
update_signals();
}
-void Session::deregister_view(std::shared_ptr view)
+void Session::deregister_view(std::shared_ptr view)
{
- views_.remove_if([&](std::shared_ptr v) {
+ views_.remove_if([&](std::shared_ptr v) {
return v == view; });
if (views_.empty()) {
@@ -496,9 +575,9 @@ void Session::deregister_view(std::shared_ptr view)
}
}
-bool Session::has_view(std::shared_ptr view)
+bool Session::has_view(std::shared_ptr view)
{
- for (std::shared_ptr v : views_)
+ for (std::shared_ptr v : views_)
if (v == view)
return true;
@@ -569,8 +648,8 @@ bool Session::add_decoder(srd_decoder *const dec)
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;
}
@@ -585,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
@@ -609,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;
@@ -624,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;
@@ -655,70 +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;
- 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_);
+ 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;
}
}
}
@@ -768,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."));
}
@@ -981,4 +1077,9 @@ void Session::data_feed_in(shared_ptr device,
}
}
+void Session::on_data_saved()
+{
+ data_saved_ = true;
+}
+
} // namespace pv