|
@@ -201,7 +201,7 @@ class MPDSpectrumPage(Page):
|
|
|
|
|
|
self._CanvasHWND = self._Screen._CanvasHWND
|
|
|
|
|
|
-
|
|
|
+ """
|
|
|
self._BGpng = IconItem()
|
|
|
self._BGpng._ImgSurf = MyIconPool._Icons["sheep_bg"]
|
|
|
self._BGpng._MyType = ICON_TYPES["STAT"]
|
|
@@ -219,7 +219,7 @@ class MPDSpectrumPage(Page):
|
|
|
self._SheepBody._MyType = ICON_TYPES["STAT"]
|
|
|
self._SheepBody._Parent = self
|
|
|
self._SheepBody.Adjust(0,0,self._SheepBodyW,self._SheepBodyH,0)
|
|
|
-
|
|
|
+ """
|
|
|
|
|
|
self.Start()
|
|
|
self._GobjectIntervalId = gobject.timeout_add(50,self.Playing)
|
|
@@ -308,123 +308,7 @@ class MPDSpectrumPage(Page):
|
|
|
|
|
|
if event.key == CurKeys["Enter"]:
|
|
|
pass
|
|
|
-
|
|
|
- def Draw(self):
|
|
|
- self.ClearCanvas()
|
|
|
- self._BGpng.NewCoord(self._Width/2,self._Height/2)
|
|
|
- self._BGpng.Draw()
|
|
|
-
|
|
|
-# print(self._Neighbor._CurSongTime)
|
|
|
-
|
|
|
- phrase1 = False
|
|
|
- phrase2 = False
|
|
|
|
|
|
- parts = self._Neighbor._CurSongTime.split(":")
|
|
|
- if len(parts) > 1:
|
|
|
- cur = float(parts[0])
|
|
|
- end = float(parts[1])
|
|
|
- pros = int((cur/end)*100.0)
|
|
|
-
|
|
|
- if pros > 30 and pros < 55:
|
|
|
- phrase1 = True
|
|
|
- if pros > 55 and pros < 100:
|
|
|
- phrase2 = True
|
|
|
-
|
|
|
-
|
|
|
- try:
|
|
|
- spects = self._Queue.get_nowait() ## last element is rms
|
|
|
- #print("get_nowait: " , spects)
|
|
|
- except Empty:
|
|
|
- return
|
|
|
- else: # got line
|
|
|
- if len(spects) == 0:
|
|
|
- return
|
|
|
-
|
|
|
- rms = spects[-1]
|
|
|
- ratio = float(rms)/float(self._Height)
|
|
|
- # 139,62
|
|
|
- dx = 0
|
|
|
- if ratio < 0.5:
|
|
|
- dx = 5
|
|
|
- else:
|
|
|
- dx = 16
|
|
|
- self._freq_count+=1 ## like frames
|
|
|
-
|
|
|
- sheepbody_xy = (181,92)
|
|
|
- sheephead_xy = (139,62)
|
|
|
- sheepeye_xy = (129,60) ## eye2 ==> 129+20
|
|
|
-
|
|
|
- eye_dx = sheephead_xy[0] - sheepeye_xy[0]
|
|
|
- eye_dy = sheephead_xy[1] - sheepeye_xy[1]
|
|
|
-
|
|
|
- self._SheepBody.NewCoord(sheepbody_xy[0],sheepbody_xy[1])
|
|
|
- leg_dx = 2
|
|
|
- if self._freq_count % 2 == 0:
|
|
|
- self._SheepHead.NewCoord(sheephead_xy[0]+dx, sheephead_xy[1])
|
|
|
-
|
|
|
- elif self._freq_count % 3 == 0:
|
|
|
- self._SheepHead.NewCoord(sheephead_xy[0]-dx, sheephead_xy[1])
|
|
|
- elif self._freq_count % 4 == 0:
|
|
|
- self._SheepHead.NewCoord(sheephead_xy[0],sheephead_xy[1]+dx*2)
|
|
|
-
|
|
|
- elif self._freq_count % 5 == 0:
|
|
|
- self._SheepBody.NewCoord(sheepbody_xy[0],sheepbody_xy[1]-dx*3)
|
|
|
- self._SheepHead.NewCoord(sheephead_xy[0],sheephead_xy[1]-dx*3)
|
|
|
-
|
|
|
- elif self._freq_count % 7 == 0:
|
|
|
- leg_dx = 0
|
|
|
- self._SheepBody.NewCoord(sheepbody_xy[0],sheepbody_xy[1])
|
|
|
-
|
|
|
-
|
|
|
- self._SheepBody.Draw()
|
|
|
- self._SheepHead.Draw()
|
|
|
-
|
|
|
- ## eyes
|
|
|
- pygame.draw.circle(self._CanvasHWND,(255,255,255),(self._SheepHead._PosX-eye_dx,self._SheepHead._PosY-eye_dy),8,0)
|
|
|
- pygame.draw.circle(self._CanvasHWND,(0,0,0),(self._SheepHead._PosX-eye_dx,self._SheepHead._PosY-eye_dy),8,2)
|
|
|
-
|
|
|
- pygame.draw.circle(self._CanvasHWND,(0,0,0),(self._SheepHead._PosX-eye_dx,self._SheepHead._PosY-eye_dy),2,0)
|
|
|
-
|
|
|
- pygame.draw.circle(self._CanvasHWND,(255,255,255),(self._SheepHead._PosX-eye_dx+20,self._SheepHead._PosY-eye_dy),8,0)
|
|
|
- pygame.draw.circle(self._CanvasHWND,(0,0,0),(self._SheepHead._PosX-eye_dx+20,self._SheepHead._PosY-eye_dy),8,2)
|
|
|
-
|
|
|
- pygame.draw.circle(self._CanvasHWND,(0,0,0),(self._SheepHead._PosX-eye_dx+20,self._SheepHead._PosY-eye_dy),2,0)
|
|
|
-
|
|
|
- ##legs
|
|
|
- legs1_xy = (self._SheepBody._PosX+13,self._SheepBody._PosY+38)
|
|
|
- legs1_xy_end = (legs1_xy[0],legs1_xy[1]+16)
|
|
|
-
|
|
|
- legs1_1_xy = (legs1_xy_end[0]-leg_dx,legs1_xy_end[1])
|
|
|
- legs1_1_xy_end = (legs1_1_xy[0],legs1_1_xy[1]+14)
|
|
|
-
|
|
|
- legs2_xy = (self._SheepBody._PosX+23,self._SheepBody._PosY+36)
|
|
|
- legs2_xy_end = (legs2_xy[0],legs2_xy[1]+16)
|
|
|
-
|
|
|
-
|
|
|
- legs3_xy = (self._SheepBody._PosX-23,self._SheepBody._PosY+38)
|
|
|
- legs3_xy_end = (legs3_xy[0],legs3_xy[1]+16)
|
|
|
-
|
|
|
- legs4_xy = (self._SheepBody._PosX-33,self._SheepBody._PosY+26)
|
|
|
- legs4_xy_end = (legs4_xy[0],legs4_xy[1]+22)
|
|
|
-
|
|
|
- legs4_1_xy = (legs4_xy_end[0]-leg_dx,legs4_xy_end[1])
|
|
|
- legs4_1_xy_end = (legs4_1_xy[0],legs4_1_xy[1]+14)
|
|
|
-
|
|
|
-
|
|
|
- pygame.draw.line(self._CanvasHWND,(0,0,0), legs1_xy,legs1_xy_end,4)
|
|
|
- pygame.draw.line(self._CanvasHWND,(0,0,0), legs2_xy,legs2_xy_end,4)
|
|
|
-
|
|
|
- pygame.draw.line(self._CanvasHWND,(0,0,0), legs3_xy,legs3_xy_end,4)
|
|
|
- pygame.draw.line(self._CanvasHWND,(0,0,0), legs4_xy,legs4_xy_end,4)
|
|
|
-
|
|
|
- pygame.draw.line(self._CanvasHWND,(0,0,0), legs1_1_xy,legs1_1_xy_end,4)
|
|
|
-
|
|
|
- pygame.draw.line(self._CanvasHWND,(0,0,0), legs4_1_xy,legs4_1_xy_end,4)
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-"""
|
|
|
def Draw(self):
|
|
|
self.ClearCanvas()
|
|
|
|
|
@@ -443,6 +327,6 @@ class MPDSpectrumPage(Page):
|
|
|
for i,v in enumerate(spects[0:-1]):
|
|
|
pygame.draw.rect(self._CanvasHWND,self._Color,(i*w+left_margin,self._Height-v,bw,v),0)
|
|
|
|
|
|
-"""
|
|
|
+
|
|
|
|
|
|
|