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,
+ QString setup_file_name,
shared_ptr<sigrok::InputFormat> format,
const map<string, Glib::VariantBase> &options)
{
return;
}
+ // Default the setup filename with a .pvs extension if none is provided
+ if (setup_file_name.isEmpty() || setup_file_name.isNull()) {
+ setup_file_name = file_name;
+ setup_file_name.truncate(setup_file_name.lastIndexOf('.'));
+ setup_file_name.append(".pvs");
+ }
// Auto-load the setup if one exists
- QString 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);