Changeset 3142

Timestamp:

Oct 26, 2017 3:12:11 PM (6 years ago)

Author:

vondreele

Message:

fix AutoIntegrate? for 2.7 & 3.6 - wx.MULTIPLE --> wx.FD_MULTIPLE
remove spurious ReadMarCCDFrame import in G2img_1TIF.py

Location:

trunk

Files:

• GSASIIimgGUI.py (modified) (1 diff)
• imports/G2img_1TIF.py (modified) (1 diff)
• scanCCD.py (modified) (1 diff)

trunk/GSASIIimgGUI.py

@@ -3126 +3126 @@
                 if not pth: pth = '.'
                 dlg = wx.FileDialog(parent, 'Read previous table or build new table by selecting image control files', pth,
-                    style=wx.FD_OPEN| wx.MULTIPLE,
+                    style=wx.FD_OPEN| wx.FD_MULTIPLE,
                     wildcard='Integration table (*.imtbl)|*.imtbl|image control files (.imctrl)|*.imctrl')
                 dlg.CenterOnParent()

trunk/imports/G2img_1TIF.py

@@ -89 +89 @@
     import struct as st
     import array as ar
-    import ReadMarCCDFrame as rmf
+#    import ReadMarCCDFrame as rmf
     image = None
     File = open(filename,'rb')

trunk/scanCCD.py

@@ -93 +93 @@
         'Any detector tif (*.tif;*.tiff)|*.tif;*.tiff|\
         All files (*.*)|*.*',
-        wx.FD_OPEN | wx.MULTIPLE)
+        wx.FD_OPEN | wx.FD_MULTIPLE)
         if self.dirname:
             dlg.SetDirectory(self.dirname)