mirror of
https://github.com/ciphervance/supercell-wx.git
synced 2025-10-30 14:50:05 +00:00
Create interface for moment data gates
This commit is contained in:
Dan Paulat
parent
a2c6ee70a4
commit
57e8e82d4d
2 changed files with 486 additions and 220 deletions
|
|
@ -9,15 +9,158 @@ namespace wsr88d
|
|||
namespace rda
|
||||
{
|
||||
|
||||
enum class DataBlockType
|
||||
{
|
||||
Volume,
|
||||
Elevation,
|
||||
Radial,
|
||||
MomentRef,
|
||||
MomentVel,
|
||||
MomentSw,
|
||||
MomentZdr,
|
||||
MomentPhi,
|
||||
MomentRho,
|
||||
MomentCfp,
|
||||
Unknown
|
||||
};
|
||||
|
||||
class DataBlockImpl;
|
||||
class ElevationDataBlockImpl;
|
||||
class MomentDataBlockImpl;
|
||||
class RadialDataBlockImpl;
|
||||
class VolumeDataBlockImpl;
|
||||
|
||||
class DigitalRadarDataImpl;
|
||||
|
||||
class DataBlock
|
||||
{
|
||||
protected:
|
||||
explicit DataBlock(const std::string& dataBlockType,
|
||||
const std::string& dataName);
|
||||
~DataBlock();
|
||||
|
||||
DataBlock(const DataBlock&) = delete;
|
||||
DataBlock& operator=(const DataBlock&) = delete;
|
||||
|
||||
DataBlock(DataBlock&&) noexcept;
|
||||
DataBlock& operator=(DataBlock&&) noexcept;
|
||||
|
||||
private:
|
||||
std::unique_ptr<DataBlockImpl> p;
|
||||
};
|
||||
|
||||
class ElevationDataBlock : public DataBlock
|
||||
{
|
||||
public:
|
||||
explicit ElevationDataBlock(const std::string& dataBlockType,
|
||||
const std::string& dataName);
|
||||
~ElevationDataBlock();
|
||||
|
||||
ElevationDataBlock(const ElevationDataBlock&) = delete;
|
||||
ElevationDataBlock& operator=(const ElevationDataBlock&) = delete;
|
||||
|
||||
ElevationDataBlock(ElevationDataBlock&&) noexcept;
|
||||
ElevationDataBlock& operator=(ElevationDataBlock&&) noexcept;
|
||||
|
||||
static std::shared_ptr<ElevationDataBlock>
|
||||
Create(const std::string& dataBlockType,
|
||||
const std::string& dataName,
|
||||
std::istream& is);
|
||||
|
||||
private:
|
||||
std::unique_ptr<ElevationDataBlockImpl> p;
|
||||
|
||||
bool Parse(std::istream& is);
|
||||
};
|
||||
|
||||
class MomentDataBlock : public DataBlock
|
||||
{
|
||||
public:
|
||||
explicit MomentDataBlock(const std::string& dataBlockType,
|
||||
const std::string& dataName);
|
||||
~MomentDataBlock();
|
||||
|
||||
MomentDataBlock(const MomentDataBlock&) = delete;
|
||||
MomentDataBlock& operator=(const MomentDataBlock&) = delete;
|
||||
|
||||
MomentDataBlock(MomentDataBlock&&) noexcept;
|
||||
MomentDataBlock& operator=(MomentDataBlock&&) noexcept;
|
||||
|
||||
uint16_t number_of_data_moment_gates() const;
|
||||
float data_moment_range() const;
|
||||
float data_moment_range_sample_interval() const;
|
||||
float snr_threshold() const;
|
||||
uint8_t data_word_size() const;
|
||||
float scale() const;
|
||||
float offset() const;
|
||||
const void* data_moments() const;
|
||||
|
||||
static std::shared_ptr<MomentDataBlock>
|
||||
Create(const std::string& dataBlockType,
|
||||
const std::string& dataName,
|
||||
std::istream& is);
|
||||
|
||||
private:
|
||||
std::unique_ptr<MomentDataBlockImpl> p;
|
||||
|
||||
bool Parse(std::istream& is);
|
||||
};
|
||||
|
||||
class RadialDataBlock : public DataBlock
|
||||
{
|
||||
public:
|
||||
explicit RadialDataBlock(const std::string& dataBlockType,
|
||||
const std::string& dataName);
|
||||
~RadialDataBlock();
|
||||
|
||||
RadialDataBlock(const RadialDataBlock&) = delete;
|
||||
RadialDataBlock& operator=(const RadialDataBlock&) = delete;
|
||||
|
||||
RadialDataBlock(RadialDataBlock&&) noexcept;
|
||||
RadialDataBlock& operator=(RadialDataBlock&&) noexcept;
|
||||
|
||||
static std::shared_ptr<RadialDataBlock>
|
||||
Create(const std::string& dataBlockType,
|
||||
const std::string& dataName,
|
||||
std::istream& is);
|
||||
|
||||
private:
|
||||
std::unique_ptr<RadialDataBlockImpl> p;
|
||||
|
||||
bool Parse(std::istream& is);
|
||||
};
|
||||
|
||||
class VolumeDataBlock : public DataBlock
|
||||
{
|
||||
public:
|
||||
explicit VolumeDataBlock(const std::string& dataBlockType,
|
||||
const std::string& dataName);
|
||||
~VolumeDataBlock();
|
||||
|
||||
VolumeDataBlock(const VolumeDataBlock&) = delete;
|
||||
VolumeDataBlock& operator=(const VolumeDataBlock&) = delete;
|
||||
|
||||
VolumeDataBlock(VolumeDataBlock&&) noexcept;
|
||||
VolumeDataBlock& operator=(VolumeDataBlock&&) noexcept;
|
||||
|
||||
static std::shared_ptr<VolumeDataBlock>
|
||||
Create(const std::string& dataBlockType,
|
||||
const std::string& dataName,
|
||||
std::istream& is);
|
||||
|
||||
private:
|
||||
std::unique_ptr<VolumeDataBlockImpl> p;
|
||||
|
||||
bool Parse(std::istream& is);
|
||||
};
|
||||
|
||||
class DigitalRadarData : public Message
|
||||
{
|
||||
public:
|
||||
explicit DigitalRadarData();
|
||||
~DigitalRadarData();
|
||||
|
||||
DigitalRadarData(const Message&) = delete;
|
||||
DigitalRadarData(const DigitalRadarData&) = delete;
|
||||
DigitalRadarData& operator=(const DigitalRadarData&) = delete;
|
||||
|
||||
DigitalRadarData(DigitalRadarData&&) noexcept;
|
||||
|
|
@ -39,6 +182,8 @@ public:
|
|||
uint8_t azimuth_indexing_mode() const;
|
||||
uint16_t data_block_count() const;
|
||||
|
||||
std::shared_ptr<MomentDataBlock> moment_data_block(DataBlockType type) const;
|
||||
|
||||
bool Parse(std::istream& is);
|
||||
|
||||
static std::shared_ptr<DigitalRadarData> Create(MessageHeader&& header,
|
||||
|
|
|
|||
|
|
@ -12,21 +12,6 @@ namespace rda
|
|||
static const std::string logPrefix_ =
|
||||
"[scwx::wsr88d::rda::digital_radar_data] ";
|
||||
|
||||
enum class DataBlockType
|
||||
{
|
||||
Volume,
|
||||
Elevation,
|
||||
Radial,
|
||||
MomentRef,
|
||||
MomentVel,
|
||||
MomentSw,
|
||||
MomentZdr,
|
||||
MomentPhi,
|
||||
MomentRho,
|
||||
MomentCfp,
|
||||
Unknown
|
||||
};
|
||||
|
||||
static const std::unordered_map<std::string, DataBlockType> strToDataBlock_ {
|
||||
{"VOL", DataBlockType::Volume},
|
||||
{"ELV", DataBlockType::Elevation},
|
||||
|
|
@ -39,9 +24,10 @@ static const std::unordered_map<std::string, DataBlockType> strToDataBlock_ {
|
|||
{"RHO", DataBlockType::MomentRho},
|
||||
{"CFP", DataBlockType::MomentCfp}};
|
||||
|
||||
struct DataBlock
|
||||
class DataBlockImpl
|
||||
{
|
||||
explicit DataBlock(const std::string& dataBlockType,
|
||||
public:
|
||||
explicit DataBlockImpl(const std::string& dataBlockType,
|
||||
const std::string& dataName) :
|
||||
dataBlockType_ {dataBlockType}, dataName_ {dataName}
|
||||
{
|
||||
|
|
@ -51,11 +37,20 @@ struct DataBlock
|
|||
std::string dataName_;
|
||||
};
|
||||
|
||||
struct MomentDataBlock : DataBlock
|
||||
{
|
||||
explicit MomentDataBlock(const std::string& dataBlockType,
|
||||
DataBlock::DataBlock(const std::string& dataBlockType,
|
||||
const std::string& dataName) :
|
||||
DataBlock(dataBlockType, dataName),
|
||||
p(std::make_unique<DataBlockImpl>(dataBlockType, dataName))
|
||||
{
|
||||
}
|
||||
DataBlock::~DataBlock() = default;
|
||||
|
||||
DataBlock::DataBlock(DataBlock&&) noexcept = default;
|
||||
DataBlock& DataBlock::operator=(DataBlock&&) noexcept = default;
|
||||
|
||||
class MomentDataBlockImpl
|
||||
{
|
||||
public:
|
||||
explicit MomentDataBlockImpl() :
|
||||
numberOfDataMomentGates_ {0},
|
||||
dataMomentRange_ {0},
|
||||
dataMomentRangeSampleInterval_ {0},
|
||||
|
|
@ -78,16 +73,90 @@ struct MomentDataBlock : DataBlock
|
|||
float scale_;
|
||||
float offset_;
|
||||
|
||||
std::vector<char> momentGates8_;
|
||||
std::vector<uint8_t> momentGates8_;
|
||||
std::vector<uint16_t> momentGates16_;
|
||||
};
|
||||
|
||||
static std::unique_ptr<MomentDataBlock>
|
||||
Create(const std::string& dataBlockType,
|
||||
MomentDataBlock::MomentDataBlock(const std::string& dataBlockType,
|
||||
const std::string& dataName) :
|
||||
DataBlock(dataBlockType, dataName),
|
||||
p(std::make_unique<MomentDataBlockImpl>())
|
||||
{
|
||||
}
|
||||
MomentDataBlock::~MomentDataBlock() = default;
|
||||
|
||||
MomentDataBlock::MomentDataBlock(MomentDataBlock&&) noexcept = default;
|
||||
MomentDataBlock&
|
||||
MomentDataBlock::operator=(MomentDataBlock&&) noexcept = default;
|
||||
|
||||
uint16_t MomentDataBlock::number_of_data_moment_gates() const
|
||||
{
|
||||
return p->numberOfDataMomentGates_;
|
||||
}
|
||||
|
||||
float MomentDataBlock::data_moment_range() const
|
||||
{
|
||||
return p->dataMomentRange_ / 0.001f;
|
||||
}
|
||||
|
||||
float MomentDataBlock::data_moment_range_sample_interval() const
|
||||
{
|
||||
return p->dataMomentRangeSampleInterval_ / 0.001f;
|
||||
}
|
||||
|
||||
float MomentDataBlock::snr_threshold() const
|
||||
{
|
||||
return p->snrThreshold_ / 0.1f;
|
||||
}
|
||||
|
||||
uint8_t MomentDataBlock::data_word_size() const
|
||||
{
|
||||
return p->dataWordSize_;
|
||||
}
|
||||
|
||||
float MomentDataBlock::scale() const
|
||||
{
|
||||
return p->scale_;
|
||||
}
|
||||
|
||||
float MomentDataBlock::offset() const
|
||||
{
|
||||
return p->offset_;
|
||||
}
|
||||
|
||||
const void* MomentDataBlock::data_moments() const
|
||||
{
|
||||
const void* dataMoments;
|
||||
|
||||
switch (p->dataWordSize_)
|
||||
{
|
||||
case 8: dataMoments = p->momentGates8_.data(); break;
|
||||
case 16: dataMoments = p->momentGates8_.data(); break;
|
||||
default: dataMoments = nullptr; break;
|
||||
}
|
||||
|
||||
return dataMoments;
|
||||
}
|
||||
|
||||
std::shared_ptr<MomentDataBlock>
|
||||
MomentDataBlock::Create(const std::string& dataBlockType,
|
||||
const std::string& dataName,
|
||||
std::istream& is)
|
||||
{
|
||||
std::unique_ptr<MomentDataBlock> p =
|
||||
std::make_unique<MomentDataBlock>(dataBlockType, dataName);
|
||||
std::shared_ptr<MomentDataBlock> p =
|
||||
std::make_shared<MomentDataBlock>(dataBlockType, dataName);
|
||||
|
||||
if (!p->Parse(is))
|
||||
{
|
||||
p.reset();
|
||||
}
|
||||
|
||||
return p;
|
||||
}
|
||||
|
||||
bool MomentDataBlock::Parse(std::istream& is)
|
||||
{
|
||||
bool dataBlockValid = true;
|
||||
|
||||
is.seekg(4, std::ios_base::cur); // 4-7
|
||||
is.read(reinterpret_cast<char*>(&p->numberOfDataMomentGates_), 2); // 8-9
|
||||
|
|
@ -103,20 +172,19 @@ struct MomentDataBlock : DataBlock
|
|||
|
||||
p->numberOfDataMomentGates_ = ntohs(p->numberOfDataMomentGates_);
|
||||
p->dataMomentRange_ = ntohs(p->dataMomentRange_);
|
||||
p->dataMomentRangeSampleInterval_ =
|
||||
ntohs(p->dataMomentRangeSampleInterval_);
|
||||
p->dataMomentRangeSampleInterval_ = ntohs(p->dataMomentRangeSampleInterval_);
|
||||
p->tover_ = ntohs(p->tover_);
|
||||
p->snrThreshold_ = ntohs(p->snrThreshold_);
|
||||
p->scale_ = Message::SwapFloat(p->scale_);
|
||||
p->offset_ = Message::SwapFloat(p->offset_);
|
||||
|
||||
if (p->numberOfDataMomentGates_ >= 0 &&
|
||||
p->numberOfDataMomentGates_ <= 1840)
|
||||
if (p->numberOfDataMomentGates_ >= 0 && p->numberOfDataMomentGates_ <= 1840)
|
||||
{
|
||||
if (p->dataWordSize_ == 8)
|
||||
{
|
||||
p->momentGates8_.resize(p->numberOfDataMomentGates_);
|
||||
is.read(p->momentGates8_.data(), p->numberOfDataMomentGates_);
|
||||
is.read(reinterpret_cast<char*>(p->momentGates8_.data()),
|
||||
p->numberOfDataMomentGates_);
|
||||
}
|
||||
else if (p->dataWordSize_ == 16)
|
||||
{
|
||||
|
|
@ -129,6 +197,7 @@ struct MomentDataBlock : DataBlock
|
|||
{
|
||||
BOOST_LOG_TRIVIAL(warning)
|
||||
<< logPrefix_ << "Invalid data word size: " << p->dataWordSize_;
|
||||
dataBlockValid = false;
|
||||
}
|
||||
}
|
||||
else
|
||||
|
|
@ -136,17 +205,16 @@ struct MomentDataBlock : DataBlock
|
|||
BOOST_LOG_TRIVIAL(warning)
|
||||
<< logPrefix_ << "Invalid number of data moment gates: "
|
||||
<< p->numberOfDataMomentGates_;
|
||||
dataBlockValid = false;
|
||||
}
|
||||
|
||||
return p;
|
||||
return dataBlockValid;
|
||||
}
|
||||
};
|
||||
|
||||
struct VolumeDataBlock : DataBlock
|
||||
class VolumeDataBlockImpl
|
||||
{
|
||||
explicit VolumeDataBlock(const std::string& dataBlockType,
|
||||
const std::string& dataName) :
|
||||
DataBlock(dataBlockType, dataName),
|
||||
public:
|
||||
explicit VolumeDataBlockImpl() :
|
||||
lrtup_ {0},
|
||||
versionNumberMajor_ {0},
|
||||
versionNumberMinor_ {0},
|
||||
|
|
@ -178,14 +246,39 @@ struct VolumeDataBlock : DataBlock
|
|||
float initialSystemDifferentialPhase_;
|
||||
uint16_t volumeCoveragePatternNumber_;
|
||||
uint16_t processingStatus_;
|
||||
};
|
||||
|
||||
static std::unique_ptr<VolumeDataBlock>
|
||||
Create(const std::string& dataBlockType,
|
||||
VolumeDataBlock::VolumeDataBlock(const std::string& dataBlockType,
|
||||
const std::string& dataName) :
|
||||
DataBlock(dataBlockType, dataName),
|
||||
p(std::make_unique<VolumeDataBlockImpl>())
|
||||
{
|
||||
}
|
||||
VolumeDataBlock::~VolumeDataBlock() = default;
|
||||
|
||||
VolumeDataBlock::VolumeDataBlock(VolumeDataBlock&&) noexcept = default;
|
||||
VolumeDataBlock&
|
||||
VolumeDataBlock::operator=(VolumeDataBlock&&) noexcept = default;
|
||||
|
||||
std::shared_ptr<VolumeDataBlock>
|
||||
VolumeDataBlock::Create(const std::string& dataBlockType,
|
||||
const std::string& dataName,
|
||||
std::istream& is)
|
||||
{
|
||||
std::unique_ptr<VolumeDataBlock> p =
|
||||
std::make_unique<VolumeDataBlock>(dataBlockType, dataName);
|
||||
std::shared_ptr<VolumeDataBlock> p =
|
||||
std::make_shared<VolumeDataBlock>(dataBlockType, dataName);
|
||||
|
||||
if (!p->Parse(is))
|
||||
{
|
||||
p.reset();
|
||||
}
|
||||
|
||||
return p;
|
||||
}
|
||||
|
||||
bool VolumeDataBlock::Parse(std::istream& is)
|
||||
{
|
||||
bool dataBlockValid = true;
|
||||
|
||||
is.read(reinterpret_cast<char*>(&p->lrtup_), 2); // 4-5
|
||||
is.read(reinterpret_cast<char*>(&p->versionNumberMajor_), 1); // 6
|
||||
|
|
@ -220,32 +313,53 @@ struct VolumeDataBlock : DataBlock
|
|||
p->volumeCoveragePatternNumber_ = ntohs(p->volumeCoveragePatternNumber_);
|
||||
p->processingStatus_ = ntohs(p->processingStatus_);
|
||||
|
||||
return p;
|
||||
return dataBlockValid;
|
||||
}
|
||||
};
|
||||
|
||||
struct ElevationDataBlock : DataBlock
|
||||
class ElevationDataBlockImpl
|
||||
{
|
||||
explicit ElevationDataBlock(const std::string& dataBlockType,
|
||||
const std::string& dataName) :
|
||||
DataBlock(dataBlockType, dataName),
|
||||
lrtup_ {0},
|
||||
atmos_ {0},
|
||||
calibrationConstant_ {0.0f}
|
||||
public:
|
||||
explicit ElevationDataBlockImpl() :
|
||||
lrtup_ {0}, atmos_ {0}, calibrationConstant_ {0.0f}
|
||||
{
|
||||
}
|
||||
|
||||
uint16_t lrtup_;
|
||||
int16_t atmos_;
|
||||
float calibrationConstant_;
|
||||
};
|
||||
|
||||
static std::unique_ptr<ElevationDataBlock>
|
||||
Create(const std::string& dataBlockType,
|
||||
ElevationDataBlock::ElevationDataBlock(const std::string& dataBlockType,
|
||||
const std::string& dataName) :
|
||||
DataBlock(dataBlockType, dataName),
|
||||
p(std::make_unique<ElevationDataBlockImpl>())
|
||||
{
|
||||
}
|
||||
ElevationDataBlock::~ElevationDataBlock() = default;
|
||||
|
||||
ElevationDataBlock::ElevationDataBlock(ElevationDataBlock&&) noexcept = default;
|
||||
ElevationDataBlock&
|
||||
ElevationDataBlock::operator=(ElevationDataBlock&&) noexcept = default;
|
||||
|
||||
std::shared_ptr<ElevationDataBlock>
|
||||
ElevationDataBlock::Create(const std::string& dataBlockType,
|
||||
const std::string& dataName,
|
||||
std::istream& is)
|
||||
{
|
||||
std::unique_ptr<ElevationDataBlock> p =
|
||||
std::make_unique<ElevationDataBlock>(dataBlockType, dataName);
|
||||
std::shared_ptr<ElevationDataBlock> p =
|
||||
std::make_shared<ElevationDataBlock>(dataBlockType, dataName);
|
||||
|
||||
if (!p->Parse(is))
|
||||
{
|
||||
p.reset();
|
||||
}
|
||||
|
||||
return p;
|
||||
}
|
||||
|
||||
bool ElevationDataBlock::Parse(std::istream& is)
|
||||
{
|
||||
bool dataBlockValid = true;
|
||||
|
||||
is.read(reinterpret_cast<char*>(&p->lrtup_), 2); // 4-5
|
||||
is.read(reinterpret_cast<char*>(&p->atmos_), 2); // 6-7
|
||||
|
|
@ -255,15 +369,13 @@ struct ElevationDataBlock : DataBlock
|
|||
p->atmos_ = ntohs(p->atmos_);
|
||||
p->calibrationConstant_ = Message::SwapFloat(p->calibrationConstant_);
|
||||
|
||||
return p;
|
||||
return dataBlockValid;
|
||||
}
|
||||
};
|
||||
|
||||
struct RadialDataBlock : DataBlock
|
||||
class RadialDataBlockImpl
|
||||
{
|
||||
explicit RadialDataBlock(const std::string& dataBlockType,
|
||||
const std::string& dataName) :
|
||||
DataBlock(dataBlockType, dataName),
|
||||
public:
|
||||
explicit RadialDataBlockImpl() :
|
||||
lrtup_ {0},
|
||||
unambigiousRange_ {0},
|
||||
noiseLevelHorizontal_ {0.0f},
|
||||
|
|
@ -283,14 +395,39 @@ struct RadialDataBlock : DataBlock
|
|||
uint16_t radialFlags_;
|
||||
float calibrationConstantHorizontal_;
|
||||
float calibrationConstantVertical_;
|
||||
};
|
||||
|
||||
static std::unique_ptr<RadialDataBlock>
|
||||
Create(const std::string& dataBlockType,
|
||||
RadialDataBlock::RadialDataBlock(const std::string& dataBlockType,
|
||||
const std::string& dataName) :
|
||||
DataBlock(dataBlockType, dataName),
|
||||
p(std::make_unique<RadialDataBlockImpl>())
|
||||
{
|
||||
}
|
||||
RadialDataBlock::~RadialDataBlock() = default;
|
||||
|
||||
RadialDataBlock::RadialDataBlock(RadialDataBlock&&) noexcept = default;
|
||||
RadialDataBlock&
|
||||
RadialDataBlock::operator=(RadialDataBlock&&) noexcept = default;
|
||||
|
||||
std::shared_ptr<RadialDataBlock>
|
||||
RadialDataBlock::Create(const std::string& dataBlockType,
|
||||
const std::string& dataName,
|
||||
std::istream& is)
|
||||
{
|
||||
std::unique_ptr<RadialDataBlock> p =
|
||||
std::make_unique<RadialDataBlock>(dataBlockType, dataName);
|
||||
std::shared_ptr<RadialDataBlock> p =
|
||||
std::make_shared<RadialDataBlock>(dataBlockType, dataName);
|
||||
|
||||
if (!p->Parse(is))
|
||||
{
|
||||
p.reset();
|
||||
}
|
||||
|
||||
return p;
|
||||
}
|
||||
|
||||
bool RadialDataBlock::Parse(std::istream& is)
|
||||
{
|
||||
bool dataBlockValid = true;
|
||||
|
||||
is.read(reinterpret_cast<char*>(&p->lrtup_), 2); // 4-5
|
||||
is.read(reinterpret_cast<char*>(&p->unambigiousRange_), 2); // 6-7
|
||||
|
|
@ -314,9 +451,8 @@ struct RadialDataBlock : DataBlock
|
|||
p->calibrationConstantVertical_ =
|
||||
Message::SwapFloat(p->calibrationConstantVertical_);
|
||||
|
||||
return p;
|
||||
return dataBlockValid;
|
||||
}
|
||||
};
|
||||
|
||||
class DigitalRadarDataImpl
|
||||
{
|
||||
|
|
@ -341,13 +477,7 @@ public:
|
|||
volumeDataBlock_ {nullptr},
|
||||
elevationDataBlock_ {nullptr},
|
||||
radialDataBlock_ {nullptr},
|
||||
momentRefDataBlock_ {nullptr},
|
||||
momentVelDataBlock_ {nullptr},
|
||||
momentSwDataBlock_ {nullptr},
|
||||
momentZdrDataBlock_ {nullptr},
|
||||
momentPhiDataBlock_ {nullptr},
|
||||
momentRhoDataBlock_ {nullptr},
|
||||
momentCfpDataBlock_ {nullptr} {};
|
||||
momentDataBlock_ {} {};
|
||||
~DigitalRadarDataImpl() = default;
|
||||
|
||||
std::string radarIdentifier_;
|
||||
|
|
@ -367,16 +497,11 @@ public:
|
|||
uint16_t dataBlockCount_;
|
||||
std::array<uint32_t, 10> dataBlockPointer_;
|
||||
|
||||
std::unique_ptr<VolumeDataBlock> volumeDataBlock_;
|
||||
std::unique_ptr<ElevationDataBlock> elevationDataBlock_;
|
||||
std::unique_ptr<RadialDataBlock> radialDataBlock_;
|
||||
std::unique_ptr<MomentDataBlock> momentRefDataBlock_;
|
||||
std::unique_ptr<MomentDataBlock> momentVelDataBlock_;
|
||||
std::unique_ptr<MomentDataBlock> momentSwDataBlock_;
|
||||
std::unique_ptr<MomentDataBlock> momentZdrDataBlock_;
|
||||
std::unique_ptr<MomentDataBlock> momentPhiDataBlock_;
|
||||
std::unique_ptr<MomentDataBlock> momentRhoDataBlock_;
|
||||
std::unique_ptr<MomentDataBlock> momentCfpDataBlock_;
|
||||
std::shared_ptr<VolumeDataBlock> volumeDataBlock_;
|
||||
std::shared_ptr<ElevationDataBlock> elevationDataBlock_;
|
||||
std::shared_ptr<RadialDataBlock> radialDataBlock_;
|
||||
std::unordered_map<DataBlockType, std::shared_ptr<MomentDataBlock>>
|
||||
momentDataBlock_;
|
||||
};
|
||||
|
||||
DigitalRadarData::DigitalRadarData() :
|
||||
|
|
@ -464,6 +589,20 @@ uint16_t DigitalRadarData::data_block_count() const
|
|||
return p->dataBlockCount_;
|
||||
}
|
||||
|
||||
std::shared_ptr<MomentDataBlock>
|
||||
DigitalRadarData::moment_data_block(DataBlockType type) const
|
||||
{
|
||||
std::shared_ptr<MomentDataBlock> momentDataBlock = nullptr;
|
||||
|
||||
auto it = p->momentDataBlock_.find(type);
|
||||
if (it != p->momentDataBlock_.end())
|
||||
{
|
||||
momentDataBlock = it->second;
|
||||
}
|
||||
|
||||
return momentDataBlock;
|
||||
}
|
||||
|
||||
bool DigitalRadarData::Parse(std::istream& is)
|
||||
{
|
||||
BOOST_LOG_TRIVIAL(debug)
|
||||
|
|
@ -571,31 +710,13 @@ bool DigitalRadarData::Parse(std::istream& is)
|
|||
std::move(RadialDataBlock::Create(dataBlockType, dataName, is));
|
||||
break;
|
||||
case DataBlockType::MomentRef:
|
||||
p->momentRefDataBlock_ =
|
||||
std::move(MomentDataBlock::Create(dataBlockType, dataName, is));
|
||||
break;
|
||||
case DataBlockType::MomentVel:
|
||||
p->momentVelDataBlock_ =
|
||||
std::move(MomentDataBlock::Create(dataBlockType, dataName, is));
|
||||
break;
|
||||
case DataBlockType::MomentSw:
|
||||
p->momentSwDataBlock_ =
|
||||
std::move(MomentDataBlock::Create(dataBlockType, dataName, is));
|
||||
break;
|
||||
case DataBlockType::MomentZdr:
|
||||
p->momentZdrDataBlock_ =
|
||||
std::move(MomentDataBlock::Create(dataBlockType, dataName, is));
|
||||
break;
|
||||
case DataBlockType::MomentPhi:
|
||||
p->momentPhiDataBlock_ =
|
||||
std::move(MomentDataBlock::Create(dataBlockType, dataName, is));
|
||||
break;
|
||||
case DataBlockType::MomentRho:
|
||||
p->momentRhoDataBlock_ =
|
||||
std::move(MomentDataBlock::Create(dataBlockType, dataName, is));
|
||||
break;
|
||||
case DataBlockType::MomentCfp:
|
||||
p->momentCfpDataBlock_ =
|
||||
p->momentDataBlock_[dataBlock] =
|
||||
std::move(MomentDataBlock::Create(dataBlockType, dataName, is));
|
||||
break;
|
||||
default:
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue