whitespace; enable hexagons and color-by-channel

1 files changed, 18 insertions, 3 deletions

diff --git a/axis.hs b/axis.hs
index a51b846..312283e 100644
--- a/axis.hs
+++ b/axis.hs
@@ -34,8 +34,8 @@ netwireIsCool =
 
 smartShowPitch p = showPitch p -- TODO: use flat for Eb, Bb; use unicode flat/sharp chars
 
-_USE_HEXAGONS = False
-_COLORIZE_BY_CHANNEL = False
+_USE_HEXAGONS = True
+_COLORIZE_BY_CHANNEL = True
 
 _AXIS_ROWS = 7 + 4
 _AXIS_UNIQUE_COLS = 7
@@ -70,7 +70,22 @@ http://en.wikipedia.org/wiki/Enhanced_Graphics_Adapter
 15 – bright white               (#FFFFFF) 111111  63
 -}
 
-_CGA = [(SDL.Color 0x00 0x00 0x00), (SDL.Color 0x00 0x00 0xAA), (SDL.Color 0x00 0xAA 0x00), (SDL.Color 0x00 0xAA 0xAA), (SDL.Color 0xAA 0x00 0x00), (SDL.Color 0xAA 0x00 0xAA), (SDL.Color 0xAA 0x55 0x00), (SDL.Color 0xAA 0xAA 0xAA), (SDL.Color 0x55 0x55 0x55), (SDL.Color 0x55 0x55 0xFF), (SDL.Color 0x55 0xFF 0x55), (SDL.Color 0x55 0xFF 0xFF), (SDL.Color 0xFF 0x55 0x55), (SDL.Color 0xFF 0x55 0xFF), (SDL.Color 0xFF 0xFF 0x55), (SDL.Color 0xFF 0xFF 0xFF)]
+_CGA = [--(SDL.Color 0x00 0x00 0x00),        --black                   
+          (SDL.Color 0x00 0x00 0xAA),        --blue                    
+          (SDL.Color 0x00 0xAA 0x00),        --green                   
+          (SDL.Color 0x00 0xAA 0xAA),        --cyan                    
+          (SDL.Color 0xAA 0x00 0x00),        --red                     
+          (SDL.Color 0xAA 0x00 0xAA),        --magenta                 
+          (SDL.Color 0xAA 0x55 0x00),        --brown                   
+          (SDL.Color 0xAA 0xAA 0xAA),        --white / light gray      
+          (SDL.Color 0x55 0x55 0x55),        --dark gray / bright black
+          (SDL.Color 0x55 0x55 0xFF),        --bright blue             
+          (SDL.Color 0x55 0xFF 0x55),        --bright green            
+          (SDL.Color 0x55 0xFF 0xFF),        --bright cyan             
+          (SDL.Color 0xFF 0x55 0x55),        --bright red              
+          (SDL.Color 0xFF 0x55 0xFF),        --bright magenta          
+          (SDL.Color 0xFF 0xFF 0x55),        --bright yellow           
+          (SDL.Color 0xFF 0xFF 0xFF)]        --bright white            
 
 _drawHexircle f v x y s c =
   if _USE_HEXAGONS