diff --git a/AmpScan/AmpScanGUI.py b/AmpScan/AmpScanGUI.py index 5c05520f9f50fad27d8c7f9561911114aed64a10..7c6c9828b93590a234c991135c40c12ca8b5abc8 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 70fad540eacad8e1934c772d5b916f961945de4b..0000000000000000000000000000000000000000 --- 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 43c3c058713c374e12c2c0f6f3bb61ee8a83d97a..1a802663c26375c1166ebe8d0f7d9baea097d218 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