fix LeBail bug #199; save splitter position, requiring fix to config save; fix ~/.GSAS-II use on Windows

Author: briantoby

GSASII/GSASIIdataGUI.py

@@ -2860,9 +2860,9 @@ def _init_ctrls(self, parent):
         self.dataWindow = G2DataWindow(self.mainPanel)
         dataSizer = wx.BoxSizer(wx.VERTICAL)
         self.dataWindow.SetSizer(dataSizer)
-        self.mainPanel.SplitVertically(self.treePanel,
-                                           self.dataWindow.outer, 400)
-        self.Status.SetStatusWidths([200,-1])   # make these match?
+        sash = min(max(100,GSASIIpath.GetConfigValue('Split_Loc',250)),500)
+        self.mainPanel.SplitVertically(self.treePanel, self.dataWindow.outer, sash)
+        self.Status.SetStatusWidths([sash,-1])   # make these match?
 
         G2G.wxID_GPXTREE = wx.NewId()
         treeSizer = wx.BoxSizer(wx.VERTICAL)
@@ -4534,7 +4534,8 @@ def ExitMain(self, event):
                      'Main_Size':tuple(self.GetSize()),
                      'Plot_Pos':tuple(self.plotFrame.GetPosition()),
                      'Plot_Size':tuple(self.plotFrame.GetSize())}
-            GSASIIpath.SetConfigValue(FrameInfo)
+            GSASIIpath.AddConfigValue(FrameInfo)
+            GSASIIpath.AddConfigValue({'Split_Loc':self.mainPanel.GetSashPosition()})
             config = G2G.GetConfigValsDocs()
             G2G.SaveConfigVars(config)
         except:

GSASII/GSASIIpath.py

@@ -60,7 +60,7 @@ def GetConfigValue(key,default=None,getDefault=False):
 def SetConfigValue(parmdict):
     '''Set configuration variables. Note that parmdict is a dictionary
     from :func:`GSASIIctrlGUI.GetConfigValsDocs` where each element is a
-    lists. The first item in list is the default value, the second is
+    list. The first item in list is the default value, the second is
     the value to use for that configuration variable. Most of the
     information gathered in GetConfigValsDocs is no longer used.
     '''
@@ -76,6 +76,15 @@ def SetConfigValue(parmdict):
             if parmdict[var][0] == parmdict[var][1]: continue
             configDict[var] = parmdict[var][1]
 
+def AddConfigValue(valsdict):
+    '''Set configuration variables. 
+
+    :param dict valsdict: a dictionary of values that are added
+      directly to configDict.
+    '''
+    global configDict
+    configDict.update(valsdict)
+
 def GetConfigDefault(key):
     '''Return the default value for a config value
 
@@ -2168,7 +2177,11 @@ def openInNewTerm(project=None,g2script=None,pythonapp=sys.executable):
         # allows this to be done in the background.
         import requests
         url='https://github.com/AdvancedPhotonSource/GSAS-II/tags'
-        releases = requests.get(url=url)
+        try:
+            releases = requests.get(url=url)
+        except:
+            print('background get tags failed')
+            sys.exit()
         taglist = [tag.split('"')[0] for tag in releases.text.split('AdvancedPhotonSource/GSAS-II/releases/tag/')[1:]]
         lastver = sorted([t for t in taglist if 'v' in t])[-1]
         lastnum = sorted([t for t in taglist if 'v' not in t],key=int)[-1]

GSASII/GSASIIscriptable.py

@@ -82,7 +82,7 @@ def SetDebugMode(mode):
     This will provide some additional output that may help with 
     tracking down problems in the code.
     '''
-    GSASIIpath.SetConfigValue({'debug':bool(mode)})
+    GSASIIpath.AddConfigValue({'debug':bool(mode)})
 
 def installScriptingShortcut():
     '''Creates a file named G2script in the current Python site-packages directory.

GSASII/GSASIIstrMain.py

@@ -437,7 +437,7 @@ def RefineCore(Controls,Histograms,Phases,restraintDict,rigidbodyDict,parmDict,h
     if IfOK:
         if CheckLeBail(Phases):   # only needed for LeBail extraction
             G2stMth.errRefine([],[Histograms,Phases,restraintDict,rigidbodyDict],
-                parmDict,[],calcControls,pawleyLookup,dlg)
+                parmDict,histDict1,[],calcControls,pawleyLookup,dlg)
         G2stMth.GetFobsSq(Histograms,Phases,parmDict,calcControls)
     if chisq0 is not None:
         Rvals['GOF0'] = np.sqrt(chisq0/(Histograms['Nobs']-len(varyList)))

GSASII/config_example.py

@@ -145,6 +145,10 @@
 these widows. If position is outside screen then it will be repositioned to default.
 This is used internally by GSAS-II and would not normally be changed by a user. 
 '''
+Split_Loc = 250
+'''Location of the splitter bar between the data tree and the data window. 
+Can be dragged by user. Is saved automatically with the window size and position
+'''
 
 Tick_length = 8.0
 '''Specifies the length of phase tick marks in pixels. Default is 8.'''

GSASII/pathHacking.py

@@ -24,7 +24,7 @@ def appendIfExists(searchpathlist,loc,subdir):
     binseapath = [os.path.abspath(sys.path[0])]  # where Python is installed
     binseapath += [os.path.abspath(os.path.dirname(__file__))]  # directory where this file is found
     binseapath += [os.path.dirname(binseapath[-1])]  # parent of above directory
-    binseapath += [os.path.expanduser('~/.GSASII')]       # directory in user's home
+    binseapath += [os.path.expanduser(os.path.join('~','.GSASII'))]       # directory in user's home
     searched = []
     for loc in binseapath:
         if loc in searched: continue