Changeset 420 for trunk/GSASIIgrid.py

Timestamp:

Nov 17, 2011 1:35:34 PM (11 years ago)

Author:

vondreele

Message:

small fixes including
move msg = in SetVaryFlags? outside loop
arrange so plot shows Yo-Yc (was other way around)
put Yo-Yc at bottom in multiplot plots
more on seq refinement plots

File:

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

trunk/GSASIIgrid.py

@@ -79 +79 @@
     wxID_PDFCOMPUTE, wxID_PDFCOMPUTEALL, wxID_PDFADDELEMENT, wxID_PDFDELELEMENT,
 ] = [wx.NewId() for _init_coll_PDF_Items in range(7)]
+
+[ wxID_HELP,
+] = [wx.NewId() for _init_coll_Help_Items in range(1)]
 
 VERY_LIGHT_GREY = wx.Colour(235,235,235)
@@ -309 +312 @@
         self.PDFCompute = parent.Append(help='Compute all PDFs', id=wxID_PDFCOMPUTEALL, kind=wx.ITEM_NORMAL,
             text='Compute all PDFs')
-        
-
+            
     def _init_utils(self):
         self.BlankMenu = wx.MenuBar()
@@ -742 +744 @@
                 'title' - histogram name; same as dict item name
                 'newAtomDict' - new atom parameters after shifts applied
+                'newCellDict' - new cell parameters after shifts to A0-A5 applied'
     """
     if not data:
@@ -747 +750 @@
         return
     histNames = data['histNames']
-    
+       
+    def GetSampleParms():
+        sampleParmDict = {'Temperature':[],'Pressure':[],'Humidity':[],'Voltage':[],'Force':[],}
+        sampleParm = {}
+        for name in histNames:
+            Id = GetPatternTreeItemId(self,self.root,name)
+            sampleData = self.PatternTree.GetItemPyData(GetPatternTreeItemId(self,Id,'Sample Parameters'))
+            for item in sampleParmDict:
+                sampleParmDict[item].append(sampleData[item])
+        for item in sampleParmDict:
+            frstValue = sampleParmDict[item][0]
+            if np.any(np.array(sampleParmDict[item])-frstValue):
+                sampleParm[item] = sampleParmDict[item]            
+        return sampleParm
+            
     def GetSigData(parm):
         sigData = []
@@ -770 +787 @@
                 plotNames.append(self.SeqTable.GetColLabelValue(col))
             plotData = np.array(plotData)
-            G2plt.PlotSeq(self,plotData,plotSig,plotNames)
+            G2plt.PlotSeq(self,plotData,plotSig,plotNames,sampleParms)
         elif rows:
             name = histNames[rows[0]]
@@ -782 +799 @@
         if item in data['varyList']:
             atomList[newAtomDict[item][0]] = item
+    sampleParms = GetSampleParms()
     self.dataFrame.SetMenuBar(self.dataFrame.BlankMenu)
     self.dataFrame.SetLabel('Sequental refinement results')
@@ -788 +806 @@
     Types = len(data['varyList']+atomList.keys())*[wg.GRID_VALUE_FLOAT,]
     seqList = [list(data[name]['variables']) for name in histNames]
+    
     for i,item in enumerate(seqList):
         newAtomDict = data[histNames[i]]['newAtomDict']
@@ -1122 +1141 @@
     self.dataFrame.Bind(wx.EVT_MENU, OnAddEquivalence, id=wxID_EQUIVADD)
     self.dataFrame.Bind(wx.EVT_MENU, OnAddHold, id=wxID_HOLDADD)
+    self.dataFrame.Bind(wx.EVT_MENU, OnHelp, id=wxID_HELP)
     self.dataDisplay = GSNoteBook(parent=self.dataFrame,size=self.dataFrame.GetClientSize())
     
@@ -1518 +1538 @@
         G2plt.PlotPatterns(self)
      
+def OnHelp(event):
+    Obj = event.GetEventObject()
+    print 'Help on '+Obj.GetTitle()