UpsilonNumworks/Upsilon
1
0
Fork 0
mirror of https://github.com/UpsilonNumworks/Upsilon.git synced 2026-01-19 00:37:25 +01:00
Code Issues Packages Projects Releases Wiki Activity

[matplotlib] Added cyan color to the color palette

Browse Source 
Change-Id: I29476d8148ad98285505adc460b90628573518fa
This commit is contained in:
Arthur
2020-05-20 14:18:01 +02:00
committed by Émilie Feral
parent 472cfc012c
commit 59bf8bbcf4
3 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
escher/include/escher/palette.h
View File

@@ -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};

1
escher/src/palette.cpp
View File

@@ -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[];

4
python/port/port.cpp
View File

@@ -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) {