Changeset 4498

Timestamp:

Jun 18, 2020 9:32:02 PM (3 years ago)

Author:

toby

Message:

cleanup errors and cruft noted in spyder

Location:

trunk

Files:

• GSASIIIO.py (modified) (4 diffs)
• GSASIIctrlGUI.py (modified) (8 diffs)

trunk/GSASIIIO.py

@@ -46 +46 @@
 import sys
 import re
-import glob
 import random as ran
 import GSASIIpath
@@ -61 +60 @@
 except ImportError:
     pass
-import GSASIIimage as G2img
 import GSASIIElem as G2el
 import GSASIIstrIO as G2stIO
@@ -1008 +1006 @@
         wx.EndBusyCursor()
     print ('index peak list saved')
-    
-class MultipleChoicesDialog(wx.Dialog):
-    '''A dialog that offers a series of choices, each with a
-    title and a wx.Choice widget. Intended to be used Modally. 
-    typical input:
-
-        *  choicelist=[ ('a','b','c'), ('test1','test2'),('no choice',)]
-        *  headinglist = [ 'select a, b or c', 'select 1 of 2', 'No option here']
-        
-    selections are placed in self.chosen when OK is pressed
-
-    Also see GSASIIctrlGUI
-    '''
-    def __init__(self,choicelist,headinglist,
-                 head='Select options',
-                 title='Please select from options below',
-                 parent=None):
-        self.chosen = []
-        wx.Dialog.__init__(
-            self,parent,wx.ID_ANY,head, 
-            pos=wx.DefaultPosition,style=wx.DEFAULT_DIALOG_STYLE)
-        panel = wx.Panel(self)
-        mainSizer = wx.BoxSizer(wx.VERTICAL)
-        mainSizer.Add((10,10),1)
-        topLabl = wx.StaticText(panel,wx.ID_ANY,title)
-        mainSizer.Add(topLabl,0,wx.ALIGN_CENTER_VERTICAL|wx.CENTER,10)
-        self.ChItems = []
-        for choice,lbl in zip(choicelist,headinglist):
-            mainSizer.Add((10,10),1)
-            self.chosen.append(0)
-            topLabl = wx.StaticText(panel,wx.ID_ANY,' '+lbl)
-            mainSizer.Add(topLabl,0,wx.ALIGN_LEFT,10)
-            self.ChItems.append(wx.Choice(self, wx.ID_ANY, (100, 50), choices = choice))
-            mainSizer.Add(self.ChItems[-1],0,wx.ALIGN_CENTER,10)
-
-        OkBtn = wx.Button(panel,-1,"Ok")
-        OkBtn.Bind(wx.EVT_BUTTON, self.OnOk)
-        cancelBtn = wx.Button(panel,-1,"Cancel")
-        cancelBtn.Bind(wx.EVT_BUTTON, self.OnCancel)
-        btnSizer = wx.BoxSizer(wx.HORIZONTAL)
-        btnSizer.Add((20,20),1)
-        btnSizer.Add(OkBtn)
-        btnSizer.Add((20,20),1)
-        btnSizer.Add(cancelBtn)
-        btnSizer.Add((20,20),1)
-        mainSizer.Add(btnSizer,0,wx.EXPAND|wx.BOTTOM|wx.TOP, 10)
-        panel.SetSizer(mainSizer)
-        panel.Fit()
-        self.Fit()
-        
-    def OnOk(self,event):
-        parent = self.GetParent()
-        if parent is not None: parent.Raise()
-        # save the results from the choice widgets
-        self.chosen = []
-        for w in self.ChItems:
-            self.chosen.append(w.GetSelection())
-        self.EndModal(wx.ID_OK)              
-            
-    def OnCancel(self,event):
-        parent = self.GetParent()
-        if parent is not None: parent.Raise()
-        self.chosen = []
-        self.EndModal(wx.ID_CANCEL)              
-            
+                
 def ExtractFileFromZip(filename, selection=None, confirmread=True,
                        confirmoverwrite=True, parent=None,
@@ -1690 +1624 @@
 
         '''
-        pth = G2G.GetExportPath(self.G2frame)
+        #pth = G2G.GetExportPath(self.G2frame)
         if self.G2frame.GSASprojectfile:
             defnam = os.path.splitext(

trunk/GSASIIctrlGUI.py

@@ -170 +170 @@
 import GSASIIfiles as G2fil
 import GSASIIscriptable as G2sc
-
+import GSASIIpwd as G2pwd
+import GSASIIlattice as G2lat
+if sys.version_info[0] >= 3:
+    unicode = str
+    basestring = str
 
 # Define a short names for convenience
@@ -2877 +2881 @@
         self.ChoiceList = ChoiceList
         self.ColumnData = ColumnData
-        nCol = len(ColumnData)
         if options['style'] & wx.OK:
             useOK = True
@@ -4639 +4642 @@
     def OnHelpAbout(self, event):
         "Display an 'About GSAS-II' box"
-        import GSASII
         try:
             import wx.adv as wxadv  # AboutBox moved here in Phoenix
@@ -5043 +5045 @@
     return selected
 
+class MultipleChoicesDialog(wx.Dialog):
+    '''A dialog that offers a series of choices, each with a
+    title and a wx.Choice widget. Intended to be used Modally. 
+    typical input:
+
+        *  choicelist=[ ('a','b','c'), ('test1','test2'),('no choice',)]
+        *  headinglist = [ 'select a, b or c', 'select 1 of 2', 'No option here']
+        
+    selections are placed in self.chosen when OK is pressed
+
+    Also see GSASIIctrlGUI
+    '''
+    def __init__(self,choicelist,headinglist,
+                 head='Select options',
+                 title='Please select from options below',
+                 parent=None):
+        self.chosen = []
+        wx.Dialog.__init__(
+            self,parent,wx.ID_ANY,head, 
+            pos=wx.DefaultPosition,style=wx.DEFAULT_DIALOG_STYLE)
+        panel = wx.Panel(self)
+        mainSizer = wx.BoxSizer(wx.VERTICAL)
+        mainSizer.Add((10,10),1)
+        topLabl = wx.StaticText(panel,wx.ID_ANY,title)
+        mainSizer.Add(topLabl,0,wx.ALIGN_CENTER_VERTICAL|wx.CENTER,10)
+        self.ChItems = []
+        for choice,lbl in zip(choicelist,headinglist):
+            mainSizer.Add((10,10),1)
+            self.chosen.append(0)
+            topLabl = wx.StaticText(panel,wx.ID_ANY,' '+lbl)
+            mainSizer.Add(topLabl,0,wx.ALIGN_LEFT,10)
+            self.ChItems.append(wx.Choice(self, wx.ID_ANY, (100, 50), choices = choice))
+            mainSizer.Add(self.ChItems[-1],0,wx.ALIGN_CENTER,10)
+
+        OkBtn = wx.Button(panel,-1,"Ok")
+        OkBtn.Bind(wx.EVT_BUTTON, self.OnOk)
+        cancelBtn = wx.Button(panel,-1,"Cancel")
+        cancelBtn.Bind(wx.EVT_BUTTON, self.OnCancel)
+        btnSizer = wx.BoxSizer(wx.HORIZONTAL)
+        btnSizer.Add((20,20),1)
+        btnSizer.Add(OkBtn)
+        btnSizer.Add((20,20),1)
+        btnSizer.Add(cancelBtn)
+        btnSizer.Add((20,20),1)
+        mainSizer.Add(btnSizer,0,wx.EXPAND|wx.BOTTOM|wx.TOP, 10)
+        panel.SetSizer(mainSizer)
+        panel.Fit()
+        self.Fit()
+        
+    def OnOk(self,event):
+        parent = self.GetParent()
+        if parent is not None: parent.Raise()
+        # save the results from the choice widgets
+        self.chosen = []
+        for w in self.ChItems:
+            self.chosen.append(w.GetSelection())
+        self.EndModal(wx.ID_OK)              
+            
+    def OnCancel(self,event):
+        parent = self.GetParent()
+        if parent is not None: parent.Raise()
+        self.chosen = []
+        self.EndModal(wx.ID_CANCEL)              
+
 def MultipleChoicesSelector(choicelist, headinglist, ParentFrame=None, **kwargs):
     '''A modal dialog that offers a series of choices, each with a title and a wx.Choice
@@ -5157 +5223 @@
     except ImportError: # no config.py file yet
         savefile = os.path.join(GSASIIpath.path2GSAS2,'config.py')
-    except Exception as err: # import failed
+    except Exception: # import failed
         # find the bad file, save it in a new name and prepare to overwrite it
         for p in sys.path:
@@ -6276 +6342 @@
                 else:
                     G2fil.G2Print("Warning: {} Reader failed to read {}"
-                                      .format(rd.formatName,filename))
+                                      .format(rd.formatName,f))
                 Iparm1, Iparm2 = G2sc.load_iprms(Settings['instfile'],rd)    
                 if 'phoenix' in wx.version():
@@ -6435 +6501 @@
                 else:
                     G2fil.G2Print("Warning: {} Reader failed to read {}"
-                                      .format(rd.formatName,filename))
+                                      .format(rd.formatName,f))
                 if 'phoenix' in wx.version():
                     HistName = 'PDF  '+rd.idstring
@@ -6728 +6794 @@
     # app.MainLoop()
     # print(td)
-        
+    choicelist=[ ('a','b','c'), ('test1','test2'),('no choice',)]
+    headinglist = [ 'select a, b or c', 'select 1 of 2', 'No option here']
+    dlg = MultipleChoicesDialog(choicelist,headinglist,parent=frm)
+    if dlg.ShowModal() == wx.ID_OK:
+        print(dlg.chosen)
+    print(MultipleChoicesSelector(choicelist,headinglist,frm))
     pnl = wx.Panel(frm)
     valArr = {'k':1.0}