blakeridgway/supercell-wx
1
0
Fork 0
mirror of https://github.com/ciphervance/supercell-wx.git synced 2025-10-31 01:40:04 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Add VIL-specific data level conversions

Browse source
This commit is contained in:
Dan Paulat 2024-02-25 01:55:54 -06:00
parent 0a1754db84
commit 24062d0417
2 changed files with 32 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

1
wxdata/include/scwx/wsr88d/rpg/product_description_block.hpp
View file

@ -66,6 +66,7 @@ public:
std::optional<DataLevelCode> data_level_code(std::uint8_t level) const; std::optional<DataLevelCode> data_level_code(std::uint8_t level) const;
std::optional<float> data_value(std::uint8_t level) const; std::optional<float> data_value(std::uint8_t level) const;
std::uint16_t log_start() const;
float log_offset() const; float log_offset() const;
float log_scale() const; float log_scale() const;

31
wxdata/source/scwx/wsr88d/rpg/product_description_block.cpp
View file

@ -4,6 +4,7 @@
#include <array> #include <array>
#include <istream> #include <istream>
#include <numbers>
#include <set> #include <set>
#include <string> #include <string>
@ -591,6 +592,20 @@ uint16_t ProductDescriptionBlock::number_of_levels() const
return numberOfLevels; return numberOfLevels;
} }
std::uint16_t ProductDescriptionBlock::log_start() const
{
std::uint16_t logStart = std::numeric_limits<std::uint16_t>::max();
switch (p->productCode_)
{
case 134:
logStart = p->halfword(33);
break;
}
return logStart;
}
float ProductDescriptionBlock::log_offset() const float ProductDescriptionBlock::log_offset() const
{ {
float logOffset = 0.0f; float logOffset = 0.0f;
@ -598,7 +613,7 @@ float ProductDescriptionBlock::log_offset() const
switch (p->productCode_) switch (p->productCode_)
{ {
case 134: case 134:
logOffset = util ::DecodeFloat16(p->halfword(35)); logOffset = util::DecodeFloat16(p->halfword(35));
break; break;
} }
@ -612,7 +627,7 @@ float ProductDescriptionBlock::log_scale() const
switch (p->productCode_) switch (p->productCode_)
{ {
case 134: case 134:
logScale = util ::DecodeFloat16(p->halfword(34)); logScale = util::DecodeFloat16(p->halfword(34));
break; break;
} }
@ -1007,6 +1022,18 @@ ProductDescriptionBlock::data_value(std::uint8_t level) const
f = (level - dataOffset) / dataScale; f = (level - dataOffset) / dataScale;
break; break;
case 134:
if (level < log_start())
{
f = (level - dataOffset) / dataScale;
}
else
{
f = static_cast<float>(std::pow<double>(
std::numbers::e, (level - log_offset()) / log_scale()));
}
break;
default: default:
f = level * dataScale + dataOffset; f = level * dataScale + dataOffset;
break; break;