Changeset 1580 for trunk/GSASIIimgGUI.py

Timestamp:

Nov 21, 2014 4:12:53 PM (9 years ago)

Author:

toby

Message:

Add ignore-threshold mask load; start on hetrogeneous seqref table display

File:

• trunk/GSASIIimgGUI.py (modified) (4 diffs)

trunk/GSASIIimgGUI.py

@@ -1032 +1032 @@
 
     def Replot(*args,**kwargs):
-        print 'Replot'
         G2plt.PlotExposedImage(G2frame)        
 
@@ -1102 +1101 @@
         
     def OnLoadMask(event):
+        if event.Id == G2gd.wxID_MASKLOADNOT:
+            ignoreThreshold = True
+        else:
+            ignoreThreshold = False
         dlg = wx.FileDialog(G2frame, 'Choose image mask file', '.', '', 
             'image mask files (*.immask)|*.immask',wx.OPEN|wx.CHANGE_DIR)
@@ -1117 +1120 @@
                     [key,val] = S[:-1].split(':')
                     if key in ['Points','Rings','Arcs','Polygons','Frames','Thresholds']:
+                        if ignoreThreshold and key == 'Thresholds': continue
                         save[key] = eval(val)
                         if key == 'Thresholds':
@@ -1161 +1165 @@
     G2frame.dataFrame.Bind(wx.EVT_MENU, OnCopyMask, id=G2gd.wxID_MASKCOPY)
     G2frame.dataFrame.Bind(wx.EVT_MENU, OnLoadMask, id=G2gd.wxID_MASKLOAD)
+    G2frame.dataFrame.Bind(wx.EVT_MENU, OnLoadMask, id=G2gd.wxID_MASKLOADNOT)
     G2frame.dataFrame.Bind(wx.EVT_MENU, OnSaveMask, id=G2gd.wxID_MASKSAVE)
     G2frame.dataFrame.Bind(wx.EVT_MENU, OnNewSpotMask, id=G2gd.wxID_NEWMASKSPOT)