Changeset 3693


Ignore:
Timestamp:
Oct 22, 2018 3:08:06 PM (3 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:
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/GSASIIconstrGUI.py

    r3691 r3693  
    12831283            parm = '%d::%s'%(pId,Aname)
    12841284        return parm
    1285        
     1285   
    12861286    Histograms,Phases = G2frame.GetUsedHistogramsAndPhasesfromTree()
    12871287    UseList = newPhase['Histograms']
     
    13681368#                    Dep[0] *= -1
    13691369#                constraints['Phase'].append([IndpCon]+DepConsDict[Usi]+[0.0,None,'c'])
    1370            
    1371 
    1372 
    1373 
    1374 
    1375 #        for iu in list(set(CSU[0])):
    1376 #            if not iu:
    1377 #                continue
    1378 #            Uid = Uids[iu-1]
    1379 #            IndpCon = [1.0,G2obj.G2VarObj('%d::%s:%s'%(npId,Uid[2],ia))]
    1380 #            DepCons = []
    1381 #            for iau in range(3):
    1382 #                for ibu in range(3):
    1383 #                    if abs(Trans[Uid[0],iau]) > 1.e-4 and abs(Trans[Uid[1],ibu]) > 1.e-4:
    1384 #                        parm = '%d::%s:%s'%(opId,unames[ibu][iau],iat)
    1385 #                        if not parm in varyList:
    1386 #                            varyList.append(parm)
    1387 #                        DepCons.append([Trans[ibu,iau]/detTrans,G2obj.G2VarObj(parm)])
    1388 #            if len(DepCons) == 1:
    1389 #                constraints['Phase'].append([DepCons[0],IndpCon,None,None,'e'])
    1390 #            elif len(DepCons) > 1:       
    1391 #                for Dep in DepCons:
    1392 #                    Dep[0] *= -1
    1393 #                constraints['Phase'].append([IndpCon]+DepCons+[0.0,None,'c'])
    13941370           
    13951371        #how do I do Uij's for most Trans?
  • trunk/GSASIIphsGUI.py

    r3687 r3693  
    595595            title = 'Magnetic atom selection'
    596596        wx.Dialog.__init__(self,parent,wx.ID_ANY,title,
    597             pos=wx.DefaultPosition,style=wx.DEFAULT_DIALOG_STYLE)
     597            pos=wx.DefaultPosition,style=wx.DEFAULT_DIALOG_STYLE|wx.RESIZE_BORDER)
    598598        self.panel = wxscroll.ScrolledPanel(self)         #just a dummy - gets destroyed in Draw!
    599599#        self.panel = wx.Panel(self)         #just a dummy - gets destroyed in Draw!
     
    25642564            generalData['SGData'] = copy.deepcopy(magchoice['SGData'])           
    25652565            generalData['Cell'][1:] = magchoice['Cell'][:]
     2566            generalData['MagDmin'] = 1.0
    25662567            SGData = generalData['SGData']
    25672568            vvec = np.array([0.,0.,0.])
  • trunk/GSASIIpwdGUI.py

    r3687 r3693  
    34173417                mSGData = phase['SGData']
    34183418                text,table = G2spc.SGPrint(mSGData,AddInv=True)
    3419                 if 'magAtoms' in phase:
     3419                if 'magAtms' in phase:
    34203420                    msg = 'Magnetic space group information for '+phase['Name']
    34213421                    text[0] = ' Magnetic Space Group: '+mSGData['MagSpGrp']
Note: See TracChangeset for help on using the changeset viewer.