avancement sur cursors.

[minwii.git] / src / app / widgets / playingscreen.py

diff --git a/src/app/widgets/playingscreen.py b/src/app/widgets/playingscreen.py
index 7944204..09b9550 100755 (executable)
--- a/src/app/widgets/playingscreen.py
+++ b/src/app/widgets/playingscreen.py
@@ -9,18 +9,43 @@ $URL$
 import pygame
 from colorsys import hls_to_rgb
 from gradients import gradients
 import pygame
 from colorsys import hls_to_rgb
 from gradients import gradients

+from cursors import WarpingCursor

 from math import floor
 from math import floor

+import types

 # TODO : positionner cette constance en fonction de la résolution d'affichage
 # externaliser la conf.
 BORDER = 5 # 5px
 FIRST_HUE = 0.6
 # TODO : positionner cette constance en fonction de la résolution d'affichage
 # externaliser la conf.
 BORDER = 5 # 5px
 FIRST_HUE = 0.6

-OFF_LUMINANCE = 0.1
+OFF_LUMINANCE = 0.2

 OFF_SATURATION = 1
 ON_TOP_LUMINANCE = 0.6
 ON_BOTTOM_LUMINANCE = 0.9
 ON_SATURATION = 1
 OFF_SATURATION = 1
 ON_TOP_LUMINANCE = 0.6
 ON_BOTTOM_LUMINANCE = 0.9
 ON_SATURATION = 1

+ON_COLUMN_OVERSIZING = 1.5
+
+
+def event_handler(eventType) :
+    def doRename(m) :
+        m.__name__ = 'eventHandler%s' % eventType
+        return m
+    return doRename
+
+
+class MetaRenamer(type):
+    def __new__(mcs, name, bases, dict) :
+        for k, v in dict.items() :
+            if isinstance(v, types.FunctionType) :
+                if k != v.__name__ :
+                    print 'renommage de %s en %s' % (k, v.__name__)
+                    dict[v.__name__] = v
+                    del dict[k]
+        return type.__new__(mcs, name, bases, dict)
+

 
 class _PlayingScreenBase(pygame.sprite.OrderedUpdates) :
 
 class _PlayingScreenBase(pygame.sprite.OrderedUpdates) :

+
+    __metaclass__ = MetaRenamer
+

     def __init__(self, distinctNotes=[]) :
         """
         distinctNotes : notes disctinctes présentes dans la chanson
     def __init__(self, distinctNotes=[]) :
         """
         distinctNotes : notes disctinctes présentes dans la chanson


@@ -30,8 +55,12 @@ class _PlayingScreenBase(pygame.sprite.OrderedUpdates) :
         self.distinctNotes = distinctNotes
         self.keyboardLength = 0
         self.keyboardRects = []
         self.distinctNotes = distinctNotes
         self.keyboardLength = 0
         self.keyboardRects = []

+        self.cursor = None

         self._initRects()
         self._initColumns()
         self._initRects()
         self._initColumns()

+        self._running = False
+        self.draw(pygame.display.get_surface())
+        self._initCursor()

             
     
     
             
     
     


@@ -66,16 +95,47 @@ class _PlayingScreenBase(pygame.sprite.OrderedUpdates) :
         hueStep = FIRST_HUE / (self.keyboardLength - 1)
         for i, rect in enumerate(self.keyboardRects) :
             hue = FIRST_HUE - hueStep * i
         hueStep = FIRST_HUE / (self.keyboardLength - 1)
         for i, rect in enumerate(self.keyboardRects) :
             hue = FIRST_HUE - hueStep * i

+            print hue

             c = Column(hue, rect)
             self.add(c)
             c = Column(hue, rect)
             self.add(c)

-            
+    
+    def _initCursor(self) :
+        self.cursor = WarpingCursor()
+        #self.add(self.cursor)
+        

         
     def highlightColumn(self, index) :
         for i, sprite in enumerate(self.sprites()) :
             sprite.update(i==index)
         self.draw(pygame.display.get_surface())
         
     def highlightColumn(self, index) :
         for i, sprite in enumerate(self.sprites()) :
             sprite.update(i==index)
         self.draw(pygame.display.get_surface())

-        
+    
+    def run(self):
+        self._running = True
+        while self._running :
+            pygame.display.flip()
+            events = pygame.event.get()
+            for event in events:
+                self.input(event)

 
 

+    def input(self, event) :
+        handler = getattr(self, 'eventHandler%s' % event.type, lambda e:None)
+        handler(event)
+    
+    @event_handler(pygame.KEYDOWN)       
+    def handleKeyDown(self, event) :
+        if event.key == pygame.K_q:
+            self._running = False
+        uni = event.unicode
+        
+        if uni.isdigit() and int(uni) <=8 :
+            self.highlightColumn(int(uni))
+    
+    @event_handler(pygame.MOUSEMOTION)
+    def handleMouseMotion(self, event) :
+        pass
+        
+        
+    

 
 class SongPlayingScreen(_PlayingScreenBase) :
     
 
 class SongPlayingScreen(_PlayingScreenBase) :
     


@@ -89,45 +149,6 @@ class SongPlayingScreenTest(_PlayingScreenBase) :
         o = C()
         o.midi=1
         super(SongPlayingScreenTest, self).__init__([o])
         o = C()
         o.midi=1
         super(SongPlayingScreenTest, self).__init__([o])

-        self.__running = True
-        #pygame.display.flip()
-        #raw_input('allez ?')
-    
-    def run(self):
-        while self.__running :
-            pygame.display.flip()
-            events = pygame.event.get()
-            for event in events:
-                self.input(event)
-    
-    def input(self, event) :
-        if event.type == pygame.KEYDOWN:
-            if event.key == pygame.K_q:
-                self.__running = False
-            uni = event.unicode
-            if uni.isdigit() and int(uni) <=8 :
-                self.highlightColumn(int(uni))
-                
-                
-            # if event.key == pygame.K_i:
-            #     self.backToInstrumentChoice = True
-            #     self.done = True
-            #     
-            # if event.key == pygame.K_w:
-            #     self.nextLevel = 0
-            #     self.done = True
-            #     
-            # if event.key == pygame.K_e:
-            #     self.nextLevel = 1
-            #     self.done = True
-            #     
-            # if event.key == pygame.K_r:
-            #     self.nextLevel = 2
-            #     self.done = True
-            #     
-            # if event.key == pygame.K_t:
-            #     self.nextLevel = 3
-            #     self.done = True 

     
 
 class Column(pygame.sprite.Sprite) :
     
 
 class Column(pygame.sprite.Sprite) :


@@ -138,12 +159,13 @@ class Column(pygame.sprite.Sprite) :
         rgba = hls_to_rgba_8bits(hue, OFF_LUMINANCE, OFF_SATURATION)
         sur.fill(rgba)
         self.stateOff = sur
         rgba = hls_to_rgba_8bits(hue, OFF_LUMINANCE, OFF_SATURATION)
         sur.fill(rgba)
         self.stateOff = sur

+        self.rectOff = rect

         
         topRgba = hls_to_rgba_8bits(hue, ON_TOP_LUMINANCE, ON_SATURATION)
         bottomRgba = hls_to_rgba_8bits(hue, ON_BOTTOM_LUMINANCE, ON_SATURATION)
         
         topRgba = hls_to_rgba_8bits(hue, ON_TOP_LUMINANCE, ON_SATURATION)
         bottomRgba = hls_to_rgba_8bits(hue, ON_BOTTOM_LUMINANCE, ON_SATURATION)

-        size = rect.inflate(2*rect.width,0).size
-        print rect.size, size
-        self.stateOn = gradients.vertical(size, topRgba, bottomRgba)
+        rectOn = rect.inflate(ON_COLUMN_OVERSIZING * rect.width, 0)
+        self.stateOn = gradients.vertical(rectOn.size, topRgba, bottomRgba)
+        self.rectOn = rectOn

         
         self.image = self.stateOff
         self.rect = rect
         
         self.image = self.stateOff
         self.rect = rect


@@ -151,11 +173,12 @@ class Column(pygame.sprite.Sprite) :
     def update(self, state) :
         if state :
             self.image = self.stateOn
     def update(self, state) :
         if state :
             self.image = self.stateOn

+            self.rect = self.rectOn

         else :
             self.image = self.stateOff
         else :
             self.image = self.stateOff

+            self.rect = self.rectOff

         
 def hls_to_rgba_8bits(h, l, s) :
     #convert to rgb ranging from 0 to 255
     rgba = [floor(255 * i) for i in hls_to_rgb(h, l, s) + (1,)]
     return tuple(rgba)
         
 def hls_to_rgba_8bits(h, l, s) :
     #convert to rgb ranging from 0 to 255
     rgba = [floor(255 * i) for i in hls_to_rgb(h, l, s) + (1,)]
     return tuple(rgba)

-        
\ No newline at end of file