From 7b16972cb1232596fa205c4acdeb91bb375663fa Mon Sep 17 00:00:00 2001 From: Dan Paulat Date: Sun, 10 Apr 2022 21:25:16 -0500 Subject: [PATCH] Adding additional STP/OHP palette assignments --- .../scwx/qt/settings/palette_settings.cpp | 2 ++ test/data | 2 +- wxdata/source/scwx/common/products.cpp | 31 ++++++++++--------- 3 files changed, 20 insertions(+), 15 deletions(-) diff --git a/scwx-qt/source/scwx/qt/settings/palette_settings.cpp b/scwx-qt/source/scwx/qt/settings/palette_settings.cpp index 947ea555..7e1a42b3 100644 --- a/scwx-qt/source/scwx/qt/settings/palette_settings.cpp +++ b/scwx-qt/source/scwx/qt/settings/palette_settings.cpp @@ -25,9 +25,11 @@ static const std::vector paletteNames_ = { "DSD", "ET", "OHP", + "OHPIN", "PHI3", "SRV", "STP", + "STPIN", "VIL", "???"}; diff --git a/test/data b/test/data index ed7d402a..ede24dd1 160000 --- a/test/data +++ b/test/data @@ -1 +1 @@ -Subproject commit ed7d402a8d5cc5b94ba0b03e63f12395ca8edfa6 +Subproject commit ede24dd1b4e1f7f4591217769b74f80ca6ebbcf1 diff --git a/wxdata/source/scwx/common/products.cpp b/wxdata/source/scwx/common/products.cpp index c62c4901..57cee160 100644 --- a/wxdata/source/scwx/common/products.cpp +++ b/wxdata/source/scwx/common/products.cpp @@ -43,20 +43,23 @@ static const std::unordered_map level2Palette_ { {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, "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, "???"}}; + {19, "BR"}, {20, "BR"}, {27, "BV"}, {30, "SW"}, + {31, "STPIN"}, {32, "BR"}, {37, "BR"}, {38, "BR"}, + {41, "ET"}, {50, "BR"}, {51, "BV"}, {56, "SRV"}, + {57, "VIL"}, {65, "BR"}, {66, "BR"}, {67, "BR"}, + {78, "OHPIN"}, {79, "OHPIN"}, {80, "STPIN"}, {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, "STPIN"}, {144, "OHPIN"}, {145, "OHPIN"}, + {146, "STPIN"}, {150, "STPIN"}, {151, "STPIN"}, {153, "BR"}, + {154, "BV"}, {155, "SW"}, {159, "ZDR"}, {161, "CC"}, + {163, "PHI3"}, {165, "???"}, {167, "CC"}, {168, "PHI3"}, + {169, "OHPIN"}, {170, "STP"}, {171, "STPIN"}, {172, "STP"}, + {173, "STP"}, {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) {