Changeset 2480 for trunk/GSASIIgrid.py


Ignore:
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:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/GSASIIgrid.py

    r2466 r2480  
    530530        self.newCell = self.Phase['General']['Cell'][1:8]
    531531        self.Common = 'abc'
     532        self.ifMag = False
    532533        self.Draw()
    533534
     
    616617            self.newCell = G2lat.TransformCell(self.oldCell[:6],self.Trans)
    617618            wx.CallAfter(self.Draw)
     619           
     620        def OnMag(event):
     621            self.ifMag = mag.GetValue()
    618622
    619623        self.panel.Destroy()
     
    673677        sgSizer.Add(SGTxt,0,WACV)
    674678        mainSizer.Add(sgSizer,0,WACV)
     679        if 'magnetic' not in self.Phase['General']['Type']:
     680            mag = wx.CheckBox(self.panel,label=' Make magnetic phase?')
     681            mag.Bind(wx.EVT_CHECKBOX,OnMag)
     682            mainSizer.Add(mag,0,WACV)
    675683
    676684        TestBtn = wx.Button(self.panel,-1,"Test")
     
    697705        self.Phase['General']['Name'] += ' %s'%(self.Common)
    698706        self.Phase['General']['Cell'][1:] = G2lat.TransformCell(self.oldCell[:6],self.Trans)           
    699         return self.Phase,self.Trans,self.Vec
     707        return self.Phase,self.Trans,self.Vec,self.ifMag
    700708
    701709    def OnOk(self,event):
Note: See TracChangeset for help on using the changeset viewer.