index 9df00cd3b9b04ea238af0755064e769188870fb5..69c952bfc585e464e9fee47eed42d2edcc65544b 100644 (file)
bval = int(round(b * 255))\r
\r
if i == 0:\r
- line = "%3s %3s %3s Black" % (rval, gval, bval)\r
+ line = "%3s %3s %3s Black" % (rval, gval, bval)\r
elif i == g_steps:\r
- line = "%3s %3s %3s White" % (rval, gval, bval)\r
+ line = "%3s %3s %3s White" % (rval, gval, bval)\r
else:\r
- line = "%3s %3s %3s %s%% Gray" % (rval, gval, bval, 100 - int(level * 100))\r
+ line = "%3s %3s %3s %s%% Gray" % (rval, gval, bval, 100 - int(level * 100))\r
print line\r
\r
- # add two more steps near white\r
+ # add three more steps near white\r
if i == g_steps - 1:\r
- level_m = level + 0.5 * g_step_size\r
- r, g, b = colorsys.hls_to_rgb(0, level_m, 0)\r
- rval = int(round(r * 255))\r
- gval = int(round(g * 255))\r
- bval = int(round(b * 255))\r
- print "%3s %3s %3s %s%% Gray" % (rval, gval, bval, 100 - int(level_m * 100))\r
+ level_m = level + 0.25 * g_step_size\r
+ r, g, b = colorsys.hls_to_rgb(0, level_m, 0)\r
+ rval = int(round(r * 255))\r
+ gval = int(round(g * 255))\r
+ bval = int(round(b * 255))\r
+ print "%3s %3s %3s %s%% Gray" % (rval, gval, bval, 100 - (level_m * 100))\r
\r
- level_mm = level + 0.75 * g_step_size\r
- r, g, b = colorsys.hls_to_rgb(0, level_mm, 0)\r
- rval = int(round(r * 255))\r
- gval = int(round(g * 255))\r
- bval = int(round(b * 255))\r
- print "%3s %3s %3s %s%% Gray" % (rval, gval, bval, 100 - (level_mm * 100))\r
+ level_m = level + 0.5 * g_step_size\r
+ r, g, b = colorsys.hls_to_rgb(0, level_m, 0)\r
+ rval = int(round(r * 255))\r
+ gval = int(round(g * 255))\r
+ bval = int(round(b * 255))\r
+ print "%3s %3s %3s %s%% Gray" % (rval, gval, bval, 100 - int(level_m * 100))\r
+\r
+ level_mm = level + 0.75 * g_step_size\r
+ r, g, b = colorsys.hls_to_rgb(0, level_mm, 0)\r
+ rval = int(round(r * 255))\r
+ gval = int(round(g * 255))\r
+ bval = int(round(b * 255))\r
+ print "%3s %3s %3s %s%% Gray" % (rval, gval, bval, 100 - (level_mm * 100))\r
\r
\r
# standard HTML colors\r
\r
# HSL palette\r
h_steps = 15\r
-s_steps = 4\r
-l_steps = 11\r
+s_steps = 3\r
+l_steps = 14\r
h_step_size = 1.0 / h_steps\r
-s_step_size = 1.0 / s_steps\r
-l_step_size = 1.0 / l_steps\r
+s_step_size = 1.3 / s_steps\r
\r
for h in range(0, h_steps):\r
- for s in range(1, s_steps):\r
- for l in range(1, l_steps):\r
+ for s in range(0, s_steps):\r
+ l_range = int(round(l_steps - (s*6/s_steps))) - 2\r
+ l_step_size = 1.0 / l_range\r
+ for l in range(1, l_range):\r
hval = h * h_step_size\r
sval = 1 - (s * s_step_size)\r
lval = l * l_step_size\r