Changeset 1378 for trunk/scanCCD.py


Ignore:
Timestamp:
Jun 11, 2014 3:38:24 PM (7 years ago)
Author:
toby
Message:

wxPython 2.9 fixes: FlexGridSizer?, wx.Colour, MacOpenFile?; move bind to prevent Rigid body crash

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/scanCCD.py

    r1112 r1378  
    308308                           
    309309            colorList = [m for m in mpl.cm.datad.keys() if not m.endswith("_r")]
    310             colorSizer = wx.FlexGridSizer(1,5,5,5)
     310            colorSizer = wx.FlexGridSizer(0,5,5,5)
    311311            colorSizer.Add(wx.StaticText(self.SCCDPanel,label=' Color bar '),0,wx.ALIGN_CENTER_VERTICAL)
    312312            colSel = wx.ComboBox(self.SCCDPanel,value=data['color'],choices=colorList,
     
    345345                self.PlotImage()
    346346           
    347             maxSizer = wx.FlexGridSizer(1,3,0,5)
     347            maxSizer = wx.FlexGridSizer(0,3,0,5)
    348348            maxSizer.AddGrowableCol(1,1)
    349349            maxSizer.SetFlexibleDirection(wx.HORIZONTAL)
     
    371371                self.PlotImage()
    372372           
    373             zSizer = wx.FlexGridSizer(1,4,5,5)
     373            zSizer = wx.FlexGridSizer(0,4,5,5)
    374374            zSizer.Add(wx.StaticText(self.SCCDPanel,label='Upper intensity mask:'),0,wx.ALIGN_CENTER_VERTICAL)
    375375            zMax = wx.TextCtrl(self.SCCDPanel,value='%d'%(data['Zmax']))
     
    411411                self.PlotImage()
    412412           
    413             zeroSizer = wx.FlexGridSizer(1,6,5,5)
     413            zeroSizer = wx.FlexGridSizer(0,6,5,5)
    414414            zeroSizer.Add(wx.StaticText(self.SCCDPanel,label='X-zero:'),0,wx.ALIGN_CENTER_VERTICAL)
    415415            zMax = wx.TextCtrl(self.SCCDPanel,value='%.3f'%(data['Zeros'][0]))
     
    445445                self.PlotImage()
    446446           
    447             TBLRsizer = wx.FlexGridSizer(2,4,5,5)
     447            TBLRsizer = wx.FlexGridSizer(0,4,5,5)
    448448            for i,item in enumerate(['Bottom','Top']):
    449449                TBLRsizer.Add(wx.StaticText(self.SCCDPanel,label=item+' limit, pixels:'),0,wx.ALIGN_CENTER_VERTICAL)
     
    474474                self.PlotImage()
    475475           
    476             scanSizer = wx.FlexGridSizer(1,6,5,5)
     476            scanSizer = wx.FlexGridSizer(0,6,5,5)
    477477            for i,item in enumerate(['Lower 2-th','Upper 2-th','2-th step']):
    478478                scanSizer.Add(wx.StaticText(self.SCCDPanel,label=item+':'),0,wx.ALIGN_CENTER_VERTICAL)
Note: See TracChangeset for help on using the changeset viewer.