diff --git a/hydra_visualizer/src/color/colormap_utilities.cpp b/hydra_visualizer/src/color/colormap_utilities.cpp index 570d79b..8ede867 100644 --- a/hydra_visualizer/src/color/colormap_utilities.cpp +++ b/hydra_visualizer/src/color/colormap_utilities.cpp @@ -71,6 +71,22 @@ std::function lookupColormap(DiscretePalette cmap) { } } +static const auto enum_init = + config::Enum::Initializer(std::map{ + {NamedColors::BLACK, "black"}, + {NamedColors::WHITE, "white"}, + {NamedColors::RED, "red"}, + {NamedColors::GREEN, "green"}, + {NamedColors::BLUE, "blue"}, + {NamedColors::YELLOW, "yellow"}, + {NamedColors::ORANGE, "orange"}, + {NamedColors::PURPLE, "purple"}, + {NamedColors::CYAN, "cyan"}, + {NamedColors::MAGENTA, "magenta"}, + {NamedColors::PINK, "pink"}, + {NamedColors::GRAY, "gray"}, + }); + } // namespace spark_dsg::Color colorFromName(NamedColors color) { diff --git a/hydra_visualizer/src/layer_info.cpp b/hydra_visualizer/src/layer_info.cpp index 0fea301..b469fb9 100644 --- a/hydra_visualizer/src/layer_info.cpp +++ b/hydra_visualizer/src/layer_info.cpp @@ -72,22 +72,7 @@ void declare_config(LayerConfig::Edges& config) { field(config.draw, "draw"); field(config.scale, "scale"); field(config.alpha, "alpha"); - enum_field(config.color, - "color", - { - {NamedColors::BLACK, "black"}, - {NamedColors::WHITE, "white"}, - {NamedColors::RED, "red"}, - {NamedColors::GREEN, "green"}, - {NamedColors::BLUE, "blue"}, - {NamedColors::YELLOW, "yellow"}, - {NamedColors::ORANGE, "orange"}, - {NamedColors::PURPLE, "purple"}, - {NamedColors::CYAN, "cyan"}, - {NamedColors::MAGENTA, "magenta"}, - {NamedColors::PINK, "pink"}, - {NamedColors::GRAY, "gray"}, - }); + enum_field(config.color, "color"); field(config.use_color, "use_color"); field(config.draw_interlayer, "draw_interlayer"); field(config.interlayer_use_source, "interlayer_use_source"); @@ -108,22 +93,7 @@ void declare_config(LayerConfig::Text& config) { field(config.scale, "scale"); field(config.add_jitter, "add_jitter"); field(config.jitter_scale, "jitter_scale"); - enum_field(config.color, - "color", - { - {NamedColors::BLACK, "black"}, - {NamedColors::WHITE, "white"}, - {NamedColors::RED, "red"}, - {NamedColors::GREEN, "green"}, - {NamedColors::BLUE, "blue"}, - {NamedColors::YELLOW, "yellow"}, - {NamedColors::ORANGE, "orange"}, - {NamedColors::PURPLE, "purple"}, - {NamedColors::CYAN, "cyan"}, - {NamedColors::MAGENTA, "magenta"}, - {NamedColors::PINK, "pink"}, - {NamedColors::GRAY, "gray"}, - }); + enum_field(config.color, "color"); } void declare_config(LayerConfig::BoundingBoxes& config) {