Changeset 4092

Timestamp:

Aug 12, 2019 3:55:40 PM (4 years ago)

Author:

vondreele

Message:

fix crash when Add Substance is aborted
fix plot rescales after value/slider adjustment in small angle models - replots full scale now

Location:

trunk

Files:

• GSASIIplot.py (modified) (1 diff)
• GSASIIpwdGUI.py (modified) (6 diffs)

trunk/GSASIIplot.py

@@ -2762 +2762 @@
     #=====================================================================================
     if not new:
-        G2frame.xylim = limits
+        G2frame.xylim = copy.copy(limits)
     else:
         if plottype in ['SASD','REFD']:

trunk/GSASIIpwdGUI.py

@@ -4968 +4968 @@
     def OnAddSubstance(event):
         dlg = wx.TextEntryDialog(None,'Enter a name for this substance','Substance Name Entry','New substance',
-            style=wx.OK)
+            style=wx.OK|wx.CANCEL)
         if dlg.ShowModal() == wx.ID_OK:
             Name = dlg.GetValue()
             data['Substances'][Name] = {'Elements':{},'Volume':1.0,'Density':1.0,
-                'Scatt density':0.0,'XAnom density':0.,'XAbsorption':0.}
+                'Scatt density':0.0,'XAnom density':0.,'XAbsorption':0.,'XImag density':0.}
             AddElement(Name)
+        else:
+            return
         dlg.Destroy()
+        if not data['Substances'][Name]['XAbsorption']:
+            del data['Substances'][Name]
         UpdateSubstanceGrid(G2frame,data)
         
@@ -5039 +5043 @@
             data['Substances'][name]['XAbsorption'] = absorb
             data['Substances'][name]['XImag density'] = imcontrst
+        else:
+            return
         dlg.Destroy()
         
@@ -5784 +5790 @@
                 sldrObj.SetValue(slMult*logv)
             G2sasd.ModelFxn(Profile,ProfDict,Limits,Sample,data)
-            RefreshPlots()
+            RefreshPlots(True)
             
         def OnSelect(event):
@@ -5800 +5806 @@
                 wx.CallAfter(UpdateModelsGrid,G2frame,data)
                 G2sasd.ModelFxn(Profile,ProfDict,Limits,Sample,data)
-                RefreshPlots()
+                RefreshPlots(True)
                 
         def OnDelLevel(event):
@@ -5808 +5814 @@
             wx.CallAfter(UpdateModelsGrid,G2frame,data)
             G2sasd.ModelFxn(Profile,ProfDict,Limits,Sample,data)
-            RefreshPlots()
+            RefreshPlots(True)
             
         def OnParmSlider(event):
@@ -5821 +5827 @@
             pvObj.SetValue('%.3g'%(item[key][0]))
             G2sasd.ModelFxn(Profile,ProfDict,Limits,Sample,data)
-            RefreshPlots()
+            RefreshPlots(True)
             
         def SizeSizer():