more output tweaking

1 files changed, 11 insertions, 14 deletions

diff --git a/countdown.hs b/countdown.hs
index 7f54920..63a41cd 100755
--- a/countdown.hs
+++ b/countdown.hs
@@ -207,19 +207,14 @@ countdownWidget isSimulated t =
     str "\n"
     <=>
     hCenter (hBox [
-      -- borderWithLabel (str $ printf "Progress through %d" currentYear) $
-      --   (str $ printf "Day %d of %d; %d remaining\nSecond %s of %s"
-      --         dayNum
-      --         numDays
-      --         (numDays - dayNum)
-      --         (commas $ (1 + toSeconds yearElapsed :: Int))
-      --         (commas $ toSeconds yearLength))
-      -- ,
-      str "   "
-      ,
-      borderWithLabel (str "Cosmic Conversion") (hBox [cosmicConversion, cosmicConversion'])
+                vBox [ cosmicCalendarNext, str "\n", cosmicCalendarPrevious ],
+                str "   ",
+                borderWithLabel (str "Cosmic Conversion") (hBox [cosmicConversion, cosmicConversion'])
     ])
   where
+    cosmicCalendarPrevious = borderWithLabel (str "Last on the Cosmic Calendar") (str "                           ")
+    cosmicCalendarNext = borderWithLabel (str "Next on the Cosmic Calendar") (str "                           ")
+
     countdownBox =
       (borderWithLabel (str $ printf "Countdown %d" currentYear) $
          (str $ printf "Day %d of %d; %d remaining\nSecond %s of %s"
@@ -261,9 +256,10 @@ countdownWidget isSimulated t =
 
     cosmicTimeBox =
       (borderWithLabel (str "Cosmic Time") $
-       vBox [ (str $ printf "%s years ago" (commas $ (floor cosmicYearsAgo :: Integer)))
-            , (str "\n")
-            , (str $ printf "%s years ago" (showLarge $ (realToFrac cosmicYearsAgo)))
+       vBox [(str $ printf "%s years" (commas $ (floor cosmicYears :: Integer))),
+              str "\n",
+             (str $ printf "%s years ago" (commas $ (floor cosmicYearsAgo :: Integer)))
+            -- , (str $ printf "%s years ago" (showLarge $ (realToFrac cosmicYearsAgo)))
             -- , (str $ printf "%s billion years ago" (commasF 9 $ cosmicYearsAgo / (1000*1000*1000)))
             -- , (str $ printf "%s million years ago" (commasF 6 $ cosmicYearsAgo / (1000*1000)))
             -- , (str $ printf "%s thousand years ago" (commasF 3 $ cosmicYearsAgo / 1000))
@@ -271,6 +267,7 @@ countdownWidget isSimulated t =
             ])
     currentTimeBox = (hCenter (borderWithLabel (str $ printf "Current time%s" (if isSimulated then " (SIMULATED)" else "")) $
                                padLeftRight 3 $ (str (formatTime defaultTimeLocale "%A, %B %e%n%Y-%m-%d %r" t))))
+    cosmicYears    = realToFrac ageOfUniverseInYears * (realToFrac $ (yearElapsed // yearLength)) :: Rational
     cosmicYearsAgo = realToFrac ageOfUniverseInYears * (realToFrac $ 1 - (yearElapsed // yearLength)) :: Rational
     -- cosmicYearsAgo = if yearElapsed == yearLength
     --                  then 0