Changeset 2863 for trunk/GSASIIphsGUI.py

Timestamp:

Jun 14, 2017 4:11:42 PM (6 years ago)

Author:

vondreele

Message:

extend contour color selection to include reversed ones (doubles the list!)
add Contour_color to configuration items; modify the Preferences GUI to present a ComboBox? for the color maps
continue implementation of protein validator
np.max --> np.fmax in some places (there may be more to be found); new numpy won't allow np.max to be used to compare an array with a value
fix one use of float as array index - not allowed now: there may be others in G2plot

File:

• trunk/GSASIIphsGUI.py (modified) (2 diffs)

trunk/GSASIIphsGUI.py

@@ -5497 +5497 @@
         if 'Axial' not in textureData['PlotType'] and '3D' not in textureData['PlotType']:
             PTSizer.Add(wx.StaticText(Texture,-1,' Color scheme'),0,WACV)
-            choice = [m for m in mpl.cm.datad.keys() if not m.endswith("_r")]
+            choice = [m for m in mpl.cm.datad.keys()]       #if not m.endswith("_r")
             choice.sort()
             colorSel = wx.ComboBox(Texture,-1,value=G2frame.ContourColor,choices=choice,
@@ -7642 +7642 @@
         if 'Map Peaks' in data:
             mapPeaks = np.array(data['Map Peaks'])
-            peakMax = np.max(mapPeaks.T[0])
+            peakMax = np.fmax(mapPeaks.T[0])
             Ind = MapPeaks.GetSelectedRows()
             for ind in Ind: