Changeset 3394

Timestamp:

May 18, 2018 3:23:49 PM (6 years ago)

Author:

vondreele

Message:

implement "Load Unit Cell" from phase on phase list to Unit Cell for testing against pattern

Location:

trunk

Files:

• GSASIIdataGUI.py (modified) (2 diffs)
• GSASIIpwdGUI.py (modified) (2 diffs)

trunk/GSASIIdataGUI.py

@@ -4989 +4989 @@
         # PDR / Unit Cells List
         G2G.Define_wxId('wxID_INDEXPEAKS', 'wxID_REFINECELL', 'wxID_COPYCELL', 'wxID_MAKENEWPHASE',
-            'wxID_EXPORTCELLS',)
+            'wxID_EXPORTCELLS','wxID_LOADCELL','wxID_IMPORTCELL')
         self.IndexMenu = wx.MenuBar()
         self.PrefillDataMenu(self.IndexMenu)
@@ -4997 +4997 @@
         self.CopyCell = self.IndexEdit.Append(G2G.wxID_COPYCELL,'Copy Cell', 
             'Copy selected unit cell from indexing to cell refinement fields')
+        self.LoadCell = self.IndexEdit.Append(G2G.wxID_LOADCELL,'Load Cell', 
+            'Load unit cell from phase')
+        self.ImportCell = self.IndexEdit.Append(G2G.wxID_IMPORTCELL,'Import Cell', 
+            'Import unit cell from file')
         self.RefineCell = self.IndexEdit.Append(G2G.wxID_REFINECELL,'Refine Cell',
             'Refine unit cell parameters from indexed peaks')

trunk/GSASIIpwdGUI.py

@@ -3021 +3021 @@
         G2frame.GPXtree.SetItemPyData(UnitCellsId,[controls,bravais,cells,dmin,ssopt])
         G2frame.dataWindow.RefineCell.Enable(True)
-        wx.CallAfter(UpdateUnitCellsGrid,G2frame,data)        
+        wx.CallAfter(UpdateUnitCellsGrid,G2frame,data)
+
+    def LoadUnitCell(event):
+        print('Load unit cell from phase - TBD')    #TODO:
+        controls,bravais,cells,dminx,ssopt = G2frame.GPXtree.GetItemPyData(UnitCellsId)
+        pId = G2gd.GetGPXtreeItemId(G2frame,G2frame.root, 'Phases')
+        if not pId: return
+        Phases = []
+        item, cookie = G2frame.GPXtree.GetFirstChild(pId)
+        while item:
+            Phases.append(G2frame.GPXtree.GetItemText(item))
+            item, cookie = G2frame.GPXtree.GetNextChild(pId, cookie)    
+        pNum = G2G.ItemSelector(Phases,G2frame,'Select phase',header='Phase')
+        if pNum is None: return
+        Phase = G2frame.GPXtree.GetItemPyData(G2gd.GetGPXtreeItemId(G2frame,pId,Phases[pNum]))
+        Cell = Phase['General']['Cell']
+        SGData = Phase['General']['SGData']
+        controls[4] = 1
+        controls[5] = SGData['SGLatt']+SGData['SGLaue']
+        controls[6:12] = Cell[1:8]
+        controls[13] = spaceGroups[bravaisSymb.index(controls[5])]
+        G2frame.GPXtree.SetItemPyData(UnitCellsId,[controls,bravais,cells,dmin,ssopt])
+        G2frame.dataWindow.RefineCell.Enable(True)
+        wx.CallAfter(UpdateUnitCellsGrid,G2frame,data)
+        
+    def ImportUnitCell(event):
+        print('Import unit cell from file - TBD')   #TODO:
+        controls,bravais,cells,dminx,ssopt = G2frame.GPXtree.GetItemPyData(UnitCellsId)
+        G2frame.GPXtree.SetItemPyData(UnitCellsId,[controls,bravais,cells,dmin,ssopt])
+        G2frame.dataWindow.RefineCell.Enable(True)
+        wx.CallAfter(UpdateUnitCellsGrid,G2frame,data)
                 
     def RefineCell(event):
@@ -3228 +3258 @@
     G2frame.Bind(wx.EVT_MENU, OnIndexPeaks, id=G2G.wxID_INDEXPEAKS)
     G2frame.Bind(wx.EVT_MENU, CopyUnitCell, id=G2G.wxID_COPYCELL)
+    G2frame.Bind(wx.EVT_MENU, LoadUnitCell, id=G2G.wxID_LOADCELL)
+    G2frame.Bind(wx.EVT_MENU, ImportUnitCell, id=G2G.wxID_IMPORTCELL)
     G2frame.Bind(wx.EVT_MENU, RefineCell, id=G2G.wxID_REFINECELL)
     G2frame.Bind(wx.EVT_MENU, MakeNewPhase, id=G2G.wxID_MAKENEWPHASE)