mirror of
https://github.com/30hours/blah2.git
synced 2024-11-18 12:33:58 +00:00
Add units in km to display
This commit is contained in:
parent
7389b76263
commit
eab1b07b86
5 changed files with 22 additions and 6 deletions
|
@ -10,16 +10,16 @@ capture:
|
||||||
process:
|
process:
|
||||||
data:
|
data:
|
||||||
cpi: 1
|
cpi: 1
|
||||||
buffer: 1.5
|
buffer: 3
|
||||||
overlap: 0
|
overlap: 0
|
||||||
ambiguity:
|
ambiguity:
|
||||||
delayMin: -10
|
delayMin: -10
|
||||||
delayMax: 300
|
delayMax: 300
|
||||||
dopplerMin: -300
|
dopplerMin: -250
|
||||||
dopplerMax: 300
|
dopplerMax: 250
|
||||||
clutter:
|
clutter:
|
||||||
delayMin: -10
|
delayMin: -10
|
||||||
delayMax: 400
|
delayMax: 300
|
||||||
detect:
|
detect:
|
||||||
pfa: 0.000001
|
pfa: 0.000001
|
||||||
nGuard: 10
|
nGuard: 10
|
||||||
|
|
12
html/plot.js
12
html/plot.js
|
@ -95,10 +95,22 @@ var intervalId = window.setInterval(function () {
|
||||||
annotations: [],
|
annotations: [],
|
||||||
displayModeBar: false,
|
displayModeBar: false,
|
||||||
xaxis: {
|
xaxis: {
|
||||||
|
title: {
|
||||||
|
text: 'Bistatic Range (km)',
|
||||||
|
font: {
|
||||||
|
size: 24
|
||||||
|
}
|
||||||
|
},
|
||||||
ticks: '',
|
ticks: '',
|
||||||
side: 'bottom'
|
side: 'bottom'
|
||||||
},
|
},
|
||||||
yaxis: {
|
yaxis: {
|
||||||
|
title: {
|
||||||
|
text: 'Bistatic Doppler (Hz)',
|
||||||
|
font: {
|
||||||
|
size: 24
|
||||||
|
}
|
||||||
|
},
|
||||||
ticks: '',
|
ticks: '',
|
||||||
ticksuffix: ' ',
|
ticksuffix: ' ',
|
||||||
autosize: false,
|
autosize: false,
|
||||||
|
|
|
@ -121,7 +121,7 @@ std::string Map<T>::to_json()
|
||||||
rapidjson::Value arrayDelay(rapidjson::kArrayType);
|
rapidjson::Value arrayDelay(rapidjson::kArrayType);
|
||||||
for (int i = 0; i < delay.size(); i++)
|
for (int i = 0; i < delay.size(); i++)
|
||||||
{
|
{
|
||||||
arrayDelay.PushBack(delay[i], allocator);
|
arrayDelay.PushBack(delay_km[i], allocator);
|
||||||
}
|
}
|
||||||
|
|
||||||
// store Doppler array
|
// store Doppler array
|
||||||
|
|
|
@ -32,6 +32,9 @@ public:
|
||||||
|
|
||||||
/// @brief Delay units of map data (bins).
|
/// @brief Delay units of map data (bins).
|
||||||
std::deque<int> delay;
|
std::deque<int> delay;
|
||||||
|
|
||||||
|
/// @brief Delay units of map data (km).
|
||||||
|
std::deque<double> delay_km;
|
||||||
|
|
||||||
/// @brief Doppler units of map data (Hz).
|
/// @brief Doppler units of map data (Hz).
|
||||||
std::deque<double> doppler;
|
std::deque<double> doppler;
|
||||||
|
@ -101,4 +104,4 @@ public:
|
||||||
bool save(std::string json, std::string path);
|
bool save(std::string json, std::string path);
|
||||||
};
|
};
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
|
@ -79,6 +79,7 @@ Ambiguity::Ambiguity(int32_t _delayMin, int32_t _delayMax, int32_t _dopplerMin,
|
||||||
for (int i = 0; i < nDelayBins; i++)
|
for (int i = 0; i < nDelayBins; i++)
|
||||||
{
|
{
|
||||||
map->delay.push_back(delay[i]);
|
map->delay.push_back(delay[i]);
|
||||||
|
map->delay_km.push_back(((double)delay[i] * (299792458/(double)fs)) / 1000);
|
||||||
}
|
}
|
||||||
for (int i = 0; i < nDopplerBins; i++)
|
for (int i = 0; i < nDopplerBins; i++)
|
||||||
{
|
{
|
||||||
|
|
Loading…
Reference in a new issue