Changeset 584


Ignore:
Timestamp:
May 3, 2012 11:35:40 AM (9 years ago)
Author:
vondreele
Message:

add coding line everywhere
more options in sample parm copy

Location:
trunk
Files:
25 edited

Legend:

Unmodified
Added
Removed
  • trunk/ElementTable.py

    r563 r584  
     1# -*- coding: utf-8 -*-
    12#Element table for building periodic table with valences & JMOL colors
    23#Need these in case go back to this periodic table coloring scheme
  • trunk/FormFactors.py

    r266 r584  
     1# -*- coding: utf-8 -*-
    12#FormFactors.py
    23
  • trunk/G2importphase.py

    r500 r584  
     1# -*- coding: utf-8 -*-
    12########### SVN repository information ###################
    23# $Date: 2012-02-13 11:33:35 -0600 (Mon, 13 Feb 2012) $
  • trunk/G2importphase_CIF.py

    r580 r584  
     1# -*- coding: utf-8 -*-
    12########### SVN repository information ###################
    23# $Date: 2012-02-13 11:33:35 -0600 (Mon, 13 Feb 2012) $
  • trunk/G2importphase_GPX.py

    r580 r584  
     1# -*- coding: utf-8 -*-
    12########### SVN repository information ###################
    23# $Date: 2012-02-13 11:33:35 -0600 (Mon, 13 Feb 2012) $
  • trunk/G2importsfact.py

    r580 r584  
     1# -*- coding: utf-8 -*-
    12########### SVN repository information ###################
    23# $Date: 2012-02-13 11:33:35 -0600 (Mon, 13 Feb 2012) $
  • trunk/G2importsfact_CIF.py

    r580 r584  
     1# -*- coding: utf-8 -*-
    12########### SVN repository information ###################
    23# $Date: 2012-02-13 11:33:35 -0600 (Mon, 13 Feb 2012) $
  • trunk/GSASII.py

    r581 r584  
    565565            self.Refine.Enable(True)
    566566            self.SeqRefine.Enable(True)
    567             #self.Solve.Enable(True) # what is this? (BHT)
    568567
    569568    def OnSize(self,event):
  • trunk/GSASIIElem.py

    r489 r584  
     1# -*- coding: utf-8 -*-
    12"""Element: functions for element types
    23   Copyright: 2008, Robert B. Von Dreele & Brian H. Toby (Argonne National Laboratory)
  • trunk/GSASIIElemGUI.py

    r563 r584  
     1# -*- coding: utf-8 -*-
    12"""ElementGUI: class defn. for element GUIs
    23   Copyright: 2008, Robert B. Von Dreele & Brian H. Toby (Argonne National Laboratory)
  • trunk/GSASIIIO.py

    r581 r584  
     1# -*- coding: utf-8 -*-
    12"""GSASIIIO: functions for IO of data
    23   Copyright: 2008, Robert B. Von Dreele (Argonne National Laboratory)
  • trunk/GSASIIgrid.py

    r583 r584  
     1# -*- coding: utf-8 -*-
    12#GSASII - data display routines
    23########### SVN repository information ###################
  • trunk/GSASIIimage.py

    r537 r584  
     1# -*- coding: utf-8 -*-
    12#GSASII image calculations: ellipse fitting & image integration       
    23########### SVN repository information ###################
  • trunk/GSASIIimgGUI.py

    r582 r584  
     1# -*- coding: utf-8 -*-
    12#GSASII - image data display routines
    23########### SVN repository information ###################
  • trunk/GSASIIindex.py

    r429 r584  
     1# -*- coding: utf-8 -*-
    12#GSASII cell indexing program: variation on that of A. Coehlo
    23#   includes cell refinement from peak positions (not zero as yet)
  • trunk/GSASIIlattice.py

    r582 r584  
     1# -*- coding: utf-8 -*-
    12'''Perform lattice-related computations'''
    2 
    33########### SVN repository information ###################
    44# $Date$
  • trunk/GSASIImapvars.py

    r577 r584  
     1# -*- coding: utf-8 -*-
    12########### SVN repository information ###################
    23# $Date: 2011-01-07 13:27:24 -0600 (Fri, 07 Jan 2011) $
  • trunk/GSASIImath.py

    r579 r584  
     1# -*- coding: utf-8 -*-
    12#GSASIImath - major mathematics routines
    23########### SVN repository information ###################
  • trunk/GSASIIpath.py

    r558 r584  
     1# -*- coding: utf-8 -*-
    12# determine a binary path for the pyd files based on the host OS and the python version, 
    23# path is relative to location of the script that is called as well as this file
  • trunk/GSASIIphsGUI.py

    r574 r584  
     1# -*- coding: utf-8 -*-
    12#GSASII - phase data display routines
    23########### SVN repository information ###################
     
    24602461            textureData['SH Coeff'][1] = SetSHCoef()
    24612462            wx.CallAfter(UpdateTexture)
    2462             G2plt.PlotTexture(G2frame,data,newPlot=False)
     2463            G2plt.PlotTexture(G2frame,data)
    24632464                       
    24642465        def OnShModel(event):
     
    24672468            textureData['SH Coeff'][1] = SetSHCoef()
    24682469            wx.CallAfter(UpdateTexture)
    2469             G2plt.PlotTexture(G2frame,data,newPlot=False)
     2470            G2plt.PlotTexture(G2frame,data)
    24702471           
    24712472        def OnSHRefine(event):
     
    24812482            Obj = event.GetEventObject()
    24822483            G2frame.Projection = Obj.GetValue()
    2483             G2plt.PlotTexture(G2frame,data,newPlot=False)
     2484            G2plt.PlotTexture(G2frame,data)
    24842485           
    24852486        def OnColorSel(event):
    24862487            Obj = event.GetEventObject()
    24872488            G2frame.ContourColor = Obj.GetValue()
    2488             G2plt.PlotTexture(G2frame,data,newPlot=False)
     2489            G2plt.PlotTexture(G2frame,data)
    24892490           
    24902491        def OnAngRef(event):
     
    25092510            Obj.SetValue('%8.3f'%(value))
    25102511            textureData['SH Coeff'][1][ODFIndx[Obj.GetId()]] = value
    2511             G2plt.PlotTexture(G2frame,data,newPlot=False)
     2512            G2plt.PlotTexture(G2frame,data)
    25122513           
    25132514        def OnPfType(event):
  • trunk/GSASIIplot.py

    r573 r584  
     1# -*- coding: utf-8 -*-
    12#GSASII plotting routines
    23########### SVN repository information ###################
     
    14121413################################################################################
    14131414           
    1414 def PlotTexture(G2frame,data,newPlot=False,Start=False):
     1415def PlotTexture(G2frame,data,Start=False):
    14151416    '''Pole figure, inverse pole figure, 3D pole distribution and 3D inverse pole distribution
    14161417    plotting.
     
    14711472                    G2frame.G2plotNB.status.SetFields(['','phi =%9.3f, gam =%9.3f, MRD =%9.3f'%(r,p,pf)])
    14721473   
    1473     if G2frame.Projection == '3D display' and 'Axial'  not in SHData['PlotType']:               
    1474         Plot = mp3d.Axes3D(G2frame.G2plotNB.add3D('Texture'))
    1475     else:
     1474    try:
     1475        plotNum = G2frame.G2plotNB.plotList.index('Texture')
     1476        Page = G2frame.G2plotNB.nb.GetPage(plotNum)
     1477        Page.figure.clf()
     1478        Plot = Page.figure.gca()
     1479        if not Page.IsShown():
     1480            Page.Show()
     1481    except ValueError:
    14761482        Plot = G2frame.G2plotNB.addMpl('Texture').gca()
    1477     plotNum = G2frame.G2plotNB.plotList.index('Texture')
    1478     Page = G2frame.G2plotNB.nb.GetPage(plotNum)
    1479     if G2frame.Projection == '3D display':
    1480         pass
    1481     else:
     1483        plotNum = G2frame.G2plotNB.plotList.index('Texture')
     1484        Page = G2frame.G2plotNB.nb.GetPage(plotNum)
    14821485        Page.canvas.mpl_connect('motion_notify_event', OnMotion)
    14831486
     
    15201523            except ValueError:
    15211524                pass
    1522             if newPlot:
    1523 #                Page.figure.colorbar(Img)    #colorbar fails - crashes gsasii
    1524                 newPlot = False
     1525            Page.figure.colorbar(Img)
    15251526            Plot.set_title('Inverse pole figure for XYZ='+str(SHData['PFxyz']))
    15261527            Plot.set_xlabel(G2frame.Projection.capitalize()+' projection')
     
    15421543                pass
    15431544            Img = Plot.imshow(Z.T,aspect='equal',cmap=G2frame.ContourColor,extent=[-1,1,-1,1])
    1544             if newPlot:
    1545 #                Page.figure.colorbar(Img)    #colorbar fails - crashes gsasii
    1546                 newPlot = False
     1545            Page.figure.colorbar(Img)
    15471546            Plot.set_title('Pole figure for HKL='+str(SHData['PFhkl']))
    15481547            Plot.set_xlabel(G2frame.Projection.capitalize()+' projection')
  • trunk/GSASIIpwdGUI.py

    r583 r584  
     1# -*- coding: utf-8 -*-
    12#GSASII - data display routines
    23########### SVN repository information ###################
     
    979980            copyDict[parm] = data[parm]
    980981        histList = ['All '+histType,]
     982        AllList = {}
    981983        item, cookie = G2frame.PatternTree.GetFirstChild(G2frame.root)
    982984        while item:
    983985            name = G2frame.PatternTree.GetItemText(item)
    984986            if histType in name and name != histName:
     987                allname = name.split(' Azm=')[0]
     988                if allname in AllList:
     989                    AllList[allname] += 1
     990                else:
     991                    AllList[allname] = 1
    985992                histList.append(name)
    986993            item, cookie = G2frame.PatternTree.GetNextChild(G2frame.root, cookie)
    987994        if len(histList) == 1:      #nothing to copy to!
    988995            return
     996        nAll = 0
     997        AllNames = AllList.keys()
     998        AllNames.sort()
     999        for allname in AllNames:
     1000            if AllList[allname] > 1:
     1001                histList.insert(1+nAll,'All '+allname)
     1002                nAll += 1
    9891003        copyList = []
    9901004        dlg = wx.MultiChoiceDialog(G2frame,'Copy parameters from\n'+histName,
     
    9951009                for i in result:
    9961010                    copyList.append(histList[i])
     1011                for allname in AllList:
     1012                    if 'All '+allname in copyList:
     1013                        copyList = []
     1014                        for name in histList:
     1015                            if name.split(' Azm=')[0] == allname:
     1016                                copyList.append(name)
     1017                        break       #only one All allowed
    9971018                if 'All '+histType in copyList:
    998                     copyList = histList[1:]
     1019                    copyList = histList[1+nAll:]
    9991020            for item in copyList:
    10001021                Id = G2gd.GetPatternTreeItemId(G2frame,G2frame.root,item)
  • trunk/GSASIIsolve.py

    r484 r584  
     1# -*- coding: utf-8 -*-
    12#GSASIIsolve - structure solving routines
    23########### SVN repository information ###################
  • trunk/GSASIIspc.py

    r530 r584  
     1# -*- coding: utf-8 -*-
    12"GSASII - Space group interpretion routines"
    2 
    33########### SVN repository information ###################
    44# $Date$
  • trunk/GSASIIstruct.py

    r578 r584  
     1# -*- coding: utf-8 -*-
    12#GSASIIstructure - structure computation routines
    23########### SVN repository information ###################
Note: See TracChangeset for help on using the changeset viewer.