Changeset 150

Timestamp:

Aug 9, 2010 10:52:39 AM (15 years ago)

Author:

vondreel

Message:

fixup menu enables, add MakeNewPhase? & changed a few names

File:

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

trunk/GSASIIpwdGUI.py ¶

@@ -442 +442 @@
     self.Bind(wx.EVT_MENU, OnReload, id=G2gd.wxID_INDXRELOAD)
     inst = self.PatternTree.GetItemPyData(G2gd.GetPatternTreeItemId(self,self.PatternId, 'Instrument Parameters'))[1]
+    self.dataFrame.IndexPeaks.Enable(False)
     self.IndexPeaksTable = []
     if data:
+        self.dataFrame.IndexPeaks.Enable(True)
         cells = self.PatternTree.GetItemPyData(G2gd.GetPatternTreeItemId(self,self.PatternId, 'Unit Cells List'))
         if cells:
@@ -478 +480 @@
     bravaisSymb = ['Fm3m','Im3m','Pm3m','R3-H','P6/mmm','I4/mmm',
         'P4/mmm','Fmmm','Immm','Cmmm','Pmmm','C2/m','P2/m','P1']
+    spaceGroups = ['F m 3 m','I m 3 m','P m 3 m','R 3- H','P 6/m m m','I 4/m m m',
+        'P 4/m m m','F m m m','I m m m','C m m m','P m m m','C 2/m','P 2/m','P 1']
         
     def SetLattice(controls):
@@ -573 +577 @@
         volVal.SetValue("%.3f"%(controls[12]))
         
-    def OnRefineCell(event):
+    def RefineCell(event):
         def cellPrint(ibrav,A):
             cell = G2lat.A2cell(A)
@@ -620 +624 @@
             G2plt.PlotPatterns(self)
         
-    def OnIndexPeaks(event):
+    def IndexPeaks(event):
         PatternId = self.PatternId    
-        peaks = self.PatternTree.GetItemPyData(G2gd.GetPatternTreeItemId(self,PatternId, 'Index Peak List'))
-        if not peaks:
-            self.ErrorDialog('No peaks!', 'Nothing to index!')
-            return
+#        peaks = self.PatternTree.GetItemPyData(G2gd.GetPatternTreeItemId(self,PatternId, 'Index Peak List'))
+#        if not peaks:
+#            self.ErrorDialog('No peaks!', 'Nothing to index!')
+#            return
         inst = self.PatternTree.GetItemPyData(G2gd.GetPatternTreeItemId(self,PatternId, 'Instrument Parameters'))[1]
         print 'Peak Indexing'
@@ -637 +641 @@
             self.ErrorDialog('Error','No Bravais lattices selected')
             return
-        self.dataFrame.IndexPeaks.Enable(False)
         self.dataFrame.CopyCell.Enable(False)
         OK,dmin,cells = G2indx.DoIndexPeaks(peaks,inst,controls,bravais)
@@ -655 +658 @@
         self.dataFrame.CopyCell.Enable(True)
         self.dataFrame.IndexPeaks.Enable(True)
+        self.dataFrame.MakeNewPhase.Enable(True)
         UpdateUnitCellsGrid(self,data)
                 
@@ -670 +674 @@
         UpdateUnitCellsGrid(self,data)
         self.dataFrame.RefineCell.Enable(True)
+        
+    def MakeNewPhase(event):
+        if not G2gd.GetPatternTreeItemId(self,self.root,'Phases'):
+            sub = self.PatternTree.AppendItem(parent=self.root,text='Phases')
+        else:
+            sub = G2gd.GetPatternTreeItemId(self,self.root,'Phases')
+        PhaseName = ''
+        dlg = wx.TextEntryDialog(None,'Enter a name for this phase','Phase Name Entry','New phase',
+            style=wx.OK)
+        if dlg.ShowModal() == wx.ID_OK:
+            PhaseName = dlg.GetValue()
+        dlg.Destroy()
+        cells = self.PatternTree.GetItemPyData(UnitCellsId)[2]
+        for Cell in cells:
+            if Cell[-1]:
+                break
+        cell = Cell[2:10]        
+        sub = self.PatternTree.AppendItem(parent=sub,text=PhaseName)
+        SGData = {'SpGrp':spaceGroups[cell[0]]}
+        self.PatternTree.SetItemPyData(sub, \
+            {'General':{'Name':'phase name','Type':'nuclear','SGData':SGData,'Cell':[False,]+cell[1:],
+            'Scale':[False,1.0],'Pawley dmin':0.25},'Atoms':[]})
+        Status.SetStatusText('Change space group if needed')
             
     def RefreshUnitCellsGrid(event):
@@ -696 +723 @@
     if not self.dataFrame.GetStatusBar():
         Status = self.dataFrame.CreateStatusBar()
-    self.Bind(wx.EVT_MENU, OnIndexPeaks, id=G2gd.wxID_INDEXPEAKS)
+    self.Bind(wx.EVT_MENU, IndexPeaks, id=G2gd.wxID_INDEXPEAKS)
     self.Bind(wx.EVT_MENU, CopyUnitCell, id=G2gd.wxID_COPYCELL)
-    self.Bind(wx.EVT_MENU, OnRefineCell, id=G2gd.wxID_REFINECELL)
+    self.Bind(wx.EVT_MENU, RefineCell, id=G2gd.wxID_REFINECELL)
+    self.Bind(wx.EVT_MENU, MakeNewPhase, id=G2gd.wxID_MAKENEWPHASE)
     
     controls,bravais,cells,dmin = data
@@ -721 +749 @@
     self.sp = wx.SplitterWindow(self.dataFrame)
     self.dataDisplay = wx.Panel(self.sp, style=wx.SUNKEN_BORDER)
+    self.dataFrame.IndexPeaks.Enable(False)
+    peaks = self.PatternTree.GetItemPyData(G2gd.GetPatternTreeItemId(self,self.PatternId, 'Index Peak List'))
+    if peaks:
+        self.dataFrame.IndexPeaks.Enable(True)
+    self.dataFrame.RefineCell.Enable(False)
+    if controls[12] > 1.0:                               #if a "real" volume (i.e. not default)
+        self.dataFrame.RefineCell.Enable(True)    
+    self.dataFrame.CopyCell.Enable(False)
+    self.dataFrame.MakeNewPhase.Enable(False)        
     if cells:
         self.bottom = wx.Panel(self.sp, style=wx.SUNKEN_BORDER)
         self.sp.SplitHorizontally(self.dataDisplay,self.bottom,0)
+        self.dataFrame.CopyCell.Enable(True)
+        self.dataFrame.MakeNewPhase.Enable(True)        
     mainSizer = wx.BoxSizer(wx.VERTICAL)
     mainSizer.Add(wx.StaticText(parent=self.dataDisplay,label=' Indexing controls: '),0,wx.ALIGN_CENTER_VERTICAL)