1 files changed, 6 insertions, 3 deletions

diff --git a/axis.hs b/axis.hs
index 17e7ec9..00e6998 100644
--- a/axis.hs
+++ b/axis.hs
@@ -46,6 +46,7 @@ drawFilledHexircle = _drawHexircle True
 
 _AXIS_ROWS = 7 + 4
 _AXIS_UNIQUE_COLS = 7
+_AXIS_COLS_REPEAT = 1
 _AXIS_TOP_PITCH = 81 + (7 * (_AXIS_ROWS - 7) `div` 2)
 _AXIS_BOTTOM_PITCH = 81 - (7 * _AXIS_ROWS) - 3
 
@@ -71,6 +72,7 @@ eraseKeys pitches videoSurface font axis_key_locations axis_key_size = do
       let (x, y) = axis_key_locations !! idx
       drawFilledHexircle videoSurface (fromIntegral x) (fromIntegral y) (fromIntegral axis_key_size) _KEY_BG_COLOR_PIXEL
       drawHexircle videoSurface (fromIntegral x) (fromIntegral y) (fromIntegral axis_key_size) _KEY_COLOR_PIXEL
+      centerText videoSurface x y font _KEY_TEXT_COLOR _KEY_BG_COLOR (smartShowPitch pitch)
 
 fi = fromIntegral
 rgbColor r g b = SDL.Pixel (shiftL (fi r) 24 .|. shiftL (fi g) 16 .|. shiftL (fi b) 8 .|. (fi 255))
@@ -181,10 +183,11 @@ centerText videoSurface x y font fgColor bgColor text = do
   _ <- SDL.blitSurface fontSurface (Just fontClipRect) videoSurface (Just (SDL.Rect (fromIntegral(x) - w `div` 2) (fromIntegral(y) - h `div` 2) w h))
   return ()
 
-pitchIndex = (\x -> x ++ x) $ concat $ map colfrom toprow
+pitchIndex = concat $ map (\x -> unique) [0 .. _AXIS_COLS_REPEAT - 1]
   where
     toprow = map (\i -> if (i `mod` 2) == 0 then (_AXIS_TOP_PITCH + i `div` 2) else (_AXIS_TOP_PITCH - 3 + i `div` 2)) [0 .. _AXIS_UNIQUE_COLS - 1]
     colfrom top = map (+ top) $ map (* (-7)) [0 .. _AXIS_ROWS - 1]
+    unique = concat $ map colfrom toprow
 
 getKeyLocations (SDL.Rect offx offy totalw totalh) =
   let (key_height, key_width, xys) = getKeyLocationsAbs
@@ -215,7 +218,7 @@ getKeyLocations (SDL.Rect offx offy totalw totalh) =
 
 getKeyLocationsAbs =
   let kb_rows = (fromIntegral _AXIS_ROWS) :: Double
-      kb_cols = 2 * (fromIntegral _AXIS_UNIQUE_COLS) :: Double
+      kb_cols = _AXIS_COLS_REPEAT * (fromIntegral _AXIS_UNIQUE_COLS) :: Double
       -- the edges of the hexagon are equal in length to its "radius"
       -- if the radius is 1, then horizontal movement is 1.5 and vertical movement is sqrt(3) from one center to the next
       -- or else it is 2*sqrt(3) to move down
@@ -230,7 +233,7 @@ getKeyLocationsAbs =
 
                 y + kh / 2 * fromInteger(i `mod` 2) +
 
-                  (if (fromInteger(i) >= kb_cols / 2) then kh * fromInteger((i+1) `mod` 2) else 0)
+                  (if (fromInteger(i) >= _AXIS_UNIQUE_COLS) then kh * fromInteger((i+1) `mod` 2) else 0)
 
               )) [0 .. round(kb_cols) - 1]) $
             map (\i -> kh * fromIntegral(i))