[GRASS-SVN] r55004 - grass/trunk/gui/wxpython/nviz
svn_grass at osgeo.org
svn_grass at osgeo.org
Tue Feb 12 00:49:54 PST 2013
Author: annakrat
Date: 2013-02-12 00:49:54 -0800 (Tue, 12 Feb 2013)
New Revision: 55004
Modified:
grass/trunk/gui/wxpython/nviz/tools.py
Log:
wxGUI: move AddGrowableCol after adding items
Modified: grass/trunk/gui/wxpython/nviz/tools.py
===================================================================
--- grass/trunk/gui/wxpython/nviz/tools.py 2013-02-12 08:32:00 UTC (rev 55003)
+++ grass/trunk/gui/wxpython/nviz/tools.py 2013-02-12 08:49:54 UTC (rev 55004)
@@ -345,7 +345,6 @@
label = " %s " % (_("Image Appearance")))
boxSizer = wx.StaticBoxSizer(box, wx.VERTICAL)
gridSizer = wx.GridBagSizer(vgap = 3, hgap = 3)
- gridSizer.AddGrowableCol(0)
# background color
self.win['view']['background'] = {}
@@ -360,6 +359,7 @@
self.win['view']['background']['color'] = color.GetId()
color.Bind(csel.EVT_COLOURSELECT, self.OnBgColor)
gridSizer.Add(item = color, pos = (0, 1))
+ gridSizer.AddGrowableCol(0)
boxSizer.Add(item = gridSizer, proportion = 1,
flag = wx.ALL | wx.EXPAND, border = 3)
@@ -673,7 +673,6 @@
label = " %s " % (_("Draw")))
boxSizer = wx.StaticBoxSizer(box, wx.VERTICAL)
gridSizer = wx.GridBagSizer(vgap = 3, hgap = 3)
- gridSizer.AddGrowableCol(3)
# mode
gridSizer.Add(item = wx.StaticText(parent = panel, id = wx.ID_ANY,
@@ -765,6 +764,7 @@
self.win['surface']['draw']['res-fine'] = resF.GetId()
resF.Bind(wx.EVT_SPINCTRL, self.OnSurfaceResolution)
gridSizer.Add(item = resF, pos = (1, 2), flag = wx.ALIGN_CENTER_VERTICAL|wx.ALIGN_RIGHT)
+ gridSizer.AddGrowableCol(3)
boxSizer.Add(item = gridSizer, proportion = 1,
flag = wx.ALL | wx.EXPAND, border = 3)
@@ -779,7 +779,6 @@
label = " %s " % (_("Surface attributes")))
boxSizer = wx.StaticBoxSizer(box, wx.VERTICAL)
gridSizer = wx.GridBagSizer(vgap = 3, hgap = 3)
- gridSizer.AddGrowableCol(2)
# type
self.win['surface']['attr'] = {}
@@ -842,6 +841,7 @@
attrb = code) # -> enable map / disable constant
row += 1
+ gridSizer.AddGrowableCol(2)
boxSizer.Add(item = gridSizer, proportion = 0,
flag = wx.ALL | wx.EXPAND, border = 3)
pageSizer.Add(item = boxSizer, proportion = 0,
@@ -855,7 +855,6 @@
label = " %s " % (_("Position")))
boxSizer = wx.StaticBoxSizer(box, wx.VERTICAL)
gridSizer = wx.GridBagSizer(vgap = 3, hgap = 3)
- gridSizer.AddGrowableCol(3)
# position
tooltip = _("Changes the x, y, and z position of the current surface")
@@ -885,6 +884,7 @@
gridSizer.Add(item = pslide, flag = wx.ALIGN_CENTER_VERTICAL, pos = (0, 1))
gridSizer.Add(item = ptext, flag = wx.ALIGN_CENTER_VERTICAL, pos = (0, 2))
gridSizer.Add(item = reset, flag = wx.ALIGN_CENTER_VERTICAL|wx.ALIGN_RIGHT, pos = (0, 3))
+ gridSizer.AddGrowableCol(3)
boxSizer.Add(item = gridSizer, proportion = 1,
flag = wx.ALL | wx.EXPAND, border = 3)
@@ -1209,7 +1209,6 @@
label = " %s " % (_("Vector lines")))
boxSizer = wx.StaticBoxSizer(box, wx.VERTICAL)
gridSizer = wx.GridBagSizer(vgap = 5, hgap = 5)
- gridSizer.AddGrowableCol(5)
# width
gridSizer.Add(item = wx.StaticText(parent = panel, id = wx.ID_ANY,
@@ -1325,6 +1324,7 @@
gridSizer.Add(item = self.FindWindowById(self.win['vector']['lines']['height']['text']),
pos = (5, 5),
flag = wx.ALIGN_CENTER)
+ gridSizer.AddGrowableCol(5)
boxSizer.Add(item = gridSizer, proportion = 1,
flag = wx.ALL | wx.EXPAND, border = 3)
@@ -1351,10 +1351,6 @@
boxSizer = wx.StaticBoxSizer(box, wx.VERTICAL)
vertSizer = wx.BoxSizer(wx.VERTICAL)
gridSizer = wx.GridBagSizer(vgap = 5, hgap = 5)
- gridSizer.AddGrowableCol(0)
- gridSizer.AddGrowableCol(2)
- gridSizer.AddGrowableCol(4)
- gridSizer.AddGrowableCol(6)
# icon size
gridSizer.Add(item = wx.StaticText(parent = panel, id = wx.ID_ANY,
@@ -1458,10 +1454,13 @@
setThematic.Bind(wx.EVT_BUTTON, self.OnSetThematic)
gridSizer.Add(item = setThematic, flag = wx.ALIGN_CENTER_VERTICAL,
pos = (2, 6))
+ gridSizer.AddGrowableCol(0)
+ gridSizer.AddGrowableCol(2)
+ gridSizer.AddGrowableCol(4)
+ gridSizer.AddGrowableCol(6)
vertSizer.Add(gridSizer, proportion = 0, flag = wx.EXPAND, border = 0)
# high
gridSizer = wx.GridBagSizer(vgap = 5, hgap = 5)
- gridSizer.AddGrowableCol(1)
gridSizer.Add(item = wx.StaticText(parent = panel, id = wx.ID_ANY,
label = _("Display on surface(s):")),
pos = (0, 0), flag = wx.ALIGN_CENTER_VERTICAL)
@@ -1489,6 +1488,7 @@
gridSizer.Add(item = self.FindWindowById(self.win['vector']['points']['height']['text']),
pos = (3, 1),
flag = wx.ALIGN_CENTER)
+ gridSizer.AddGrowableCol(1)
vertSizer.Add(gridSizer, proportion = 0, flag = wx.EXPAND, border = 0)
boxSizer.Add(item = vertSizer, proportion = 1,
@@ -1670,7 +1670,6 @@
label = " %s " % (_("Position")))
boxSizer = wx.StaticBoxSizer(box, wx.VERTICAL)
gridSizer = wx.GridBagSizer(vgap = 3, hgap = 3)
- gridSizer.AddGrowableCol(3)
# position
self._createControl(panel, data = self.win['volume'], name = 'position',
@@ -1699,6 +1698,7 @@
gridSizer.Add(item = pslide, flag = wx.ALIGN_CENTER_VERTICAL, pos = (0, 1))
gridSizer.Add(item = ptext, flag = wx.ALIGN_CENTER_VERTICAL, pos = (0, 2))
gridSizer.Add(item = reset, flag = wx.ALIGN_CENTER_VERTICAL|wx.ALIGN_RIGHT, pos = (0, 3))
+ gridSizer.AddGrowableCol(3)
boxSizer.Add(item = gridSizer, proportion = 1,
flag = wx.ALL | wx.EXPAND, border = 3)
@@ -2507,9 +2507,6 @@
boxSizer.Add(hSizer, proportion = 0, flag = wx.ALL|wx.EXPAND, border = 3)
gridSizer = wx.GridBagSizer(vgap = 3, hgap = 3)
- gridSizer.AddGrowableCol(0,1)
- gridSizer.AddGrowableCol(1,2)
- gridSizer.AddGrowableCol(2,2)
# text labels
for i in range(2):
@@ -2556,6 +2553,9 @@
gridSizer.Add(item = slider, pos = (4,i+1),
flag = wx.ALIGN_CENTER|wx.EXPAND)
+ gridSizer.AddGrowableCol(0,1)
+ gridSizer.AddGrowableCol(1,2)
+ gridSizer.AddGrowableCol(2,2)
boxSizer.Add(item = gridSizer, proportion = 1,
flag = wx.ALL | wx.EXPAND, border = 3)
More information about the grass-commit
mailing list