1
0
mirror of https://github.com/f4exb/sdrangel.git synced 2024-12-23 10:05:46 -05:00

MainCore::getFeatureIndexFromId - Support Feature Ids without feature set index.

This commit is contained in:
srcejon 2024-03-18 14:10:02 +00:00
parent cb89392c86
commit 29ae05a494

View File

@ -612,12 +612,16 @@ bool MainCore::getDeviceAndChannelIndexFromId(const QString& channelId, unsigned
bool MainCore::getFeatureIndexFromId(const QString& featureId, unsigned int &featureSetIndex, unsigned int &featureIndex)
{
const QRegularExpression re("[F]([0-9]+):([0-9]+)");
const QRegularExpression re("F([0-9]+)?:([0-9]+)");
QRegularExpressionMatch match = re.match(featureId);
if (match.hasMatch())
{
featureSetIndex = match.capturedTexts()[1].toInt();
if (match.capturedTexts()[1].isEmpty()) {
featureSetIndex = 0;
} else {
featureSetIndex = match.capturedTexts()[1].toInt();
}
featureIndex = match.capturedTexts()[2].toInt();
return true;
}