fix note labels

1 files changed, 5 insertions, 5 deletions

diff --git a/axis.hs b/axis.hs
index e263862..8c30a32 100644
--- a/axis.hs
+++ b/axis.hs
@@ -36,14 +36,14 @@ netwireIsCool =
 smartShowPitch p = showPitch p -- TODO: use flat for Eb, Bb; use unicode flat/sharp chars
 
 _USE_HEXAGONS = True
-_COLORIZE_BY_CHANNEL = True
+_LABEL_WHILE_PLAYING = True
+_LABEL_ALL_KEYS = False
 
 _AXIS_ROWS = 7 + 4
 _AXIS_UNIQUE_COLS = 7
 _AXIS_COLS_REPEAT = 2
 _AXIS_TOP_PITCH = 81 + (7 * (_AXIS_ROWS - 7) `div` 2)
 _AXIS_BOTTOM_PITCH = 81 - (7 * _AXIS_ROWS) - 3
-_OCTAVE_SQUASH = False -- it's terrible, because it draws the octave in the wrong shape
 
 --_KEY_BORDER_COLOR = (SDL.Color 0 0 255)
 _KEY_BORDER_COLOR = (SDL.Color 0 0 0)
@@ -108,7 +108,6 @@ inMajorC pclass = not (pclass == 1 || pclass == 3 || pclass == 6 || pclass == 8
 -- TODO: try hilighting like in the app, where only part of the key is colored
 -- TODO: idea: for the channels, draw a dot.  offset the dot from the center of the key at an angle determined by the channel number
 
-_UNLABELLED_KEYS = True
 pitchToColor p =
   case p `mod` 12 of
     2 -> (SDL.Color 0xD0 0xD0 0xFF) -- D
@@ -129,11 +128,12 @@ smartDrawKeys reallyErase beforeKeys_ nowKeys_ videoSurface font axis_key_locati
 
   forM_ actions $ \ (n, chans) -> do
     let text = smartShowPitch (unPitch n)
-        pitch = if _OCTAVE_SQUASH then unPitch n `mod` 12 + 12 * 6 else unPitch n
+        pitch = unPitch n
     forM_ (elemIndices pitch pitchIndex) $ \idx -> do
+      let showLabel = (not reallyErase) && (_LABEL_ALL_KEYS || (_LABEL_WHILE_PLAYING && (length chans /= 0)))
       drawKey idx videoSurface font axis_key_locations axis_key_size
         (if reallyErase then _KB_BG_COLOR else pitchToColor pitch)
-        (if reallyErase || _UNLABELLED_KEYS then Nothing else (Just text))
+        (if showLabel then (Just text) else Nothing)
         chans
 
 --drawKey :: (Integral a1, Integral a2, Integral a) => Int -> SDL.Surface -> SDL.TTF.Font -> [(a1, a2)] -> a -> SDL.Color -> t -> Maybe String -> [Int] -> IO ()