Changeset 1295 for trunk/GSASII.py

Timestamp:

Apr 22, 2014 9:37:51 AM (8 years ago)

Author:

vondreele

Message:

disable plotting while multiple PWDR & SASD data sets are imported - huge speedup
small fix in neutron anomalous data input (current not used)
begin sequential SASD fit
add an OnMotion? for sequential plots & add point plotting for Pseudo Variable plots

File:

• trunk/GSASII.py (modified) (6 diffs)

trunk/GSASII.py

@@ -1181 +1181 @@
         lastdatafile = ''
         newHistList = []
+        self.EnablePlot = False
         for rd in rdlist:
             # get instrument parameters for each dataset
@@ -1254 +1255 @@
                 self.PatternTree.AppendItem(Id,text='Reflection Lists'),
                 {})
+            newHistList.append(HistName)
+        else:
+            self.EnablePlot = True
             self.PatternTree.Expand(Id)
             self.PatternTree.SelectItem(Id)
-            newHistList.append(HistName)
             
         if not newHistList: return # somehow, no new histograms
@@ -1522 +1525 @@
         lastdatafile = ''
         newHistList = []
+        self.EnablePlot = False
         for rd in rdlist:
             lastdatafile = rd.smallangleentry[0]
@@ -1579 +1583 @@
             self.PatternTree.SetItemPyData(
                 self.PatternTree.AppendItem(Id,text='Models'),G2pdG.SetDefaultSASDModel())
+            newHistList.append(HistName)
+        else:
+            self.EnablePlot = True
             self.PatternTree.Expand(Id)
             self.PatternTree.SelectItem(Id)
-            newHistList.append(HistName)
             
         if not newHistList: return # somehow, no new histograms
@@ -1906 +1912 @@
         self.MaskKey = ''           #trigger for making image masks
         self.StrainKey = ''         #ditto for new strain d-zeros
+        self.EnablePlot = True
         arg = sys.argv
         if len(arg) > 1:
@@ -2080 +2087 @@
                         self.PickId = Id
                         self.Image = Id
-                os.chdir(dlg.GetDirectory())           # to get Mac/Linux to change directory!
+                os.chdir(dlg.GetDirectory())           # to get Mac/Linux to change directory!                
                 self.PatternTree.SelectItem(G2gd.GetPatternTreeItemId(self,Id,'Image Controls'))             #show last one
         finally: