mirror
/
sdrangel
kopia lustrzana https://github.com/f4exb/sdrangel
1
0
Forkuj 0
Kod Zgłoszenia Projekty Wydania Wiki Aktywność

Scope GUI: refactor amp scale

pull/942/head
f4exb 2021-06-27 01:52:42 +02:00
rodzic 0cf6497ba0
commit 70167c0ed8
23 zmienionych plików z 1210 dodań i 415 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

4
plugins/channelmimo/interferometer/interferometerwebapiadapter.cpp
Wyświetl plik

@ -70,7 +70,6 @@ void InterferometerWebAPIAdapter::webapiFormatChannelSettings(
{
swgScope->getTracesData()->append(new SWGSDRangel::SWGTraceData);
swgScope->getTracesData()->back()->setAmp(traceIt->m_amp);
swgScope->getTracesData()->back()->setAmpIndex(traceIt->m_ampIndex);
swgScope->getTracesData()->back()->setHasTextOverlay(traceIt->m_hasTextOverlay ? 1 : 0);
swgScope->getTracesData()->back()->setStreamIndex(traceIt->m_streamIndex);
swgScope->getTracesData()->back()->setOfs(traceIt->m_ofs);
@ -206,9 +205,6 @@ void InterferometerWebAPIAdapter::webapiUpdateChannelSettings(
if (channelSettingsKeys.contains(QString("scopeConfig.tracesData[%1].amp").arg(i))) {
scopeSettings.m_tracesData.back().m_amp = traceData->getAmp();
}
if (channelSettingsKeys.contains(QString("scopeConfig.tracesData[%1].ampIndex").arg(i))) {
scopeSettings.m_tracesData.back().m_ampIndex = traceData->getAmpIndex();
}
if (channelSettingsKeys.contains(QString("scopeConfig.tracesData[%1].hasTextOverlay").arg(i))) {
scopeSettings.m_tracesData.back().m_hasTextOverlay = traceData->getHasTextOverlay() != 0;
}

4
plugins/channelrx/chanalyzer/chanalyzerwebapiadapter.cpp
Wyświetl plik

@ -87,7 +87,6 @@ void ChannelAnalyzerWebAPIAdapter::webapiFormatChannelSettings(
swgScope->getTracesData()->append(new SWGSDRangel::SWGTraceData);
swgScope->getTracesData()->back()->setStreamIndex(traceIt->m_streamIndex);
swgScope->getTracesData()->back()->setAmp(traceIt->m_amp);
swgScope->getTracesData()->back()->setAmpIndex(traceIt->m_ampIndex);
swgScope->getTracesData()->back()->setHasTextOverlay(traceIt->m_hasTextOverlay ? 1 : 0);
swgScope->getTracesData()->back()->setStreamIndex(traceIt->m_streamIndex);
swgScope->getTracesData()->back()->setOfs(traceIt->m_ofs);
@ -272,9 +271,6 @@ void ChannelAnalyzerWebAPIAdapter::webapiUpdateChannelSettings(
if (channelSettingsKeys.contains(QString("scopeConfig.tracesData[%1].amp").arg(i))) {
scopeSettings.m_tracesData.back().m_amp = traceData->getAmp();
}
if (channelSettingsKeys.contains(QString("scopeConfig.tracesData[%1].ampIndex").arg(i))) {
scopeSettings.m_tracesData.back().m_ampIndex = traceData->getAmpIndex();
}
if (channelSettingsKeys.contains(QString("scopeConfig.tracesData[%1].hasTextOverlay").arg(i))) {
scopeSettings.m_tracesData.back().m_hasTextOverlay = traceData->getHasTextOverlay() != 0;
}

2
plugins/channelrx/demodais/aisdemodgui.cpp
Wyświetl plik

@ -425,12 +425,10 @@ AISDemodGUI::AISDemodGUI(PluginAPI* pluginAPI, DeviceUISet *deviceUISet, Baseban
GLScopeSettings::TraceData traceDataI, traceDataQ;
traceDataI.m_projectionType = Projector::ProjectionReal;
traceDataI.m_amp = 1.0; // for -1 to +1
traceDataI.m_ampIndex = 0;
traceDataI.m_ofs = 0.0; // vertical offset
traceDataI.m_ofsCoarse = 0;
traceDataQ.m_projectionType = Projector::ProjectionImag;
traceDataQ.m_amp = 1.0;
traceDataQ.m_ampIndex = 0;
traceDataQ.m_ofs = 0.0;
traceDataQ.m_ofsCoarse = 0;
ui->scopeGUI->changeTrace(0, traceDataI);

1
plugins/channelrx/demodatv/atvdemodgui.cpp
Wyświetl plik

@ -254,7 +254,6 @@ ATVDemodGUI::ATVDemodGUI(PluginAPI* objPluginAPI, DeviceUISet *deviceUISet, Base
ui->scopeGUI->setPreTrigger(1);
GLScopeSettings::TraceData traceData;
traceData.m_amp = 2.0; // amplification factor
traceData.m_ampIndex = 1; // this is second step
traceData.m_ofs = 0.5; // direct offset
traceData.m_ofsCoarse = 50; // this is 50 coarse steps
ui->scopeGUI->changeTrace(0, traceData);

2
plugins/channeltx/mod802.15.4/ieee_802_15_4_modgui.cpp
Wyświetl plik

@ -370,12 +370,10 @@ IEEE_802_15_4_ModGUI::IEEE_802_15_4_ModGUI(PluginAPI* pluginAPI, DeviceUISet *de
GLScopeSettings::TraceData traceDataI, traceDataQ;
traceDataI.m_projectionType = Projector::ProjectionReal;
traceDataI.m_amp = 1.0; // for -1 to +1
traceDataI.m_ampIndex = 0;
traceDataI.m_ofs = 0.0; // vertical offset
traceDataI.m_ofsCoarse = 0;
traceDataQ.m_projectionType = Projector::ProjectionImag;
traceDataQ.m_amp = 1.0;
traceDataQ.m_ampIndex = 0;
traceDataQ.m_ofs = 0.0;
traceDataQ.m_ofsCoarse = 0;
ui->scopeGUI->changeTrace(0, traceDataI);

2
plugins/channeltx/modais/aismodgui.cpp
Wyświetl plik

@ -500,12 +500,10 @@ AISModGUI::AISModGUI(PluginAPI* pluginAPI, DeviceUISet *deviceUISet, BasebandSam
GLScopeSettings::TraceData traceDataI, traceDataQ;
traceDataI.m_projectionType = Projector::ProjectionReal;
traceDataI.m_amp = 1.0; // for -1 to +1
traceDataI.m_ampIndex = 0;
traceDataI.m_ofs = 0.0; // vertical offset
traceDataI.m_ofsCoarse = 0;
traceDataQ.m_projectionType = Projector::ProjectionImag;
traceDataQ.m_amp = 1.0;
traceDataQ.m_ampIndex = 0;
traceDataQ.m_ofs = 0.0;
traceDataQ.m_ofsCoarse = 0;
ui->scopeGUI->changeTrace(0, traceDataI);

6
sdrbase/dsp/glscopesettings.cpp
Wyświetl plik

@ -92,7 +92,7 @@ QByteArray GLScopeSettings::serialize() const
}
s.writeS32(20 + 16*i, (int) traceDataIt->m_projectionType);
s.writeU32(21 + 16*i, traceDataIt->m_ampIndex);
s.writeFloat(21 + 16*i, traceDataIt->m_amp);
s.writeS32(22 + 16*i, traceDataIt->m_ofsCoarse);
s.writeS32(23 + 16*i, traceDataIt->m_ofsFine);
s.writeS32(24 + 16*i, traceDataIt->m_traceDelayCoarse);
@ -168,9 +168,7 @@ bool GLScopeSettings::deserialize(const QByteArray& data)
d.readS32(20 + 16*iTrace, &intValue, 0);
m_tracesData.back().m_projectionType = (Projector::ProjectionType) intValue;
d.readU32(21 + 16*iTrace, &uintValue, 0);
m_tracesData.back().m_ampIndex = uintValue;
m_tracesData.back().m_amp = 0.2 / AMPS[m_tracesData.back().m_ampIndex < 27 ? m_tracesData.back().m_ampIndex : 26];
d.readFloat(21 + 16*iTrace, &m_tracesData.back().m_amp, 1.0f);
d.readS32(22 + 16*iTrace, &intValue, 0);
m_tracesData.back().m_ofsCoarse = intValue;
d.readS32(23 + 16*iTrace, &intValue, 0);

2
sdrbase/dsp/glscopesettings.h
Wyświetl plik

@ -45,7 +45,6 @@ public:
uint32_t m_streamIndex; //!< I/Q stream index
Projector::ProjectionType m_projectionType; //!< Complex to real projection type
float m_amp; //!< Amplification factor
uint32_t m_ampIndex; //!< Index in list of amplification factors
float m_ofs; //!< Offset factor
int m_ofsCoarse; //!< Coarse offset slider value
int m_ofsFine; //!< Fine offset slider value
@ -81,7 +80,6 @@ public:
m_streamIndex = 0;
m_projectionType = Projector::ProjectionReal;
m_amp = 1.0f;
m_ampIndex = 0;
m_ofs = 0.0f;
m_ofsCoarse = 0;
m_ofsFine = 0;

84
sdrbase/resources/webapi/doc/html2/index.html
Wyświetl plik

@ -3072,6 +3072,9 @@ margin-bottom: 20px;
"SSBDemodReport" : {
"$ref" : "#/definitions/SSBDemodReport"
},
"RadioClockReport" : {
"$ref" : "#/definitions/RadioClockReport"
},
"RemoteSourceReport" : {
"$ref" : "#/definitions/RemoteSourceReport"
},
@ -3218,6 +3221,9 @@ margin-bottom: 20px;
"PacketModSettings" : {
"$ref" : "#/definitions/PacketModSettings"
},
"RadioClockSettings" : {
"$ref" : "#/definitions/RadioClockSettings"
},
"RemoteSinkSettings" : {
"$ref" : "#/definitions/RemoteSinkSettings"
},
@ -8783,6 +8789,78 @@ margin-bottom: 20px;
"format" : "float"
}
}
};
defs.RadioClockReport = {
"properties" : {
"channelPowerDB" : {
"type" : "number",
"format" : "float",
"description" : "power received in channel (dB)"
},
"channelSampleRate" : {
"type" : "integer"
},
"date" : {
"type" : "string"
},
"time" : {
"type" : "string"
}
},
"description" : "RadioClock"
};
defs.RadioClockSettings = {
"properties" : {
"inputFrequencyOffset" : {
"type" : "integer",
"format" : "int64",
"description" : "channel center frequency shift from baseband center in Hz"
},
"rfBandwidth" : {
"type" : "number",
"format" : "float",
"description" : "channel RF bandwidth in Hz"
},
"threshold" : {
"type" : "number",
"format" : "float"
},
"modulation" : {
"type" : "integer",
"description" : "0 - MSF, 1 - DCF77, 2 - TDF"
},
"timezone" : {
"type" : "integer",
"description" : "0 - Broadcast, 1 - Local, 2 - UTC"
},
"rgbColor" : {
"type" : "integer"
},
"title" : {
"type" : "string"
},
"streamIndex" : {
"type" : "integer",
"description" : "MIMO channel. Not relevant when connected to SI (single Rx)."
},
"useReverseAPI" : {
"type" : "integer",
"description" : "Synchronize with reverse API (1 for yes, 0 for no)"
},
"reverseAPIAddress" : {
"type" : "string"
},
"reverseAPIPort" : {
"type" : "integer"
},
"reverseAPIDeviceIndex" : {
"type" : "integer"
},
"reverseAPIChannelIndex" : {
"type" : "integer"
}
},
"description" : "RadioClock"
};
defs.Range = {
"properties" : {
@ -10808,10 +10886,6 @@ margin-bottom: 20px;
"format" : "float",
"description" : "Amplification factor"
},
"ampIndex" : {
"type" : "integer",
"description" : "Index in list of amplification factors"
},
"ofs" : {
"type" : "number",
"format" : "float",
@ -46776,7 +46850,7 @@ except ApiException as e:
</div>
<div id="generator">
<div class="content">
Generated 2021-06-14T15:03:45.792+02:00
Generated 2021-06-26T10:56:36.867+02:00
</div>
</div>
</div>

2
sdrbase/resources/webapi/doc/swagger/include/ChannelReport.yaml
Wyświetl plik

@ -53,6 +53,8 @@ ChannelReport:
$ref: "/doc/swagger/include/NoiseFigure.yaml#/NoiseFigureReport"
SSBDemodReport:
$ref: "/doc/swagger/include/SSBDemod.yaml#/SSBDemodReport"
RadioClockReport:
$ref: "/doc/swagger/include/RadioClock.yaml#/RadioClockReport"
RemoteSourceReport:
$ref: "/doc/swagger/include/RemoteSource.yaml#/RemoteSourceReport"
PacketModReport:

2
sdrbase/resources/webapi/doc/swagger/include/ChannelSettings.yaml
Wyświetl plik

@ -79,6 +79,8 @@ ChannelSettings:
$ref: "/doc/swagger/include/PacketDemod.yaml#/PacketDemodSettings"
PacketModSettings:
$ref: "/doc/swagger/include/PacketMod.yaml#/PacketModSettings"
RadioClockSettings:
$ref: "/doc/swagger/include/RadioClock.yaml#/RadioClockSettings"
RemoteSinkSettings:
$ref: "/doc/swagger/include/RemoteSink.yaml#/RemoteSinkSettings"
RemoteSourceSettings:

3
sdrbase/resources/webapi/doc/swagger/include/GLScope.yaml
Wyświetl plik

@ -14,9 +14,6 @@ TraceData:
description: Amplification factor
type: number
format: float
ampIndex:
description: Index in list of amplification factors
type: integer
ofs:
description: Offset factor
type: number

6
sdrbase/util/db.cpp
Wyświetl plik

@ -35,3 +35,9 @@ double CalcDb::powerFromdB(double powerdB)
{
return pow(10.0, powerdB / 10.0);
}
double CalcDb::frexp10(double arg, int *exp)
{
*exp = (arg == 0) ? 0 : 1 + (int)std::floor(std::log10(std::fabs(arg) ) );
return arg * std::pow(10 , -(*exp));
}

1
sdrbase/util/db.h
Wyświetl plik

@ -26,6 +26,7 @@ class SDRBASE_API CalcDb
public:
static double dbPower(double magsq, double floor = 1e-12);
static double powerFromdB(double powerdB);
static double frexp10(double arg, int *exp);
};
#endif /* INCLUDE_UTIL_DB_H_ */

36
sdrgui/gui/glscope.cpp
Wyświetl plik

@ -1876,33 +1876,49 @@ void GLScope::setYScale(ScaleEngine &scale, uint32_t highlightedTraceIndex)
break;
case Projector::ProjectionMagLin:
case Projector::ProjectionMagSq:
if (amp_range < 1e-6) {
if (amp_range < 1e-9) {
scale.setRange(Unit::None, amp_ofs * 1e12, amp_range * 1e12 + amp_ofs * 1e12);
} else if (amp_range < 1e-6) {
scale.setRange(Unit::None, amp_ofs * 1e9, amp_range * 1e9 + amp_ofs * 1e9);
} else if (amp_range < 1e-3) {
scale.setRange(Unit::None, amp_ofs * 1e6, amp_range * 1e6 + amp_ofs * 1e6);
} else if (amp_range < 1.0) {
scale.setRange(Unit::None, amp_ofs * 1e3, amp_range * 1e3 + amp_ofs * 1e3);
} else if (amp_range < 1e3) {
scale.setRange(Unit::None, amp_ofs * 1e0, amp_range * 1e0 + amp_ofs * 1e0);
} else if (amp_range < 1e6) {
scale.setRange(Unit::None, amp_ofs * 1e3, amp_range * 1e3 + amp_ofs * 1e3);
} else if (amp_range < 1e9) {
scale.setRange(Unit::None, amp_ofs * 1e6, amp_range * 1e6 + amp_ofs * 1e6);
} else {
scale.setRange(Unit::None, amp_ofs, amp_range + amp_ofs);
scale.setRange(Unit::None, amp_ofs * 1e9, amp_range * 1e9 + amp_ofs * 1e9);
}
break;
case Projector::ProjectionPhase: // Phase or frequency
case Projector::ProjectionPhase: // Phase or frequency (should be +/- 1)
case Projector::ProjectionDOAP:
case Projector::ProjectionDOAN:
case Projector::ProjectionDPhase:
scale.setRange(Unit::None, -1.0 / traceData.m_amp + amp_ofs, 1.0 / traceData.m_amp + amp_ofs);
break;
// scale.setRange(Unit::None, -1.0 / traceData.m_amp + amp_ofs, 1.0 / traceData.m_amp + amp_ofs);
// break;
case Projector::ProjectionReal: // Linear generic
case Projector::ProjectionImag:
default:
if (amp_range < 1e-6) {
scale.setRange(Unit::None, -amp_range * 5e8 + amp_ofs * 1e9, amp_range * 5e8 + amp_ofs * 1e9);
if (amp_range < 1e-9) {
scale.setRange(Unit::None, -amp_range * 5e11 + amp_ofs * 1e12, amp_range * 5e11 + amp_ofs * 1e12);
} else if (amp_range < 1e-6) {
scale.setRange(Unit::None, -amp_range * 5e8 + amp_ofs * 1e9, amp_range * 5e8 + amp_ofs * 1e9);
} else if (amp_range < 1e-3) {
scale.setRange(Unit::None, -amp_range * 5e5 + amp_ofs * 1e6, amp_range * 5e5 + amp_ofs * 1e6);
scale.setRange(Unit::None, -amp_range * 5e5 + amp_ofs * 1e6, amp_range * 5e5 + amp_ofs * 1e6);
} else if (amp_range < 1.0) {
scale.setRange(Unit::None, -amp_range * 5e2 + amp_ofs * 1e3, amp_range * 5e2 + amp_ofs * 1e3);
scale.setRange(Unit::None, -amp_range * 5e2 + amp_ofs * 1e3, amp_range * 5e2 + amp_ofs * 1e3);
} else if (amp_range < 1e3) {
scale.setRange(Unit::None, -amp_range * 5e-1 + amp_ofs * 1e0, amp_range * 5e-1 + amp_ofs * 1e0);
} else if (amp_range < 1e6) {
scale.setRange(Unit::None, -amp_range * 5e-4 + amp_ofs * 1e3, amp_range * 5e-4 + amp_ofs * 1e3);
} else if (amp_range < 1e9) {
scale.setRange(Unit::None, -amp_range * 5e-7 + amp_ofs * 1e6, amp_range * 5e-7 + amp_ofs * 1e6);
} else {
scale.setRange(Unit::None, -amp_range * 0.5 + amp_ofs, amp_range * 0.5 + amp_ofs);
scale.setRange(Unit::None, -amp_range * 5e-10 + amp_ofs * 1e9, amp_range * 5e-10 + amp_ofs * 1e9);
}
break;
}

113
sdrgui/gui/glscopegui.cpp
Wyświetl plik

@ -24,18 +24,7 @@
#include "glscope.h"
#include "ui_glscopegui.h"
#include "util/simpleserializer.h"
const double GLScopeGUI::amps[27] = {
2e-1, 1e-1, 5e-2,
2e-2, 1e-2, 5e-3,
2e-3, 1e-3, 5e-4,
2e-4, 1e-4, 5e-5,
2e-5, 1e-5, 5e-6,
2e-6, 1e-6, 5e-7,
2e-7, 1e-7, 5e-8,
2e-8, 1e-8, 5e-9,
2e-9, 1e-9, 5e-10,
};
#include "util/db.h"
GLScopeGUI::GLScopeGUI(QWidget* parent) :
QWidget(parent),
@ -198,7 +187,7 @@ QByteArray GLScopeGUI::serialize() const
for (; traceDataIt != tracesData.end(); ++traceDataIt, i++)
{
s.writeS32(20 + 16*i, (int) traceDataIt->m_projectionType);
s.writeU32(21 + 16*i, traceDataIt->m_ampIndex);
s.writeFloat(21 + 16*i, traceDataIt->m_amp);
s.writeS32(22 + 16*i, traceDataIt->m_ofsCoarse);
s.writeS32(23 + 16*i, traceDataIt->m_ofsFine);
s.writeS32(24 + 16*i, traceDataIt->m_traceDelayCoarse);
@ -287,25 +276,29 @@ bool GLScopeGUI::deserialize(const QByteArray& data)
float r, g, b;
d.readS32(20 + 16*iTrace, &intValue, 0);
ui->traceMode->setCurrentIndex(intValue);
d.readU32(21 + 16*iTrace, &uintValue, 0);
ui->amp->setValue(uintValue);
traceData.m_projectionType = (Projector::ProjectionType) intValue;
d.readFloat(21 + 16*iTrace, &traceData.m_amp, 1.0f);
d.readS32(22 + 16*iTrace, &intValue, 0);
ui->ofsCoarse->setValue(intValue);
traceData.m_ofsCoarse = intValue;
d.readS32(23 + 16*iTrace, &intValue, 0);
ui->ofsFine->setValue(intValue);
traceData.m_ofsFine = intValue;
d.readS32(24 + 16*iTrace, &intValue, 0);
ui->traceDelayCoarse->setValue(intValue);
traceData.m_traceDelayCoarse = intValue;
d.readS32(25 + 16*iTrace, &intValue, 0);
ui->traceDelayFine->setValue(intValue);
traceData.m_traceDelayFine = intValue;
d.readFloat(26 + 16*iTrace, &r, 1.0f);
d.readFloat(27 + 16*iTrace, &g, 1.0f);
d.readFloat(28 + 16*iTrace, &b, 1.0f);
m_focusedTraceColor.setRgbF(r, g, b);
traceData.m_traceColorR = r;
traceData.m_traceColorG = g;
traceData.m_traceColorB = b;
traceData.m_traceColor.setRedF(r);
traceData.m_traceColor.setGreenF(g);
traceData.m_traceColor.setBlueF(b);
d.readU32(29 + 16*iTrace, &uintValue, 0);
ui->traceStream->setCurrentIndex(uintValue);
traceData.m_streamIndex = uintValue;
fillTraceData(traceData);
setTraceUI(traceData);
if (iTrace < tracesData.size()) // change existing traces
{
@ -872,6 +865,20 @@ void GLScopeGUI::on_amp_valueChanged(int value)
changeCurrentTrace();
}
void GLScopeGUI::on_ampCoarse_valueChanged(int value)
{
(void) value;
setAmpScaleDisplay();
changeCurrentTrace();
}
void GLScopeGUI::on_ampExp_valueChanged(int value)
{
(void) value;
setAmpScaleDisplay();
changeCurrentTrace();
}
void GLScopeGUI::on_ofsCoarse_valueChanged(int value)
{
(void) value;
@ -1223,31 +1230,38 @@ void GLScopeGUI::setTimeOfsDisplay()
void GLScopeGUI::setAmpScaleDisplay()
{
Projector::ProjectionType projectionType = (Projector::ProjectionType) ui->traceMode->currentIndex();
double ampValue = amps[ui->amp->value()];
double amp = (ui->amp->value() / 1000.0) + ui->ampCoarse->value();
int ampExp = ui->ampExp->value();
double ampValue = amp * pow(10.0, ampExp);
ui->ampText->setText(tr("%1").arg(amp, 0, 'f', 3));
if (projectionType == Projector::ProjectionMagDB)
{
double displayValue = ampValue*500.0f;
if (displayValue < 10.0f) {
ui->ampText->setText(tr("%1\ndB").arg(displayValue, 0, 'f', 2));
}
else {
ui->ampText->setText(tr("%1\ndB").arg(displayValue, 0, 'f', 1));
}
ui->ampExpText->setText(tr("e%1%2").arg(ampExp+2 < 0 ? "" : "+").arg(ampExp+2));
ui->ampMultiplierText->setText("-");
}
else
{
double a = ampValue*10.0f;
ui->ampExpText->setText(tr("e%1%2").arg(ampExp < 0 ? "" : "+").arg(ampExp));
double ampValue2 = 2.0 * ampValue;
if(a < 0.000001)
ui->ampText->setText(tr("%1\nn").arg(a * 1000000000.0));
else if(a < 0.001)
ui->ampText->setText(tr("%1\nµ").arg(a * 1000000.0));
else if(a < 1.0)
ui->ampText->setText(tr("%1\nm").arg(a * 1000.0));
else
ui->ampText->setText(tr("%1").arg(a * 1.0));
if (ampValue2 < 1e-9) {
ui->ampMultiplierText->setText("p");
} else if (ampValue2 < 1e-6) {
ui->ampMultiplierText->setText("n");
} else if (ampValue2 < 1e-3) {
ui->ampMultiplierText->setText("µ");
} else if (ampValue2 < 1e0) {
ui->ampMultiplierText->setText("m");
} else if (ampValue2 <= 1e3) {
ui->ampMultiplierText->setText("-");
} else if (ampValue2 <= 1e6) {
ui->ampMultiplierText->setText("k");
} else if (ampValue2 <= 1e9) {
ui->ampMultiplierText->setText("M");
} else {
ui->ampMultiplierText->setText("G");
}
}
}
@ -1477,10 +1491,11 @@ void GLScopeGUI::fillTraceData(GLScopeSettings::TraceData& traceData)
{
traceData.m_streamIndex = ui->traceStream->currentIndex();
traceData.m_projectionType = (Projector::ProjectionType) ui->traceMode->currentIndex();
traceData.m_hasTextOverlay = (traceData.m_projectionType == Projector::ProjectionMagDB) || (traceData.m_projectionType == Projector::ProjectionMagSq);
traceData.m_hasTextOverlay = (traceData.m_projectionType == Projector::ProjectionMagDB)
|| (traceData.m_projectionType == Projector::ProjectionMagSq);
traceData.m_textOverlay.clear();
traceData.m_amp = 0.2 / amps[ui->amp->value()];
traceData.m_ampIndex = ui->amp->value();
double ampValue = ((ui->amp->value() / 1000.0) + ui->ampCoarse->value()) * pow(10.0, ui->ampExp->value());
traceData.m_amp = 1.0 / ampValue;
traceData.m_ofsCoarse = ui->ofsCoarse->value();
traceData.m_ofsFine = ui->ofsFine->value();
@ -1522,7 +1537,15 @@ void GLScopeGUI::setTraceUI(const GLScopeSettings::TraceData& traceData)
ui->traceStream->setCurrentIndex(traceData.m_streamIndex);
ui->traceMode->setCurrentIndex((int) traceData.m_projectionType);
ui->amp->setValue(traceData.m_ampIndex);
double ampValue = 1.0 / traceData.m_amp;
int ampExp;
double ampMant = CalcDb::frexp10(ampValue, &ampExp) * 10.0;
int ampCoarse = (int) ampMant;
int ampFine = round((ampMant - ampCoarse) * 1000.0);
ampExp -= 1;
ui->amp->setValue(ampFine);
ui->ampCoarse->setValue(ampCoarse);
ui->ampExp->setValue(ampExp);
setAmpScaleDisplay();
ui->ofsCoarse->setValue(traceData.m_ofsCoarse);

4
sdrgui/gui/glscopegui.h
Wyświetl plik

@ -155,8 +155,6 @@ private:
int m_ctlTraceIndex; //!< controlled trace index
int m_ctlTriggerIndex; //!< controlled trigger index
static const double amps[27];
void applySettings(const GLScopeSettings& settings, bool force = false);
void displaySettings();
// First row
@ -222,6 +220,8 @@ private slots:
void on_traceStream_currentIndexChanged(int index);
void on_traceMode_currentIndexChanged(int index);
void on_amp_valueChanged(int value);
void on_ampCoarse_valueChanged(int value);
void on_ampExp_valueChanged(int value);
void on_ofsCoarse_valueChanged(int value);
void on_ofsFine_valueChanged(int value);
void on_traceDelayCoarse_valueChanged(int value);

195
sdrgui/gui/glscopegui.ui
Wyświetl plik

@ -7,7 +7,7 @@
<x>0</x>
<y>0</y>
<width>758</width>
<height>138</height>
<height>180</height>
</rect>
</property>
<property name="minimumSize">
@ -642,6 +642,7 @@ kS/s</string>
</property>
<property name="font">
<font>
<family>Liberation Sans</family>
<pointsize>10</pointsize>
</font>
</property>
@ -700,6 +701,7 @@ kS/s</string>
</property>
<property name="font">
<font>
<family>Liberation Sans</family>
<pointsize>10</pointsize>
</font>
</property>
@ -833,39 +835,166 @@ kS/s</string>
</widget>
</item>
<item>
<widget class="QLabel" name="ampText">
<property name="minimumSize">
<size>
<width>36</width>
<height>0</height>
</size>
<layout class="QVBoxLayout" name="ampLayout">
<property name="leftMargin">
<number>6</number>
</property>
<property name="toolTip">
<string>Vertical range value</string>
<property name="rightMargin">
<number>6</number>
</property>
<property name="text">
<string>000</string>
</property>
<property name="alignment">
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
</property>
</widget>
</item>
<item>
<widget class="QSlider" name="amp">
<property name="toolTip">
<string>Vertical range</string>
</property>
<property name="maximum">
<number>26</number>
</property>
<property name="pageStep">
<number>1</number>
</property>
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
</widget>
<item>
<layout class="QHBoxLayout" name="ampMantissaLayout">
<property name="leftMargin">
<number>6</number>
</property>
<property name="topMargin">
<number>6</number>
</property>
<property name="rightMargin">
<number>6</number>
</property>
<property name="bottomMargin">
<number>6</number>
</property>
<item>
<widget class="QLabel" name="ampText">
<property name="minimumSize">
<size>
<width>36</width>
<height>0</height>
</size>
</property>
<property name="toolTip">
<string>Vertical range value</string>
</property>
<property name="text">
<string>1.000</string>
</property>
<property name="alignment">
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
</property>
</widget>
</item>
<item>
<widget class="QSlider" name="amp">
<property name="toolTip">
<string>Vertical range (fine)</string>
</property>
<property name="minimum">
<number>0</number>
</property>
<property name="maximum">
<number>999</number>
</property>
<property name="pageStep">
<number>1</number>
</property>
<property name="value">
<number>0</number>
</property>
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
</widget>
</item>
<item>
<widget class="QDial" name="ampCoarse">
<property name="maximumSize">
<size>
<width>24</width>
<height>24</height>
</size>
</property>
<property name="toolTip">
<string>Vertical range (coarse)</string>
</property>
<property name="minimum">
<number>1</number>
</property>
<property name="maximum">
<number>9</number>
</property>
<property name="pageStep">
<number>1</number>
</property>
</widget>
</item>
</layout>
</item>
<item>
<layout class="QHBoxLayout" name="ampExponentLayout">
<property name="leftMargin">
<number>6</number>
</property>
<property name="topMargin">
<number>6</number>
</property>
<property name="rightMargin">
<number>6</number>
</property>
<property name="bottomMargin">
<number>6</number>
</property>
<item>
<widget class="QLabel" name="ampExpText">
<property name="minimumSize">
<size>
<width>36</width>
<height>0</height>
</size>
</property>
<property name="toolTip">
<string>Vertical range value</string>
</property>
<property name="text">
<string>e+0</string>
</property>
<property name="alignment">
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
</property>
</widget>
</item>
<item>
<widget class="QSlider" name="ampExp">
<property name="toolTip">
<string>Vertical range exponent</string>
</property>
<property name="minimum">
<number>-10</number>
</property>
<property name="maximum">
<number>10</number>
</property>
<property name="pageStep">
<number>1</number>
</property>
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
</widget>
</item>
<item>
<widget class="QLabel" name="ampMultiplierText">
<property name="minimumSize">
<size>
<width>20</width>
<height>0</height>
</size>
</property>
<property name="toolTip">
<string>Vertical range value</string>
</property>
<property name="text">
<string>-</string>
</property>
<property name="alignment">
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
</property>
</widget>
</item>
</layout>
</item>
</layout>
</item>
<item>
<widget class="Line" name="line_8">
@ -1315,6 +1444,7 @@ kS/s</string>
</property>
<property name="font">
<font>
<family>Liberation Sans</family>
<pointsize>10</pointsize>
</font>
</property>
@ -1373,6 +1503,7 @@ kS/s</string>
</property>
<property name="font">
<font>
<family>Liberation Sans</family>
<pointsize>10</pointsize>
</font>
</property>

3
swagger/sdrangel/api/swagger/include/GLScope.yaml
Wyświetl plik

@ -14,9 +14,6 @@ TraceData:
description: Amplification factor
type: number
format: float
ampIndex:
description: Index in list of amplification factors
type: integer
ofs:
description: Offset factor
type: number

84
swagger/sdrangel/code/html2/index.html
Wyświetl plik

@ -3072,6 +3072,9 @@ margin-bottom: 20px;
"SSBDemodReport" : {
"$ref" : "#/definitions/SSBDemodReport"
},
"RadioClockReport" : {
"$ref" : "#/definitions/RadioClockReport"
},
"RemoteSourceReport" : {
"$ref" : "#/definitions/RemoteSourceReport"
},
@ -3218,6 +3221,9 @@ margin-bottom: 20px;
"PacketModSettings" : {
"$ref" : "#/definitions/PacketModSettings"
},
"RadioClockSettings" : {
"$ref" : "#/definitions/RadioClockSettings"
},
"RemoteSinkSettings" : {
"$ref" : "#/definitions/RemoteSinkSettings"
},
@ -8783,6 +8789,78 @@ margin-bottom: 20px;
"format" : "float"
}
}
};
defs.RadioClockReport = {
"properties" : {
"channelPowerDB" : {
"type" : "number",
"format" : "float",
"description" : "power received in channel (dB)"
},
"channelSampleRate" : {
"type" : "integer"
},
"date" : {
"type" : "string"
},
"time" : {
"type" : "string"
}
},
"description" : "RadioClock"
};
defs.RadioClockSettings = {
"properties" : {
"inputFrequencyOffset" : {
"type" : "integer",
"format" : "int64",
"description" : "channel center frequency shift from baseband center in Hz"
},
"rfBandwidth" : {
"type" : "number",
"format" : "float",
"description" : "channel RF bandwidth in Hz"
},
"threshold" : {
"type" : "number",
"format" : "float"
},
"modulation" : {
"type" : "integer",
"description" : "0 - MSF, 1 - DCF77, 2 - TDF"
},
"timezone" : {
"type" : "integer",
"description" : "0 - Broadcast, 1 - Local, 2 - UTC"
},
"rgbColor" : {
"type" : "integer"
},
"title" : {
"type" : "string"
},
"streamIndex" : {
"type" : "integer",
"description" : "MIMO channel. Not relevant when connected to SI (single Rx)."
},
"useReverseAPI" : {
"type" : "integer",
"description" : "Synchronize with reverse API (1 for yes, 0 for no)"
},
"reverseAPIAddress" : {
"type" : "string"
},
"reverseAPIPort" : {
"type" : "integer"
},
"reverseAPIDeviceIndex" : {
"type" : "integer"
},
"reverseAPIChannelIndex" : {
"type" : "integer"
}
},
"description" : "RadioClock"
};
defs.Range = {
"properties" : {
@ -10808,10 +10886,6 @@ margin-bottom: 20px;
"format" : "float",
"description" : "Amplification factor"
},
"ampIndex" : {
"type" : "integer",
"description" : "Index in list of amplification factors"
},
"ofs" : {
"type" : "number",
"format" : "float",
@ -46776,7 +46850,7 @@ except ApiException as e:
</div>
<div id="generator">
<div class="content">
Generated 2021-06-14T15:03:45.792+02:00
Generated 2021-06-26T10:56:36.867+02:00
</div>
</div>
</div>

1040
swagger/sdrangel/code/qt5/client/SWGModelFactory.h
Wyświetl plik

Plik diff jest za duży Load Diff

23
swagger/sdrangel/code/qt5/client/SWGTraceData.cpp
Wyświetl plik

@ -36,8 +36,6 @@ SWGTraceData::SWGTraceData() {
m_input_index_isSet = false;
amp = 0.0f;
m_amp_isSet = false;
amp_index = 0;
m_amp_index_isSet = false;
ofs = 0.0f;
m_ofs_isSet = false;
ofs_coarse = 0;
@ -82,8 +80,6 @@ SWGTraceData::init() {
m_input_index_isSet = false;
amp = 0.0f;
m_amp_isSet = false;
amp_index = 0;
m_amp_index_isSet = false;
ofs = 0.0f;
m_ofs_isSet = false;
ofs_coarse = 0;
@ -132,7 +128,6 @@ SWGTraceData::cleanup() {
if(text_overlay != nullptr) {
delete text_overlay;
}
@ -158,8 +153,6 @@ SWGTraceData::fromJsonObject(QJsonObject &pJson) {
::SWGSDRangel::setValue(&amp, pJson["amp"], "float", "");
::SWGSDRangel::setValue(&amp_index, pJson["ampIndex"], "qint32", "");
::SWGSDRangel::setValue(&ofs, pJson["ofs"], "float", "");
::SWGSDRangel::setValue(&ofs_coarse, pJson["ofsCoarse"], "qint32", "");
@ -216,9 +209,6 @@ SWGTraceData::asJsonObject() {
if(m_amp_isSet){
obj->insert("amp", QJsonValue(amp));
}
if(m_amp_index_isSet){
obj->insert("ampIndex", QJsonValue(amp_index));
}
if(m_ofs_isSet){
obj->insert("ofs", QJsonValue(ofs));
}
@ -305,16 +295,6 @@ SWGTraceData::setAmp(float amp) {
this->m_amp_isSet = true;
}
qint32
SWGTraceData::getAmpIndex() {
return amp_index;
}
void
SWGTraceData::setAmpIndex(qint32 amp_index) {
this->amp_index = amp_index;
this->m_amp_index_isSet = true;
}
float
SWGTraceData::getOfs() {
return ofs;
@ -472,9 +452,6 @@ SWGTraceData::isSet(){
if(m_amp_isSet){
isObjectUpdated = true; break;
}
if(m_amp_index_isSet){
isObjectUpdated = true; break;
}
if(m_ofs_isSet){
isObjectUpdated = true; break;
}

6
swagger/sdrangel/code/qt5/client/SWGTraceData.h
Wyświetl plik

@ -54,9 +54,6 @@ public:
float getAmp();
void setAmp(float amp);
qint32 getAmpIndex();
void setAmpIndex(qint32 amp_index);
float getOfs();
void setOfs(float ofs);
@ -115,9 +112,6 @@ private:
float amp;
bool m_amp_isSet;
qint32 amp_index;
bool m_amp_index_isSet;
float ofs;
bool m_ofs_isSet;