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

Deconflicting internal level 3 struct names

Browse source
This commit is contained in:
Dan Paulat 2022-01-08 01:35:05 -06:00
parent 0487a40f67
commit 62429bdea7
3 changed files with 52 additions and 52 deletions
Download patch file Download diff file Expand all files Collapse all files

12
wxdata/source/scwx/wsr88d/rpg/digital_precipitation_data_array_packet.cpp
View file

@ -15,18 +15,18 @@ namespace rpg
static const std::string logPrefix_ = static const std::string logPrefix_ =
"[scwx::wsr88d::rpg::digital_precipitation_data_array_packet] "; "[scwx::wsr88d::rpg::digital_precipitation_data_array_packet] ";
struct Row class DigitalPrecipitationDataArrayPacketImpl
{ {
public:
struct Row
{
uint16_t numberOfBytes_; uint16_t numberOfBytes_;
std::vector<uint8_t> run_; std::vector<uint8_t> run_;
std::vector<uint8_t> level_; std::vector<uint8_t> level_;
Row() : numberOfBytes_ {0}, run_ {}, level_ {} {} Row() : numberOfBytes_ {0}, run_ {}, level_ {} {}
}; };
class DigitalPrecipitationDataArrayPacketImpl
{
public:
explicit DigitalPrecipitationDataArrayPacketImpl() : explicit DigitalPrecipitationDataArrayPacketImpl() :
packetCode_ {0}, packetCode_ {0},
numberOfLfmBoxesInRow_ {0}, numberOfLfmBoxesInRow_ {0},
@ -122,7 +122,7 @@ bool DigitalPrecipitationDataArrayPacket::Parse(std::istream& is)
{ {
size_t rowBytesRead = 0; size_t rowBytesRead = 0;
Row& row = p->row_[r]; auto& row = p->row_[r];
is.read(reinterpret_cast<char*>(&row.numberOfBytes_), 2); is.read(reinterpret_cast<char*>(&row.numberOfBytes_), 2);
bytesRead += 2; bytesRead += 2;

26
wxdata/source/scwx/wsr88d/rpg/radial_data_packet.cpp
View file

@ -15,8 +15,11 @@ namespace rpg
static const std::string logPrefix_ = static const std::string logPrefix_ =
"[scwx::wsr88d::rpg::radial_data_packet] "; "[scwx::wsr88d::rpg::radial_data_packet] ";
struct Radial class RadialDataPacketImpl
{ {
public:
struct Radial
{
uint16_t numberOfRleHalfwords_; uint16_t numberOfRleHalfwords_;
uint16_t startAngle_; uint16_t startAngle_;
uint16_t angleDelta_; uint16_t angleDelta_;
@ -26,19 +29,16 @@ struct Radial
numberOfRleHalfwords_ {0}, startAngle_ {0}, angleDelta_ {0}, data_ {} numberOfRleHalfwords_ {0}, startAngle_ {0}, angleDelta_ {0}, data_ {}
{ {
} }
}; };
class RadialDataPacketImpl
{
public:
explicit RadialDataPacketImpl() : explicit RadialDataPacketImpl() :
packetCode_ {}, packetCode_ {0},
indexOfFirstRangeBin_ {}, indexOfFirstRangeBin_ {0},
numberOfRangeBins_ {}, numberOfRangeBins_ {0},
iCenterOfSweep_ {}, iCenterOfSweep_ {0},
jCenterOfSweep_ {}, jCenterOfSweep_ {0},
scaleFactor_ {}, scaleFactor_ {0},
dataSize_ {} {}; dataSize_ {0} {};
~RadialDataPacketImpl() = default; ~RadialDataPacketImpl() = default;
uint16_t packetCode_; uint16_t packetCode_;
@ -162,7 +162,7 @@ bool RadialDataPacket::Parse(std::istream& is)
for (uint16_t r = 0; r < p->numberOfRadials_; r++) for (uint16_t r = 0; r < p->numberOfRadials_; r++)
{ {
Radial& radial = p->radial_[r]; auto& radial = p->radial_[r];
is.read(reinterpret_cast<char*>(&radial.numberOfRleHalfwords_), 2); is.read(reinterpret_cast<char*>(&radial.numberOfRleHalfwords_), 2);
is.read(reinterpret_cast<char*>(&radial.startAngle_), 2); is.read(reinterpret_cast<char*>(&radial.startAngle_), 2);

36
wxdata/source/scwx/wsr88d/rpg/raster_data_packet.cpp
View file

@ -15,30 +15,30 @@ namespace rpg
static const std::string logPrefix_ = static const std::string logPrefix_ =
"[scwx::wsr88d::rpg::raster_data_packet] "; "[scwx::wsr88d::rpg::raster_data_packet] ";
struct Row class RasterDataPacketImpl
{ {
public:
struct Row
{
uint16_t numberOfBytes_; uint16_t numberOfBytes_;
std::vector<uint8_t> data_; std::vector<uint8_t> data_;
Row() : numberOfBytes_ {0}, data_ {} {} Row() : numberOfBytes_ {0}, data_ {} {}
}; };
class RasterDataPacketImpl
{
public:
explicit RasterDataPacketImpl() : explicit RasterDataPacketImpl() :
packetCode_ {}, packetCode_ {0},
opFlag_ {}, opFlag_ {0},
iCoordinateStart_ {}, iCoordinateStart_ {0},
jCoordinateStart_ {}, jCoordinateStart_ {0},
xScaleInt_ {}, xScaleInt_ {0},
xScaleFractional_ {}, xScaleFractional_ {0},
yScaleInt_ {}, yScaleInt_ {0},
yScaleFractional_ {}, yScaleFractional_ {0},
numberOfRows_ {}, numberOfRows_ {0},
packagingDescriptor_ {}, packagingDescriptor_ {0},
row_ {}, row_ {},
dataSize_ {} {}; dataSize_ {0} {};
~RasterDataPacketImpl() = default; ~RasterDataPacketImpl() = default;
uint16_t packetCode_; uint16_t packetCode_;
@ -52,7 +52,7 @@ public:
uint16_t numberOfRows_; uint16_t numberOfRows_;
uint16_t packagingDescriptor_; uint16_t packagingDescriptor_;
// Repeat for each radial // Repeat for each row
std::vector<Row> row_; std::vector<Row> row_;
size_t dataSize_; size_t dataSize_;
@ -181,7 +181,7 @@ bool RasterDataPacket::Parse(std::istream& is)
{ {
size_t rowBytesRead = 0; size_t rowBytesRead = 0;
Row& row = p->row_[r]; auto& row = p->row_[r];
is.read(reinterpret_cast<char*>(&row.numberOfBytes_), 2); is.read(reinterpret_cast<char*>(&row.numberOfBytes_), 2);
bytesRead += 2; bytesRead += 2;