for (const shared_ptr<views::ViewBase>& view : views_) {
if (view != main_view_) {
settings.beginGroup("view" + QString::number(views++));
+ settings.setValue("type", view->get_type());
view->save_settings(settings);
settings.endGroup();
}
if (i > 0) {
views::ViewType type = (views::ViewType)settings.value("type").toInt();
- add_view(name_, type, this);
+ add_view(type, this);
views_.back()->restore_settings(settings);
} else
main_view_->restore_settings(settings);
return result;
}
-void Session::load_init_file(const string &file_name, const string &format)
+void Session::load_init_file(const string &file_name,
+ const string &format, const string &setup_file_name)
{
shared_ptr<InputFormat> input_format;
map<string, Glib::VariantBase> input_opts;
input_format->options());
}
- load_file(QString::fromStdString(file_name), input_format, input_opts);
+ load_file(QString::fromStdString(file_name), QString::fromStdString(setup_file_name),
+ input_format, input_opts);
}
-void Session::load_file(QString file_name,
- shared_ptr<sigrok::InputFormat> format,
- const map<string, Glib::VariantBase> &options)
+void Session::load_file(QString file_name, QString setup_file_name,
+ shared_ptr<sigrok::InputFormat> format, const map<string, Glib::VariantBase> &options)
{
const QString errorMessage(
QString("Failed to load file %1").arg(file_name));
return;
}
+ // Use the input file with .pvs extension if no setup file was given
+ if (setup_file_name.isEmpty()) {
+ setup_file_name = file_name;
+ setup_file_name.truncate(setup_file_name.lastIndexOf('.'));
+ setup_file_name.append(".pvs");
+ }
+
+ if (QFileInfo::exists(setup_file_name) && QFileInfo(setup_file_name).isReadable()) {
+ QSettings settings_storage(setup_file_name, QSettings::IniFormat);
+ restore_setup(settings_storage);
+ }
+
main_bar_->update_device_list();
start_capture([&, errorMessage](QString infoMessage) {
void Session::register_view(shared_ptr<views::ViewBase> view)
{
- if (views_.empty()) {
+ if (views_.empty())
main_view_ = view;
- }
views_.push_back(view);
update_signals();
// Add all other signals
- unordered_set< shared_ptr<data::SignalBase> > view_signalbases =
- view->signalbases();
-
- views::trace::View *trace_view =
- qobject_cast<views::trace::View*>(view.get());
-
- if (trace_view) {
- for (const shared_ptr<data::SignalBase>& signalbase : signalbases_) {
- const int sb_exists = count_if(
- view_signalbases.cbegin(), view_signalbases.cend(),
- [&](const shared_ptr<data::SignalBase> &sb) {
- return sb == signalbase;
- });
- // Add the signal to the view as it doesn't have it yet
- if (!sb_exists)
- switch (signalbase->type()) {
- case data::SignalBase::AnalogChannel:
- case data::SignalBase::LogicChannel:
- case data::SignalBase::DecodeChannel:
+ unordered_set< shared_ptr<data::SignalBase> > view_signalbases = view->signalbases();
+
+ for (const shared_ptr<data::SignalBase>& signalbase : signalbases_) {
+ const int sb_exists = count_if(
+ view_signalbases.cbegin(), view_signalbases.cend(),
+ [&](const shared_ptr<data::SignalBase> &sb) {
+ return sb == signalbase;
+ });
+
+ // Add the signal to the view if it doesn't have it yet
+ if (!sb_exists)
+ switch (signalbase->type()) {
+ case data::SignalBase::AnalogChannel:
+ case data::SignalBase::LogicChannel:
+ case data::SignalBase::MathChannel:
+ view->add_signalbase(signalbase);
+ break;
+ case data::SignalBase::DecodeChannel:
#ifdef ENABLE_DECODE
- trace_view->add_decode_signal(
- dynamic_pointer_cast<data::DecodeSignal>(signalbase));
+ view->add_decode_signal(dynamic_pointer_cast<data::DecodeSignal>(signalbase));
#endif
- break;
- case data::SignalBase::MathChannel:
- // TBD
- break;
- }
- }
+ break;
+ }
}
signals_changed();
{
bool changed;
+ if (state == Running)
+ acq_time_.restart();
+ if (state == Stopped)
+ qDebug("Acquisition took %.2f s", acq_time_.elapsed() / 1000.);
+
{
lock_guard<mutex> lock(sampling_mutex_);
changed = capture_state_ != state;
data_saved_ = true;
}
+#ifdef ENABLE_DECODE
+void Session::on_new_decoders_selected(vector<const srd_decoder*> decoders)
+{
+ assert(decoders.size() > 0);
+
+ shared_ptr<data::DecodeSignal> signal = add_decode_signal();
+
+ if (signal)
+ for (const srd_decoder* d : decoders)
+ signal->stack_decoder(d);
+}
+#endif
+
} // namespace pv