Changeset 5352 for trunk/GSASIIphsGUI.py

Timestamp:

Oct 20, 2022 9:56:41 PM (8 months ago)

Author:

toby

Message:

add ability to merge chem and magnetic phases in a quick CIF

File:

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

trunk/GSASIIphsGUI.py

@@ -487 +487 @@
         commonSizer.Add(common,0,WACV)
         transSizer.Add(commonSizer)
-        Trmat = wx.FlexGridSizer(4,6,0,0)
-        Trmat.Add((10,0),0)
-        Trmat.Add(wx.StaticText(self.panel,label='      M'),wx.ALIGN_CENTER)
-        Trmat.Add((10,0),0)
-        Trmat.Add((10,0),0)
-        Trmat.Add(wx.StaticText(self.panel,label='      U'),wx.ALIGN_CENTER)
-        Trmat.Add(wx.StaticText(self.panel,label='      V'),wx.ALIGN_CENTER)
-        
-        for iy,line in enumerate(self.Trans):
-            for ix,val in enumerate(line):
-                item = G2G.ValidatedTxtCtrl(self.panel,self.Trans[iy],ix,nDig=(10,3),size=(65,25))
-                Trmat.Add(item)
-            Trmat.Add((25,0),0)
-            vec = G2G.ValidatedTxtCtrl(self.panel,self.Uvec,iy,nDig=(10,3),size=(65,25))
-            Trmat.Add(vec)
-            vec = G2G.ValidatedTxtCtrl(self.panel,self.Vvec,iy,nDig=(10,3),size=(65,25))
-            Trmat.Add(vec)
-        transSizer.Add(Trmat)
+        transSizer.Add(G2G.XformMatrix(self.panel,self.Trans,self.Uvec,self.Vvec))
         MatSizer.Add((10,0),0)
         MatSizer.Add(transSizer)
@@ -3044 +3027 @@
         
     def OnUseBilbao(event):
+        '''Select and apply a transformation matrix from the Bilbao web site 
+        to create a new phase
+        '''
         PatternName = data['magPhases']
         PatternId = G2gd.GetGPXtreeItemId(G2frame,G2frame.root,PatternName)
@@ -3096 +3082 @@
             SGData = generalData['SGData']
             vvec = np.array([0.,0.,0.])
+            newPhase['MagXform'] = (magchoice['Trans'],magchoice['Uvec'],vvec)
             newPhase,atCodes = G2lat.TransformPhase(data,newPhase,magchoice['Trans'],magchoice['Uvec'],vvec,ifMag)
             Atoms = newPhase['Atoms']