Changeset 3075

Timestamp:

Sep 13, 2017 4:13:06 PM (6 years ago)

Author:

toby

Message:

Allow editing of proxy info

Location:

trunk

Files:

• GSASIIctrlGUI.py (modified) (3 diffs)
• GSASIIdataGUI.py (modified) (4 diffs)
• GSASIIpath.py (modified) (2 diffs)

trunk/GSASIIctrlGUI.py

@@ -2208 +2208 @@
     :param str prompts: strings to tell use what they are inputting
     :param str values: default input values, if any
+    :param int size: length of the input box in pixels
     '''
-    def __init__(self,parent,title,prompts,values=[]):      #,size=(200,-1)?
+    def __init__(self,parent,title,prompts,values=[],size=-1):
         
         wx.Dialog.__init__(self,parent,wx.ID_ANY,title, 
@@ -2217 +2218 @@
         self.prompts = prompts
         self.CenterOnParent()
-        self.panel = wx.Panel(self)
         mainSizer = wx.BoxSizer(wx.VERTICAL)
         promptSizer = wx.FlexGridSizer(0,2,5,5)
         self.Indx = {}
         for prompt,value in zip(prompts,values):
-            promptSizer.Add(wx.StaticText(self.panel,-1,prompt),0,WACV)
-            valItem = wx.TextCtrl(self.panel,-1,value=value,style=wx.TE_PROCESS_ENTER)
+            promptSizer.Add(wx.StaticText(self,-1,prompt),0,WACV)
+            valItem = wx.TextCtrl(self,-1,value=value,style=wx.TE_PROCESS_ENTER,size=(size,-1))
             self.Indx[valItem.GetId()] = prompt
             valItem.Bind(wx.EVT_TEXT,self.newValue)
-            promptSizer.Add(valItem,0,WACV)
-        mainSizer.Add(promptSizer,0)
+            promptSizer.Add(valItem,1,WACV|wx.EXPAND,1)
+        mainSizer.Add(promptSizer,1,wx.ALL|wx.EXPAND,1)
         btnsizer = wx.StdDialogButtonSizer()
-        OKbtn = wx.Button(self.panel, wx.ID_OK)
+        OKbtn = wx.Button(self, wx.ID_OK)
         OKbtn.SetDefault()
         btnsizer.AddButton(OKbtn)
-        btn = wx.Button(self.panel, wx.ID_CANCEL)
+        btn = wx.Button(self, wx.ID_CANCEL)
         btnsizer.AddButton(btn)
         btnsizer.Realize()
         mainSizer.Add(btnsizer,0,wx.ALIGN_CENTER)
-        self.panel.SetSizer(mainSizer)
-        self.panel.Fit()
+        self.SetSizer(mainSizer)
         self.Fit()
         
@@ -2758 +2757 @@
         self.GBsizer.Layout()
         self.FitInside()
-
+        
 ################################################################################
 def GetImportFile(G2frame, message, defaultDir="", defaultFile="", style=wx.OPEN,

trunk/GSASIIdataGUI.py

@@ -126 +126 @@
 #### class definitions used for main GUI
 ################################################################################
-
                
 class MergeDialog(wx.Dialog):
@@ -457 +456 @@
         item = parent.Append(wx.ID_PREFERENCES, text = "&Preferences")
         self.Bind(wx.EVT_MENU, self.OnPreferences, item)
+        if GSASIIpath.whichsvn():
+            item = parent.Append(
+                help='Edit proxy internet information (used for updates)', id=wx.ID_ANY,
+                kind=wx.ITEM_NORMAL,text='Edit proxy...')
+            self.Bind(wx.EVT_MENU, self.EditProxyInfo, id=item.GetId())
         if GSASIIpath.GetConfigValue('debug'):
             def OnIPython(event):
@@ -462 +466 @@
             item = parent.Append(wx.ID_ANY, text = "IPython Console")
             self.Bind(wx.EVT_MENU, OnIPython, item)
+            def OnwxInspect(event):
+                import wx.lib.inspection as wxeye
+                wxeye.InspectionTool().Show()
+            item = parent.Append(wx.ID_ANY, text = "wx inspection tool")
+            self.Bind(wx.EVT_MENU, OnwxInspect, item)
+            
         item = parent.Append(
             help='Exit from GSAS-II', id=wx.ID_ANY,
@@ -1962 +1972 @@
         dlg.Destroy()
 
+    def EditProxyInfo(self,event):
+        '''Edit the proxy information used by subversion
+        '''
+        h,p = host,port = GSASIIpath.getsvnProxy()
+        dlg = G2G.MultiStringDialog(self,'Enter proxy values',
+                                        ['Proxy address','proxy port'],
+                                        [host,port],size=300)
+        #dlg.SetSize((300,-1))
+        if dlg.Show():
+            h,p = dlg.GetValues()
+        dlg.Destroy()
+        if h != host or p != port:
+            proxyinfo = os.path.join(GSASIIpath.path2GSAS2,"proxyinfo.txt")
+            GSASIIpath.setsvnProxy(h,p)
+            if not h.strip():
+                os.remove(proxyinfo)
+                return
+            try:
+                fp = open(proxyinfo,'w')
+                fp.write(h.strip()+'\n')
+                fp.write(p.strip()+'\n')
+                fp.close()
+            except Exception as err:
+                print('Error writing file {}:\n{}'.format(proxyinfo,err))
     def _Add_ImportMenu_smallangle(self,parent):
         '''configure the Small Angle Data menus accord to the readers found in _init_Imports

trunk/GSASIIpath.py

@@ -120 +120 @@
 svnLocCache = None
 'Cached location of svn to avoid multiple searches for it'
-
+def getsvnProxy():
+    '''Loads a proxy for subversion from the file created by bootstrap.py
+    '''
+    proxyinfo = os.path.join(path2GSAS2,"proxyinfo.txt")
+    if os.path.exists(proxyinfo):
+        global proxycmds
+        proxycmds = []
+        fp = open(proxyinfo,'r')
+        host = fp.readline().strip()
+        port = fp.readline().strip()
+        fp.close()
+        setsvnProxy(host,port)
+        if not host.strip(): return '',''
+        return host,port
+
+def setsvnProxy(host,port):
+    '''Sets the svn commands needed to use a proxy
+    '''
+    global proxycmds
+    proxycmds = []
+    host = host.strip()
+    port = port.strip()
+    if not host.strip(): return
+    proxycmds.append('--config-option')
+    proxycmds.append('servers:global:http-proxy-host='+host)
+    proxycmds.append('--config-option')
+    proxycmds.append('servers:global:http-proxy-port='+port)
+        
 def whichsvn():
     '''Returns a path to the subversion exe file, if any is found.
@@ -136 +163 @@
     svnprog = 'svn'
     if sys.platform.startswith('win'): svnprog += '.exe'
-    gsaspath = os.path.split(__file__)[0]
-    # check for a proxy
-    proxyinfo = os.path.join(gsaspath,"proxyinfo.txt")
-    if os.path.exists(proxyinfo):
-        global proxycmds
-        proxycmds = []
-        fp = open(proxyinfo,'r')
-        host = fp.readline().strip()
-        port = fp.readline().strip()
-        fp.close()
-        proxycmds.append('--config-option')
-        proxycmds.append('servers:global:http-proxy-host='+host)
-        proxycmds.append('--config-option')
-        proxycmds.append('servers:global:http-proxy-port='+port)
+    host,port = getsvnProxy()
+    if GetConfigValue('debug'):
+        print('Using proxy host {} port {}'.format(host,port))
     # add likely places to find subversion when installed with GSAS-II
     pathlist = os.environ["PATH"].split(os.pathsep)
     pathlist.append(os.path.split(sys.executable)[0])
-    pathlist.append(gsaspath)
+    pathlist.append(path2GSAS2)
     for rpt in ('..','bin'),('..','Library','bin'),('svn','bin'),('svn',),('.'):
-        pt = os.path.normpath(os.path.join(gsaspath,*rpt))
+        pt = os.path.normpath(os.path.join(path2GSAS2,*rpt))
         if os.path.exists(pt):
             pathlist.insert(0,pt)