Changeset 2019

Timestamp:

Oct 20, 2015 1:45:54 PM (8 years ago)

Author:

toby

Message:

put autoint into debug mode

Location:

trunk

Files:

• GSASIIgrid.py (modified) (1 diff)
• GSASIIimgGUI.py (modified) (1 diff)
• autoint.py (added)

trunk/GSASIIgrid.py

@@ -1110 +1110 @@
         self.ImageEdit.Append(help='Load image controls from file', 
             id=wxID_IMLOADCONTROLS, kind=wx.ITEM_NORMAL,text='Load Controls')
-        try: # remove after AutoInt is completed
+        if GSASIIpath.GetConfigValue('debug'):
             import autoint
             self.ImageEdit.Append(help='Open Auto-integration window to integrate a series of images', 
                 id=wxID_IMAUTOINTEG, kind=wx.ITEM_NORMAL,text='Auto Integrate')
-            print "development code: AutoInt found"
-        except ImportError:
-            pass
         self.PostfillDataMenu()
             

trunk/GSASIIimgGUI.py

@@ -1053 +1053 @@
     G2frame.dataFrame.Bind(wx.EVT_MENU, OnSaveControls, id=G2gd.wxID_IMSAVECONTROLS)
     G2frame.dataFrame.Bind(wx.EVT_MENU, OnLoadControls, id=G2gd.wxID_IMLOADCONTROLS)
-    try: # remove after AutoInt is completed
+    if GSASIIpath.GetConfigValue('debug'):
         import autoint
         def OnAutoInt(event):
             frame = autoint.AutoIntFrame(G2frame,PollTime=5.0)
-
         G2frame.dataFrame.Bind(wx.EVT_MENU, OnAutoInt, id=G2gd.wxID_IMAUTOINTEG)
-        print "development code: AutoInt found"
-    except ImportError:
-        pass
     G2frame.dataDisplay = wx.Panel(G2frame.dataFrame)