Changeset 2759

Timestamp:

Mar 23, 2017 12:08:06 PM (6 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:

• GSASIIgrid.py (modified) (1 diff)
• GSASIIimgGUI.py (modified) (1 diff)

trunk/GSASIIgrid.py

@@ -1497 +1497 @@
         self.globVars = list(set([' ',]+[item[2] for item in splitNames if not item[0] and not item[1]]))
         self.globVars.sort()
-        self.hisNames = [':'.join(item) for item in splitNames if not item[0]]
+        self.hisNames = [':'.join(item) for item in splitNames if not item[0] and item[1]]
         self.hisNums = list(set([int(item.split(':')[1]) for item in self.hisNames]))
         self.hisNums.sort()

trunk/GSASIIimgGUI.py

@@ -1375 +1375 @@
     def OnAutoSpotMask(event):
         'Do auto search for spot masks'
-        if wx.MessageDialog(G2frame.dataDisplay,'NB: This will clear any old spot masks','Auto Spot Masks', wx.OK|wx.CANCEL).ShowModal() == wx.ID_OK:
+        if wx.MessageDialog(G2frame.dataDisplay,'NB: This will clear any old spot masks',
+            'Auto Spot Masks', wx.OK|wx.CANCEL).ShowModal() == wx.ID_OK:
             Controls = copy.deepcopy(G2frame.PatternTree.GetItemPyData( 
-            G2gd.GetPatternTreeItemId(G2frame,G2frame.PatternId,'Image Controls')))
+                G2gd.GetPatternTreeItemId(G2frame,G2frame.Image,'Image Controls')))
             Error = G2img.AutoSpotMasks(G2frame.ImageZ,data,Controls)
             if not Error is None: