Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

sigmf: Add support for datasets #236

Merged
merged 1 commit into from
Jul 21, 2024
Merged

sigmf: Add support for datasets #236

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 17 additions & 2 deletions src/inputsource.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -241,7 +241,7 @@ void InputSource::cleanup()
}
}

void InputSource::readMetaData(const QString &filename)
QJsonObject InputSource::readMetaData(const QString &filename)
{
QFile datafile(filename);
if (!datafile.open(QFile::ReadOnly | QIODevice::Text)) {
Expand Down Expand Up @@ -349,6 +349,8 @@ void InputSource::readMetaData(const QString &filename)
}
}
}

return root;
}

void InputSource::openFile(const char *filename)
Expand Down Expand Up @@ -406,7 +408,20 @@ void InputSource::openFile(const char *filename)
if (suffix == "sigmf-meta" || suffix == "sigmf-data" || suffix == "sigmf-") {
dataFilename = fileInfo.path() + "/" + fileInfo.completeBaseName() + ".sigmf-data";
metaFilename = fileInfo.path() + "/" + fileInfo.completeBaseName() + ".sigmf-meta";
readMetaData(metaFilename);
auto metaData = readMetaData(metaFilename);
QFile datafile(dataFilename);
if (!datafile.open(QFile::ReadOnly | QIODevice::Text)) {
auto global = metaData["global"].toObject();
if (global.contains("core:dataset")) {
auto datasetfilename = global["core:dataset"].toString();
if(QFileInfo(datasetfilename).isAbsolute()){
dataFilename = datasetfilename;
}
else{
dataFilename = fileInfo.path() + "/" + datasetfilename;
}
}
}
}
else if (suffix == "sigmf") {
throw std::runtime_error("SigMF archives are not supported. Consider extracting a recording.");
Expand Down
2 changes: 1 addition & 1 deletion src/inputsource.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ class InputSource : public SampleSource<std::complex<float>>
std::string _fmt;
bool _realSignal = false;

void readMetaData(const QString &filename);
QJsonObject readMetaData(const QString &filename);

public:
InputSource();
Expand Down
Loading