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

Rename rpg_types to wsr88d_types, common between level 2 and level 3

Browse source
This commit is contained in:
Dan Paulat 2024-01-04 20:07:30 -06:00
parent 3a607cc1fe
commit 0e031e3b69
4 changed files with 6 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1,7 +1,7 @@
#pragma once #pragma once
#include <scwx/awips/message.hpp> #include <scwx/awips/message.hpp>
#include <scwx/wsr88d/rpg/rpg_types.hpp> #include <scwx/wsr88d/wsr88d_types.hpp>
#include <cstdint> #include <cstdint>
#include <memory> #include <memory>

3
wxdata/include/scwx/wsr88d/rpg/rpg_types.hpp → wxdata/include/scwx/wsr88d/wsr88d_types.hpp
View file

@ -6,8 +6,6 @@ namespace scwx
{ {
namespace wsr88d namespace wsr88d
{ {
namespace rpg
{
enum class DataLevelCode enum class DataLevelCode
{ {
@ -58,6 +56,5 @@ enum class DataLevelCode
const std::string& GetDataLevelCodeName(DataLevelCode dataLevelCode); const std::string& GetDataLevelCodeName(DataLevelCode dataLevelCode);
const std::string& GetDataLevelCodeShortName(DataLevelCode dataLevelCode); const std::string& GetDataLevelCodeShortName(DataLevelCode dataLevelCode);
} // namespace rpg
} // namespace wsr88d } // namespace wsr88d
} // namespace scwx } // namespace scwx

5
wxdata/source/scwx/wsr88d/rpg/rpg_types.cpp → wxdata/source/scwx/wsr88d/wsr88d_types.cpp
View file

@ -1,4 +1,4 @@
#include <scwx/wsr88d/rpg/rpg_types.hpp> #include <scwx/wsr88d/wsr88d_types.hpp>
#include <unordered_map> #include <unordered_map>
@ -6,8 +6,6 @@ namespace scwx
{ {
namespace wsr88d namespace wsr88d
{ {
namespace rpg
{
static const std::unordered_map<DataLevelCode, std::string> dataLevelCodeName_ { static const std::unordered_map<DataLevelCode, std::string> dataLevelCodeName_ {
{DataLevelCode::BadData, "Bad Data"}, {DataLevelCode::BadData, "Bad Data"},
@ -109,6 +107,5 @@ const std::string& GetDataLevelCodeShortName(DataLevelCode dataLevelCode)
return dataLevelCodeShortName_.at(dataLevelCode); return dataLevelCodeShortName_.at(dataLevelCode);
} }
} // namespace rpg
} // namespace wsr88d } // namespace wsr88d
} // namespace scwx } // namespace scwx

8
wxdata/wxdata.cmake
View file

@ -93,11 +93,13 @@ set(SRC_UTIL source/scwx/util/environment.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/nexrad_file.hpp include/scwx/wsr88d/nexrad_file.hpp
include/scwx/wsr88d/nexrad_file_factory.hpp) include/scwx/wsr88d/nexrad_file_factory.hpp
include/scwx/wsr88d/wsr88d_types.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/nexrad_file.cpp source/scwx/wsr88d/nexrad_file.cpp
source/scwx/wsr88d/nexrad_file_factory.cpp) source/scwx/wsr88d/nexrad_file_factory.cpp
source/scwx/wsr88d/wsr88d_types.cpp)
set(HDR_WSR88D_RDA include/scwx/wsr88d/rda/clutter_filter_bypass_map.hpp set(HDR_WSR88D_RDA include/scwx/wsr88d/rda/clutter_filter_bypass_map.hpp
include/scwx/wsr88d/rda/clutter_filter_map.hpp include/scwx/wsr88d/rda/clutter_filter_map.hpp
include/scwx/wsr88d/rda/digital_radar_data.hpp include/scwx/wsr88d/rda/digital_radar_data.hpp
@ -146,7 +148,6 @@ set(HDR_WSR88D_RPG include/scwx/wsr88d/rpg/ccb_header.hpp
include/scwx/wsr88d/rpg/radar_coded_message.hpp include/scwx/wsr88d/rpg/radar_coded_message.hpp
include/scwx/wsr88d/rpg/radial_data_packet.hpp include/scwx/wsr88d/rpg/radial_data_packet.hpp
include/scwx/wsr88d/rpg/raster_data_packet.hpp include/scwx/wsr88d/rpg/raster_data_packet.hpp
include/scwx/wsr88d/rpg/rpg_types.hpp
include/scwx/wsr88d/rpg/scit_forecast_data_packet.hpp include/scwx/wsr88d/rpg/scit_forecast_data_packet.hpp
include/scwx/wsr88d/rpg/set_color_level_packet.hpp include/scwx/wsr88d/rpg/set_color_level_packet.hpp
include/scwx/wsr88d/rpg/special_graphic_symbol_packet.hpp include/scwx/wsr88d/rpg/special_graphic_symbol_packet.hpp
@ -186,7 +187,6 @@ set(SRC_WSR88D_RPG source/scwx/wsr88d/rpg/ccb_header.cpp
source/scwx/wsr88d/rpg/radar_coded_message.cpp source/scwx/wsr88d/rpg/radar_coded_message.cpp
source/scwx/wsr88d/rpg/radial_data_packet.cpp source/scwx/wsr88d/rpg/radial_data_packet.cpp
source/scwx/wsr88d/rpg/raster_data_packet.cpp source/scwx/wsr88d/rpg/raster_data_packet.cpp
source/scwx/wsr88d/rpg/rpg_types.cpp
source/scwx/wsr88d/rpg/scit_forecast_data_packet.cpp source/scwx/wsr88d/rpg/scit_forecast_data_packet.cpp
source/scwx/wsr88d/rpg/set_color_level_packet.cpp source/scwx/wsr88d/rpg/set_color_level_packet.cpp
source/scwx/wsr88d/rpg/special_graphic_symbol_packet.cpp source/scwx/wsr88d/rpg/special_graphic_symbol_packet.cpp