Changeset 1124

Timestamp:

Oct 25, 2013 3:19:10 PM (10 years ago)

Author:

toby

Message:

add a new mask menu command; change the dataframe status when in new mask adding modes

Location:

trunk

Files:

• GSASIIgrid.py (modified) (3 diffs)
• GSASIIimgGUI.py (modified) (2 diffs)
• GSASIIplot.py (modified) (2 diffs)

trunk/GSASIIgrid.py

@@ -95 +95 @@
 
 [ wxID_MASKCOPY, wxID_MASKSAVE, wxID_MASKLOAD,
-] = [wx.NewId() for item in range(3)]
+  wxID_NEWMASKFRAME, wxID_NEWMASKPOLY,
+] = [wx.NewId() for item in range(5)]
+
 
 [ wxID_STRSTACOPY, wxID_STRSTAFIT, wxID_STRSTASAVE, wxID_STRSTALOAD,wxID_APPENDDZERO,
@@ -2179 +2181 @@
         self.MaskEdit = wx.Menu(title='')
         self.MaskMenu.Append(menu=self.MaskEdit, title='Operations')
+        submenu = wx.Menu()
+        self.MaskEdit.AppendMenu(
+            wx.ID_ANY,'Create new', submenu,
+            help=''
+            )
         self.MaskEdit.Append(help='Copy mask to other images', 
             id=wxID_MASKCOPY, kind=wx.ITEM_NORMAL,text='Copy mask')
@@ -2185 +2192 @@
         self.MaskEdit.Append(help='Load mask from file', 
             id=wxID_MASKLOAD, kind=wx.ITEM_NORMAL,text='Load mask')
+        submenu.Append(help='Create a Frame mask with mouse input', 
+            id=wxID_NEWMASKFRAME, kind=wx.ITEM_NORMAL,text='Frame mask')
+        submenu.Append(help='Create a polygon mask with mouse input', 
+            id=wxID_NEWMASKPOLY, kind=wx.ITEM_NORMAL,text='Polygon mask')
         self.PostfillDataMenu()
             

trunk/GSASIIimgGUI.py

@@ -990 +990 @@
         finally:
             dlg.Destroy()
+    def OnNewFrameMask(event):
+        'Start a new Frame mask'
+        G2plt.OnStartMask(G2frame,'f')
+    def OnNewPolyMask(event):
+        'Start a new polygon mask'
+        G2plt.OnStartMask(G2frame,'p')
         
     if G2frame.dataDisplay:
@@ -996 +1002 @@
     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, OnSaveMask, id=G2gd.wxID_MASKSAVE)    
+    G2frame.dataFrame.Bind(wx.EVT_MENU, OnSaveMask, id=G2gd.wxID_MASKSAVE)
+    G2frame.dataFrame.Bind(wx.EVT_MENU, OnNewFrameMask, id=G2gd.wxID_NEWMASKFRAME)
+    G2frame.dataFrame.Bind(wx.EVT_MENU, OnNewPolyMask, id=G2gd.wxID_NEWMASKPOLY)
     if not G2frame.dataFrame.GetStatusBar():
         Status = G2frame.dataFrame.CreateStatusBar()
-        Status.SetStatusText("To add mask: On 2D Powder Image, key a:arc, r:ring, s:spot, p:polygon, f:frame")
+    if G2frame.setFrame:
+        G2frame.dataFrame.GetStatusBar().SetStatusText("Adding frame mask")
+    elif G2frame.setPoly:
+        G2frame.dataFrame.GetStatusBar().SetStatusText("Adding polygon mask")
+    else:
+        G2frame.dataFrame.GetStatusBar().SetStatusText("To add mask: On 2D Powder Image, key a:arc, r:ring, s:spot, p:polygon, f:frame")
     G2frame.dataDisplay = wx.Panel(G2frame.dataFrame)
     mainSizer = wx.BoxSizer(wx.VERTICAL)

trunk/GSASIIplot.py

@@ -2083 +2083 @@
         PlotIntegration(G2frame,newPlot,event)
 
+def OnStartMask(G2frame,eventkey):
+    '''Initiate the start of a Frame or Polygon map
+
+    :param wx.Frame G2frame: The main GSAS-II tree "window"
+    :param str eventkey: a single letter ('f' or 'p') that
+      determines what type of mask is created.    
+    '''
+    Masks = G2frame.PatternTree.GetItemPyData(
+        G2gd.GetPatternTreeItemId(G2frame,G2frame.Image, 'Masks'))
+    if eventkey == 'f':
+        G2frame.setFrame = True
+        Masks['Frames'] = []
+        G2frame.G2plotNB.status.SetFields(['','Frame mask active - LB pick next point, RB close polygon'])
+    elif eventkey == 'p':
+        G2frame.setPoly = True
+        Masks['Polygons'].append([])
+        G2frame.G2plotNB.status.SetFields(['','Polygon mask active - LB pick next point, RB close polygon'])
+    G2imG.UpdateMasks(G2frame,Masks)
+    PlotImage(G2frame,newImage=True)
+
 def PlotImage(G2frame,newPlot=False,event=None,newImage=True):
     '''Plot of 2D detector images as contoured plot. Also plot calibration ellipses,
@@ -2159 +2179 @@
                 Masks['Arcs'].append([tth,[azm-5,azm+5],0.1])
             elif event.key == 'p':
-                G2frame.setPoly = True
-                Masks['Polygons'].append([])
-                G2frame.G2plotNB.status.SetFields(['','Polygon mask active - LB pick next point, RB close polygon'])
+                OnStartMask(G2frame,event.key)
+                #G2frame.setPoly = True
+                #Masks['Polygons'].append([])
+                #G2frame.G2plotNB.status.SetFields(['','Polygon mask active - LB pick next point, RB close polygon'])
             elif event.key == 'f':
-                G2frame.setFrame = True
-                Masks['Frames'] = []
-                G2frame.G2plotNB.status.SetFields(['','Frame mask active - LB pick next point, RB close polygon'])
+                OnStartMask(G2frame,event.key)
+                #G2frame.setFrame = True
+                #Masks['Frames'] = []
+                #G2frame.G2plotNB.status.SetFields(['','Frame mask active - LB pick next point, RB close polygon'])
             G2imG.UpdateMasks(G2frame,Masks)
         elif PickName == 'Image Controls':