Changeset 2759


Ignore:
Timestamp:
Mar 23, 2017 12:08:06 PM (5 years ago)
Author:
vondreele
Message:

fix problem viewing LS parameters with constraints
fix problem accessing auto spot masks (NB: working on auto spot masks)

Location:
trunk
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/GSASIIgrid.py

    r2755 r2759  
    14971497        self.globVars = list(set([' ',]+[item[2] for item in splitNames if not item[0] and not item[1]]))
    14981498        self.globVars.sort()
    1499         self.hisNames = [':'.join(item) for item in splitNames if not item[0]]
     1499        self.hisNames = [':'.join(item) for item in splitNames if not item[0] and item[1]]
    15001500        self.hisNums = list(set([int(item.split(':')[1]) for item in self.hisNames]))
    15011501        self.hisNums.sort()
  • trunk/GSASIIimgGUI.py

    r2742 r2759  
    13751375    def OnAutoSpotMask(event):
    13761376        'Do auto search for spot masks'
    1377         if wx.MessageDialog(G2frame.dataDisplay,'NB: This will clear any old spot masks','Auto Spot Masks', wx.OK|wx.CANCEL).ShowModal() == wx.ID_OK:
     1377        if wx.MessageDialog(G2frame.dataDisplay,'NB: This will clear any old spot masks',
     1378            'Auto Spot Masks', wx.OK|wx.CANCEL).ShowModal() == wx.ID_OK:
    13781379            Controls = copy.deepcopy(G2frame.PatternTree.GetItemPyData(
    1379             G2gd.GetPatternTreeItemId(G2frame,G2frame.PatternId,'Image Controls')))
     1380                G2gd.GetPatternTreeItemId(G2frame,G2frame.Image,'Image Controls')))
    13801381            Error = G2img.AutoSpotMasks(G2frame.ImageZ,data,Controls)
    13811382            if not Error is None:
Note: See TracChangeset for help on using the changeset viewer.