Changeset 4672 for trunk/fprime.py


Ignore:
Timestamp:
Dec 14, 2020 12:58:19 PM (10 months ago)
Author:
vondreele
Message:

remove all wx.ALIGN from wx Add with wx.EXPAND - invalid combination ignored in older wx; now flagged in current wx 4.1.x
make ax as self.ax in Absorb.py - fix matplotlib warning about reusing a subaxis
put floors on pink beam alp & bet. Fix typo in GetPinkAlpBet? function - now works better.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/fprime.py

    r4365 r4672  
    158158        self.Results = wx.TextCtrl( parent=panel,style=wx.TE_MULTILINE|wx.TE_DONTWRAP )
    159159        self.Results.SetEditable(False)
    160         mainSizer.Add(self.Results,1,wx.ALIGN_CENTER_HORIZONTAL|wx.EXPAND)
     160        mainSizer.Add(self.Results,1,wx.EXPAND)
    161161        mainSizer.Add((10,15),0)
    162162
    163163        selSizer = wx.BoxSizer(wx.HORIZONTAL)
    164164        selSizer.Add((5,10),0)
    165         selSizer.Add(wx.StaticText(parent=panel, label='Wavelength:'),0,
    166             wx.ALIGN_CENTER_VERTICAL|wx.EXPAND)
     165        selSizer.Add(wx.StaticText(parent=panel, label='Wavelength:'),0,wx.EXPAND)
    167166        selSizer.Add((5,10),0)
    168167        self.SpinText1 = wx.TextCtrl(id=wxID_SPINTEXT1, parent=panel,
     
    172171        self.SpinText1.Bind(wx.EVT_TEXT_ENTER, self.OnSpinText1, id=wxID_SPINTEXT1)
    173172       
    174         selSizer.Add(wx.StaticText(parent=panel, label='Energy:'),0,
    175             wx.ALIGN_CENTER_VERTICAL|wx.EXPAND)
     173        selSizer.Add(wx.StaticText(parent=panel, label='Energy:'),0,wx.EXPAND)
    176174        selSizer.Add((5,10),0)
    177175        self.SpinText2 = wx.TextCtrl(id=wxID_SPINTEXT2, parent=panel,
     
    193191            minValue=int(1000.*self.Wmin), parent=panel,style=wx.SL_HORIZONTAL,
    194192            value=int(self.Wave*1000.), )
    195         slideSizer.Add(self.slider1,1,wx.EXPAND|wx.ALIGN_RIGHT)
     193        slideSizer.Add(self.slider1,1,wx.EXPAND)
    196194        self.slider1.Bind(wx.EVT_SLIDER, self.OnSlider1, id=wxID_FPRIMESLIDER1)
    197195        mainSizer.Add(slideSizer,0,wx.EXPAND)
     
    200198        choiceSizer = wx.BoxSizer(wx.HORIZONTAL)
    201199        choiceSizer.Add((5,10),0)
    202         choiceSizer.Add(wx.StaticText(parent=panel, label='Plot scales:'),
    203             0,wx.ALIGN_CENTER_VERTICAL|wx.EXPAND)
     200        choiceSizer.Add(wx.StaticText(parent=panel, label='Plot scales:'),0,wx.EXPAND)
    204201        choiceSizer.Add((5,10),0)
    205202
Note: See TracChangeset for help on using the changeset viewer.