diff --git a/scwx-qt/source/scwx/qt/settings/palette_settings.cpp b/scwx-qt/source/scwx/qt/settings/palette_settings.cpp index c66de6ae..947ea555 100644 --- a/scwx-qt/source/scwx/qt/settings/palette_settings.cpp +++ b/scwx-qt/source/scwx/qt/settings/palette_settings.cpp @@ -13,7 +13,23 @@ namespace settings static const std::string logPrefix_ = "[scwx::qt::settings::palette_settings] "; static const std::vector paletteNames_ = { - "BR", "BV", "SW", "ZDR", "PHI", "CC", "STP", "???"}; + // Level 2 / Common Products + "BR", + "BV", + "SW", + "ZDR", + "PHI2", + "CC", + // Level 3 Products + "DOD", + "DSD", + "ET", + "OHP", + "PHI3", + "SRV", + "STP", + "VIL", + "???"}; static const std::string DEFAULT_KEY = "Default"; static const std::string DEFAULT_PALETTE = ""; diff --git a/test/data b/test/data index c82e2471..ed7d402a 160000 --- a/test/data +++ b/test/data @@ -1 +1 @@ -Subproject commit c82e24718e7d5a0ae0c47b460240990a1187b383 +Subproject commit ed7d402a8d5cc5b94ba0b03e63f12395ca8edfa6 diff --git a/wxdata/source/scwx/common/products.cpp b/wxdata/source/scwx/common/products.cpp index 78c4e61c..c62c4901 100644 --- a/wxdata/source/scwx/common/products.cpp +++ b/wxdata/source/scwx/common/products.cpp @@ -37,25 +37,25 @@ static const std::unordered_map level2Palette_ { {Level2Product::Velocity, "BV"}, {Level2Product::SpectrumWidth, "SW"}, {Level2Product::DifferentialReflectivity, "ZDR"}, - {Level2Product::DifferentialPhase, "PHI"}, + {Level2Product::DifferentialPhase, "PHI2"}, {Level2Product::CorrelationCoefficient, "CC"}, {Level2Product::ClutterFilterPowerRemoved, "???"}, {Level2Product::Unknown, "???"}}; static const std::unordered_map level3Palette_ { - {19, "BR"}, {20, "BR"}, {27, "BV"}, {30, "SW"}, {31, "STP"}, - {32, "BR"}, {37, "BR"}, {38, "BR"}, {41, "???"}, {50, "BR"}, - {51, "BV"}, {56, "BV"}, {57, "???"}, {65, "BR"}, {66, "BR"}, - {67, "BR"}, {78, "STP"}, {79, "STP"}, {80, "STP"}, {81, "???"}, - {86, "BV"}, {90, "BR"}, {93, "BV"}, {94, "BR"}, {97, "BR"}, - {98, "BR"}, {99, "BV"}, {113, "???"}, {132, "???"}, {133, "???"}, - {134, "???"}, {135, "???"}, {137, "BR"}, {138, "???"}, {144, "STP"}, - {145, "STP"}, {146, "STP"}, {150, "STP"}, {151, "STP"}, {153, "BR"}, - {154, "BV"}, {155, "SW"}, {159, "ZDR"}, {161, "CC"}, {163, "PHI"}, - {165, "???"}, {167, "CC"}, {168, "PHI"}, {169, "STP"}, {170, "???"}, - {171, "???"}, {172, "???"}, {173, "???"}, {174, "???"}, {175, "???"}, - {176, "???"}, {177, "???"}, {178, "???"}, {179, "???"}, {180, "BR"}, - {181, "BR"}, {182, "BV"}, {184, "SW"}, {186, "BR"}, {193, "BR"}, + {19, "BR"}, {20, "BR"}, {27, "BV"}, {30, "SW"}, {31, "STP"}, + {32, "BR"}, {37, "BR"}, {38, "BR"}, {41, "ET"}, {50, "BR"}, + {51, "BV"}, {56, "SRV"}, {57, "VIL"}, {65, "BR"}, {66, "BR"}, + {67, "BR"}, {78, "OHP"}, {79, "OHP"}, {80, "STP"}, {81, "???"}, + {86, "BV"}, {90, "BR"}, {93, "BV"}, {94, "BR"}, {97, "BR"}, + {98, "BR"}, {99, "BV"}, {113, "???"}, {132, "???"}, {133, "???"}, + {134, "VIL"}, {135, "ET"}, {137, "BR"}, {138, "???"}, {144, "STP"}, + {145, "STP"}, {146, "STP"}, {150, "STP"}, {151, "STP"}, {153, "BR"}, + {154, "BV"}, {155, "SW"}, {159, "ZDR"}, {161, "CC"}, {163, "PHI3"}, + {165, "???"}, {167, "CC"}, {168, "PHI3"}, {169, "STP"}, {170, "???"}, + {171, "???"}, {172, "???"}, {173, "???"}, {174, "DOD"}, {175, "DSD"}, + {176, "???"}, {177, "???"}, {178, "???"}, {179, "???"}, {180, "BR"}, + {181, "BR"}, {182, "BV"}, {184, "SW"}, {186, "BR"}, {193, "BR"}, {195, "BR"}, {-1, "???"}}; const std::string& GetRadarProductGroupName(RadarProductGroup group)