Changeset 3909

Timestamp:

Apr 19, 2019 10:42:41 AM (4 years ago)

Author:

vondreele

Message:

Add new menu item to Map Peaks - Invert peak position; inverts map and then redoes the map search

Location:

trunk

Files:

• GSASIIdataGUI.py (modified) (2 diffs)
• GSASIIphsGUI.py (modified) (2 diffs)
• GSASIIplot.py (modified) (1 diff)

trunk/GSASIIdataGUI.py

@@ -5649 +5649 @@
             
         # Phase / Map peaks tab
-        G2G.Define_wxId('wxID_PEAKSMOVE', 'wxID_PEAKSCLEAR','wxID_PEAKSUNIQUE', 'wxID_PEAKSDELETE','wxID_PEAKSSAVE',
-            'wxID_PEAKSDA','wxID_PEAKSDISTVP', 'wxID_PEAKSVIEWPT', 'wxID_FINDEQVPEAKS', 'wxID_SHOWBONDS',)
+        G2G.Define_wxId('wxID_PEAKSMOVE', 'wxID_PEAKSCLEAR','wxID_PEAKSUNIQUE', 'wxID_PEAKSDELETE','wxID_PEAKSSAVE','wxID_PEAKSDA',
+            'wxID_PEAKSDISTVP', 'wxID_PEAKSVIEWPT', 'wxID_FINDEQVPEAKS', 'wxID_SHOWBONDS','wxID_INVERTPEAKS',)
         self.MapPeaksMenu = wx.MenuBar()
         self.PrefillDataMenu(self.MapPeaksMenu)
@@ -5662 +5662 @@
         self.MapPeaksEdit.Append(G2G.wxID_PEAKSDA,'Calc dist/ang','Calculate distance or angle for selection')
         self.MapPeaksEdit.Append(G2G.wxID_FINDEQVPEAKS,'Equivalent peaks','Find equivalent peaks')
+        self.MapPeaksEdit.Append(G2G.wxID_INVERTPEAKS,'Invert peak positions','Inverts map & peak positions')
         self.MapPeaksEdit.Append(G2G.wxID_PEAKSUNIQUE,'Unique peaks','Select unique set')
         self.MapPeaksEdit.Append(G2G.wxID_PEAKSSAVE,'Save peaks','Save peaks to csv file')

trunk/GSASIIphsGUI.py

@@ -9031 +9031 @@
         G2plt.PlotStructure(G2frame,data)
         
+    def OnPeaksInvert(event):
+        if 'Map Peaks' in data:
+            generalData = data['General']
+            mapData = generalData['Map']
+            try:
+                mapData['rho'] = np.flip(mapData['rho'],(0,1,2))
+            except TypeError:
+                mapData['rho'] = np.flip(mapData['rho'],0)
+                mapData['rho'] = np.flip(mapData['rho'],1)
+                mapData['rho'] = np.flip(mapData['rho'],2)                
+            OnSearchMaps(event)
+        FillMapPeaksGrid()
+        G2plt.PlotStructure(G2frame,data)
+        
     def OnPeaksEquiv(event):
         if 'Map Peaks' in data:
@@ -9547 +9561 @@
         G2frame.Bind(wx.EVT_MENU, OnShowBonds, id=G2G.wxID_SHOWBONDS)
         G2frame.Bind(wx.EVT_MENU, OnPeaksEquiv, id=G2G.wxID_FINDEQVPEAKS)
+        G2frame.Bind(wx.EVT_MENU, OnPeaksInvert, id=G2G.wxID_INVERTPEAKS)
         G2frame.Bind(wx.EVT_MENU, OnPeaksUnique, id=G2G.wxID_PEAKSUNIQUE)
         G2frame.Bind(wx.EVT_MENU, OnPeaksSave, id=G2G.wxID_PEAKSSAVE)

trunk/GSASIIplot.py

@@ -8800 +8800 @@
                 for plane in Planes:
                     RenderPlane(plane,color)
-        if drawingData['showSlice']:
+        if drawingData.get('showSlice',False):
             if len(D4mapData.get('rho',[])):        #preferentially select 4D map if there
                 rho = D4mapData['rho'][:,:,:,int(G2frame.tau*10)]   #pick current tau 3D slice