diff --git a/AmpScan/ampVis.py b/AmpScan/ampVis.py index 14da43672f0e8c1dbb78b3ba588fa784f54c0d09..2cacdabccc53f4858c36a68a3ed8288b19b9f55e 100644 --- a/AmpScan/ampVis.py +++ b/AmpScan/ampVis.py @@ -96,16 +96,16 @@ class ampVTK(object): self.axes[viewport].GetTitleTextProperty(axes).SetFontFamilyToCourier() self.axes[viewport].GetLabelTextProperty(axes).SetFontFamilyToCourier() - self.axes[viewport].GetXAxesLinesProperty().SetColor(color) - self.axes[viewport].GetYAxesLinesProperty().SetColor(color) - self.axes[viewport].GetZAxesLinesProperty().SetColor(color) - - self.axes[viewport].SetGridLineLocation(self.axes[viewport].VTK_GRID_LINES_FURTHEST) - - self.axes[viewport].XAxisMinorTickVisibilityOff() - self.axes[viewport].YAxisMinorTickVisibilityOff() - self.axes[viewport].ZAxisMinorTickVisibilityOff() - self.rens[viewport].AddActor(self.axes[viewport]) +# self.axes[viewport].GetXAxesLinesProperty().SetColor(color) +# self.axes[viewport].GetYAxesLinesProperty().SetColor(color) +# self.axes[viewport].GetZAxesLinesProperty().SetColor(color) +# +# self.axes[viewport].SetGridLineLocation(self.axes[viewport].VTK_GRID_LINES_FURTHEST) +# +# self.axes[viewport].XAxisMinorTickVisibilityOff() +# self.axes[viewport].YAxisMinorTickVisibilityOff() +# self.axes[viewport].ZAxisMinorTickVisibilityOff() +# self.rens[viewport].AddActor(self.axes[viewport]) class qtVtkWindow(QVTKRenderWindowInteractor, ampVTK): @@ -195,12 +195,14 @@ class vtkRenWin(vtk.vtkRenderWindow, ampVTK): [self.winWidth, self.winHeight, 3])) / 255.0 def getScreenshot(self, fname, mag=10): + self.SetAlphaBitPlanes(1) w2if = vtk.vtkWindowToImageFilter() w2if.SetInput(self) w2if.SetScale(mag) + w2if.SetInputBufferTypeToRGBA() w2if.Update() - writer = vtk.vtkTIFFWriter() + writer = vtk.vtkPNGWriter() writer.SetFileName(fname) writer.SetInputConnection(w2if.GetOutputPort()) writer.Write() @@ -210,7 +212,7 @@ class visMixin(object): def genIm(self, actor=['limb'], winWidth=512, winHeight=512, views=[[0, -1, 0]], background=[1.0, 1.0, 1.0], projection=True, - shading=True, mag=10): + shading=True, mag=10, out='im', name='test.tiff'): """ """ @@ -224,7 +226,13 @@ class visMixin(object): win.setProjection(projection, viewport=i) win.renderActors(self.actors, actor, viewport=i, shading=shading, zoom=1.3) win.Render() - win.getScreenshot('test.tiff') + win.getImage() + if out == 'im': + return win.im + elif out == 'fh': + win.getScreenshot(name) + return +# win.getScreenshot('test.tiff') # return win.im def addActor(self, stype=0, CMap=None): diff --git a/AmpScan/fe.py b/AmpScan/fe.py index 9fef4dfa0d8d4d9c8a3d5a1282869a9e0018db73..1c6e5d113dfcbe9d4533369e215b3c924501fa29 100644 --- a/AmpScan/fe.py +++ b/AmpScan/fe.py @@ -12,7 +12,7 @@ class feMixin(object): def addFE(self, files): if len(files) == 1: data = np.load(files[0], encoding='bytes').item() - for k, v in data.items(): + for k in list(data.keys()): data[str(k, 'utf-8')] = data.pop(k) if len(files) == 3: data = {}