Changeset 1205 for trunk/GSASIIgrid.py

Timestamp:

Jan 23, 2014 3:15:51 PM (9 years ago)

Author:

vondreele

Message:

Add models to SASD data tree
Add error bar plotting to SASD data
Add I*Q^{4 option to log SASD data
got rid of the if, else blocks for all key driven toggles in G2plot}

File:

• trunk/GSASIIgrid.py (modified) (3 diffs)

trunk/GSASIIgrid.py

@@ -133 +133 @@
 [ wxID_SAVESEQSEL,
 ] = [wx.NewId() for item in range(1)]
+
+[ wxID_MODELCOPY,wxID_MODELFIT
+] = [wx.NewId() for item in range(2)]
 
 [ wxID_SELECTPHASE,
@@ -2371 +2374 @@
         self.SelectPhase = self.ReflEdit.Append(help='Select phase for reflection list',id=wxID_SELECTPHASE, 
             kind=wx.ITEM_NORMAL,text='Select phase')
+        self.PostfillDataMenu()
+        
+        # SASD/ Models
+        self.ModelMenu = wx.MenuBar()
+        self.PrefillDataMenu(self.ModelMenu,helpType='Models')
+        self.ModelEdit = wx.Menu(title='')
+        self.ModelMenu.Append(menu=self.ModelEdit, title='Models')
+        self.ModelEdit.Append(id=wxID_MODELFIT, kind=wx.ITEM_NORMAL,text='Fit',
+            help='Fit model parameters to data')
+        self.ModelEdit.Append(id=wxID_MODELCOPY, kind=wx.ITEM_NORMAL,text='Copy',
+            help='Copy model parameters to other histograms')
         self.PostfillDataMenu()
         
@@ -3816 +3830 @@
         if 'P' in data['Type'][0]:          #powder data only
             G2plt.PlotPeakWidths(G2frame)
+    elif G2frame.PatternTree.GetItemText(item) == 'Models':
+        G2frame.PatternId = G2frame.PatternTree.GetItemParent(item)
+        G2frame.PickId = item
+        data = G2frame.PatternTree.GetItemPyData(item)
+        G2pdG.UpdateModelsGrid(G2frame,data)
     elif G2frame.PatternTree.GetItemText(item) == 'Sample Parameters':
         G2frame.PatternId = G2frame.PatternTree.GetItemParent(item)