From 20e4e4fcc2fdd6e41161151c2fe3f553bffc679c Mon Sep 17 00:00:00 2001 From: s444417 Date: Mon, 23 Mar 2020 18:47:02 +0100 Subject: [PATCH 1/2] branch test commit --- .../inspectionProfiles/profiles_settings.xml | 6 ++++++ kelner/.idea/kelner.iml | 11 +++++++++++ kelner/.idea/misc.xml | 7 +++++++ kelner/.idea/modules.xml | 8 ++++++++ kelner/.idea/workspace.xml | 17 +++++++++++++---- 5 files changed, 45 insertions(+), 4 deletions(-) create mode 100644 kelner/.idea/inspectionProfiles/profiles_settings.xml create mode 100644 kelner/.idea/kelner.iml create mode 100644 kelner/.idea/misc.xml create mode 100644 kelner/.idea/modules.xml diff --git a/kelner/.idea/inspectionProfiles/profiles_settings.xml b/kelner/.idea/inspectionProfiles/profiles_settings.xml new file mode 100644 index 0000000..105ce2d --- /dev/null +++ b/kelner/.idea/inspectionProfiles/profiles_settings.xml @@ -0,0 +1,6 @@ + + + + \ No newline at end of file diff --git a/kelner/.idea/kelner.iml b/kelner/.idea/kelner.iml new file mode 100644 index 0000000..9c88284 --- /dev/null +++ b/kelner/.idea/kelner.iml @@ -0,0 +1,11 @@ + + + + + + + + + + \ No newline at end of file diff --git a/kelner/.idea/misc.xml b/kelner/.idea/misc.xml new file mode 100644 index 0000000..53407e2 --- /dev/null +++ b/kelner/.idea/misc.xml @@ -0,0 +1,7 @@ + + + + + + \ No newline at end of file diff --git a/kelner/.idea/modules.xml b/kelner/.idea/modules.xml new file mode 100644 index 0000000..620b5e5 --- /dev/null +++ b/kelner/.idea/modules.xml @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file diff --git a/kelner/.idea/workspace.xml b/kelner/.idea/workspace.xml index 1b05ddd..ab49e6b 100644 --- a/kelner/.idea/workspace.xml +++ b/kelner/.idea/workspace.xml @@ -2,7 +2,6 @@ - @@ -115,7 +122,9 @@ - + + From f6224703d0dd7cd5a34478d678b48e1a40cd8361 Mon Sep 17 00:00:00 2001 From: s444417 Date: Tue, 24 Mar 2020 00:27:45 +0100 Subject: [PATCH 2/2] waiter get extreme XY values --- kelner/.idea/workspace.xml | 4 +++- kelner/src/components/Waiter.py | 12 ++++++++++++ 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/kelner/.idea/workspace.xml b/kelner/.idea/workspace.xml index ab49e6b..98cd211 100644 --- a/kelner/.idea/workspace.xml +++ b/kelner/.idea/workspace.xml @@ -3,6 +3,7 @@ + - + \ No newline at end of file diff --git a/kelner/src/components/Waiter.py b/kelner/src/components/Waiter.py index 061263b..b33a306 100644 --- a/kelner/src/components/Waiter.py +++ b/kelner/src/components/Waiter.py @@ -33,6 +33,18 @@ class Waiter: def getY(self): return self.__y + def getXmin(self): + return self.__minX + + def getXmax(self): + return self.__maxX + + def getYmin(self): + return self.__minY + + def getYmax(self): + return self.__maxY + def moveUp(self): if self.__y > self.__minY: self.__y -= 1