#include <sys/stat.h>
#include <QDebug>
+#include <QDir>
#include <QFileInfo>
#include "devicemanager.hpp"
using Gst::Pipeline;
#endif
+using pv::data::SignalGroup;
using pv::util::Timestamp;
using pv::views::trace::Signal;
using pv::views::trace::AnalogSignal;
shared_ptr<sigrok::Context> Session::sr_context;
Session::Session(DeviceManager &device_manager, QString name) :
+ shutting_down_(false),
device_manager_(device_manager),
default_name_(name),
name_(name),
Session::~Session()
{
+ shutting_down_ = true;
+
// Stop and join to the thread
stop_capture();
+
+ for (SignalGroup* group : signal_groups_) {
+ group->clear();
+ delete group;
+ }
}
DeviceManager& Session::device_manager()
name_changed();
}
+QString Session::save_path() const
+{
+ return save_path_;
+}
+
+void Session::set_save_path(QString path)
+{
+ save_path_ = path;
+}
+
const vector< shared_ptr<views::ViewBase> > Session::views() const
{
return views_;
settings.endGroup();
}
- shared_ptr<devices::SessionFile> sessionfile_device =
- dynamic_pointer_cast<devices::SessionFile>(device_);
-
- if (sessionfile_device) {
+ // Having saved the data to srzip overrides the current device. This is
+ // a crappy hack around the fact that saving e.g. an imported file to
+ // srzip would require changing the underlying libsigrok device
+ if (!save_path_.isEmpty()) {
+ QFileInfo fi = QFileInfo(QDir(save_path_), name_);
settings.setValue("device_type", "sessionfile");
settings.beginGroup("device");
- settings.setValue("filename", QString::fromStdString(
- sessionfile_device->full_name()));
+ settings.setValue("filename", fi.absoluteFilePath());
settings.endGroup();
- }
+ } else {
+ shared_ptr<devices::SessionFile> 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();
+ }
- shared_ptr<devices::InputFile> inputfile_device =
- dynamic_pointer_cast<devices::InputFile>(device_);
+ shared_ptr<devices::InputFile> inputfile_device =
+ dynamic_pointer_cast<devices::InputFile>(device_);
- if (inputfile_device) {
- settings.setValue("device_type", "inputfile");
- settings.beginGroup("device");
- inputfile_device->save_meta_to_settings(settings);
- settings.endGroup();
+ if (inputfile_device) {
+ settings.setValue("device_type", "inputfile");
+ settings.beginGroup("device");
+ inputfile_device->save_meta_to_settings(settings);
+ settings.endGroup();
+ }
}
save_setup(settings);
settings.endGroup();
}
+
+ QString filename;
if ((device_type == "sessionfile") || (device_type == "inputfile")) {
if (device_type == "sessionfile") {
settings.beginGroup("device");
- const QString filename = settings.value("filename").toString();
+ filename = settings.value("filename").toString();
settings.endGroup();
- if (QFileInfo(filename).isReadable()) {
+ if (QFileInfo(filename).isReadable())
device = make_shared<devices::SessionFile>(device_manager_.context(),
filename.toStdString());
- }
}
if (device_type == "inputfile") {
set_name(QString::fromStdString(
dynamic_pointer_cast<devices::File>(device)->display_name(device_manager_)));
+
+ if (!filename.isEmpty()) {
+ // Only set the save path if we load an srzip file
+ if (device_type == "sessionfile")
+ set_save_path(QFileInfo(filename).absolutePath());
+
+ set_name(QFileInfo(filename).fileName());
+ }
}
}
#endif
view->reset_view_state();
}
+
+ for (SignalGroup* group : signal_groups_) {
+ group->clear();
+ delete group;
+ }
+ signal_groups_.clear();
+
for (const shared_ptr<data::SignalData>& d : all_signal_data_)
d->clear();
+
all_signal_data_.clear();
signalbases_.clear();
cur_logic_segment_.reset();
* data type.
*/
auto found = fmt_opts.find(key);
- if (found == fmt_opts.end())
+ if (found == fmt_opts.end()) {
+ qCritical() << "Supplied input option" << QString::fromStdString(key) <<
+ "is not a valid option for this input module, it will be ignored!";
continue;
+ }
+
shared_ptr<Option> opt = found->second;
result[key] = opt->parse_string(val);
}
return f.first == user_name; });
if (iter == formats.end()) {
MainWindow::show_session_error(tr("Error"),
- tr("Unexpected input format: %s").arg(QString::fromStdString(format)));
+ tr("Unexpected input format: %1").arg(QString::fromStdString(format)));
return;
}
input_format = (*iter).second;
start_capture([&, errorMessage](QString infoMessage) {
MainWindow::show_session_error(errorMessage, infoMessage); });
+ // Only set save path if we loaded an srzip file
+ if (dynamic_pointer_cast<devices::SessionFile>(device_))
+ set_save_path(QFileInfo(file_name).absolutePath());
+
set_name(QFileInfo(file_name).fileName());
}
d->clear();
trigger_list_.clear();
+ segment_sample_count_.clear();
// Revert name back to default name (e.g. "Session 1") for real devices
// as the (possibly saved) data is gone. File devices keep their name.
return samplerate;
}
-uint32_t Session::get_segment_count() const
+uint32_t Session::get_highest_segment_id() const
{
- uint32_t value = 0;
-
- // Find the highest number of segments
- for (const shared_ptr<data::SignalData>& data : all_signal_data_)
- if (data->get_segment_count() > value)
- value = data->get_segment_count();
+ return highest_segment_id_;
+}
- return value;
+uint64_t Session::get_segment_sample_count(uint32_t segment_id) const
+{
+ if (segment_id < segment_sample_count_.size())
+ return segment_sample_count_[segment_id];
+ else
+ return 0;
}
vector<util::Timestamp> Session::get_triggers(uint32_t segment_id) const
return signalbases_;
}
+uint32_t Session::get_signal_count(data::SignalBase::ChannelType type) const
+{
+ return count_if(signalbases_.begin(), signalbases_.end(),
+ [&] (shared_ptr<SignalBase> sb) { return sb->type() == type; });
+}
+
+uint32_t Session::get_next_signal_index(data::SignalBase::ChannelType type)
+{
+ next_index_list_[type]++;
+ return next_index_list_[type];
+}
+
void Session::add_generated_signal(shared_ptr<data::SignalBase> signal)
{
signalbases_.push_back(signal);
void Session::remove_generated_signal(shared_ptr<data::SignalBase> signal)
{
+ if (shutting_down_)
+ return;
+
signalbases_.erase(std::remove_if(signalbases_.begin(), signalbases_.end(),
[&](shared_ptr<data::SignalBase> s) { return s == signal; }),
signalbases_.end());
update_signals();
}
-bool Session::all_segments_complete(uint32_t segment_id) const
-{
- bool all_complete = true;
-
- for (const shared_ptr<data::SignalBase>& base : signalbases_)
- if (!base->segment_is_complete(segment_id))
- all_complete = false;
-
- return all_complete;
-}
-
#ifdef ENABLE_DECODE
shared_ptr<data::DecodeSignal> Session::add_decode_signal()
{
void Session::remove_decode_signal(shared_ptr<data::DecodeSignal> signal)
{
+ if (shutting_down_)
+ return;
+
signalbases_.erase(std::remove_if(signalbases_.begin(), signalbases_.end(),
[&](shared_ptr<data::SignalBase> s) { return s == signal; }),
signalbases_.end());
}
#endif
+bool Session::all_segments_complete(uint32_t segment_id) const
+{
+ bool all_complete = true;
+
+ for (const shared_ptr<data::SignalBase>& base : signalbases_)
+ if (!base->segment_is_complete(segment_id))
+ all_complete = false;
+
+ return all_complete;
+}
+
MetadataObjManager* Session::metadata_obj_manager()
{
return &metadata_obj_manager_;
signalbase->set_data(logic_data_);
connect(this, SIGNAL(capture_state_changed(int)),
- signalbase.get(), SLOT(on_capture_state_changed(int)));
+ signalbase.get(), SLOT(on_capture_state_changed(int)));
break;
case SR_CHANNEL_ANALOG:
signalbase->set_data(data);
connect(this, SIGNAL(capture_state_changed(int)),
- signalbase.get(), SLOT(on_capture_state_changed(int)));
+ signalbase.get(), SLOT(on_capture_state_changed(int)));
break;
}
}
}
+ // Create and assign default signal groups if needed
+ if (signal_groups_.empty()) {
+ for (auto& entry : sr_dev->channel_groups()) {
+ const shared_ptr<sigrok::ChannelGroup>& group = entry.second;
+
+ if (group->channels().size() <= 1)
+ continue;
+
+ SignalGroup* sg = new SignalGroup(QString::fromStdString(entry.first));
+ for (const shared_ptr<sigrok::Channel>& channel : group->channels()) {
+ for (shared_ptr<data::SignalBase> s : signalbases_) {
+ if (s->channel() == channel) {
+ sg->append_signal(s);
+ break;
+ }
+ }
+ }
+ signal_groups_.emplace_back(sg);
+ }
+ }
+
+ // Update all views
for (shared_ptr<views::ViewBase>& viewbase : views_) {
vector< shared_ptr<SignalBase> > view_signalbases =
viewbase->signalbases();
if (new_segment_id > highest_segment_id_) {
highest_segment_id_ = new_segment_id;
+ segment_sample_count_.emplace_back(0);
new_segment(highest_segment_id_);
}
}
cur_logic_segment_->append_payload(logic);
+ segment_sample_count_[highest_segment_id_] =
+ max(segment_sample_count_[highest_segment_id_], cur_logic_segment_->get_sample_count());
+
data_received();
}
// Append the samples in the segment
segment->append_interleaved_samples(channel_data++, analog->num_samples(),
channels.size());
+
+ segment_sample_count_[highest_segment_id_] =
+ max(segment_sample_count_[highest_segment_id_], segment->get_sample_count());
}
if (sweep_beginning) {
projects / pulseview.git / blobdiff