From 0549f194ae63cc4556a378c2dc62af2300bbdd35 Mon Sep 17 00:00:00 2001
From: Callum Arthurs <callumarthurs@yahoo.co.uk>
Date: Wed, 16 Sep 2020 22:33:46 +0100
Subject: [PATCH] qthread issue fixed

---
 DAB_application.py                |  4 ++--
 dab_analysis_application.spec     | 37 -------------------------------
 scripts/Cut_Application_thread.py |  2 +-
 scripts/DAB_layout.ui             |  2 +-
 4 files changed, 4 insertions(+), 41 deletions(-)
 delete mode 100755 dab_analysis_application.spec

diff --git a/DAB_application.py b/DAB_application.py
index 8674643..4aba58d 100755
--- a/DAB_application.py
+++ b/DAB_application.py
@@ -1,5 +1,5 @@
 # DEPLOY MAC
-# sudo pyinstaller -F --windowed -p /Users/callum/callum/TMAPP/scripts --add-data "/Users/callum/callum/TMAPP/scripts:scripts" --icon=scripts/docs/he.icns DAB_application.py
+# sudo pyinstaller -F --windowed -p /Users/callum/callum/TMAPP/scripts --add-data "/Users/callum/callum/TMAPP/scripts:scripts" --add-binary "/Users/callum/Library/Application Support/pyinstaller/bincache00_py37_64bit/libopenslide.0.dylib:." --icon=scripts/docs/he.icns DAB_application.py
 # Windows
 # pyinstaller -F --windowed -p C:/Users/Daniel/Downloads/TMAPP-master/TMAPP-master/scripts --add-data "C:/Users/Daniel/Downloads/TMAPP-master/TMAPP-master/scripts;scripts" --icon=scripts/docs/he.ico DAB_application.py
 
@@ -21,7 +21,7 @@
 from skimage import color
 from PIL import Image
 
-sys._MEIPASS = '.'  # for running locally
+# sys._MEIPASS = '.'  # for running locally
 
 class MyWindow(QMainWindow):
     def __init__(self):
diff --git a/dab_analysis_application.spec b/dab_analysis_application.spec
deleted file mode 100755
index 84c67d6..0000000
--- a/dab_analysis_application.spec
+++ /dev/null
@@ -1,37 +0,0 @@
-# -*- mode: python ; coding: utf-8 -*-
-
-block_cipher = None
-
-
-a = Analysis(['dab_analysis_application.py'],
-             pathex=['/Users/callum/callum/dab/analysis_application/scripts', '/Users/callum/callum/dab/analysis_application'],
-             binaries=[],
-             datas=[],
-             hiddenimports=[],
-             hookspath=[],
-             runtime_hooks=[],
-             excludes=[],
-             win_no_prefer_redirects=False,
-             win_private_assemblies=False,
-             cipher=block_cipher,
-             noarchive=False)
-pyz = PYZ(a.pure, a.zipped_data,
-             cipher=block_cipher)
-exe = EXE(pyz,
-          a.scripts,
-          a.binaries,
-          a.zipfiles,
-          a.datas,
-          [],
-          name='dab_analysis_application',
-          debug=False,
-          bootloader_ignore_signals=False,
-          strip=False,
-          upx=True,
-          upx_exclude=[],
-          runtime_tmpdir=None,
-          console=False )
-app = BUNDLE(exe,
-             name='dab_analysis_application.app',
-             icon=None,
-             bundle_identifier=None)
diff --git a/scripts/Cut_Application_thread.py b/scripts/Cut_Application_thread.py
index 39edc31..afe48a6 100755
--- a/scripts/Cut_Application_thread.py
+++ b/scripts/Cut_Application_thread.py
@@ -28,7 +28,7 @@
 have been applied and then reapply them when the image is needed - for the remove small objects phase
 """
 
-sys._MEIPASS = '.'  # for running locally
+# sys._MEIPASS = '.'  # for running locally
 
 
 # setup the Graphics scene to detect clicks
diff --git a/scripts/DAB_layout.ui b/scripts/DAB_layout.ui
index 62a16ca..4ef4f09 100755
--- a/scripts/DAB_layout.ui
+++ b/scripts/DAB_layout.ui
@@ -46,7 +46,7 @@
            </size>
           </property>
           <property name="text">
-           <string>Whole Slide Image Exporter</string>
+           <string>TMA WSI Exporter</string>
           </property>
          </widget>
         </item>