Changeset 2566 for trunk

Timestamp:

Dec 8, 2016 7:51:19 AM (9 years ago)

Author:

toby

Message:

AutoInt? win-only problem; update for IPython 5 debug

Location:

trunk

Files:

• GSASIIimgGUI.py (modified) (10 diffs)
• GSASIIpath.py (modified) (1 diff)

trunk/GSASIIimgGUI.py ¶

@@ -2252 +2252 @@
             '''
             self.Evaluator = None
-            if r2.GetValue():
+            if self.useTable.GetValue():
+                dlg = None
                 try:
-                    dlg = IntegParmTable(self.G2frame) # create the dialog
+                    dlg = IntegParmTable(self) # create the dialog
                     dlg.CenterOnParent()
                     if dlg.ShowModal() == wx.ID_OK:
@@ -2261 +2262 @@
                         self.Evaluator = DefineEvaluator(dlg)
                         self.params['Mode'] = 'table'
-                        r2E.Enable(True)
+                        self.editTable.Enable(True)
                     else:
                         self.useActive.SetValue(True)
                 finally:
-                    dlg.Destroy()
-            if self.useActive.GetValue():
+                    if dlg: dlg.Destroy()
+            elif self.useActive.GetValue():
                 self.params['Mode'] = 'active'
                 self.imageBase = G2frame.Image
                 self.useActive.SetLabel("Active Image: "+
                         G2frame.PatternTree.GetItemText(self.imageBase))
-                r2E.Enable(False)
+                self.editTable.Enable(False)
+            else:
+                print('unexpected mode in OnRadioSelect')
 
         def OnEditTable(event):
@@ -2285 +2288 @@
                     self.Evaluator = DefineEvaluator(dlg)
                     self.params['Mode'] = 'table'
-                    r2E.Enable(True)
+                    self.editTable.Enable(True)
                 else:
                     self.useActive.SetValue(True)
@@ -2292 +2295 @@
                     self.useActive.SetLabel("Active Image: "+
                             G2frame.PatternTree.GetItemText(self.imageBase))
-                    r2E.Enable(False)
+                    self.editTable.Enable(False)
             finally:
                 dlg.Destroy()
@@ -2339 +2342 @@
         self.useActive.SetValue(True)
         minisizer = wx.BoxSizer(wx.HORIZONTAL)
-        r2 = wx.RadioButton(mnpnl, wx.ID_ANY, "From distance look-up table")
-        minisizer.Add(r2,0,wx.ALIGN_LEFT|wx.ALL,1)
-        r2.Bind(wx.EVT_RADIOBUTTON, OnRadioSelect)
-        r2E = wx.Button(mnpnl,  wx.ID_ANY, "Edit table")
-        minisizer.Add(r2E,0,wx.ALIGN_LEFT,10)
-        r2E.Enable(False)
-        r2E.Bind(wx.EVT_BUTTON, OnEditTable)
+        self.useTable = wx.RadioButton(mnpnl, wx.ID_ANY, "From distance look-up table")
+        minisizer.Add(self.useTable,0,wx.ALIGN_LEFT|wx.ALL,1)
+        self.useTable.Bind(wx.EVT_RADIOBUTTON, OnRadioSelect)
+        self.editTable = wx.Button(mnpnl,  wx.ID_ANY, "Edit table")
+        minisizer.Add(self.editTable,0,wx.ALIGN_LEFT,10)
+        self.editTable.Enable(False)
+        self.editTable.Bind(wx.EVT_BUTTON, OnEditTable)
         # bind button and deactivate be default
         lblsizr.Add(minisizer)
@@ -2511 +2514 @@
                 
     def EnableButtons(self,flag):
-        '''Turns the buttons at window bottom "off" when integration is running
+        '''Relabels and enable/disables the buttons at window bottom when auto-integration is running
         '''
-        for item in (self.btnstart,self.btnreset,self.btnclose):
-            item.Enable(flag)
+        # for unclear reasons disabling these buttons causes OnRadioSelect to be invoked
+        # on windows
+        if sys.platform != "win32":
+            for item in (self.btnstart,self.btnreset,self.btnclose): item.Enable(flag)
         if flag:
             self.btnstart.SetLabel('Pause')
@@ -2767 +2772 @@
             'Mask File',
             )
-    def __init__(self,G2frame,parms=None,IMfileList=None):
-        self.G2frame = G2frame
-        wx.Dialog.__init__(self,G2frame,style=wx.RESIZE_BORDER|wx.DEFAULT_DIALOG_STYLE)
+    def __init__(self,parent,parms=None,IMfileList=None):
+        self.G2frame = parent.G2frame
+        wx.Dialog.__init__(self,parent,style=wx.RESIZE_BORDER|wx.DEFAULT_DIALOG_STYLE)
         if parms:
             self.parms = parms # list of values by column
@@ -2778 +2783 @@
             files = []
             try:
-                pth = G2G.GetImportPath(G2frame)
+                pth = G2G.GetImportPath(self.G2frame)
                 if not pth: pth = '.'
-                dlg = wx.FileDialog(self, 'Read previous table or build new table by selecting image control files', pth,
+                dlg = wx.FileDialog(parent, 'Read previous table or build new table by selecting image control files', pth,
                     style=wx.OPEN| wx.MULTIPLE,
                     wildcard='Integration table (*.imtbl)|*.imtbl|image control files (.imctrl)|*.imctrl')
@@ -2829 +2834 @@
                 S = fp.readline()
             fp.close()
-            # delete entries
+            # delete entries where files do not exist
             m1 = [i for i,f in enumerate(tmpDict['filenames']) if not os.path.exists(f)]
             if m1:
@@ -2854 +2859 @@
                 except ValueError:
                     parms.append(tmpDict[key])
+                except IndexError:
+                    print('No valid image control entries read')
+                    wx.CallAfter(self.EndModal,wx.ID_CANCEL)
+                    return [[]],[]
             return parms,fileList
         # option 2, read in a list of files

trunk/GSASIIpath.py ¶

@@ -504 +504 @@
     msg   = 'Entering IPython console at {0.f_code.co_filename} at line {0.f_lineno}'.format(frame)
     savehook = sys.excepthook # save the exception hook
-    InteractiveShellEmbed(banner1=msg)(local_ns=frame.f_locals,global_ns=frame.f_globals)
+    try:
+        InteractiveShellEmbed(banner1=msg)(local_ns=frame.f_locals,global_ns=frame.f_globals)
+    except: # use a different call for IPython 5
+        class c(object): pass
+        pseudomod = c() # create something that acts like a module
+        pseudomod.__dict__ = frame.f_locals
+        InteractiveShellEmbed(banner1=msg)(module=pseudomod,global_ns=frame.f_globals)
     sys.excepthook = savehook # reset IPython's change to the exception hook