add second cosmic conversion table

1 files changed, 36 insertions, 3 deletions

diff --git a/countdown.hs b/countdown.hs
index afd9266..ac5193b 100755
--- a/countdown.hs
+++ b/countdown.hs
@@ -142,7 +142,9 @@ showTime t | t < 60*60       = formatTime defaultTimeLocale "%M minutes" t
 showTime t | t == 60*60      = "1 hour"
 showTime t | t < 60*60*2     = formatTime defaultTimeLocale "%H hour %Mm" t
 showTime t | t < 60*60*24    = formatTime defaultTimeLocale "%H hours %Mm" t
+showTime t | t == 60*60*24   = formatTime defaultTimeLocale "%d day" t
 showTime t | t < 60*60*24*2  = formatTime defaultTimeLocale "%d day %Hh" t
+showTime t | t == 60*60*24*7 = formatTime defaultTimeLocale "%d days" t
 showTime t | t < 60*60*24*10 = formatTime defaultTimeLocale "%d days %Hh" t
 showTime t                   = formatTime defaultTimeLocale "%d days" t
 -- showTime t = formatTime defaultTimeLocale "%w weeks %D days" t
@@ -153,18 +155,49 @@ yearsToCosmicTime = (/ (realToFrac ageOfUniverseInYears)) . (* lengthOfYear) . r
 showCosmicYears :: Integer -> Widget n
 showCosmicYears = str . showTime . yearsToCosmicTime
 
+toCosmicTime :: NominalDiffTime -> Rational
+toCosmicTime t = realToFrac ageOfUniverseInYears * (realToFrac $ t // yearLength) :: Rational
+  where
+    yearLength = daysPerYear * nominalDay
+    x // y     = fromRational $ toRational x / toRational y :: Double
+
+conversionTableRowFromCosmicSeconds :: NominalDiffTime -> [Widget n]
+conversionTableRowFromCosmicSeconds n = [cosmicTime, realTime]
+  where
+    realTime = str $ showLarge (fromRational $ toCosmicTime n) ++ " years"
+    -- cosmicTime = showCosmicYears $ ceiling $ toCosmicTime n
+    cosmicTime = str $ showTime n
+
+cosmicConversion' :: Widget n
+cosmicConversion' = renderTable $
+  table
+  [
+    conversionTableRowFromCosmicSeconds $ 30 * 24 * 60 * 60,
+    conversionTableRowFromCosmicSeconds $ 7 * 24 * 60 * 60,
+    conversionTableRowFromCosmicSeconds $ 24 * 60 * 60,
+    conversionTableRowFromCosmicSeconds $ 60 * 60,
+    conversionTableRowFromCosmicSeconds $ 60,
+    conversionTableRowFromCosmicSeconds $ 1
+  ]
+
 cosmicConversion :: Widget n
-cosmicConversion = borderWithLabel (str "Cosmic Conversion") $ renderTable $
+cosmicConversion = renderTable $
   table
   [
     [str "1 billion years"    , showCosmicYears $ 1000 * 1000 * 1000],
+    -- conversionTableRowFromCosmicSeconds $ 7 * 24 * 60 * 60,
     [str "100 million years"  , showCosmicYears $ 100 * 1000 * 1000],
+    -- conversionTableRowFromCosmicSeconds $ 24 * 60 * 60,
     [str "10 million years"   , showCosmicYears $ 10 * 1000 * 1000],
+    -- conversionTableRowFromCosmicSeconds $ 60 * 60,
     [str "1 million years"    , showCosmicYears $ 1000 * 1000],
     [str "100 thousand years" , showCosmicYears $ 100 * 1000],
+    -- conversionTableRowFromCosmicSeconds $ 60,
     [str "10 thousand years"  , showCosmicYears $ 10 * 1000],
     [str "1 thousand years"   , showCosmicYears 1000],
-    [str "100 years"          , showCosmicYears 100]
+    [str "100 years"          , showCosmicYears 100],
+    [str "10 years"           , showCosmicYears 10],
+    [str "1 year"             , showCosmicYears 1]
   ]
 
 showLarge :: Double -> String
@@ -230,7 +263,7 @@ countdownWidget isSimulated t =
       ,
       str "   "
       ,
-      cosmicConversion
+      borderWithLabel (str "Cosmic Conversion") (hBox [cosmicConversion, cosmicConversion'])
     ])
   where
     cosmicYearsAgo = realToFrac ageOfUniverseInYears * (realToFrac $ 1 - (yearElapsed // yearLength)) :: Rational