From 0bfeeb2486801e4bd578b64eee59b01db014918f Mon Sep 17 00:00:00 2001 From: = <=> Date: Wed, 20 May 2020 08:30:30 +0200 Subject: [PATCH] made relative path to model --- kelner/src/algorithms/CNN/PrepareData.py | 5 ++++- kelner/src/managers/TableManager.py | 4 ++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/kelner/src/algorithms/CNN/PrepareData.py b/kelner/src/algorithms/CNN/PrepareData.py index cbfc609..763ed2b 100644 --- a/kelner/src/algorithms/CNN/PrepareData.py +++ b/kelner/src/algorithms/CNN/PrepareData.py @@ -103,7 +103,10 @@ class LoadModelThread(threading.Thread): self.__runThread = True def run(self): - model_path = 'D:\\Nauka\\Studia\\4_sem\\SztucznaInteligencja\\ProjektAI\\kelner\\src\\algorithms\\CNN\\trainedModels\\big_model_trained_3class.hdf5' + cwd = os.getcwd() + print(cwd) + model_path = os.path.join(cwd, 'src', 'algorithms', 'CNN', 'trainedModels', 'big_model_trained_3class.hdf5') + # model_path = 'D:\\Nauka\\Studia\\4_sem\\SztucznaInteligencja\\ProjektAI\\kelner\\src\\algorithms\\CNN\\trainedModels\\big_model_trained_3class.hdf5' model = load_model(model_path) settings.tensorflowModel = model print("---MODEL LOADED---") diff --git a/kelner/src/managers/TableManager.py b/kelner/src/managers/TableManager.py index 45bc3e7..0a65f50 100644 --- a/kelner/src/managers/TableManager.py +++ b/kelner/src/managers/TableManager.py @@ -33,10 +33,14 @@ class TableManager(threading.Thread): tables = self.__drawableManager.getTables(Status.Waiting) for table in tables: if (table.getX(), table.getY()) == position: + return table def pause(self): self._active = False + def stop(self): + self.__runThread = False + def resume(self): self._active = True