From 02c9dddf360a4b0553a2b4f63e19ba564428541d Mon Sep 17 00:00:00 2001 From: Mattias Andrée Date: Wed, 5 Mar 2014 16:29:16 +0100 Subject: add derivatives to xmobar and xpybar examples MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Mattias Andrée --- examples/xmobar | 44 ++++++++++++++++++++++++++++++++++++-------- examples/xpybar | 43 ++++++++++++++++++++++++++++++++++++------- 2 files changed, 72 insertions(+), 15 deletions(-) (limited to 'examples') diff --git a/examples/xmobar b/examples/xmobar index 469f7cd..427d4b5 100644 --- a/examples/xmobar +++ b/examples/xmobar @@ -12,20 +12,48 @@ latitude, longitude = 59.3472, 18.0728 temperature_day, temperature_night = 6500, 3700 +# Get current time. +now = epoch() +now_m = now - 1 +now_p = now + 1 +now_d = now_p - now_m +now = epoch_to_julian_centuries(now) +now_m = epoch_to_julian_centuries(now_m) +now_p = epoch_to_julian_centuries(now_p) + # The visibility of the Sun. -dayness = sun(latitude, longitude) +dayness = sun(latitude, longitude, now) +dayness_m = sun(latitude, longitude, now_m) +dayness_p = sun(latitude, longitude, now_p) +dayness_d = (dayness_p - dayness_m) / now_d # The Sun's elevation. -elevation = solar_elevation(latitude, longitude) - - -# Calculation of the whitepoint with adjusted colour temperature. -temperature_now = temperature_day * dayness + temperature_night * (1 - dayness) -whitepoint = divide_by_maximum(cmf_10deg(temperature_now)) +elevation = solar_elevation(latitude, longitude, now) +elevation_m = solar_elevation(latitude, longitude, now_m) +elevation_p = solar_elevation(latitude, longitude, now_p) +elevation_d = (elevation_p - elevation_m) / now_d + +# Calculation of the colour temperature. +temperature = temperature_day * dayness + temperature_night * (1 - dayness) +temperature_m = temperature_day * dayness_m + temperature_night * (1 - dayness_m) +temperature_p = temperature_day * dayness_p + temperature_night * (1 - dayness_p) +temperature_d = (temperature_p - temperature_m) / now_d + +# Calculate the whitepoint with adjusted colour temperature. +whitepoint = divide_by_maximum(cmf_10deg(temperature)) whitepoint = [('0' + hex(int(c * 255 + 0.5))[2:].upper())[-2:] for c in whitepoint] whitepoint = whitepoint[0] + whitepoint[1] + whitepoint[2] +# Convert derivative to per minutes from per seconds. +temperature_d *= 60 +elevation_d *= 60 +dayness_d *= 60 + # Print information. -print('%iK %.1f° %.0f%%' % (whitepoint, int(temperature_now), elevation, int(dayness * 100))) +dayness *= 100 +dayness_d *= 100 +output = '%0.fK %.1fK/min %.1f° %.2f°/min %.0f%% %.1f%%/min' +output %= (whitepoint, temperature, temperature_d, elevation, elevation_d, dayness, dayness_d) +print(output) diff --git a/examples/xpybar b/examples/xpybar index b9dc99f..f403f15 100644 --- a/examples/xpybar +++ b/examples/xpybar @@ -12,20 +12,49 @@ latitude, longitude = 59.3472, 18.0728 temperature_day, temperature_night = 6500, 3700 +# Get current time. +now = epoch() +now_m = now - 1 +now_p = now + 1 +now_d = now_p - now_m +now = epoch_to_julian_centuries(now) +now_m = epoch_to_julian_centuries(now_m) +now_p = epoch_to_julian_centuries(now_p) + # The visibility of the Sun. -dayness = sun(latitude, longitude) +dayness = sun(latitude, longitude, now) +dayness_m = sun(latitude, longitude, now_m) +dayness_p = sun(latitude, longitude, now_p) +dayness_d = (dayness_p - dayness_m) / now_d # The Sun's elevation. -elevation = solar_elevation(latitude, longitude) - - -# Calculation of the whitepoint with adjusted colour temperature. +elevation = solar_elevation(latitude, longitude, now) +elevation_m = solar_elevation(latitude, longitude, now_m) +elevation_p = solar_elevation(latitude, longitude, now_p) +elevation_d = (elevation_p - elevation_m) / now_d + +# Calculation of the colour temperature. +temperature = temperature_day * dayness + temperature_night * (1 - dayness) +temperature_m = temperature_day * dayness_m + temperature_night * (1 - dayness_m) +temperature_p = temperature_day * dayness_p + temperature_night * (1 - dayness_p) +temperature_d = (temperature_p - temperature_m) / now_d + +# Calculate the whitepoint with adjusted colour temperature. temperature_now = temperature_day * dayness + temperature_night * (1 - dayness) -whitepoint = divide_by_maximum(cmf_10deg(temperature_now)) +whitepoint = divide_by_maximum(cmf_10deg(temperature)) whitepoint = [str(int(c * 255 + 0.5)) for c in whitepoint] whitepoint = ';'.join(whitepoint) +# Convert derivative to per minutes from per seconds. +temperature_d *= 60 +elevation_d *= 60 +dayness_d *= 60 + # Print information. -print('\033[38;2;%sm%i\033[0mK %.1f° %.0f%%' % (whitepoint, int(temperature_now), elevation, int(dayness * 100))) +dayness *= 100 +dayness_d *= 100 +output = '\033[38;2;%sm%0.f\033[0mK %.1fK/min %.1f° %.2f°/min %.0f%% %.1f%%/min' +output %= (whitepoint, temperature, temperature_d, elevation, elevation_d, dayness, dayness_d) +print(output) -- cgit v1.2.3-70-g09d2