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

[python] Color: avoid magic number 255, clean code of ColorParser and

Browse Source 
Turtle::colormode
This commit is contained in:
Émilie Feral
2020-04-29 10:10:12 +02:00
committed by LeaNumworks
parent c920df1f76
commit 8f5fa50f22
3 changed files with 21 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
python/port/port.cpp
View File

@@ -181,7 +181,8 @@ void MicroPython::collectRootsAtAddress(char * address, int byteLength) {
}
KDColor MicroPython::ColorParser::ParseColor(mp_obj_t input, ColorMode ColorMode){
if(mp_obj_is_str(input)){
static constexpr int maxColorIntensity = static_cast<int>(ColorMode::MaxIntensity255);
if (mp_obj_is_str(input)) {
size_t l;
const char * color = mp_obj_str_get_data(input, &l);
// TODO add cyan
@@ -219,11 +220,11 @@ KDColor MicroPython::ColorParser::ParseColor(mp_obj_t input, ColorMode ColorMode
}
mp_float_t GreyLevel = mp_obj_float_get(mp_parse_num_decimal(color, strlen(color), false, false, NULL));
if(GreyLevel >= 0 && GreyLevel <= 1){
if(GreyLevel >= 0.0 && GreyLevel <= 1.0){
return KDColor::RGB888(
255 * (float) GreyLevel,
255 * (float) GreyLevel,
255 * (float) GreyLevel
maxColorIntensity * (float) GreyLevel,
maxColorIntensity * (float) GreyLevel,
maxColorIntensity * (float) GreyLevel
);
}
mp_raise_ValueError("Grey levels are between 0.0 and 1.0");
@@ -237,22 +238,14 @@ KDColor MicroPython::ColorParser::ParseColor(mp_obj_t input, ColorMode ColorMode
mp_obj_get_array(input, &len, &elem);
if (len != 3) {
mp_raise_TypeError("color needs 3 components");
mp_raise_TypeError("Color needs 3 components");
}
if(ColorMode == MicroPython::ColorParser::ColorMode::MaxIntensity1){
return KDColor::RGB888(
255 * mp_obj_get_float(elem[0]),
255 * mp_obj_get_float(elem[1]),
255 * mp_obj_get_float(elem[2])
int intensityFactor = maxColorIntensity/static_cast<int>(ColorMode);
return KDColor::RGB888(
intensityFactor * mp_obj_get_float(elem[0]),
intensityFactor * mp_obj_get_float(elem[1]),
intensityFactor * mp_obj_get_float(elem[2])
);
} else {
return KDColor::RGB888(
mp_obj_get_int(elem[0]),
mp_obj_get_int(elem[1]),
mp_obj_get_int(elem[2])
);
}
}
mp_raise_TypeError("Color couldn't be parsed");
}