Changeset 1319


Ignore:
Timestamp:
May 2, 2014 4:00:11 PM (8 years ago)
Author:
vondreele
Message:

fix status line stuff in G2plot

Location:
trunk
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/GSASIIplot.py

    r1312 r1319  
    23672367                Plot.plot(X,Y,'o',label=name)
    23682368        if Page.fitvals:
    2369                 Plot.plot(X,fitvals)
    2370                 Plot.plot(X,fitvals,'*',label='Fit')
     2369                Plot.plot(X,fitvals,label='Fit')
    23712370           
    23722371        Plot.legend(loc='best')
     
    25702569                        Data['ring'].append([xpos,ypos])
    25712570                elif event.button == 3:
    2572                     G2frame.dataFrame.GetStatusBar().SetStatusText('Calibrating...',1)
     2571                    G2frame.dataFrame.GetStatusBar().SetStatusText('Calibrating...',0)
    25732572                    if G2img.ImageCalibrate(G2frame,Data):
    2574                         G2frame.dataFrame.GetStatusBar().SetStatusText('Calibration successful - Show ring picks to check',1)
     2573                        G2frame.dataFrame.GetStatusBar().SetStatusText('Calibration successful - Show ring picks to check',0)
    25752574                        print 'Calibration successful'
    25762575                    else:
    2577                         G2frame.dataFrame.GetStatusBar().SetStatusText('Calibration failed - Show ring picks to diagnose',1)
     2576                        G2frame.dataFrame.GetStatusBar().SetStatusText('Calibration failed - Show ring picks to diagnose',0)
    25782577                        print 'Calibration failed'
    25792578                    G2frame.ifGetRing = False
  • trunk/GSASIIsasd.py

    r1318 r1319  
    10011001    return (G*P/Rg**P)*np.exp(scsp.gammaln(P/2))
    10021002   
     1003def SmearData(Ic,Q,slitLength):
     1004    return Ic   #for now
     1005   
    10031006###############################################################################
    10041007#### Size distribution
     
    10121015        'Cylinder diam':[CylinderDFF,CylinderDVol]}
    10131016    Shape = data['Size']['Shape'][0]
     1017    SlitLen = Sample.get('SlitLen',0.0)
    10141018    Parms = data['Size']['Shape'][1:]
    10151019    if data['Size']['logBins']:
     
    10711075
    10721076    def GetModelParms():
    1073         parmDict = {'Scale':Sample['Scale'][0]}
     1077        parmDict = {'Scale':Sample['Scale'][0],'SlitLen':Sample.get('SlitLen',0.0),}
    10741078        varyList = []
    10751079        values = []
     
    12631267    matFrac = partData['Matrix']['VolFrac'] #[value,flag]       
    12641268    Scale = Sample['Scale']     #[value,flag]
     1269    SlitLen = Sample.get('SlitLen',0.0)
    12651270    Back = sasdData['Back']
    12661271    Q,Io,wt,Ic,Ib,Ifb = Profile[:6]
Note: See TracChangeset for help on using the changeset viewer.