Changeset 719

Timestamp:

Aug 16, 2012 2:21:08 PM (11 years ago)

Author:

vondreele

Message:

fix up atom color change items

File:

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

trunk/GSASIIphsGUI.py

@@ -1770 +1770 @@
                     FindBondsDraw()
                 elif drawAtoms.GetColLabelValue(c) == 'Color':
-                    color = atomData[r][c]
-                    colors = wx.ColourData()
-                    colors.SetChooseFull(True)
-                    colors.SetCustomColour(0,color)
-                    colors.SetColour(color)
-                    dlg = wx.ColourDialog(G2frame,colors)
-                    dlg.GetColourData().SetCustomColour(0,color)
+                    dlg = wx.ColourDialog(G2frame)
                     if dlg.ShowModal() == wx.ID_OK:
                         color = dlg.GetColourData().GetColour()
@@ -1786 +1780 @@
                         drawAtoms.SetAttr(i,cs+2,attr)
                     dlg.Destroy()
-                    event.StopPropagation()
+#                    event.StopPropagation()
                     UpdateDrawAtoms()
             G2plt.PlotStructure(G2frame,data)
@@ -1913 +1907 @@
             colors = wx.ColourData()
             colors.SetChooseFull(True)
-            for i,color in enumerate(atmColors):
-                colors.SetCustomColour(i,color)
-            dlg = wx.ColourDialog(G2frame,colors)
+            dlg = wx.ColourDialog(G2frame)
             if dlg.ShowModal() == wx.ID_OK:
                 for i in range(len(atmColors)):                    
-                    atmColors[i] = dlg.GetColourData().GetCustomColour(i)
+                    atmColors[i] = dlg.GetColourData().GetColour()
                 colorDict = dict(zip(atmTypes,atmColors))
                 for r in indx: