diff --git a/AmpScan/AmpScanGUI.py b/AmpScan/AmpScanGUI.py index dfa1a86a5fe7071794075cc032201b095d2191a6..26b93fca5f817e1797e9b21d3e8aacff4db6d5b7 100644 --- a/AmpScan/AmpScanGUI.py +++ b/AmpScan/AmpScanGUI.py @@ -146,10 +146,9 @@ class AmpScanGUI(QMainWindow): self.analyseMenu.addAction(self.analyse) self.kineticMenu = self.menuBar().addMenu("&Kinetic Measurements") self.kineticMenu.addAction(self.openPress) - -def runAmpScanGUI(): -# 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/ampVis.py b/AmpScan/ampVis.py index b156020dd6b2d7c67cbee05c630ae39735f7956c..de5d82fc07cd83f5466cc0691139a51699b9a076 100644 --- a/AmpScan/ampVis.py +++ b/AmpScan/ampVis.py @@ -90,7 +90,7 @@ class ampVTK(object): self.axes[viewport].SetBounds(tuple(lim.max(axis=0))) self.axes[viewport].SetCamera(self.cams[viewport]) self.axes[viewport].SetFlyModeToClosestTriad() - for axes in xrange(3): + for axes in range(3): self.axes[viewport].GetTitleTextProperty(axes).SetColor(color) self.axes[viewport].GetLabelTextProperty(axes).SetColor(color) self.axes[viewport].GetTitleTextProperty(axes).SetFontFamilyToCourier() @@ -134,7 +134,7 @@ class qtVtkWindow(QVTKRenderWindowInteractor, ampVTK): self.GetRenderWindow().RemoveRenderer(ren) self.rens = self.rens[:n] elif dif > 0: - for i in xrange(dif): + for i in range(dif): self.rens.append(vtkRender()) self.axes.append(vtk.vtkCubeAxesActor()) self.GetRenderWindow().AddRenderer(self.rens[-1]) @@ -174,7 +174,7 @@ class vtkRenWin(vtk.vtkRenderWindow, ampVTK): self.RemoveRenderer(ren) self.rens = self.rens[:n] elif dif > 0: - for i in xrange(dif): + for i in range(dif): self.rens.append(vtkRender()) self.axes.append(vtk.vtkCubeAxesActor()) self.AddRenderer(self.rens[-1]) @@ -295,7 +295,7 @@ class visMixin(object): self.lut = vtk.vtkLookupTable() self.lut.SetNumberOfTableValues(bands) self.lut.Build() - for i in xrange(bands): + for i in range(bands): rgb = list(self.ctf.GetColor(float(i) / bands)) + [1] self.lut.SetTableValue(i, rgb) diff --git a/AmpScan/core.py b/AmpScan/core.py index 2ac875cc4e0288487622857e7459d65adcbc7856..640a791a43e5cfc5d234c5a7aaf130499396be83 100644 --- a/AmpScan/core.py +++ b/AmpScan/core.py @@ -10,17 +10,6 @@ Remove pd dependency and instead just use numpy arrays Requires numpy 1.13 -import os -path = (r'J:\\Shared Resources\\AmpScan IfLS Team\\' - '100 PYTHON\\STLReader') -path = r'\\filestore.soton.ac.uk\SharedResources\AmpScan IfLS Team\100 PYTHON\STLReader' -path = (r'C:\Users\js22g12\OneDrive - University of Southampton\Documents ' - r'(OneDrive)\AmpScan\Code\2017_09\02_Code\AmpScan') -path = (r'C:\Users\Josh\OneDrive - University of Southampton\Documents ' - r'(OneDrive)\AmpScan\Code\2017_09\02_Code\AmpScan') -filename = '01_PhantomShell_ICEM_3mm.stl' -filename2 = '01_PhantomShell_ICEM_3mm_write.stl' -os.chdir(path) AmpObject Read @@ -75,7 +64,7 @@ class AmpObject(alignMixin, trimMixin, smoothMixin, analyseMixin, def addData(self, Data, stype): - if isinstance(Data, basestring): + if isinstance(Data, str): self.stype.append(stype) self.read_stl(Data, stype) # Import stl as filename diff --git a/AmpScan/fe.py b/AmpScan/fe.py index 32306dd2e3853879c3fda8cd49a766850641b0ca..2cd4b961fb0cc0ed7626bdd9def9c6125e3710aa 100644 --- a/AmpScan/fe.py +++ b/AmpScan/fe.py @@ -11,7 +11,7 @@ class feMixin(object): def addFE(self, files): if len(files) == 1: - data = np.load(files[0]).item() + data = np.load(files[0], encoding='bytes').item() if len(files) == 3: data = {} names = ['vert', 'faces', 'values']