Changeset 5122 for trunk/GSASIIElemGUI.py

Timestamp:

Jan 1, 2022 3:00:59 PM (15 months ago)

Author:

toby

Message:

start on fullrmc mods; wx4.1 fix; address wx.Point with float args warning

File:

• trunk/GSASIIElemGUI.py (modified) (4 diffs)

trunk/GSASIIElemGUI.py

@@ -20 +20 @@
 import os
 import wx.lib.colourselect as wscs
+# for Python 3.10+, define a version of wxPoint that accepts float params
+def wxPoint(x,y): return wx.Point(int(x),int(y))
 class PickElement(wx.Dialog):
     '''Makes periodic table widget for picking element. Modes:
@@ -49 +51 @@
                 color=E[6]
             self.ElButton(name=E[0],
-               pos=wx.Point(E[1]*self.butWid+25,E[2]*24+24),
+               pos=wxPoint(E[1]*self.butWid+25,E[2]*24+24),
                tip=E[3],color=color)
             i+=1
         if self.multiple:
             b = wx.Button(self,wx.ID_CLOSE,
-                pos=wx.Point(16.5*self.butWid+25,7.75*24+24),label="Done")
+                pos=wxPoint(16.5*self.butWid+25,7.75*24+24),label="Done")
             b.Bind(wx.EVT_BUTTON, self.OnClose)
 
@@ -246 +248 @@
         for E in self.ElTable:
             PickElements.ElButton(self,parent=elPanel,name=E[0],
-                pos=wx.Point(E[1]*30+20,E[2]*30+25),tip=E[3],color=E[4])
+                pos=wxPoint(E[1]*30+20,E[2]*30+25),tip=E[3],color=E[4])
             i+=1
         mainSizer.Add(elPanel,0,wx.EXPAND)
@@ -321 +323 @@
         Elem = []
         for Elem in choice:
-            self.ElButton(name=Elem,pos=wx.Point(16+i*24, 16))
+            self.ElButton(name=Elem,pos=wxPoint(16+i*24, 16))
             i+=1