Changeset 3693

Timestamp:

Oct 22, 2018 3:08:06 PM (4 years ago)

Author:

vondreele

Message:

magAtoms --> magAtms spelling error n RefreshMagCellsGrid?
allow resizing of UseMagAtom? Dialog box
clean up commented out code in G2cstrGUI

Location:

trunk

Files:

• GSASIIconstrGUI.py (modified) (2 diffs)
• GSASIIphsGUI.py (modified) (2 diffs)
• GSASIIpwdGUI.py (modified) (1 diff)

trunk/GSASIIconstrGUI.py

@@ -1283 +1283 @@
             parm = '%d::%s'%(pId,Aname)
         return parm
-        
+    
     Histograms,Phases = G2frame.GetUsedHistogramsAndPhasesfromTree()
     UseList = newPhase['Histograms']
@@ -1368 +1368 @@
 #                    Dep[0] *= -1
 #                constraints['Phase'].append([IndpCon]+DepConsDict[Usi]+[0.0,None,'c'])
-            
-
-
-
-
-#        for iu in list(set(CSU[0])):
-#            if not iu:
-#                continue
-#            Uid = Uids[iu-1]
-#            IndpCon = [1.0,G2obj.G2VarObj('%d::%s:%s'%(npId,Uid[2],ia))]
-#            DepCons = []
-#            for iau in range(3):
-#                for ibu in range(3):
-#                    if abs(Trans[Uid[0],iau]) > 1.e-4 and abs(Trans[Uid[1],ibu]) > 1.e-4:
-#                        parm = '%d::%s:%s'%(opId,unames[ibu][iau],iat)
-#                        if not parm in varyList:
-#                            varyList.append(parm)
-#                        DepCons.append([Trans[ibu,iau]/detTrans,G2obj.G2VarObj(parm)])
-#            if len(DepCons) == 1:
-#                constraints['Phase'].append([DepCons[0],IndpCon,None,None,'e'])
-#            elif len(DepCons) > 1:        
-#                for Dep in DepCons:
-#                    Dep[0] *= -1
-#                constraints['Phase'].append([IndpCon]+DepCons+[0.0,None,'c'])
             
         #how do I do Uij's for most Trans?

trunk/GSASIIphsGUI.py

@@ -595 +595 @@
             title = 'Magnetic atom selection'
         wx.Dialog.__init__(self,parent,wx.ID_ANY,title, 
-            pos=wx.DefaultPosition,style=wx.DEFAULT_DIALOG_STYLE)
+            pos=wx.DefaultPosition,style=wx.DEFAULT_DIALOG_STYLE|wx.RESIZE_BORDER)
         self.panel = wxscroll.ScrolledPanel(self)         #just a dummy - gets destroyed in Draw!
 #        self.panel = wx.Panel(self)         #just a dummy - gets destroyed in Draw!
@@ -2564 +2564 @@
             generalData['SGData'] = copy.deepcopy(magchoice['SGData'])            
             generalData['Cell'][1:] = magchoice['Cell'][:]
+            generalData['MagDmin'] = 1.0
             SGData = generalData['SGData']
             vvec = np.array([0.,0.,0.])

trunk/GSASIIpwdGUI.py

@@ -3417 +3417 @@
                 mSGData = phase['SGData']
                 text,table = G2spc.SGPrint(mSGData,AddInv=True)
-                if 'magAtoms' in phase:
+                if 'magAtms' in phase:
                     msg = 'Magnetic space group information for '+phase['Name']
                     text[0] = ' Magnetic Space Group: '+mSGData['MagSpGrp']