Changeset 2480 for trunk/GSASIIgrid.py

Timestamp:

Sep 28, 2016 12:16:00 PM (6 years ago)

Author:

vondreele

Message:

add make magnetic phase to General/Transform? option
trap missing rigid bodies to define torsion seq option
fix lighting issues for polygons
fix xye importer to stop on trailing blank lines rather than crashing
fix error in powder structure factor calc
add magnetic structure factor calc. (some error still & no derivatives yet)

File:

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

trunk/GSASIIgrid.py

@@ -530 +530 @@
         self.newCell = self.Phase['General']['Cell'][1:8]
         self.Common = 'abc'
+        self.ifMag = False
         self.Draw()
 
@@ -616 +617 @@
             self.newCell = G2lat.TransformCell(self.oldCell[:6],self.Trans)
             wx.CallAfter(self.Draw)
+            
+        def OnMag(event):
+            self.ifMag = mag.GetValue()
 
         self.panel.Destroy()
@@ -673 +677 @@
         sgSizer.Add(SGTxt,0,WACV)
         mainSizer.Add(sgSizer,0,WACV)
+        if 'magnetic' not in self.Phase['General']['Type']:
+            mag = wx.CheckBox(self.panel,label=' Make magnetic phase?')
+            mag.Bind(wx.EVT_CHECKBOX,OnMag)
+            mainSizer.Add(mag,0,WACV)
 
         TestBtn = wx.Button(self.panel,-1,"Test")
@@ -697 +705 @@
         self.Phase['General']['Name'] += ' %s'%(self.Common)
         self.Phase['General']['Cell'][1:] = G2lat.TransformCell(self.oldCell[:6],self.Trans)            
-        return self.Phase,self.Trans,self.Vec
+        return self.Phase,self.Trans,self.Vec,self.ifMag
 
     def OnOk(self,event):