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

Refactoring generic message components to awips namespace

Browse source
This commit is contained in:
Dan Paulat 2022-01-14 19:34:47 -06:00
parent a76103650e
commit 7a9582a689
14 changed files with 64 additions and 65 deletions
Download patch file Download diff file Expand all files Collapse all files

4
wxdata/include/scwx/wsr88d/message.hpp → wxdata/include/scwx/awips/message.hpp
View file

@ -14,7 +14,7 @@
namespace scwx namespace scwx
{ {
namespace wsr88d namespace awips
{ {
class MessageImpl; class MessageImpl;
@ -120,5 +120,5 @@ private:
std::unique_ptr<MessageImpl> p; std::unique_ptr<MessageImpl> p;
}; };
} // namespace wsr88d } // namespace awips
} // namespace scwx } // namespace scwx

7
wxdata/include/scwx/wsr88d/rpg/wmo_header.hpp → wxdata/include/scwx/awips/wmo_header.hpp
View file

@ -5,9 +5,7 @@
namespace scwx namespace scwx
{ {
namespace wsr88d namespace awips
{
namespace rpg
{ {
class WmoHeaderImpl; class WmoHeaderImpl;
@ -51,6 +49,5 @@ private:
std::unique_ptr<WmoHeaderImpl> p; std::unique_ptr<WmoHeaderImpl> p;
}; };
} // namespace rpg } // namespace awips
} // namespace wsr88d
} // namespace scwx } // namespace scwx

4
wxdata/include/scwx/wsr88d/rda/level2_message.hpp
View file

@ -1,7 +1,7 @@
#pragma once #pragma once
#include <scwx/awips/message.hpp>
#include <scwx/wsr88d/rda/level2_message_header.hpp> #include <scwx/wsr88d/rda/level2_message_header.hpp>
#include <scwx/wsr88d/message.hpp>
#ifdef WIN32 #ifdef WIN32
# include <WinSock2.h> # include <WinSock2.h>
@ -18,7 +18,7 @@ namespace rda
class Level2MessageImpl; class Level2MessageImpl;
class Level2Message : public Message class Level2Message : public awips::Message
{ {
protected: protected:
explicit Level2Message(); explicit Level2Message();

4
wxdata/include/scwx/wsr88d/rpg/graphic_alphanumeric_block.hpp
View file

@ -1,6 +1,6 @@
#pragma once #pragma once
#include <scwx/wsr88d/message.hpp> #include <scwx/awips/message.hpp>
#include <cstdint> #include <cstdint>
#include <memory> #include <memory>
@ -14,7 +14,7 @@ namespace rpg
class GraphicAlphanumericBlockImpl; class GraphicAlphanumericBlockImpl;
class GraphicAlphanumericBlock : public Message class GraphicAlphanumericBlock : public awips::Message
{ {
public: public:
explicit GraphicAlphanumericBlock(); explicit GraphicAlphanumericBlock();

4
wxdata/include/scwx/wsr88d/rpg/level3_message.hpp
View file

@ -1,7 +1,7 @@
#pragma once #pragma once
#include <scwx/awips/message.hpp>
#include <scwx/wsr88d/rpg/level3_message_header.hpp> #include <scwx/wsr88d/rpg/level3_message_header.hpp>
#include <scwx/wsr88d/message.hpp>
namespace scwx namespace scwx
{ {
@ -12,7 +12,7 @@ namespace rpg
class Level3MessageImpl; class Level3MessageImpl;
class Level3Message : public Message class Level3Message : public awips::Message
{ {
protected: protected:
explicit Level3Message(); explicit Level3Message();

4
wxdata/include/scwx/wsr88d/rpg/packet.hpp
View file

@ -1,6 +1,6 @@
#pragma once #pragma once
#include <scwx/wsr88d/message.hpp> #include <scwx/awips/message.hpp>
#include <cstdint> #include <cstdint>
#include <memory> #include <memory>
@ -12,7 +12,7 @@ namespace wsr88d
namespace rpg namespace rpg
{ {
class Packet : public Message class Packet : public awips::Message
{ {
protected: protected:
explicit Packet(); explicit Packet();

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

@ -1,6 +1,6 @@
#pragma once #pragma once
#include <scwx/wsr88d/message.hpp> #include <scwx/awips/message.hpp>
#include <cstdint> #include <cstdint>
#include <memory> #include <memory>
@ -14,7 +14,7 @@ namespace rpg
class ProductDescriptionBlockImpl; class ProductDescriptionBlockImpl;
class ProductDescriptionBlock : public Message class ProductDescriptionBlock : public awips::Message
{ {
public: public:
explicit ProductDescriptionBlock(); explicit ProductDescriptionBlock();

4
wxdata/include/scwx/wsr88d/rpg/product_symbology_block.hpp
View file

@ -1,6 +1,6 @@
#pragma once #pragma once
#include <scwx/wsr88d/message.hpp> #include <scwx/awips/message.hpp>
#include <scwx/wsr88d/rpg/packet.hpp> #include <scwx/wsr88d/rpg/packet.hpp>
#include <cstdint> #include <cstdint>
@ -15,7 +15,7 @@ namespace rpg
class ProductSymbologyBlockImpl; class ProductSymbologyBlockImpl;
class ProductSymbologyBlock : public Message class ProductSymbologyBlock : public awips::Message
{ {
public: public:
explicit ProductSymbologyBlock(); explicit ProductSymbologyBlock();

4
wxdata/include/scwx/wsr88d/rpg/tabular_alphanumeric_block.hpp
View file

@ -1,6 +1,6 @@
#pragma once #pragma once
#include <scwx/wsr88d/message.hpp> #include <scwx/awips/message.hpp>
#include <cstdint> #include <cstdint>
#include <memory> #include <memory>
@ -14,7 +14,7 @@ namespace rpg
class TabularAlphanumericBlockImpl; class TabularAlphanumericBlockImpl;
class TabularAlphanumericBlock : public Message class TabularAlphanumericBlock : public awips::Message
{ {
public: public:
explicit TabularAlphanumericBlock(); explicit TabularAlphanumericBlock();

8
wxdata/source/scwx/wsr88d/message.cpp → wxdata/source/scwx/awips/message.cpp
View file

@ -1,13 +1,13 @@
#include <scwx/wsr88d/message.hpp> #include <scwx/awips/message.hpp>
#include <boost/log/trivial.hpp> #include <boost/log/trivial.hpp>
namespace scwx namespace scwx
{ {
namespace wsr88d namespace awips
{ {
static const std::string logPrefix_ = "[scwx::wsr88d::message] "; static const std::string logPrefix_ = "[scwx::awips::message] ";
class MessageImpl class MessageImpl
{ {
@ -63,5 +63,5 @@ bool Message::ValidateMessage(std::istream& is, size_t bytesRead) const
return messageValid; return messageValid;
} }
} // namespace wsr88d } // namespace awips
} // namespace scwx } // namespace scwx

11
wxdata/source/scwx/wsr88d/rpg/wmo_header.cpp → wxdata/source/scwx/awips/wmo_header.cpp
View file

@ -1,4 +1,4 @@
#include <scwx/wsr88d/rpg/wmo_header.hpp> #include <scwx/awips/wmo_header.hpp>
#include <scwx/util/streams.hpp> #include <scwx/util/streams.hpp>
#include <istream> #include <istream>
@ -15,12 +15,10 @@
namespace scwx namespace scwx
{ {
namespace wsr88d namespace awips
{
namespace rpg
{ {
static const std::string logPrefix_ = "[scwx::wsr88d::rpg::wmo_header] "; static const std::string logPrefix_ = "[scwx::awips::wmo_header] ";
class WmoHeaderImpl class WmoHeaderImpl
{ {
@ -249,6 +247,5 @@ bool WmoHeader::Parse(std::istream& is)
return headerValid; return headerValid;
} }
} // namespace rpg } // namespace awips
} // namespace wsr88d
} // namespace scwx } // namespace scwx

10
wxdata/source/scwx/wsr88d/level3_file.cpp
View file

@ -1,7 +1,7 @@
#include <scwx/wsr88d/level3_file.hpp> #include <scwx/wsr88d/level3_file.hpp>
#include <scwx/awips/wmo_header.hpp>
#include <scwx/wsr88d/rpg/ccb_header.hpp> #include <scwx/wsr88d/rpg/ccb_header.hpp>
#include <scwx/wsr88d/rpg/level3_message_factory.hpp> #include <scwx/wsr88d/rpg/level3_message_factory.hpp>
#include <scwx/wsr88d/rpg/wmo_header.hpp>
#include <fstream> #include <fstream>
@ -27,9 +27,9 @@ public:
bool DecompressFile(std::istream& is, std::stringstream& ss); bool DecompressFile(std::istream& is, std::stringstream& ss);
bool LoadFileData(std::istream& is); bool LoadFileData(std::istream& is);
std::shared_ptr<rpg::WmoHeader> wmoHeader_; std::shared_ptr<awips::WmoHeader> wmoHeader_;
std::shared_ptr<rpg::CcbHeader> ccbHeader_; std::shared_ptr<rpg::CcbHeader> ccbHeader_;
std::shared_ptr<rpg::WmoHeader> innerHeader_; std::shared_ptr<awips::WmoHeader> innerHeader_;
std::shared_ptr<rpg::Level3Message> message_; std::shared_ptr<rpg::Level3Message> message_;
}; };
@ -69,7 +69,7 @@ bool Level3File::LoadData(std::istream& is)
{ {
BOOST_LOG_TRIVIAL(debug) << logPrefix_ << "Loading Data"; BOOST_LOG_TRIVIAL(debug) << logPrefix_ << "Loading Data";
p->wmoHeader_ = std::make_shared<rpg::WmoHeader>(); p->wmoHeader_ = std::make_shared<awips::WmoHeader>();
bool dataValid = p->wmoHeader_->Parse(is); bool dataValid = p->wmoHeader_->Parse(is);
@ -161,7 +161,7 @@ bool Level3FileImpl::DecompressFile(std::istream& is, std::stringstream& ss)
if (dataValid) if (dataValid)
{ {
innerHeader_ = std::make_shared<rpg::WmoHeader>(); innerHeader_ = std::make_shared<awips::WmoHeader>();
dataValid = innerHeader_->Parse(ss); dataValid = innerHeader_->Parse(ss);
} }

39
wxdata/source/scwx/wsr88d/rda/digital_radar_data.cpp
View file

@ -190,8 +190,8 @@ bool MomentDataBlock::Parse(std::istream& is)
p->dataMomentRangeSampleInterval_ = ntohs(p->dataMomentRangeSampleInterval_); p->dataMomentRangeSampleInterval_ = ntohs(p->dataMomentRangeSampleInterval_);
p->tover_ = ntohs(p->tover_); p->tover_ = ntohs(p->tover_);
p->snrThreshold_ = ntohs(p->snrThreshold_); p->snrThreshold_ = ntohs(p->snrThreshold_);
p->scale_ = Message::SwapFloat(p->scale_); p->scale_ = awips::Message::SwapFloat(p->scale_);
p->offset_ = Message::SwapFloat(p->offset_); p->offset_ = awips::Message::SwapFloat(p->offset_);
if (p->numberOfDataMomentGates_ >= 0 && p->numberOfDataMomentGates_ <= 1840) if (p->numberOfDataMomentGates_ >= 0 && p->numberOfDataMomentGates_ <= 1840)
{ {
@ -206,7 +206,7 @@ bool MomentDataBlock::Parse(std::istream& is)
p->momentGates16_.resize(p->numberOfDataMomentGates_); p->momentGates16_.resize(p->numberOfDataMomentGates_);
is.read(reinterpret_cast<char*>(p->momentGates16_.data()), is.read(reinterpret_cast<char*>(p->momentGates16_.data()),
p->numberOfDataMomentGates_ * 2); p->numberOfDataMomentGates_ * 2);
Message::SwapVector(p->momentGates16_); awips::Message::SwapVector(p->momentGates16_);
} }
else else
{ {
@ -329,17 +329,17 @@ bool VolumeDataBlock::Parse(std::istream& is)
is.read(reinterpret_cast<char*>(&p->processingStatus_), 2); // 42-43 is.read(reinterpret_cast<char*>(&p->processingStatus_), 2); // 42-43
p->lrtup_ = ntohs(p->lrtup_); p->lrtup_ = ntohs(p->lrtup_);
p->latitude_ = Message::SwapFloat(p->latitude_); p->latitude_ = awips::Message::SwapFloat(p->latitude_);
p->longitude_ = Message::SwapFloat(p->longitude_); p->longitude_ = awips::Message::SwapFloat(p->longitude_);
p->siteHeight_ = ntohs(p->siteHeight_); p->siteHeight_ = ntohs(p->siteHeight_);
p->feedhornHeight_ = ntohs(p->feedhornHeight_); p->feedhornHeight_ = ntohs(p->feedhornHeight_);
p->calibrationConstant_ = Message::SwapFloat(p->calibrationConstant_); p->calibrationConstant_ = awips::Message::SwapFloat(p->calibrationConstant_);
p->horizontaShvTxPower_ = Message::SwapFloat(p->horizontaShvTxPower_); p->horizontaShvTxPower_ = awips::Message::SwapFloat(p->horizontaShvTxPower_);
p->verticalShvTxPower_ = Message::SwapFloat(p->verticalShvTxPower_); p->verticalShvTxPower_ = awips::Message::SwapFloat(p->verticalShvTxPower_);
p->systemDifferentialReflectivity_ = p->systemDifferentialReflectivity_ =
Message::SwapFloat(p->systemDifferentialReflectivity_); awips::Message::SwapFloat(p->systemDifferentialReflectivity_);
p->initialSystemDifferentialPhase_ = p->initialSystemDifferentialPhase_ =
Message::SwapFloat(p->initialSystemDifferentialPhase_); awips::Message::SwapFloat(p->initialSystemDifferentialPhase_);
p->volumeCoveragePatternNumber_ = ntohs(p->volumeCoveragePatternNumber_); p->volumeCoveragePatternNumber_ = ntohs(p->volumeCoveragePatternNumber_);
p->processingStatus_ = ntohs(p->processingStatus_); p->processingStatus_ = ntohs(p->processingStatus_);
@ -397,7 +397,7 @@ bool ElevationDataBlock::Parse(std::istream& is)
p->lrtup_ = ntohs(p->lrtup_); p->lrtup_ = ntohs(p->lrtup_);
p->atmos_ = ntohs(p->atmos_); p->atmos_ = ntohs(p->atmos_);
p->calibrationConstant_ = Message::SwapFloat(p->calibrationConstant_); p->calibrationConstant_ = awips::Message::SwapFloat(p->calibrationConstant_);
return dataBlockValid; return dataBlockValid;
} }
@ -475,16 +475,17 @@ bool RadialDataBlock::Parse(std::istream& is)
is.read(reinterpret_cast<char*>(&p->calibrationConstantVertical_), is.read(reinterpret_cast<char*>(&p->calibrationConstantVertical_),
4); // 24-27 4); // 24-27
p->lrtup_ = ntohs(p->lrtup_); p->lrtup_ = ntohs(p->lrtup_);
p->unambigiousRange_ = ntohs(p->unambigiousRange_); p->unambigiousRange_ = ntohs(p->unambigiousRange_);
p->noiseLevelHorizontal_ = Message::SwapFloat(p->noiseLevelHorizontal_); p->noiseLevelHorizontal_ =
p->noiseLevelVertical_ = Message::SwapFloat(p->noiseLevelVertical_); awips::Message::SwapFloat(p->noiseLevelHorizontal_);
p->nyquistVelocity_ = ntohs(p->nyquistVelocity_); p->noiseLevelVertical_ = awips::Message::SwapFloat(p->noiseLevelVertical_);
p->radialFlags_ = ntohs(p->radialFlags_); p->nyquistVelocity_ = ntohs(p->nyquistVelocity_);
p->radialFlags_ = ntohs(p->radialFlags_);
p->calibrationConstantHorizontal_ = p->calibrationConstantHorizontal_ =
Message::SwapFloat(p->calibrationConstantHorizontal_); awips::Message::SwapFloat(p->calibrationConstantHorizontal_);
p->calibrationConstantVertical_ = p->calibrationConstantVertical_ =
Message::SwapFloat(p->calibrationConstantVertical_); awips::Message::SwapFloat(p->calibrationConstantVertical_);
return dataBlockValid; return dataBlockValid;
} }

22
wxdata/wxdata.cmake
View file

@ -2,6 +2,10 @@ project(scwx-data)
find_package(Boost) find_package(Boost)
set(HDR_AWIPS include/scwx/awips/message.hpp
include/scwx/awips/wmo_header.hpp)
set(SRC_AWIPS source/scwx/awips/message.cpp
source/scwx/awips/wmo_header.cpp)
set(HDR_COMMON include/scwx/common/characters.hpp set(HDR_COMMON include/scwx/common/characters.hpp
include/scwx/common/color_table.hpp include/scwx/common/color_table.hpp
include/scwx/common/constants.hpp include/scwx/common/constants.hpp
@ -22,11 +26,9 @@ set(SRC_UTIL source/scwx/util/rangebuf.cpp
source/scwx/util/time.cpp source/scwx/util/time.cpp
source/scwx/util/vectorbuf.cpp) source/scwx/util/vectorbuf.cpp)
set(HDR_WSR88D include/scwx/wsr88d/ar2v_file.hpp set(HDR_WSR88D include/scwx/wsr88d/ar2v_file.hpp
include/scwx/wsr88d/level3_file.hpp include/scwx/wsr88d/level3_file.hpp)
include/scwx/wsr88d/message.hpp)
set(SRC_WSR88D source/scwx/wsr88d/ar2v_file.cpp set(SRC_WSR88D source/scwx/wsr88d/ar2v_file.cpp
source/scwx/wsr88d/level3_file.cpp source/scwx/wsr88d/level3_file.cpp)
source/scwx/wsr88d/message.cpp)
set(HDR_WSR88D_RDA include/scwx/wsr88d/rda/clutter_filter_map.hpp set(HDR_WSR88D_RDA include/scwx/wsr88d/rda/clutter_filter_map.hpp
include/scwx/wsr88d/rda/digital_radar_data.hpp include/scwx/wsr88d/rda/digital_radar_data.hpp
include/scwx/wsr88d/rda/level2_message.hpp include/scwx/wsr88d/rda/level2_message.hpp
@ -83,8 +85,7 @@ set(HDR_WSR88D_RPG include/scwx/wsr88d/rpg/ccb_header.hpp
include/scwx/wsr88d/rpg/unlinked_contour_vector_packet.hpp include/scwx/wsr88d/rpg/unlinked_contour_vector_packet.hpp
include/scwx/wsr88d/rpg/unlinked_vector_packet.hpp include/scwx/wsr88d/rpg/unlinked_vector_packet.hpp
include/scwx/wsr88d/rpg/vector_arrow_data_packet.hpp include/scwx/wsr88d/rpg/vector_arrow_data_packet.hpp
include/scwx/wsr88d/rpg/wind_barb_data_packet.hpp include/scwx/wsr88d/rpg/wind_barb_data_packet.hpp)
include/scwx/wsr88d/rpg/wmo_header.hpp)
set(SRC_WSR88D_RPG source/scwx/wsr88d/rpg/ccb_header.cpp set(SRC_WSR88D_RPG source/scwx/wsr88d/rpg/ccb_header.cpp
source/scwx/wsr88d/rpg/cell_trend_data_packet.cpp source/scwx/wsr88d/rpg/cell_trend_data_packet.cpp
source/scwx/wsr88d/rpg/cell_trend_volume_scan_times.cpp source/scwx/wsr88d/rpg/cell_trend_volume_scan_times.cpp
@ -122,10 +123,11 @@ set(SRC_WSR88D_RPG source/scwx/wsr88d/rpg/ccb_header.cpp
source/scwx/wsr88d/rpg/unlinked_contour_vector_packet.cpp source/scwx/wsr88d/rpg/unlinked_contour_vector_packet.cpp
source/scwx/wsr88d/rpg/unlinked_vector_packet.cpp source/scwx/wsr88d/rpg/unlinked_vector_packet.cpp
source/scwx/wsr88d/rpg/vector_arrow_data_packet.cpp source/scwx/wsr88d/rpg/vector_arrow_data_packet.cpp
source/scwx/wsr88d/rpg/wind_barb_data_packet.cpp source/scwx/wsr88d/rpg/wind_barb_data_packet.cpp)
source/scwx/wsr88d/rpg/wmo_header.cpp)
add_library(wxdata OBJECT ${HDR_COMMON} add_library(wxdata OBJECT ${HDR_AWIPS}
${SRC_AWIPS}
${HDR_COMMON}
${SRC_COMMON} ${SRC_COMMON}
${HDR_UTIL} ${HDR_UTIL}
${SRC_UTIL} ${SRC_UTIL}
@ -136,6 +138,8 @@ add_library(wxdata OBJECT ${HDR_COMMON}
${HDR_WSR88D_RPG} ${HDR_WSR88D_RPG}
${SRC_WSR88D_RPG}) ${SRC_WSR88D_RPG})
source_group("Header Files\\awips" FILES ${HDR_AWIPS})
source_group("Source Files\\awips" FILES ${SRC_AWIPS})
source_group("Header Files\\common" FILES ${HDR_COMMON}) source_group("Header Files\\common" FILES ${HDR_COMMON})
source_group("Source Files\\common" FILES ${SRC_COMMON}) source_group("Source Files\\common" FILES ${SRC_COMMON})
source_group("Header Files\\util" FILES ${HDR_UTIL}) source_group("Header Files\\util" FILES ${HDR_UTIL})