Changeset 3588
- Timestamp:
- Sep 7, 2018 9:10:11 AM (5 years ago)
- Location:
- trunk
- Files:
-
- 4 edited
-
GSASIIconstrGUI.py (modified) (2 diffs)
-
GSASIIphsGUI.py (modified) (3 diffs)
-
GSASIIplot.py (modified) (6 diffs)
-
GSASIIrestrGUI.py (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
-
trunk/GSASIIconstrGUI.py
r3577 r3588 1466 1466 dlg = wx.FileDialog(G2frame,message='Choose '+macName+' rigid body macro file', 1467 1467 defaultDir=defDir,defaultFile="",wildcard="GSAS-II macro file (*.mac)|*.mac", 1468 style=wx.FD_OPEN | wx. CHANGE_DIR)1468 style=wx.FD_OPEN | wx.FD_CHANGE_DIR) 1469 1469 try: 1470 1470 if dlg.ShowModal() == wx.ID_OK: … … 1486 1486 "GSAS-II text file (*.txt)|*.txt|XYZ file (*.xyz)|*.xyz|" 1487 1487 "Sybyl mol2 file (*.mol2)|*.mol2|PDB file (*.pdb;*.ent)|*.pdb;*.ent", 1488 wx.FD_OPEN | wx. CHANGE_DIR)1488 wx.FD_OPEN | wx.FD_CHANGE_DIR) 1489 1489 try: 1490 1490 if dlg.ShowModal() == wx.ID_OK: -
trunk/GSASIIphsGUI.py
r3587 r3588 4080 4080 def OnImportLayer(event): 4081 4081 dlg = wx.FileDialog(G2frame, 'Choose GSAS-II project file', 4082 wildcard='GSAS-II project file (*.gpx)|*.gpx',style=wx.FD_OPEN| wx. CHANGE_DIR)4082 wildcard='GSAS-II project file (*.gpx)|*.gpx',style=wx.FD_OPEN| wx.FD_CHANGE_DIR) 4083 4083 try: 4084 4084 if dlg.ShowModal() == wx.ID_OK: … … 4531 4531 def OnCopyPhase(event): 4532 4532 dlg = wx.FileDialog(G2frame, 'Choose GSAS-II project file', 4533 wildcard='GSAS-II project file (*.gpx)|*.gpx',style=wx.FD_OPEN| wx. CHANGE_DIR)4533 wildcard='GSAS-II project file (*.gpx)|*.gpx',style=wx.FD_OPEN| wx.FD_CHANGE_DIR) 4534 4534 try: 4535 4535 if dlg.ShowModal() == wx.ID_OK: … … 4561 4561 dlg.Destroy() 4562 4562 dlg = wx.FileDialog(G2frame, 'Choose DIFFaX file name to read', '.', '', 4563 'DIFFaX file (*.*)|*.*',style=wx.FD_OPEN | wx. CHANGE_DIR)4563 'DIFFaX file (*.*)|*.*',style=wx.FD_OPEN | wx.FD_CHANGE_DIR) 4564 4564 try: 4565 4565 if dlg.ShowModal() == wx.ID_OK: -
trunk/GSASIIplot.py
r3584 r3588 1097 1097 size = Page.canvas.GetSize() 1098 1098 GL.glPixelStorei(GL.GL_UNPACK_ALIGNMENT, 1) 1099 if mode in ['jpeg',]: 1100 Pix = GL.glReadPixels(0,0,size[0],size[1],GL.GL_RGBA,GL.GL_UNSIGNED_BYTE) 1101 im = Im.new("RGBA", (size[0],size[1])) 1102 else: 1103 Pix = GL.glReadPixels(0,0,size[0],size[1],GL.GL_RGB,GL.GL_UNSIGNED_BYTE) 1104 im = Im.new("RGB", (size[0],size[1])) 1099 Pix = GL.glReadPixels(0,0,size[0],size[1],GL.GL_RGB,GL.GL_UNSIGNED_BYTE) 1100 im = Im.new("RGB", (size[0],size[1])) 1105 1101 try: 1106 1102 im.frombytes(Pix) … … 3088 3084 ''' 3089 3085 def ClosestColorNumber(color): 3090 '''Convert a RGB or RGBAvalue to the closest default Grace color3086 '''Convert a RGB value to the closest default Grace color 3091 3087 ''' 3092 3088 import matplotlib.colors as mpcls … … 7111 7107 else: 7112 7108 dlg = wx.FileDialog(G2frame, 'Choose graphics save file', 7113 wildcard='Graphics file (*.'+mode+')|*.'+mode,style=wx.FD_OPEN| wx. CHANGE_DIR)7109 wildcard='Graphics file (*.'+mode+')|*.'+mode,style=wx.FD_OPEN| wx.FD_CHANGE_DIR) 7114 7110 try: 7115 7111 if dlg.ShowModal() == wx.ID_OK: … … 7118 7114 dlg.Destroy() 7119 7115 size = Page.canvas.GetSize() 7120 GL.glPixelStorei(GL.GL_UNPACK_ALIGNMENT, 1) 7121 if mode in ['jpeg',]: 7122 Pix = GL.glReadPixels(0,0,size[0],size[1],GL.GL_RGBA, GL.GL_UNSIGNED_BYTE) 7123 im = Im.new("RGBA", (size[0],size[1])) 7124 else: 7125 Pix = GL.glReadPixels(0,0,size[0],size[1],GL.GL_RGB, GL.GL_UNSIGNED_BYTE) 7126 im = Im.new("RGB", (size[0],size[1])) 7127 try: 7128 im.frombytes(Pix) 7129 except AttributeError: 7130 im.fromstring(Pix) 7131 im = im.transpose(Im.FLIP_TOP_BOTTOM) 7132 im.save(Fname,mode) 7133 cb.SetValue(' save as/key:') 7134 G2frame.G2plotNB.status.SetStatusText('Drawing saved to: '+Fname,1) 7116 if Fname: 7117 GL.glPixelStorei(GL.GL_UNPACK_ALIGNMENT, 1) 7118 if mode in ['jpeg',]: 7119 Pix = GL.glReadPixels(0,0,size[0],size[1],GL.GL_RGB, GL.GL_UNSIGNED_BYTE) 7120 im = Im.new("RGB", (size[0],size[1])) 7121 else: 7122 Pix = GL.glReadPixels(0,0,size[0],size[1],GL.GL_RGB, GL.GL_UNSIGNED_BYTE) 7123 im = Im.new("RGB", (size[0],size[1])) 7124 try: 7125 im.frombytes(Pix) 7126 except AttributeError: 7127 im.fromstring(Pix) 7128 im = im.transpose(Im.FLIP_TOP_BOTTOM) 7129 im.save(Fname,mode) 7130 cb.SetValue(' save as/key:') 7131 G2frame.G2plotNB.status.SetStatusText('Drawing saved to: '+Fname,1) 7135 7132 else: 7136 7133 event.key = cb.GetValue()[0] … … 8478 8475 size = Page.canvas.GetSize() 8479 8476 GL.glPixelStorei(GL.GL_UNPACK_ALIGNMENT, 1) 8480 if mode in ['jpeg',]: 8481 Pix = GL.glReadPixels(0,0,size[0],size[1],GL.GL_RGBA, GL.GL_UNSIGNED_BYTE) 8482 im = Im.new("RGBA", (size[0],size[1])) 8483 else: 8484 Pix = GL.glReadPixels(0,0,size[0],size[1],GL.GL_RGB, GL.GL_UNSIGNED_BYTE) 8485 im = Im.new("RGB", (size[0],size[1])) 8477 Pix = GL.glReadPixels(0,0,size[0],size[1],GL.GL_RGB, GL.GL_UNSIGNED_BYTE) 8478 im = Im.new("RGB", (size[0],size[1])) 8486 8479 try: 8487 8480 im.frombytes(Pix) … … 8625 8618 size = Page.canvas.GetSize() 8626 8619 GL.glPixelStorei(GL.GL_UNPACK_ALIGNMENT, 1) 8627 if mode in ['jpeg',]: 8628 Pix = GL.glReadPixels(0,0,size[0],size[1],GL.GL_RGBA, GL.GL_UNSIGNED_BYTE) 8629 im = Im.new("RGBA", (size[0],size[1])) 8630 else: 8631 Pix = GL.glReadPixels(0,0,size[0],size[1],GL.GL_RGB, GL.GL_UNSIGNED_BYTE) 8632 im = Im.new("RGB", (size[0],size[1])) 8620 Pix = GL.glReadPixels(0,0,size[0],size[1],GL.GL_RGB, GL.GL_UNSIGNED_BYTE) 8621 im = Im.new("RGB", (size[0],size[1])) 8633 8622 try: 8634 8623 im.frombytes(Pix) -
trunk/GSASIIrestrGUI.py
r3511 r3588 63 63 dlg = wx.FileDialog(G2frame,message='Choose '+macName+' restraint macro file', 64 64 defaultDir=defDir,defaultFile="",wildcard="GSAS-II macro file (*.mac)|*.mac", 65 style=wx.FD_OPEN | wx. CHANGE_DIR)65 style=wx.FD_OPEN | wx.FD_CHANGE_DIR) 66 66 try: 67 67 macro = ''
Note: See TracChangeset
for help on using the changeset viewer.
