Changeset 2314 for trunk/GSASIIgrid.py


Ignore:
Timestamp:
Jun 9, 2016 2:59:47 PM (6 years ago)
Author:
vondreele
Message:

change Levenberg/Marquardt? lambda max to 103 from 105 (it was excessive)
fix image loading on tree selection; now any pick of IMG child will reload image

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/GSASIIgrid.py

    r2310 r2314  
    40274027            GetPatternTreeItemId(G2frame,G2frame.Image, 'Masks'))
    40284028        data = G2frame.PatternTree.GetItemPyData(item)
     4029        G2frame.ImageZ = G2imG.GetImageZ(G2frame,data)
    40294030        G2imG.UpdateImageControls(G2frame,data,masks)
    40304031        G2plt.PlotImage(G2frame,newPlot=True)
     
    40324033        G2frame.dataFrame.SetTitle('Masks')
    40334034        G2frame.Image = G2frame.PatternTree.GetItemParent(item)
    4034         data = G2frame.PatternTree.GetItemPyData(item)
    4035         G2imG.UpdateMasks(G2frame,data)
     4035        masks = G2frame.PatternTree.GetItemPyData(item)
     4036        data = G2frame.PatternTree.GetItemPyData(
     4037            GetPatternTreeItemId(G2frame,G2frame.Image, 'Image Controls'))
     4038        G2frame.ImageZ = G2imG.GetImageZ(G2frame,data)
     4039        G2imG.UpdateMasks(G2frame,masks)
    40364040        G2plt.PlotImage(G2frame,newPlot=True)
    40374041    elif G2frame.PatternTree.GetItemText(item) == 'Stress/Strain':
    40384042        G2frame.dataFrame.SetTitle('Stress/Strain')
    40394043        G2frame.Image = G2frame.PatternTree.GetItemParent(item)
    4040         data = G2frame.PatternTree.GetItemPyData(item)
     4044        data = G2frame.PatternTree.GetItemPyData(
     4045            GetPatternTreeItemId(G2frame,G2frame.Image, 'Image Controls'))
     4046        G2frame.ImageZ = G2imG.GetImageZ(G2frame,data)
     4047        strsta = G2frame.PatternTree.GetItemPyData(item)
    40414048        G2plt.PlotImage(G2frame,newPlot=True)
    4042         G2plt.PlotStrain(G2frame,data,newPlot=True)
    4043         G2imG.UpdateStressStrain(G2frame,data)
     4049        G2plt.PlotStrain(G2frame,strsta,newPlot=True)
     4050        G2imG.UpdateStressStrain(G2frame,strsta)
    40444051    elif G2frame.PatternTree.GetItemText(item) == 'PDF Controls':
    40454052        G2frame.PatternId = G2frame.PatternTree.GetItemParent(item)
Note: See TracChangeset for help on using the changeset viewer.