Changeset 4594 for trunk/GSASIIdataGUI.py

Timestamp:

Oct 14, 2020 2:56:09 PM (2 years ago)

Author:

vondreele

Message:

remove WACV,wx.ALIGN_CENTER_VERTICAL from all Add for wx.VERTICAL wx.BoxSizers?
fix use of inspect.getargspec - now inspect.getfullargspec for python 3.x in G2dataGUI
Add a File.close in G2img_CBF reader

File:

• trunk/GSASIIdataGUI.py (modified) (7 diffs)

trunk/GSASIIdataGUI.py

@@ -227 +227 @@
             'hexagonal':['6','-6','6 2 2','6 m m','-6 m 2','-6 2 m',],'cubic':['2 3','4 3 2','-4 3 m']}
         centChoice = ['noncentrosymmetric','centrosymmetric']
-        mainSizer.Add(wx.StaticText(self.panel,label=' Select Laue class for new lattice:'),0,WACV)
+        mainSizer.Add(wx.StaticText(self.panel,label=' Select Laue class for new lattice:'),0)
         Class = wx.ComboBox(self.panel,value=self.Class,choices=laueClass,
             style=wx.CB_READONLY|wx.CB_DROPDOWN)
         Class.Bind(wx.EVT_COMBOBOX,OnClass)
-        mainSizer.Add(Class,0,WACV)
-        mainSizer.Add(wx.StaticText(self.panel,label=' Target Laue symmetry:'),0,WACV)
+        mainSizer.Add(Class,0)
+        mainSizer.Add(wx.StaticText(self.panel,label=' Target Laue symmetry:'),0)
         Cent = wx.ComboBox(self.panel,value=self.Cent,choices=centChoice,
             style=wx.CB_READONLY|wx.CB_DROPDOWN)
@@ -2793 +2793 @@
                         data = self.GPXtree.GetItemPyData(Id)
                         G2IO.ExportSequential(self,data,obj,typ)
-                    if 'mode' in inspect.getargspec(obj.Writer)[0]:
-                        item = submenu.Append(wx.ID_ANY,obj.formatName,obj.longFormatName)
-                        self.Bind(wx.EVT_MENU, seqMenuItemEventHandler, item)
+                        if '2' in platform.python_version_tuple()[0]:
+                            if 'mode' in inspect.getargspec(obj.Writer)[0]:
+                                item = submenu.Append(wx.ID_ANY,obj.formatName,obj.longFormatName)
+                                self.Bind(wx.EVT_MENU, seqMenuItemEventHandler, item)
+                        else:
+                            if 'mode' in inspect.getfullargspec(obj.Writer)[0]:
+                                item = submenu.Append(wx.ID_ANY,obj.formatName,obj.longFormatName)
+                                self.Bind(wx.EVT_MENU, seqMenuItemEventHandler, item)
                         #                    self.SeqExportLookup[item.GetId()] = (obj,lbl) # lookup table for submenu item
                         # Bind is in UpdateSeqResults
@@ -3412 +3417 @@
                 style = wx.TAB_TRAVERSAL|wx.SUNKEN_BORDER)
             mainSizer = wx.BoxSizer(wx.VERTICAL)
-            mainSizer.Add(wx.StaticText(self.panel,label=self.text),0,WACV)
+            mainSizer.Add(wx.StaticText(self.panel,label=self.text),0)
             mainSizer.Add((10,10))
             self.dataGridSizer = wx.FlexGridSizer(cols=2,hgap=2,vgap=2)
@@ -5612 +5617 @@
                     except AttributeError:
                         continue
-                    if 'mode' in inspect.getargspec(obj.Writer)[0]:
-                        objlist.append(obj)
+                    if '2' in platform.python_version_tuple()[0]:
+                        if 'mode' in inspect.getargspec(obj.Writer)[0]:
+                            objlist.append(obj)
+                    else:
+                        if 'mode' in inspect.getfullargspec(obj.Writer)[0]:
+                            objlist.append(obj)
             if objlist:
                 submenu = wx.Menu()
@@ -6290 +6299 @@
         text.AppendText(line+"\n")
     text.AppendText('Notebook entry @ '+time.ctime()+"\n")
-    G2frame.dataWindow.GetSizer().Add(wx.StaticText(G2frame.dataWindow,-1,' Add notes on project here: '),0,WACV)
+    G2frame.dataWindow.GetSizer().Add(wx.StaticText(G2frame.dataWindow,-1,' Add notes on project here: '),0)
     G2frame.dataWindow.GetSizer().Add(text,1,wx.ALL|wx.EXPAND)
 
@@ -6560 +6569 @@
         subSizer = wx.BoxSizer(wx.HORIZONTAL)
         subSizer.Add(wx.StaticText(G2frame.dataWindow,
-                    label='There are {} frozen variables (values refined outside limits)'
-                                .format(count)),0,WACV)
+            label='There are {} frozen variables (values refined outside limits)'.format(count)),0,WACV)
         subSizer.Add((5,-1))
         btn = wx.Button(G2frame.dataWindow, wx.ID_ANY,'Clear All Frozen')
@@ -8326 +8334 @@
     wtSizer.Add(G2G.ValidatedTxtCtrl(G2frame.dataWindow,data[0],'histTitle',typeHint=str,
         notBlank=False,size=(300,-1)),1,WACV)
-    mainSizer.Add(wtSizer,0,WACV)
+    mainSizer.Add(wtSizer,0)
     if data[0].get('Dummy',False):
         simSizer = wx.BoxSizer(wx.HORIZONTAL)