Changeset 2674 for trunk

Timestamp:

Jan 30, 2017 2:25:48 PM (8 years ago)

Author:

vondreele

Message:

prevent delete if PWDR if corresponding PDF exists
use PickElements? instead of PickElement? - allows multiple selection, blacks out ones already picked & can unpick a pick
add delete spots option to masks

Location:

trunk

Files:

• GSASII.py (modified) (2 diffs)
• GSASIIElemGUI.py (modified) (3 diffs)
• GSASIIgrid.py (modified) (2 diffs)
• GSASIIimgGUI.py (modified) (2 diffs)
• GSASIIpwdGUI.py (modified) (4 diffs)

trunk/GSASII.py ¶

@@ -3152 +3152 @@
         DelItemList = []
         nItems = {'PWDR':0,'SASD':0,'IMG':0,'HKLF':0,'PDF':0}
+        PDFnames = []
         if self.PatternTree.GetCount():
             item, cookie = self.PatternTree.GetFirstChild(self.root)
@@ -3162 +3163 @@
                     if 'IMG' in name:  nItems['IMG'] += 1
                     if 'HKLF' in name: nItems['HKLF'] += 1
-                    if 'PDF' in name:  nItems['PDF'] += 1
+                    if 'PDF' in name:
+                        PDFnames.append(name)
+                        nItems['PDF'] += 1
                     TextList.append(name)
                 item, cookie = self.PatternTree.GetNextChild(self.root, cookie)
+            for pdfName in PDFnames:
+                TextList.remove('PWDR'+pdfName[4:])
             dlg = G2G.G2MultiChoiceDialog(self, 'Which data to delete?', 'Delete data', TextList, wx.CHOICEDLG_STYLE)
             try:

trunk/GSASIIElemGUI.py ¶

@@ -26 +26 @@
 class PickElement(wx.Dialog):
     '''Makes periodic table widget for picking element. Modes:
-        oneOnly if True element symbols are provided, otherwise select isotope
-        ifNone ?
+        oneOnly if True element symbols are provided, otherwise select valence
+        ifNone if True show None button
         ifMag if True present magnetic scatters only
         multiple if True multiple elements can be selected
@@ -72 +72 @@
     def ElButton(self, name, pos, tip, color):
         'Creates an element button widget'
+        self.color = color
         if not self.ifNone and name[0] == 'None':
             return
@@ -105 +106 @@
         self.Elem = El
         if self.multiple:
-            self.elementList.append(El)
-            event.GetEventObject().SetBackgroundColour('black') # Shows on Mac
+            if El in self.elementList:
+                self.elementList.remove(El)
+                event.GetEventObject().SetBackgroundColour(self.color) # Shows on Mac
+            else:
+                self.elementList.append(El)
+                event.GetEventObject().SetBackgroundColour('black') # Shows on Mac
             event.GetEventObject().SetColour(
                 wx.Colour(*[int(i/2) for i in event.GetEventObject().GetColour()]))

trunk/GSASIIgrid.py ¶

@@ -99 +99 @@
 
 [ wxID_MASKCOPY, wxID_MASKSAVE, wxID_MASKLOAD, wxID_NEWMASKSPOT,wxID_NEWMASKARC,wxID_NEWMASKRING,
-    wxID_NEWMASKFRAME, wxID_NEWMASKPOLY,wxID_MASKLOADNOT,wxID_FINDSPOTS,
-] = [wx.NewId() for item in range(10)]
+    wxID_NEWMASKFRAME, wxID_NEWMASKPOLY,wxID_MASKLOADNOT,wxID_FINDSPOTS,wxID_DELETESPOTS
+] = [wx.NewId() for item in range(11)]
 
 [ wxID_STRSTACOPY, wxID_STRSTAFIT, wxID_STRSTASAVE, wxID_STRSTALOAD,wxID_STRSTSAMPLE,
@@ -2121 +2121 @@
         self.MaskEdit.Append(help='Auto search for spot masks; NB: will clear old spot masks', 
             id=wxID_FINDSPOTS, kind=wx.ITEM_NORMAL,text='Auto spot masks')
+        self.MaskEdit.Append(help='Delete all spot masks', 
+            id=wxID_DELETESPOTS, kind=wx.ITEM_NORMAL,text='Delete spot masks')        
         submenu.Append(help='Create an arc mask with mouse input', 
             id=wxID_NEWMASKARC, kind=wx.ITEM_NORMAL,text='Arc mask')

trunk/GSASIIimgGUI.py ¶

@@ -1320 +1320 @@
                 G2frame.ErrorDialog('Auto spot search error',Error)
             wx.CallAfter(UpdateMasks,G2frame,data)
-            wx.CallAfter(G2plt.PlotExposedImage,G2frame,event=event)                
+            wx.CallAfter(G2plt.PlotExposedImage,G2frame,event=event)
+
+    def OnDeleteSpotMask(event):
+        data['Points'] = []
+        wx.CallAfter(UpdateMasks,G2frame,data)
+        wx.CallAfter(G2plt.PlotExposedImage,G2frame,event=event)          
             
     def ToggleSpotMaskMode(event):
@@ -1513 +1518 @@
     G2frame.dataFrame.Bind(wx.EVT_MENU, OnSaveMask, id=G2gd.wxID_MASKSAVE)
     G2frame.dataFrame.Bind(wx.EVT_MENU, OnAutoSpotMask, id=G2gd.wxID_FINDSPOTS)
+    G2frame.dataFrame.Bind(wx.EVT_MENU, OnDeleteSpotMask, id=G2gd.wxID_DELETESPOTS)
     G2frame.dataFrame.Bind(wx.EVT_MENU, ToggleSpotMaskMode, id=G2gd.wxID_NEWMASKSPOT)
     G2frame.dataFrame.Bind(wx.EVT_MENU, OnNewArcMask, id=G2gd.wxID_NEWMASKARC)

trunk/GSASIIpwdGUI.py ¶

@@ -4933 +4933 @@
     def OnAddElement(event):
         ElList = data['ElList']
-        PE = G2elemGUI.PickElement(G2frame,oneOnly=True,multiple=True)
+        choice = ElList.keys()
+        PE = G2elemGUI.PickElements(G2frame,choice)
         if PE.ShowModal() == wx.ID_OK:
-            for El in PE.elementList:
-                if El not in ElList and El != 'None':
+            for El in PE.Elem:
+                if El not in ElList:
                     try:
                         data['ElList'][El] = G2elem.GetElInfo(El,inst)
@@ -5251 +5252 @@
     noRing.SetValue(data['noRing'])
     noRing.Bind(wx.EVT_CHECKBOX, OnNoRing)
-    sqBox.Add(noRing,0)
+    sqBox.Add(noRing,0,WACV)
     mainSizer.Add(sqBox,0)
 
@@ -5326 +5327 @@
         Source = G2frame.PatternTree.GetItemText(G2frame.PatternId)
         if len(TextList) == 1:
-            G2frame.ErrorDialog('Nothing to copy controls to','There must be more than one "PDF" pattern')
+            G2frame.ErrorDialog('Nothing to copy PDF peaks to','There must be more than one "PDF" pattern')
             return
         dlg = G2G.G2MultiChoiceDialog(G2frame,'Copy PDF peaks','Copy peaks from '+Source+' to:',TextList)
@@ -5342 +5343 @@
         
     def OnFitPDFpeaks(event):
+        PatternId = G2frame.PatternId
+        data = G2frame.PatternTree.GetItemPyData(G2gd.GetPatternTreeItemId(G2frame,PatternId, 'PDF Controls'))['G(R)']
+        peaks = G2frame.PatternTree.GetItemPyData(G2gd.GetPatternTreeItemId(G2frame,PatternId, 'PDF Peaks'))
+        if not peaks:
+            G2frame.ErrorDialog('No peaks!','Nothing to fit!')
+            return
+        
         print 'fit peaks'