Added wrapper class for pygame display updates so they happen in one …

…location and so additional future improvements can be easier to implement

src/aboutScreen.py

@@ -80,8 +80,8 @@ def drawBackground(self, display):
         display : Display
             The Display instance used for displaying to the screen.
         '''
-        display.draw.rect(self.win, (170, 170, 170), self.aboutBackground, 0)
-        display.draw.rect(self.win, (100, 100, 100), self.aboutBackground, 2)
+        display.draw.rect((170, 170, 170), self.aboutBackground, 0)
+        display.draw.rect((100, 100, 100), self.aboutBackground, 2)
 
     def display(self, display, source):
         '''
@@ -143,11 +143,11 @@ def display(self, display, source):
         for button in self.buttons:
             if button.updated:
                 button.hovered = False
-                button.draw(self.win)
+                button.draw(display)
 
         # Draw the text to the screen.
         for txt in self.aboutText:
-            txt.draw(self.win)
+            txt.draw(display)
 
         # Update the screen to display the updated draws.
         display.flip()
@@ -191,7 +191,7 @@ def display(self, display, source):
                 # If any of the buttons have had changes happen to them
                 # then redraw them.
                 if button.updated:
-                    button.draw(self.win)
+                    button.draw(display)
 
             # Update the screen to display the updated draws.
             display.flip()

src/bell.py

@@ -150,29 +150,29 @@ def updateLocation(self, x, y, textX, textY):
         # Update the position of the 'blank' bell image too.
         self.bellNumberTextBlank = pygame.Rect(self.textX, self.textY, self.bellNumberText.get_width(), self.bellNumberText.get_height())
 
-    def draw(self, win, renderNumber=True):
+    def draw(self, display, renderNumber=True):
         '''
         Draws the bell image and bell number text to the screen, with the bell
         stroke being drawn corresponding to the current value of the internal
         'stroke' variable.
 
         Parameters
         ----------
-        win : pygame.display
-            The pygame display window.
+        display : Display
+            The display instance used for displaying to the screen.
 
         renderNumber : bool
             The flag to decide whether to draw the bell number text.
         '''
         if self.stroke == 'H':
-            win.blit(self.backstrokeBellBlank, (self.x, self.y))
-            win.blit(self.handstrokeBell, (self.x, self.y))
+            display.blit(self.backstrokeBellBlank, (self.x, self.y))
+            display.blit(self.handstrokeBell, (self.x, self.y))
         else:
-            win.blit(self.handstrokeBellBlank, (self.x, self.y))
-            win.blit(self.backstrokeBell, (self.x, self.y))
+            display.blit(self.handstrokeBellBlank, (self.x, self.y))
+            display.blit(self.backstrokeBell, (self.x, self.y))
         if renderNumber:
-            pygame.draw.rect(win, self.backgroundColour, self.bellNumberTextBlank, 0)
-            win.blit(self.bellNumberText, (self.textX, self.textY))
+            display.draw.rect(self.backgroundColour, self.bellNumberTextBlank, 0)
+            display.blit(self.bellNumberText, (self.textX, self.textY))
 
     def handle_event(self, send):
         '''

src/button.py

@@ -47,16 +47,16 @@ def set_inactive(self):
         self.active = False
         self.hovered = True
 
-    def draw(self, win):
+    def draw(self, display):
         self.set_rend()
 
         if self.border:
-            pygame.draw.rect(win, self.buttonColour, (self.rect.x, self.rect.y, self.rect.w, self.rect.h))
-            win.blit(self.rend, (self.rect.x+5, self.rect.y))
-            pygame.draw.rect(win, self.borderColour,(self.rect.x, self.rect.y, self.rect.w, self.rect.h), 2)
+            display.draw.rect(self.buttonColour, (self.rect.x, self.rect.y, self.rect.w, self.rect.h))
+            display.blit(self.rend, (self.rect.x+5, self.rect.y))
+            display.draw.rect(self.borderColour,(self.rect.x, self.rect.y, self.rect.w, self.rect.h), 2)
         else:
-            pygame.draw.rect(win, self.buttonColour, (self.rect.x, self.rect.y, self.rect.w, self.rect.h))
-            win.blit(self.rend, (self.rect.x+5, self.rect.y))
+            display.draw.rect(self.buttonColour, (self.rect.x, self.rect.y, self.rect.w, self.rect.h))
+            display.blit(self.rend, (self.rect.x+5, self.rect.y))
 
     def set_rend(self):
         self.rend = self.font.render(self.text, True, self.get_color())

src/display.py

@@ -1,11 +1,11 @@
 import pygame
 
 class Draw:
-    def __init__(self):
-        pass
+    def __init__(self, win):
+        self.win = win
 
     def rect(self, *args):
-        pygame.draw.rect(*args)
+        pygame.draw.rect(self.win, *args)
 
 class Display:
 
@@ -23,7 +23,7 @@ def __init__(self, width, height, caption=None, iconFile=None):
             self.icon = pygame.image.load(self.iconFile)
             pygame.display.set_icon(self.icon)
 
-        self.draw = Draw()
+        self.draw = Draw(self.win)
 
     def set_mode(self, *args):
         self.win = pygame.display.set_mode(*args)

src/helpScreen.py

@@ -89,8 +89,8 @@ def drawBackground(self, display):
         display : Display
             The Display instance used for displaying to the screen.
         '''
-        display.draw.rect(self.win, (170, 170, 170), self.helpBackground, 0)
-        display.draw.rect(self.win, (100, 100, 100), self.helpBackground, 2)
+        display.draw.rect((170, 170, 170), self.helpBackground, 0)
+        display.draw.rect((100, 100, 100), self.helpBackground, 2)
 
     def display(self, display, source):
         self.win = display.win
@@ -152,10 +152,10 @@ def display(self, display, source):
         for button in self.buttons:
             if button.updated:
                 button.hovered = False
-                button.draw(self.win)
+                button.draw(display)
 
         for txt in text:
-            txt.draw(self.win)
+            txt.draw(display)
 
         display.flip()
 
@@ -179,14 +179,14 @@ def display(self, display, source):
                         self.button_ringingPage.active = True
                         self.drawBackground(display)
                         for txt in text:
-                            txt.draw(self.win)
+                            txt.draw(display)
                     elif self.button_ringingPage.rect.collidepoint(event.pos) and self.button_ringingPage.active == True:
                         text = self.ringingText
                         self.button_serverPage.active = True
                         self.button_ringingPage.active = False
                         self.drawBackground(display)
                         for txt in text:
-                            txt.draw(self.win)
+                            txt.draw(display)
 
                 for button in self.buttons:
                     if button.rect.collidepoint(pygame.mouse.get_pos()):
@@ -198,7 +198,7 @@ def display(self, display, source):
 
             for button in self.buttons:
                 if button.updated:
-                    button.draw(self.win)
+                    button.draw(display)
 
             display.flip()
             clock.tick(self.frameRate)

src/inputBox.py

@@ -116,8 +116,8 @@ def update(self):
             self.rectOld.h = self.rectOld.h
             self.rect.w = self.width
 
-    def draw(self, screen):
-        pygame.draw.rect(screen, (255, 255, 255), self.rectOld, 0)
-        screen.blit(self.txt_surface, (self.rect.x+5, self.rect.y+2))
-        pygame.draw.rect(screen, self.color, self.rect, 2)
+    def draw(self, display):
+        display.draw.rect((255, 255, 255), self.rectOld, 0)
+        display.blit(self.txt_surface, (self.rect.x+5, self.rect.y+2))
+        display.draw.rect(self.color, self.rect, 2)
 

src/menuScreen.py

@@ -85,7 +85,7 @@ def connectionStatusMessage(self):
             return self.blankMessage
 
     def updateConnectionStatusMessage(self, display):
-        display.draw.rect(self.win, (255, 255, 255), self.connectionRectWhite, 0)
+        display.draw.rect((255, 255, 255), self.connectionRectWhite, 0)
         if self.connection:
             display.blit(self.connectionStatusMessage(), (self.button_serverConnect.width+25, self.button_serverConnect.rect.y+5))
 
@@ -138,22 +138,22 @@ def display(self, display):
         display.blit(self.rebelLogo, (self.width/2-self.rebelLogo.get_width()/2, (self.inputBox_userName.rect.y - self.rebelLogo.get_height())*3/8))
 
         for box in self.input_boxes:
-            box.draw(self.win, redrawTitle=True)
+            box.draw(display, redrawTitle=True)
             box.updated = False
         for button in self.buttons:
             button.hovered = False
-            button.draw(self.win)
+            button.draw(display)
 
         self.updateConnectionStatusMessage(display)
 
         while self.run_menu:
             for box in self.input_boxes:
                 if box.updated:
-                    box.draw(self.win, redrawTitle=False)
+                    box.draw(display, redrawTitle=False)
                     box.updated = False
             for button in self.buttons:
                 if button.updated:
-                    button.draw(self.win)
+                    button.draw(display)
 
             for event in pygame.event.get():
                 if event.type == pygame.QUIT:
@@ -225,7 +225,7 @@ def display(self, display):
                     elif button.active == True:
                         button.hovered = False
                         button.updated = True
-                        button.draw(self.win)
+                        button.draw(display)
 
             display.flip()
             clock.tick(self.frameRate)

src/optionsScreen.py

@@ -152,8 +152,8 @@ def saveConfig(self):
         self.config.set('keys', bellKeyList)
 
     def drawBackground(self, display):
-        display.draw.rect(self.win, (170, 170, 170), self.optionsBackground, 0)
-        display.draw.rect(self.win, (100, 100, 100), self.optionsBackground, 2)
+        display.draw.rect((170, 170, 170), self.optionsBackground, 0)
+        display.draw.rect((100, 100, 100), self.optionsBackground, 2)
 
     def display(self, display, source):
         self.win = display.win
@@ -213,23 +213,23 @@ def display(self, display, source):
 
         self.drawBackground(display)
 
-        self.bellNumberInputBoxes[0].draw(self.win, redrawTitle=True)
+        self.bellNumberInputBoxes[0].draw(display, redrawTitle=True)
         self.bellNumberInputBoxes[0].updated = False
         for box in self.bellNumberInputBoxes[1:]:
-            box.draw(self.win)
+            box.draw(display)
             box.updated = False
-        self.bellKeyInputBoxes[0].draw(self.win, redrawTitle=True)
+        self.bellKeyInputBoxes[0].draw(display, redrawTitle=True)
         self.bellKeyInputBoxes[0].updated = False
         for box in self.bellKeyInputBoxes[1:]:
-            box.draw(self.win)
+            box.draw(display)
             box.updated = False
         for button in self.buttons:
             if button.updated:
                 button.hovered = False
-                button.draw(self.win)
+                button.draw(display)
 
         for txt in text:
-            txt.draw(self.win)
+            txt.draw(display)
 
         display.flip()
 
@@ -261,27 +261,27 @@ def display(self, display, source):
                         self.button_tuning.active = True
                         self.button_keys.active = False
                         self.button_other.active = True
-                        self.drawBackground()
+                        self.drawBackground(display)
                         for txt in text:
-                            txt.draw(self.win)
+                            txt.draw(display)
                     elif self.button_tuning.rect.collidepoint(event.pos) and self.button_tuning.active == True:
                         optionsPage = 'tuning'
                         text = self.tuningText
                         self.button_keys.active = True
                         self.button_tuning.active = False
                         self.button_other.active = True
-                        self.drawBackground()
+                        self.drawBackground(display)
                         for txt in text:
-                            txt.draw(self.win)
+                            txt.draw(display)
                     elif self.button_other.rect.collidepoint(event.pos) and self.button_other.active == True:
                         optionsPage = 'other'
                         text = self.otherText
                         self.button_keys.active = True
                         self.button_tuning.active = True
                         self.button_other.active = False
-                        self.drawBackground()
+                        self.drawBackground(display)
                         for txt in text:
-                            txt.draw(self.win)
+                            txt.draw(display)
 
                     for box in self.bellNumberInputBoxes:
                         box.mouseDownEvent(event, self.win)
@@ -307,16 +307,16 @@ def display(self, display, source):
             if optionsPage == 'keys':
                 for box in self.bellNumberInputBoxes:
                     if box.updated:
-                        box.draw(self.win)
+                        box.draw(display)
                         box.updated = False
                 for box in self.bellKeyInputBoxes:
                     if box.updated:
-                        box.draw(self.win)
+                        box.draw(display)
                         box.updated = False
 
             for button in self.buttons:
                 if button.updated:
-                    button.draw(self.win)
+                    button.draw(display)
 
             display.flip()
             clock.tick(self.frameRate)

src/ringingScreen.py

@@ -215,18 +215,18 @@ def display(self, display):
 
         self.win.fill(self.backgroundColour)
         for bell in self.bells.values():
-                bell.draw(self.win, renderNumber=True)
+                bell.draw(display, renderNumber=True)
         for button in self.buttons:
             button.active = True
             button.hovered = False
-            button.draw(self.win)
+            button.draw(display)
 
         run_ringing = True
         while run_ringing:
 
             for button in self.buttons:
                 if button.updated:
-                    button.draw(self.win)
+                    button.draw(display)
 
             for event in pygame.event.get():
                 if event.type == pygame.QUIT:
@@ -238,10 +238,10 @@ def display(self, display):
                         self.initialise()
                         self.win.fill(self.backgroundColour)
                         for bell in self.bells.values():
-                                bell.draw(self.win, renderNumber=True)
+                                bell.draw(display, renderNumber=True)
                         for button in self.buttons:
                             button.hovered = False
-                            button.draw(self.win)
+                            button.draw(display)
                     elif self.button_options.rect.collidepoint(event.pos):
                         run_ringing = False
                         return 'optionsScreen'
@@ -270,7 +270,7 @@ def display(self, display):
                     elif button.active == True:
                         button.hovered = False
                         button.updated = True
-                        button.draw(self.win)
+                        button.draw(display)
 
             try:
                 stroke, bellNumber = self.network.getBellRung()
@@ -280,7 +280,7 @@ def display(self, display):
                 pass
             else:
                 self.bells[bellNumber].bellRung(stroke)
-                self.bells[bellNumber].draw(self.win)
+                self.bells[bellNumber].draw(display)
                 pygame.mixer.Channel(bellNumber-1).play(self.audio.bells[bellNumber])
 
             display.flip()

src/textBox.py

@@ -74,9 +74,9 @@ def generateFormattedText(self, startingY, width):
         else:
             self.h = (y - self.y)
 
-    def draw(self, win):
+    def draw(self, display):
         for text in self.textFormatted:
-            win.blit(*text)
+            display.blit(*text)
 
     def set_rect(self):
         self.rect = pygame.Rect(self.x, self.y, self.width, 0)