From abbd48ea0ec572adae694c6fbd3a070dd9c976db Mon Sep 17 00:00:00 2001
From: Joshua Steer <joshua.w.steer@gmail.com>
Date: Wed, 11 Jul 2018 09:55:35 +0100
Subject: [PATCH] Temporary fix to the GUI imports, will work if you run script
from AmpScan folder which contains the major .py files
---
AmpScan/AmpScanGUI.py | 20 +++++++++++---------
AmpScan/runAmpScanGUI.py | 15 ---------------
AmpScan/surrogateModelGUI_2.py | 5 ++---
3 files changed, 13 insertions(+), 27 deletions(-)
delete mode 100644 AmpScan/runAmpScanGUI.py
diff --git a/AmpScan/AmpScanGUI.py b/AmpScan/AmpScanGUI.py
index 5c05520..7c6c982 100644
--- a/AmpScan/AmpScanGUI.py
+++ b/AmpScan/AmpScanGUI.py
@@ -1,10 +1,12 @@
+import os
+os.chdir('..')
import sys
import numpy as np
from vtk.util import numpy_support
-from .core import AmpObject
-from .registration import registration
-from .ampVis import qtVtkWindow
-from .pressSens import pressSense
+from AmpScan.core import AmpObject
+from AmpScan.registration import registration
+from AmpScan.ampVis import qtVtkWindow
+from AmpScan.pressSens import pressSense
from PyQt5.QtCore import QPoint, QSize, Qt, QTimer, QRect, pyqtSignal
from PyQt5.QtGui import (QColor, QFontMetrics, QImage, QPainter, QIcon,
QOpenGLVersionProfile)
@@ -151,8 +153,8 @@ class AmpScanGUI(QMainWindow):
self.kineticMenu = self.menuBar().addMenu("&Kinetic Measurements")
self.kineticMenu.addAction(self.openPress)
-#if __name__ == "__main__":
-# app = QApplication(sys.argv)
-# mainWin = AmpScanGUI()
-# mainWin.show()
-# sys.exit(app.exec_())
\ No newline at end of file
+if __name__ == "__main__":
+ app = QApplication(sys.argv)
+ mainWin = AmpScanGUI()
+ mainWin.show()
+ sys.exit(app.exec_())
\ No newline at end of file
diff --git a/AmpScan/runAmpScanGUI.py b/AmpScan/runAmpScanGUI.py
deleted file mode 100644
index 70fad54..0000000
--- a/AmpScan/runAmpScanGUI.py
+++ /dev/null
@@ -1,15 +0,0 @@
-# -*- coding: utf-8 -*-
-"""
-Created on Wed May 2 20:21:07 2018
-
-@author: Josh
-"""
-
-import AmpScan as ampS
-from PyQt5.QtWidgets import QApplication
-import sys
-if __name__ == "__main__":
- app = QApplication(sys.argv)
- mainWin = ampS.AmpScanGUI()
- mainWin.show()
- sys.exit(app.exec_())
\ No newline at end of file
diff --git a/AmpScan/surrogateModelGUI_2.py b/AmpScan/surrogateModelGUI_2.py
index 43c3c05..1a80266 100644
--- a/AmpScan/surrogateModelGUI_2.py
+++ b/AmpScan/surrogateModelGUI_2.py
@@ -5,11 +5,10 @@ Created on Tue Oct 10 16:21:12 2017
@author: js22g12
"""
+import os
+os.chdir('..')
import sys
import copy
-import os
-os.chdir('C:\\Local\\Documents (Local)\\Code\\AmpScan\\')
-#os.chdir('C:\\Users\\Josh\\Documents\\Python\\AmpScan')
import numpy as np
from scipy.special import binom
from scipy.interpolate import interp1d
--
GitLab