From 59bf8bbcf4af69bd1b50fb9d4f5ee4256a13c642 Mon Sep 17 00:00:00 2001 From: Arthur Date: Wed, 20 May 2020 14:18:01 +0200 Subject: [PATCH] [matplotlib] Added cyan color to the color palette Change-Id: I29476d8148ad98285505adc460b90628573518fa --- escher/include/escher/palette.h | 1 + escher/src/palette.cpp | 1 + python/port/port.cpp | 4 ++-- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/escher/include/escher/palette.h b/escher/include/escher/palette.h index ccc965a5d..c50b276b7 100644 --- a/escher/include/escher/palette.h +++ b/escher/include/escher/palette.h @@ -34,6 +34,7 @@ public: constexpr static KDColor Brown = KDColor::RGB24(0x8d7350); constexpr static KDColor Purple = KDColor::RGB24(0x6e2d79); constexpr static KDColor BlueishGrey = KDColor::RGB24(0x919ea4); + constexpr static KDColor Cyan = KDColor::RGB24(0x00ffff); constexpr static KDColor DataColor[] = {Red, Blue, Green, YellowDark, Magenta, Turquoise, Pink, Orange}; constexpr static KDColor DataColorLight[] = {RedLight, BlueLight, GreenLight, YellowLight}; diff --git a/escher/src/palette.cpp b/escher/src/palette.cpp index 9d96af6d7..ac7cd7279 100644 --- a/escher/src/palette.cpp +++ b/escher/src/palette.cpp @@ -28,6 +28,7 @@ constexpr KDColor Palette::Green; constexpr KDColor Palette::GreenLight; constexpr KDColor Palette::Brown; constexpr KDColor Palette::Purple; +constexpr KDColor Palette::Cyan; constexpr KDColor Palette::BlueishGrey; constexpr KDColor Palette::DataColor[]; constexpr KDColor Palette::DataColorLight[]; diff --git a/python/port/port.cpp b/python/port/port.cpp index e4dae7789..bc2ee4113 100644 --- a/python/port/port.cpp +++ b/python/port/port.cpp @@ -184,7 +184,6 @@ KDColor MicroPython::Color::Parse(mp_obj_t input, Mode mode){ if (mp_obj_is_str(input)) { size_t l; const char * color = mp_obj_str_get_data(input, &l); - // TODO add cyan constexpr NamedColor pairs[] = { NamedColor("blue", KDColorBlue), NamedColor("b", KDColorBlue), @@ -202,7 +201,8 @@ KDColor MicroPython::Color::Parse(mp_obj_t input, Mode mode){ NamedColor("pink", Palette::Pink), NamedColor("orange", Palette::Orange), NamedColor("purple", Palette::Purple), - NamedColor("grey", Palette::GreyDark) + NamedColor("grey", Palette::GreyDark), + NamedColor("cyan", Palette::Cyan) }; for (NamedColor p : pairs) { if (strcmp(p.name(), color) == 0) {