Changeset 3154 for trunk/GSASIIimgGUI.py

Timestamp:

Nov 18, 2017 6:14:55 PM (5 years ago)

Author:

vondreele

Message:

new & imporved spot mask routines:
manual spot mask now fits position & size for selected spot.
changed mouse controls LB drag moves spot, shift-LB changes size & RB deletes spot
autospotmask improved - new algorithm

File:

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

trunk/GSASIIimgGUI.py

@@ -234 +234 @@
         '''
         CleanupMasks(masks)
-        blkSize = 128   #this seems to be optimal; will break in polymask if >1024
+        blkSize = 1024   #this seems to be optimal; will break in polymask if >1024
+#        blkSize = 128   #this seems to be optimal; will break in polymask if >1024
         sumImg = GetImageZ(G2frame,data)
         wx.BeginBusyCursor()
@@ -1514 +1515 @@
         #   (Imin0, Imax0) => Range[0] = data['range'][0] # lowest to highest pixel intensity
         #   [Imin, Imax] => Range[1] = data['range'][1] #   lowest to highest pixel intensity on cmap scale
+        scaleChoices = ("100%","99%","95%","90%","80%","?")
+        scaleSel = wx.Choice(G2frame.dataWindow,choices=scaleChoices,size=(-1,-1))
+        if (Range[1][0] == Range[0][0] and Range[1][1] == Range[0][1]):
+            scaleSel.SetSelection(0)
+        else:
+            scaleSel.SetSelection(len(scaleChoices)-1)
+        scaleSel.Bind(wx.EVT_CHOICE,OnAutoSet)
+        
         maxSizer = wx.GridBagSizer(0,0)
         r = c = 0
@@ -1533 +1542 @@
         maxSizer.Add(maxVal,(r,c))
         c += 1
-        scaleChoices = ("100%","99%","95%","90%","80%","?")
-        scaleSel = wx.Choice(G2frame.dataWindow,choices=scaleChoices,size=(-1,-1))
-        if (Range[1][0] == Range[0][0] and
-            Range[1][1] == Range[0][1]):
-            scaleSel.SetSelection(0)
-        else:
-            scaleSel.SetSelection(len(scaleChoices)-1)
-        scaleSel.Bind(wx.EVT_CHOICE,OnAutoSet)
         maxSizer.Add(scaleSel,(r,c),(2,1),flag=wx.ALIGN_CENTER)
         c = 0
@@ -1624 +1625 @@
     mainSizer.Add(littleSizer,0,)
     if len(Spots):
-        lbl = wx.StaticText(parent=G2frame.dataWindow,label=' Spot masks')
+        lbl = wx.StaticText(parent=G2frame.dataWindow,label=' Spot masks(on plot LB drag to move, shift-LB drag to resize, RB to delete)')
         lbl.SetBackgroundColour(wx.Colour(200,200,210))
         mainSizer.Add(lbl,0,wx.EXPAND|wx.ALIGN_CENTER,0)