From 21021ea59a7a8ca9c9c0d496a2fb2bf24cb63523 Mon Sep 17 00:00:00 2001 From: = <=> Date: Mon, 15 Jun 2020 17:43:52 +0200 Subject: [PATCH] working version that was presented --- kelner/main.py | 2 +- kelner/src/components/Table.py | 42 ++++++++++++++++++++-------------- 2 files changed, 26 insertions(+), 18 deletions(-) diff --git a/kelner/main.py b/kelner/main.py index dccd8ba..e6519dc 100644 --- a/kelner/main.py +++ b/kelner/main.py @@ -106,4 +106,4 @@ while running: if not kitchenManager.is_running(): gridBoard.reinitialize() gridBoard.draw(drawableManager) - gridBoard.udpdate() + gridBoard.udpdate() \ No newline at end of file diff --git a/kelner/src/components/Table.py b/kelner/src/components/Table.py index b388dda..d2e8540 100644 --- a/kelner/src/components/Table.py +++ b/kelner/src/components/Table.py @@ -84,23 +84,19 @@ class Table(Drawable): # self.__tableLock.release() # return order - # def get_order(self): - # return self.__order - def get_order(self): - order = None - if self.__tableLock.acquire(False): - try: - if self.isStatus(Status.Ready) and self.hasOrder(): - # Generates order - order = [] - for a in range(0, len(self.__guests)): - order.append(Tree_Builder.zgadnij(self.__zainteresowania[a], self.Decision_Tree)) - print("Zamowienie: " + str(order)) - self.setOrder([]) - finally: - self.__tableLock.release() - return order + return self.__order + + # def getOrder(self): + # order = None + # if self.__tableLock.acquire(False): + # try: + # if self.isStatus(Status.Ready) and self.hasOrder(): + # order = self.__order + # self.setOrder([]) + # finally: + # self.__tableLock.release() + # return order def setOrder(self, order): self.__order = order @@ -115,7 +111,7 @@ class Table(Drawable): self.__status = status def __getImage(self, imageKind): - if imageKind in [Images.Guest1, Images.Guest2, Images.Guest3, Images.Plate]: + if imageKind in [Images.Guest1, Images.Guest2, Images.Guest3, Images.Plate, Images.Chicken]: size = int(self.getCellSize() / 3) else: size = int(1.4 * self.getCellSize()) @@ -168,3 +164,15 @@ class Table(Drawable): screen.blit(imagePlate, (xBase + guest1XOffset, yBase + platesYOffset)) screen.blit(imagePlate, (xBase + guest2XOffset, yBase + platesYOffset)) screen.blit(imagePlate, (xBase + guest3XOffset, yBase + platesYOffset)) + elif self.isStatus(Status.Served): + platesYOffset = int(0.3 * self.getCellSize()) + imageChicken = self.__getImage(Images.Chicken) + if len(self.__guests) == 1: + screen.blit(imageChicken, (xBase + guest2XOffset, yBase + platesYOffset)) + elif len(self.__guests) == 2: + screen.blit(imageChicken, (xBase + guest4XOffset, yBase + platesYOffset)) + screen.blit(imageChicken, (xBase + guest5XOffset, yBase + platesYOffset)) + elif len(self.__guests) == 3: + screen.blit(imageChicken, (xBase + guest1XOffset, yBase + platesYOffset)) + screen.blit(imageChicken, (xBase + guest2XOffset, yBase + platesYOffset)) + screen.blit(imageChicken, (xBase + guest3XOffset, yBase + platesYOffset)) \ No newline at end of file