Merge remote-tracking branch 'origin/master' into I04_1-293

Author: UrszulaNeuman

build.bat

@@ -3,6 +3,9 @@ mkdir bin
 
 cd dls_barcode
 
+REM use to debug the exe file
+REM pyinstaller --onefile --icon=..\resources\icons\qr_code.ico --debug --clean main.py
+
 pyinstaller --onefile --windowed --icon=..\resources\icons\qr_code.ico --clean main.py
 
 move dist\main.exe ..\bin\barcode.exe

dls_barcode/geometry/unipuck_locator.py

@@ -89,7 +89,8 @@ def _find_feature(self, features_cnt):  # do this better
         # compares the feature from the image with the features found on the edge of the puck
         if getattr(sys, 'frozen', False): # for the .exe bundle
             #see: #see https://pythonhosted.org/PyInstaller/runtime-information.html
-            f_path = os.path.join('..', 'resources', 'features', 'fit.png')
+            #f_path = os.path.join('..', 'resources', 'features', 'fit.png')
+            f_path = os.path.join('resources', 'features', 'fit.png')
         else:
             dir_path = os.path.dirname(os.path.abspath(__file__))
             f_path = os.path.join(dir_path, '..', '..', 'resources', 'features', 'fit.png')