Changeset 4987

Timestamp:

Jul 2, 2021 2:20:10 PM (2 years ago)

Author:

toby

Message:

duplicate Seq->csv export; set svn proxy from environment variables

Location:

trunk

Files:

• GSASIIctrlGUI.py (modified) (3 diffs)
• GSASIIdataGUI.py (modified) (2 diffs)
• GSASIIpath.py (modified) (2 diffs)
• GSASIIseqGUI.py (modified) (1 diff)

trunk/GSASIIctrlGUI.py

@@ -2797 +2797 @@
         self.addRows = addRows
         self.size = size
-        self.hlp = StripIndents(hlp,True)
+        self.hlp = hlp
         self.lbl = lbl
         self.CenterOnParent()
@@ -5601 +5601 @@
     When singleLine is True, all newline are removed, but inserting "%%"
     into the string will cause a blank line to be inserted at that point
+    and %t% will generate a new line and tab (to indent a line)
 
     :param str msg: a string containing one or more lines of text. 
       spaces or tabs following a newline are removed.
+    :param bool singleLine: removes all newlines from the msg so that 
+      the text may be wrapped. 
     :returns: the string but reformatted
     '''
@@ -5622 +5625 @@
             msg1 = msg1.replace('  ',' ')
         msg = msg.replace('%%','\n\n')
+        msg = msg.replace('%t%','\n\t')
     return msg
 

trunk/GSASIIdataGUI.py

@@ -2357 +2357 @@
         command. If a proxy server is needed, the address/host and port 
         can be added supplied here. This will generate command-line options 
-
-        --config-option servers:global:http-proxy-host=*host* 
-        --config-option servers:global:http-proxy-port=*port*
-
+%t%          --config-option servers:global:http-proxy-host=*host*
+%t%          --config-option servers:global:http-proxy-port=*port*
+%%
         Additional subversion command line options can be supplied here
         by pressing the '+' button. As examples of options that might be of 
         value, use two extra lines to add:
-
-        --config-dir
-        DIR
-
+%t%          --config-dir
+%t%          DIR
+%%
         to specify an alternate configuration location. 
-
+%%
         Or, use four extra lines to add
-
-        --config-option
-        servers:global:http-proxy-username=*account*
-        --config-option
-        servers:global:http-proxy-password=*password*
-
+%t%          --config-option
+%t%          servers:global:http-proxy-username=*account*
+%t%          --config-option
+%t%          servers:global:http-proxy-password=*password*
+%%
         to specify a proxy user name and password.
-
+%%
         Note that strings marked *value* are items that will be configured 
         by the user. See http://svnbook.red-bean.com for more information on
@@ -5899 +5896 @@
                     self.SeqExportLookup[item.GetId()] = (obj,lbl) # lookup table for submenu item
                     # Bind is in UpdateSeqResults
-        
+        G2G.Define_wxId('wxID_XPORTSEQCSV')      
+        self.SequentialEx.Append(G2G.wxID_XPORTSEQCSV,'Save table as CSV',
+            'Save all sequential refinement results as a CSV spreadsheet file')
         self.PostfillDataMenu()
             

trunk/GSASIIpath.py

@@ -178 +178 @@
                 
 def getsvnProxy():
-    '''Loads a proxy for subversion from the file created by bootstrap.py
+    '''Loads a proxy for subversion from the proxyinfo.txt file created 
+    by bootstrap.py or File => Edit Proxy...; If not found, then the 
+    standard http_proxy and https_proxy environment variables are scanned
+    (see https://docs.python.org/3/library/urllib.request.html#urllib.request.getproxies) 
+    with case ignored and that is used. 
     '''
     global proxycmds
@@ -185 +189 @@
     if not os.path.exists(proxyinfo):
         proxyinfo = os.path.join(path2GSAS2,"proxyinfo.txt")
-    if not os.path.exists(proxyinfo):
-        return '','',''
-    fp = open(proxyinfo,'r')
-    host = fp.readline().strip()
-    # allow file to begin with comments
-    while host.startswith('#'):
+    if os.path.exists(proxyinfo):
+        fp = open(proxyinfo,'r')
         host = fp.readline().strip()
-    port = fp.readline().strip()
-    etc = []
-    line = fp.readline()
-    while line:
-        etc.append(line.strip())
+        # allow file to begin with comments
+        while host.startswith('#'):
+            host = fp.readline().strip()
+        port = fp.readline().strip()
+        etc = []
         line = fp.readline()
-    fp.close()
-    setsvnProxy(host,port,etc)
-    return host,port,etc
+        while line:
+            etc.append(line.strip())
+            line = fp.readline()
+        fp.close()
+        setsvnProxy(host,port,etc)
+        return host,port,etc
+    import urllib.request
+    proxdict = urllib.request.getproxies()
+    varlist = ("https","http")
+    for var in proxdict:
+        if var.lower() in varlist:
+            proxy = proxdict[var]
+            pl = proxy.split(':')
+            if len(pl) < 2: continue
+            host = ':'.join(pl[0:2])
+            port = ''
+            if len(pl) == 3:
+                port = pl[2].strip('/').strip()
+            return host,port,''
+    return '','',''
 
 def setsvnProxy(host,port,etc=[]):

trunk/GSASIIseqGUI.py

@@ -1180 +1180 @@
     for id in G2frame.dataWindow.SeqExportLookup:        
         G2frame.Bind(wx.EVT_MENU, DoSequentialExport, id=id)
+    G2frame.Bind(wx.EVT_MENU, OnSaveSeqCSV, id=G2G.wxID_XPORTSEQCSV)
 
     EnablePseudoVarMenus()