Changeset 4492

Timestamp:

Jun 17, 2020 8:46:08 PM (5 years ago)

Author:

vondreele

Message:

cleanup here & there

Location:

trunk

Files:

• GSASIIIO.py (modified) (1 diff)
• GSASIIconstrGUI.py (modified) (3 diffs)
• GSASIIctrlGUI.py (modified) (1 diff)
• GSASIIdataGUI.py (modified) (2 diffs)
• GSASIIexprGUI.py (modified) (2 diffs)
• GSASIIimgGUI.py (modified) (1 diff)
• GSASIIphsGUI.py (modified) (1 diff)

trunk/GSASIIIO.py ¶

@@ -257 +257 @@
     vsizer.Add(wx.StaticText(dlg,wx.ID_ANY,u'Pixel size (\xb5m). Width '),
         0,wx.ALIGN_LEFT|wx.ALL, 2)
-    wdgt = G2G.ValidatedTxtCtrl(dlg,Data['pixelSize'],0,
-                                 size=(50,-1))
+    wdgt = G2G.ValidatedTxtCtrl(dlg,Data['pixelSize'],0,size=(50,-1))
     vsizer.Add(wdgt)
     vsizer.Add(wx.StaticText(dlg,wx.ID_ANY,u'  Height '),wx.ALIGN_LEFT|wx.ALL, 2)

trunk/GSASIIconstrGUI.py ¶

@@ -286 +286 @@
             lbl1 = lbl = str(self.data[id][1])
             if lbl[-1] != '=': lbl1 = lbl + ' ' + separator + ' '
-            name = wx.StaticText(panel,wx.ID_ANY,lbl1,
-                                 style=wx.ALIGN_RIGHT)
-            scale = G2G.ValidatedTxtCtrl(panel,self.data[id],0,
-                                          typeHint=float,
-                                          OKcontrol=self.DisableOK)
+            name = wx.StaticText(panel,wx.ID_ANY,lbl1,style=wx.ALIGN_RIGHT)
+            scale = G2G.ValidatedTxtCtrl(panel,self.data[id],0,OKcontrol=self.DisableOK)
             dataGridSizer.Add(name,0,wx.LEFT|wx.RIGHT|wx.ALIGN_CENTER_VERTICAL,5)
             dataGridSizer.Add(scale,0,wx.RIGHT,3)
@@ -301 +298 @@
         if title == 'New Variable':
             name = wx.StaticText(panel,wx.ID_ANY,"New variable's\nname (optional)",
-                                 style=wx.ALIGN_CENTER)
-            scale = G2G.ValidatedTxtCtrl(panel,self.newvar,0,
-                                          typeHint=str,notBlank=False)
+                style=wx.ALIGN_CENTER)
+            scale = G2G.ValidatedTxtCtrl(panel,self.newvar,0,notBlank=False)
             dataGridSizer.Add(name,0,wx.LEFT|wx.RIGHT|wx.ALIGN_CENTER_VERTICAL,5)
             dataGridSizer.Add(scale,0,wx.RIGHT|wx.ALIGN_CENTER_VERTICAL,3)
@@ -3135 +3131 @@
             nameSizer.Add(G2G.ValidatedTxtCtrl(ResidueRBDisplay,rbData,'RBname'),0,WACV)
             nameSizer.Add((5,0),)
-            plotRB =  wx.Button(ResidueRBDisplay,wx.ID_ANY,'Plot',
-                                style=wx.BU_EXACTFIT)
+            plotRB =  wx.Button(ResidueRBDisplay,wx.ID_ANY,'Plot',style=wx.BU_EXACTFIT)
             plotRB.Bind(wx.EVT_BUTTON, OnPlotRB)
             Indx[plotRB.GetId()] = rbid

trunk/GSASIIctrlGUI.py ¶

@@ -1087 +1087 @@
     def onValSet(*args,**kwargs):
         vScale.SetValue(int(0.5+iscale*loc[key]))        
-    loc[key] = val = min(xmax,max(xmin,loc[key]))
+    loc[key] = min(xmax,max(xmin,loc[key]))
     hSizer = wx.BoxSizer(wx.HORIZONTAL)
     hSizer.Add(wx.StaticText(parent,wx.ID_ANY,label),0,wx.ALL|wx.ALIGN_CENTER_VERTICAL)

trunk/GSASIIdataGUI.py ¶

@@ -563 +563 @@
         if GSASIIpath.GetConfigValue('debug'):
             def OnIPython(event):
-                G2frame = self
                 GSASIIpath.IPyBreak()
             item = parent.Append(wx.ID_ANY,"IPython Console",'')
@@ -6606 +6605 @@
         
     def OnKeyUp(event):
-        key = event.GetKeyCode()
-        rows = G2frame.dataDisplay.GetSelectedRows()
-        #print(key,rows)
         event.Skip()
         wx.CallAfter(PlotSelectedColRow,'single')

trunk/GSASIIexprGUI.py ¶

@@ -612 +612 @@
                 GridSiz.Add((-1,-1),0,wx.ALIGN_LEFT|wx.EXPAND,0)
             elif self.varSelect.get(v) == 0:
-                wid = G2G.ValidatedTxtCtrl(self.varbox,self.varName,v,
-                                            #OnLeave=self.OnTxtLeave,
-                                            size=(50,-1))
+                wid = G2G.ValidatedTxtCtrl(self.varbox,self.varName,v,size=(50,-1))
                 GridSiz.Add(wid,0,wx.ALIGN_LEFT|wx.EXPAND,0)
             else:
@@ -624 +622 @@
                 GridSiz.Add((-1,-1),0,wx.ALIGN_RIGHT|wx.EXPAND,0)
             elif self.varSelect.get(v) == 0:
-                wid = G2G.ValidatedTxtCtrl(self.varbox,self.varValue,v,
-                                            #OnLeave=self.OnTxtLeave,
-                                            size=(75,-1))
+                wid = G2G.ValidatedTxtCtrl(self.varbox,self.varValue,v,size=(75,-1))
                 GridSiz.Add(wid,0,wx.ALIGN_LEFT|wx.EXPAND,0)
                 wid.Bind(wx.EVT_CHAR,self.OnChar)

trunk/GSASIIimgGUI.py ¶

@@ -155 +155 @@
         data['setdist'] = data['distance']
     distSizer.Add(G2G.ValidatedTxtCtrl(G2frame.dataWindow,data,'setdist',nDig=(10,4),
-            typeHint=float),0,WACV)
+        typeHint=float),0,WACV)
     distSizer.Add(wx.StaticText(G2frame.dataWindow,label=' Polarization: '),0,WACV)
     if 'PolaVal' not in data:       #patch

trunk/GSASIIphsGUI.py ¶

@@ -65 +65 @@
 import numpy as np
 import numpy.linalg as nl
-import numpy.fft as fft
 import atmdata