VE7UWU/sdrangel
1
0
Fork 0
mirror of https://github.com/f4exb/sdrangel.git synced 2026-02-27 03:40:28 -05:00
Code Issues Projects Releases Wiki Activity

SigMF file input: fixed negative sample rate handling. UI enhancemens

Browse Source
This commit is contained in:
f4exb 2020-06-15 02:51:01 +02:00
parent dfa7486b96
commit 4c9d447bf3
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
plugins/samplesource/sigmffileinput/sigmffileinput.cpp
View File

@ -262,9 +262,10 @@ void SigMFFileInput::extractCaptures(
m_captureStarts.push_back(m_captures.back().m_sampleStart);
m_captures.back().m_cumulativeTime = cumulativeTime;
int sdrangelSampleRate = it->get<sdrangel::DescrT>().sample_rate;
double globalSampleRate = metaRecord->global.access<core::GlobalT>().sample_rate;
if (sdrangelSampleRate == 0) {
m_captures.back().m_sampleRate = metaRecord->global.access<core::GlobalT>().sample_rate;
m_captures.back().m_sampleRate = globalSampleRate < 0 ? -globalSampleRate : globalSampleRate;
} else {
m_captures.back().m_sampleRate = sdrangelSampleRate;
}

8
plugins/samplesource/sigmffileinput/sigmffileinputgui.cpp
View File

@ -212,9 +212,13 @@ bool SigMFFileInputGUI::handleMessage(const Message& message)
if (m_metaInfo.m_sigMFVersion.size() > 0) {
m_recordInfo += QString("Version....: %1\n").arg(m_metaInfo.m_sigMFVersion);
}
if (m_metaInfo.m_hw.size() > 0) {
m_recordInfo += QString("Hardware...: %1\n").arg(m_metaInfo.m_hw);
}
m_recordInfo += QString("Data type..: %1\n").arg(m_metaInfo.m_dataTypeStr);
m_recordInfo += QString("Nb samples.: %1\n").arg(m_metaInfo.m_totalSamples);
m_recordInfo += QString("Swap I/Q...: %1\n").arg(m_metaInfo.m_dataType.m_swapIQ ? "yes" : "no");
m_recordInfo += QString("Nb samples.: %1 (%2S)\n").arg(m_metaInfo.m_totalSamples).arg(displayScaled(m_metaInfo.m_totalSamples, 3));
m_recordInfo += QString("Nb captures: %1\n").arg(m_metaInfo.m_nbCaptures);
m_recordInfo += QString("Nb annot...: %1\n").arg(m_metaInfo.m_nbAnnotations);
@ -226,7 +230,7 @@ bool SigMFFileInputGUI::handleMessage(const Message& message)
m_recordInfo += QString("Hardware...: %1\n").arg(m_metaInfo.m_hw);
m_recordInfo += QString("Data type..: %1\n").arg(m_metaInfo.m_dataTypeStr);
m_recordInfo += QString("Core SRate.: %1 S/s\n").arg(m_metaInfo.m_coreSampleRate);
m_recordInfo += QString("Nb samples.: %1\n").arg(m_metaInfo.m_totalSamples);
m_recordInfo += QString("Nb samples.: %1 (%2S)\n").arg(m_metaInfo.m_totalSamples).arg(displayScaled(m_metaInfo.m_totalSamples, 3));
m_recordInfo += QString("Nb captures: %1\n").arg(m_metaInfo.m_nbCaptures);
m_recordInfo += QString("SDRangel application info:\n");
m_recordInfo += QString("Version....: v%1\n").arg(m_metaInfo.m_sdrAngelVersion);