Skip to content

remove invalid wx sizer flags #1707

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
barentine wants to merge 11 commits into
base: master
Choose a base branch
from
Open

remove invalid wx sizer flags #1707

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
c4ef44a
fix typo in wx.HORIZONTAL even if code is currently unreachable with …
barentine Sep 11, 2026
0dc2974
add wx sizer flag parse test
barentine Sep 11, 2026
1ecee50
fix wx flag in code that's never reached
barentine Sep 12, 2026
c4ced2a
remove invalid wx flags in LaserPanel (not really used these days?)
barentine Sep 12, 2026
7d303a8
remove bad wx flags in unused IntegrationSliders_ class
barentine Sep 12, 2026
536c8e2
verified fix for invalid wx flag
barentine Sep 12, 2026
b92e3d4
wx flag fixes in unused code
barentine Sep 12, 2026
a58a85a
verified fix to sizer flag in segmentation (mc annealing)
barentine Sep 12, 2026
f3557d8
fix to display widefield shift panel
barentine Sep 12, 2026
fe3864d
verified wx flag fix for shiftmap selection dialog
barentine Sep 12, 2026
3d0d3a3
remaining, untested, changes to invalid wx sizer flags
barentine Sep 12, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 9 additions & 9 deletions PYME/Acquire/Hardware/AndorNeo/AndorNeoControlFrame.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ def _init_ctrls(self, prnt):

self.tCCDTemp = wx.TextCtrl(self, -1, '0', size=(30, -1))
hsizer2.Add(self.tCCDTemp, 1, wx.wx.RIGHT|wx.ALIGN_CENTER_VERTICAL, 5)
sbCooling.Add(hsizer2, 0, wx.EXPAND|wx.ALIGN_CENTER_HORIZONTAL, 0)
sbCooling.Add(hsizer2, 0, wx.EXPAND, 0)

self.bSetTemp = wx.Button(self, -1, 'Set', style=wx.BU_EXACTFIT)
self.bSetTemp.Bind(wx.EVT_BUTTON, self.OnBSetTempButton)
Expand All @@ -85,30 +85,30 @@ def _init_ctrls(self, prnt):
self.tEMGain.Bind(wx.EVT_TEXT, self.OnEMGainTextChange)
self.tEMGain.Bind(wx.EVT_TEXT_ENTER, self.OnBSetGainButton)
self.tEMGain.Bind(wx.EVT_COMBOBOX, self.OnBSetGainButton)
hsizer2.Add(self.tEMGain, 1, wx.EXPAND|wx.RIGHT|wx.ALIGN_CENTER_VERTICAL, 5)
hsizer2.Add(self.tEMGain, 1, wx.EXPAND|wx.RIGHT, 5)

self.bSetGain = wx.Button(self, -1, 'Set', style=wx.BU_EXACTFIT)
self.bSetGain.Bind(wx.EVT_BUTTON, self.OnBSetGainButton)
hsizer2.Add(self.bSetGain, 0, wx.EXPAND|wx.ALIGN_CENTER_VERTICAL, 0)
hsizer2.Add(self.bSetGain, 0, wx.EXPAND, 0)

sbEMGain.Add(hsizer2, 0, wx.EXPAND|wx.ALIGN_CENTER_HORIZONTAL, 0)
sbEMGain.Add(hsizer2, 0, wx.EXPAND, 0)

self.stTrueEMGain = wx.StaticText(self, -1, '????')
self.stTrueEMGain.SetForegroundColour(wx.RED)
sbEMGain.Add(self.stTrueEMGain, 0, wx.EXPAND|wx.ALIGN_CENTER_HORIZONTAL, 0)
sbEMGain.Add(self.stTrueEMGain, 0, wx.EXPAND, 0)

hsizer.Add(sbEMGain, 1, wx.EXPAND|wx.ALIGN_CENTER_VERTICAL, 0)
vsizer.Add(hsizer, 0, wx.EXPAND|wx.ALIGN_CENTER_HORIZONTAL, 0)
hsizer.Add(sbEMGain, 1, wx.EXPAND, 0)
vsizer.Add(hsizer, 0, wx.EXPAND, 0)

self.cbShutter = wx.CheckBox(self, -1, u'Spurious Noise Filter')
self.cbShutter.SetValue(False)
self.cbShutter.Bind(wx.EVT_CHECKBOX, self.OnCbShutterCheckbox)
vsizer.Add(self.cbShutter, 0, wx.ALIGN_CENTER_VERTICAL|wx.TOP, 5)
vsizer.Add(self.cbShutter, 0, wx.TOP, 5)

self.cbStaticBlemishCorrection = wx.CheckBox(self, -1, u'Static Blemish Correction')
self.cbStaticBlemishCorrection.SetValue(False)
self.cbStaticBlemishCorrection.Bind(wx.EVT_CHECKBOX, self.OnCbStaticBlemishCorrection)
vsizer.Add(self.cbStaticBlemishCorrection, 0, wx.ALIGN_CENTER_VERTICAL|wx.TOP, 5)
vsizer.Add(self.cbStaticBlemishCorrection, 0, wx.TOP, 5)

self.SetSizer(vsizer)

Expand Down
8 changes: 4 additions & 4 deletions PYME/Acquire/Hardware/LaserControlFrame.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,9 +38,9 @@ def __init__(self, parent,laser):
self.bs1.Add(self.cbOn, 0, wx.ALL | wx.ALIGN_LEFT | wx.ALIGN_CENTER_VERTICAL, 2)

self.bs1.AddStretchSpacer()
self.bs1.Add(wx.StaticLine(self, style=wx.LI_VERTICAL, size=(2,25)), 0,wx.LEFT | wx.RIGHT | wx.ALIGN_RIGHT | wx.ALIGN_CENTER_VERTICAL, 5)
self.bs1.Add(wx.StaticLine(self, style=wx.LI_VERTICAL, size=(2,25)), 0,wx.LEFT | wx.RIGHT | wx.ALIGN_CENTER_VERTICAL, 5)

self.bs1.Add(wx.StaticText(self, wx.ID_ANY, 'Power:'), 0,wx.ALL | wx.ALIGN_RIGHT | wx.ALIGN_CENTER_VERTICAL, 2)
self.bs1.Add(wx.StaticText(self, wx.ID_ANY, 'Power:'), 0,wx.ALL | wx.ALIGN_CENTER_VERTICAL, 2)

self.tcPower= wx.TextCtrl(self, wx.ID_ANY, '1', size=(40,-1))
self.bs1.Add(self.tcPower, 0,wx.ALL | wx.ALIGN_CENTRE | wx.ALIGN_CENTER_VERTICAL, 2)
Expand All @@ -53,10 +53,10 @@ def __init__(self, parent,laser):
self.bSetPower.Enable(self.laser.IsPowerControlable())

self.bs1.AddStretchSpacer()
self.bs1.Add(wx.StaticLine(self, style=wx.LI_VERTICAL, size=(2,25)), 0,wx.LEFT | wx.RIGHT | wx.ALIGN_RIGHT | wx.ALIGN_CENTER_VERTICAL, 5)
self.bs1.Add(wx.StaticLine(self, style=wx.LI_VERTICAL, size=(2,25)), 0,wx.LEFT | wx.RIGHT | wx.ALIGN_CENTER_VERTICAL, 5)

self.tcPulse= wx.TextCtrl(self, wx.ID_ANY, '0', size=(40,-1))
self.bs1.Add(self.tcPulse, 0,wx.ALL | wx.ALIGN_RIGHT | wx.ALIGN_CENTER_VERTICAL, 2)
self.bs1.Add(self.tcPulse, 0,wx.ALL | wx.ALIGN_CENTER_VERTICAL, 2)
self.tcPulse.Enable(not self.laser.IsOn())

self.bPulse = wx.Button(self, wx.ID_ANY, 'Pulse', style=wx.BU_EXACTFIT)
Expand Down
24 changes: 12 additions & 12 deletions PYME/Acquire/Hardware/uc480/AndorControlFrame.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,15 +72,15 @@ def _createCollapsingPane(self):
self.rbSingleShot.SetValue(False)
self.rbSingleShot.SetToolTipString('Allows multiple channels with different integration times and good shutter synchronisation')
self.rbSingleShot.Bind(wx.EVT_RADIOBUTTON,self.OnRbSingleShotRadiobutton)
sbAqMode.Add(self.rbSingleShot, 1, wx.EXPAND|wx.ALIGN_CENTER_VERTICAL, 0)
sbAqMode.Add(self.rbSingleShot, 1, wx.EXPAND, 0)

self.rbContin = wx.RadioButton(cp, -1, 'Continuous')
self.rbContin.SetValue(True)
self.rbContin.SetToolTipString('Allows fastest speeds, albeit without good syncronisation (fixable) or integration time flexibility')
self.rbContin.Bind(wx.EVT_RADIOBUTTON, self.OnRbContinRadiobutton)
sbAqMode.Add(self.rbContin, 1, wx.EXPAND|wx.ALIGN_CENTER_VERTICAL, 0)
sbAqMode.Add(self.rbContin, 1, wx.EXPAND, 0)

vsizer.Add(sbAqMode, 0, wx.EXPAND|wx.ALIGN_CENTER_HORIZONTAL|wx.TOP, 5)
vsizer.Add(sbAqMode, 0, wx.EXPAND|wx.TOP, 5)

#self.bUpdateInt = wx.Button(id=wxID_ANDORFRAMEBUPDATEINT,
# label='Update Integration Time', name='bUpdateInt',
Expand Down Expand Up @@ -126,7 +126,7 @@ def _createCollapsingPane(self):
hsizer.Add(self.cbBaselineClamp, 0, wx.ALIGN_CENTER_VERTICAL, 0)

sbReadout.Add(hsizer, 0, wx.TOP, 2)
vsizer.Add(sbReadout, 0, wx.EXPAND|wx.ALIGN_CENTER_HORIZONTAL|wx.TOP, 5)
vsizer.Add(sbReadout, 0, wx.EXPAND|wx.TOP, 5)

cp.SetSizer(vsizer)

Expand All @@ -148,7 +148,7 @@ def _init_ctrls(self, prnt):

self.tCCDTemp = wx.TextCtrl(self, -1, '0', size=(30, -1))
hsizer2.Add(self.tCCDTemp, 1, wx.wx.RIGHT|wx.ALIGN_CENTER_VERTICAL, 5)
sbCooling.Add(hsizer2, 0, wx.EXPAND|wx.ALIGN_CENTER_HORIZONTAL, 0)
sbCooling.Add(hsizer2, 0, wx.EXPAND, 0)

self.bSetTemp = wx.Button(self, -1, 'Set', style=wx.BU_EXACTFIT)
self.bSetTemp.Bind(wx.EVT_BUTTON, self.OnBSetTempButton)
Expand All @@ -164,25 +164,25 @@ def _init_ctrls(self, prnt):
self.tEMGain.Bind(wx.EVT_TEXT, self.OnEMGainTextChange)
self.tEMGain.Bind(wx.EVT_TEXT_ENTER, self.OnBSetGainButton)
self.tEMGain.Bind(wx.EVT_COMBOBOX, self.OnBSetGainButton)
hsizer2.Add(self.tEMGain, 1, wx.EXPAND|wx.RIGHT|wx.ALIGN_CENTER_VERTICAL, 5)
hsizer2.Add(self.tEMGain, 1, wx.EXPAND|wx.RIGHT, 5)

self.bSetGain = wx.Button(self, -1, 'Set', style=wx.BU_EXACTFIT)
self.bSetGain.Bind(wx.EVT_BUTTON, self.OnBSetGainButton)
hsizer2.Add(self.bSetGain, 0, wx.EXPAND|wx.ALIGN_CENTER_VERTICAL, 0)
hsizer2.Add(self.bSetGain, 0, wx.EXPAND, 0)

sbEMGain.Add(hsizer2, 0, wx.EXPAND|wx.ALIGN_CENTER_HORIZONTAL, 0)
sbEMGain.Add(hsizer2, 0, wx.EXPAND, 0)

self.stTrueEMGain = wx.StaticText(self, -1, '????')
self.stTrueEMGain.SetForegroundColour(wx.RED)
sbEMGain.Add(self.stTrueEMGain, 0, wx.EXPAND|wx.ALIGN_CENTER_HORIZONTAL, 0)
sbEMGain.Add(self.stTrueEMGain, 0, wx.EXPAND, 0)

hsizer.Add(sbEMGain, 1, wx.EXPAND|wx.ALIGN_CENTER_VERTICAL, 0)
vsizer.Add(hsizer, 0, wx.EXPAND|wx.ALIGN_CENTER_HORIZONTAL, 0)
hsizer.Add(sbEMGain, 1, wx.EXPAND, 0)
vsizer.Add(hsizer, 0, wx.EXPAND, 0)

self.cbShutter = wx.CheckBox(self, -1, u'Camera Shutter Open')
self.cbShutter.SetValue(True)
self.cbShutter.Bind(wx.EVT_CHECKBOX, self.OnCbShutterCheckbox)
vsizer.Add(self.cbShutter, 0, wx.ALIGN_CENTER_VERTICAL|wx.TOP, 5)
vsizer.Add(self.cbShutter, 0, wx.TOP, 5)

self.cp = self._createCollapsingPane()

Expand Down
8 changes: 4 additions & 4 deletions PYME/Acquire/Hardware/uc480/ucCamControlFrame.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,16 +44,16 @@ def _init_ctrls(self, prnt):
self.sl.SetTickFreq(10)
self.Bind(wx.EVT_SCROLL,self.onSlide)
hsizer.Add(self.sl, 1, wx.ALL|wx.EXPAND, 2)
ucGain.Add(hsizer, 0, wx.EXPAND|wx.ALIGN_CENTER_HORIZONTAL, 0)
ucGain.Add(hsizer, 0, wx.EXPAND, 0)

self.stGainFactor = wx.StaticText(self, -1, 'Gain Factor = %3.2f' % self.cam.GetGainFactor())
ucGain.Add(self.stGainFactor, 0, wx.EXPAND|wx.ALIGN_CENTER_HORIZONTAL, 0)
ucGain.Add(self.stGainFactor, 0, wx.EXPAND, 0)

self.stepc = wx.StaticText(self, -1, 'Electrons/Count = %3.2f' % (self.cam.noise_properties['ElectronsPerCount']))
ucGain.Add(self.stepc, 0, wx.EXPAND|wx.ALIGN_CENTER_HORIZONTAL, 0)
ucGain.Add(self.stepc, 0, wx.EXPAND, 0)


vsizer.Add(ucGain, 0, wx.EXPAND|wx.ALIGN_CENTER_HORIZONTAL, 0)
vsizer.Add(ucGain, 0, wx.EXPAND, 0)

self.SetSizer(vsizer)

Expand Down
2 changes: 1 addition & 1 deletion PYME/Acquire/sampleInformation.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -267,7 +267,7 @@ def __init__(self, parent, init_filter=('', '', ''), acquiring=True):

btSizer.Realize()

sizer1.Add(btSizer, 0, wx.ALIGN_RIGHT|wx.ALIGN_CENTER_VERTICAL|wx.ALL, 5)
sizer1.Add(btSizer, 0, wx.ALIGN_RIGHT|wx.ALL, 5)

self.SetSizerAndFit(sizer1)

Expand Down
2 changes: 1 addition & 1 deletion PYME/Acquire/sampleInformationDjangoDirect.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -205,7 +205,7 @@ def __init__(self, parent, init_filter=('', '', ''), acquiring=True):

btSizer.Realize()

sizer1.Add(btSizer, 0, wx.ALIGN_RIGHT|wx.ALIGN_CENTER_VERTICAL|wx.ALL, 5)
sizer1.Add(btSizer, 0, wx.ALIGN_RIGHT|wx.ALL, 5)

self.SetSizerAndFit(sizer1)

Expand Down
4 changes: 2 additions & 2 deletions PYME/Acquire/ui/intsliders.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ def __init__(self, chaninfo, parent, scope, winid=-1):
else:
sz = wx.BoxSizer(wx.HORIZONTAL)

sz.Add(sl, 1, wx.ALL|wx.EXPAND|wx.ALIGN_CENTER_VERTICAL, 2)
sz.Add(sl, 1, wx.ALL|wx.EXPAND, 2)
sz.Add(sl_val, 0, wx.ALL|wx.ALIGN_CENTER_VERTICAL, 2)
sz.Add(wx.StaticText(self, -1, 'ms'), 0, wx.ALL|wx.ALIGN_CENTER_VERTICAL, 2)
sizer_2.Add(sz,1,wx.EXPAND,0)
Expand Down Expand Up @@ -154,7 +154,7 @@ def __init__(self, parent, scope, winid=-1):
# TODO - fix this for new wx

if nsliders > 1:
sz = wx.StaticBoxSizer(wx.StaticBox(self, -1, self.chaninfo.names[c] + " (ms)"), wx.HORIZONTAl)
sz = wx.StaticBoxSizer(wx.StaticBox(self, -1, self.chaninfo.names[c] + " (ms)"), wx.HORIZONTAL)
else:
sz = wx.BoxSizer(wx.HORIZONTAL)

Expand Down
6 changes: 3 additions & 3 deletions PYME/Acquire/ui/mpd_picosecond_delay_panel.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,18 +30,18 @@ def __init__(self, parent, delayer, scope):
self.sl.SetTickFreq(25000)
self.Bind(wx.EVT_SCROLL,self.on_slide)
hsizer.Add(self.sl, 1, wx.ALL|wx.EXPAND, 2)
delay.Add(hsizer, 0, wx.EXPAND|wx.ALIGN_CENTER_HORIZONTAL, 0)
delay.Add(hsizer, 0, wx.EXPAND, 0)



vsizer.Add(delay, 0, wx.EXPAND|wx.ALIGN_CENTER_HORIZONTAL, 0)
vsizer.Add(delay, 0, wx.EXPAND, 0)

hsizer = wx.BoxSizer(wx.HORIZONTAL)
self.cb_highspeed = wx.CheckBox(self, wx.ID_ANY, 'High-Speed mode (no GUI update)')
self.cb_highspeed.SetValue(self.delayer.high_speed_mode)
self.cb_highspeed.Bind(wx.EVT_CHECKBOX, self.on_cb_highspeed)

vsizer.Add(hsizer, 0, wx.EXPAND|wx.ALIGN_CENTER_HORIZONTAL, 0)
vsizer.Add(hsizer, 0, wx.EXPAND, 0)

self.SetSizer(vsizer)

Expand Down
6 changes: 3 additions & 3 deletions PYME/DSView/displaySettingsPanel.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ def __init__(self, parent, vp):
self.hlDispMapping = histLimits.HistLimitPanel(self, -1, self.dsa, self.vp.do.getDisp1Off(), self.vp.do.getDisp1Off() + 255./self.vp.do.getDisp1Gain(), True, size=(100, 80))
self.hlDispMapping.Bind(histLimits.EVT_LIMIT_CHANGE, self.OnMappingChange)

hsizer.Add(self.hlDispMapping, 1, wx.EXPAND|wx.ALIGN_CENTER_VERTICAL|wx.ALL, 5)
hsizer.Add(self.hlDispMapping, 1, wx.EXPAND|wx.ALL, 5)

vsizer2 = wx.BoxSizer(wx.VERTICAL)
self.bOptimise = wx.Button(self, -1, 'Optimise', style=wx.BU_EXACTFIT)
Expand All @@ -94,9 +94,9 @@ def __init__(self, parent, vp):

#scaleSizer.Add(self.cbScale, 0, wx.ALL, 5)
#hsizer.Add(wx.StaticText(self, -1, 'Scale: '), 0, wx.ALIGN_CENTER_VERTICAL|wx.ALL, 5)
vsizer2.Add(self.cbScale, 0, wx.ALIGN_CENTER_HORIZONTAL|wx.EXPAND, 5)
vsizer2.Add(self.cbScale, 0, wx.EXPAND, 5)

hsizer.Add(vsizer2, 0, wx.EXPAND|wx.ALIGN_CENTER_VERTICAL|wx.ALL, 5)
hsizer.Add(vsizer2, 0, wx.EXPAND|wx.ALL, 5)

#vsizer.Add(hsizer, 0, wx.ALIGN_CENTER_HORIZONTAL|wx.ALL, 5)

Expand Down
6 changes: 4 additions & 2 deletions PYME/DSView/modules/composite.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -170,7 +170,9 @@ def __init__(self, parent, image):

sizer1 = wx.BoxSizer(wx.VERTICAL)

sizer2 = wx.GridSizer(nChans, 2, 5, 5)
# rows=0 => let wx work out the number of rows from the column count. We add a
# header row on top of one row per channel, so an explicit nChans would be too few.
sizer2 = wx.GridSizer(0, 2, 5, 5)

sizer2.Add(wx.StaticText(self, -1, 'Channel:'))
sizer2.Add(wx.StaticText(self, -1, 'Shiftmap:'))
Expand Down Expand Up @@ -198,7 +200,7 @@ def __init__(self, parent, image):

btSizer.Realize()

sizer1.Add(btSizer, 0, wx.ALIGN_RIGHT|wx.ALIGN_CENTER_VERTICAL|wx.ALL, 5)
sizer1.Add(btSizer, 0, wx.ALIGN_RIGHT|wx.ALL, 5)

self.SetSizer(sizer1)
sizer1.Fit(self)
Expand Down
8 changes: 4 additions & 4 deletions PYME/DSView/modules/deconvolution.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -405,23 +405,23 @@ def __init__(self, parent, sourceImage, destImage):

sizer3.Add(self.fpPSF, 1, wx.ALIGN_CENTER_VERTICAL | wx.ALL, 5)

sizer2.Add(sizer3, 0, wx.EXPAND|wx.ALIGN_CENTER_VERTICAL | wx.ALL, 0)
sizer2.Add(sizer3, 0, wx.EXPAND | wx.ALL, 0)

sizer3 = wx.BoxSizer(wx.HORIZONTAL)
sizer3.Add(wx.StaticText(self, -1, 'Offset:'), 0, wx.ALIGN_CENTER_VERTICAL | wx.ALL, 5)
self.tOffset = wx.TextCtrl(self, -1, '0')

sizer3.Add(self.tOffset, 1, wx.ALIGN_CENTER_VERTICAL | wx.ALL, 5)

sizer2.Add(sizer3, 0, wx.EXPAND|wx.ALIGN_CENTER_VERTICAL | wx.ALL, 0)
sizer2.Add(sizer3, 0, wx.EXPAND | wx.ALL, 0)

sizer3 = wx.BoxSizer(wx.HORIZONTAL)
sizer3.Add(wx.StaticText(self, -1, u'Regularisation \u03BB:'), 0, wx.ALIGN_CENTER_VERTICAL | wx.ALL, 5)
self.tRegLambda = wx.TextCtrl(self, -1, '1e-8')

sizer3.Add(self.tRegLambda, 1, wx.ALIGN_CENTER_VERTICAL | wx.ALL, 5)

sizer2.Add(sizer3, 0, wx.EXPAND|wx.ALIGN_CENTER_VERTICAL | wx.ALL, 0)
sizer2.Add(sizer3, 0, wx.EXPAND | wx.ALL, 0)

sizer3 = wx.BoxSizer(wx.HORIZONTAL)
sizer3.AddSpacer(10)
Expand All @@ -431,7 +431,7 @@ def __init__(self, parent, sourceImage, destImage):

sizer3.Add(self.bCalculate, 1, wx.ALIGN_CENTER_VERTICAL | wx.ALL, 5)

sizer2.Add(sizer3, 0, wx.EXPAND|wx.ALIGN_CENTER_VERTICAL | wx.ALL, 0)
sizer2.Add(sizer3, 0, wx.EXPAND | wx.ALL, 0)

self.SetSizerAndFit(sizer2)

Expand Down
2 changes: 1 addition & 1 deletion PYME/DSView/modules/segmentation.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,7 @@ def __init__(self, parent, sourceImage, destImage):
btn = wx.Button(self, -1, 'Apply')
btn.Bind(wx.EVT_BUTTON, self.OnApply)

sizer1.Add(btn, 0, wx.ALIGN_RIGHT|wx.ALIGN_CENTER_VERTICAL|wx.ALL, 5)
sizer1.Add(btn, 0, wx.ALIGN_RIGHT|wx.ALL, 5)

# btn = wx.Button(self, -1, 'Done')
# btn.Bind(wx.EVT_BUTTON, self.OnDone)
Expand Down
6 changes: 4 additions & 2 deletions PYME/Deconv/deconvDialogs.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -384,7 +384,9 @@ def __init__(self, parent, numIters):

self.gProgress = wx.Gauge(self, -1, numIters)

sizer1.Add(self.gProgress, 5, wx.EXPAND|wx.ALIGN_CENTER_VERTICAL | wx.ALL, 5)
# sizer1.Add(self.gProgress, 5, wx.EXPAND|wx.ALIGN_CENTER_VERTICAL | wx.ALL, 5)
sizer1.Add(self.gProgress, 5, wx.EXPAND | wx.ALL, 5)


#btSizer = wx.StdDialogButtonSizer()

Expand All @@ -395,7 +397,7 @@ def __init__(self, parent, numIters):

#btSizer.Realize()

sizer1.Add(btn, 0, wx.ALIGN_RIGHT|wx.ALIGN_CENTER_VERTICAL|wx.ALL, 5)
sizer1.Add(btn, 0, wx.ALIGN_CENTER_VERTICAL|wx.ALL, 5)

self.SetSizer(sizer1)
sizer1.Fit(self)
Expand Down
2 changes: 1 addition & 1 deletion PYME/LMVis/Extras/animation.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -299,7 +299,7 @@ def __init__(self, parent, snapshot, title=''):

bt_sizer.Realize()

sizer1.Add(bt_sizer, 0, wx.ALIGN_RIGHT | wx.ALIGN_CENTER_VERTICAL | wx.ALL, 5)
sizer1.Add(bt_sizer, 0, wx.ALIGN_RIGHT | wx.ALL, 5)

# set total size
self.SetSizer(sizer1)
Expand Down
2 changes: 1 addition & 1 deletion PYME/LMVis/genImageDialog.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -142,7 +142,7 @@ def __init__(self, parent, mode='current', defaultPixelSize=5.0, jitterVariables
self.cbTriangSoftRender.SetValue(True)
sizer2.Add(self.cbTriangSoftRender, 1, wx.ALIGN_CENTER_VERTICAL | wx.ALL, 5)

sizer1.Add(sizer2, 0, wx.ALIGN_CENTER_VERTICAL|wx.ALL, 5)
sizer1.Add(sizer2, 0, wx.ALL, 5)

if mode in ['3Dhistogram', '3Dgaussian', '3Dtriangles']:
zThick = 50
Expand Down
8 changes: 4 additions & 4 deletions PYME/LMVis/importTextDialog.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -271,17 +271,17 @@ def __init__(self, parent, varnames=['Orte']):

sizer2.Add(self.cbVarNames, 0, wx.ALIGN_CENTER_VERTICAL | wx.ALL, 5)

sizer1.Add(sizer2, 0, wx.ALIGN_CENTER_VERTICAL | wx.ALL, 0)
sizer1.Add(sizer2, 0, wx.ALL, 0)

sizer1.Add(wx.StaticText(self, -1, 'Field Names must evaluate to a list of field names present in the file,\n and should use "x", "y", "sig", "A" and "error_x" to refer to the \nfitted position, std dev., amplitude, and error respectively.'), 0, wx.ALIGN_CENTER_VERTICAL | wx.ALL, 5)
sizer1.Add(wx.StaticText(self, -1, 'Field Names must evaluate to a list of field names present in the file,\n and should use "x", "y", "sig", "A" and "error_x" to refer to the \nfitted position, std dev., amplitude, and error respectively.'), 0, wx.ALL, 5)

sizer2 = wx.BoxSizer(wx.HORIZONTAL)
sizer2.Add(wx.StaticText(self, -1, 'Field Names:'), 0, wx.ALIGN_CENTER_VERTICAL | wx.ALL, 5)
self.tFieldNames = wx.TextCtrl(self, -1, '"A","x","y","error_x","error_y","sig_x","sig_y","Nphotons","t"', size=(250, -1))

sizer2.Add(self.tFieldNames, 0, wx.ALIGN_CENTER_VERTICAL | wx.ALL, 5)

sizer1.Add(sizer2, 0, wx.ALIGN_CENTER_VERTICAL | wx.ALL, 0)
sizer1.Add(sizer2, 0, wx.ALL, 0)

btSizer = wx.StdDialogButtonSizer()

Expand All @@ -296,7 +296,7 @@ def __init__(self, parent, varnames=['Orte']):

btSizer.Realize()

sizer1.Add(btSizer, 0, wx.ALIGN_RIGHT|wx.ALIGN_CENTER_VERTICAL|wx.ALL, 5)
sizer1.Add(btSizer, 0, wx.ALIGN_RIGHT|wx.ALL, 5)

self.SetSizer(sizer1)
sizer1.Fit(self)
Expand Down
2 changes: 1 addition & 1 deletion PYME/LMVis/pointSettingsPanel.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ def __init__(self, parent, pipeline, pointDisplaySettings):
self.chPointColour.SetSelection(colKeys.index(currentCol))


hsizer.Add(self.chPointColour, 0,wx.ALL|wx.ALIGN_CENTER_VERTICAL|wx.EXPAND, 5)
hsizer.Add(self.chPointColour, 0,wx.ALL|wx.EXPAND, 5)

bsizer.Add(hsizer, 0, wx.ALL|wx.EXPAND, 0)

Expand Down
2 changes: 1 addition & 1 deletion PYME/ui/progress.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ def __init__(self, parent, description, exc_type, exc_val, exc_tb):
s_b.SetIcon(wx.ArtProvider.GetIcon(wx.ART_ERROR, client=wx.ART_MESSAGE_BOX, size=(32, 32)))
hsizer.Add(s_b, 0, wx.ALL | wx.ALIGN_CENTRE_VERTICAL, 2)
hsizer.Add(wx.StaticText(self, label='%s' % exc_val), 1,
wx.ALL | wx.ALIGN_CENTRE_VERTICAL|wx.EXPAND, 2)
wx.ALL | wx.EXPAND, 2)
vsizer.Add(hsizer, 0, wx.ALL, 2)

btnsizer = wx.StdDialogButtonSizer()
Expand Down
Loading
Loading