[GRASS-SVN] r55677 - in grass/trunk/gui/wxpython: gcp gui_core modules vdigit
svn_grass at osgeo.org
svn_grass at osgeo.org
Tue Apr 9 14:13:17 PDT 2013
Author: annakrat
Date: 2013-04-09 14:13:17 -0700 (Tue, 09 Apr 2013)
New Revision: 55677
Modified:
grass/trunk/gui/wxpython/gcp/manager.py
grass/trunk/gui/wxpython/gui_core/forms.py
grass/trunk/gui/wxpython/gui_core/toolbars.py
grass/trunk/gui/wxpython/modules/mcalc_builder.py
grass/trunk/gui/wxpython/vdigit/wxdigit.py
grass/trunk/gui/wxpython/vdigit/wxdisplay.py
Log:
wxGUI: remove tabs (except of gui for v.clean)
Modified: grass/trunk/gui/wxpython/gcp/manager.py
===================================================================
--- grass/trunk/gui/wxpython/gcp/manager.py 2013-04-09 18:48:30 UTC (rev 55676)
+++ grass/trunk/gui/wxpython/gcp/manager.py 2013-04-09 21:13:17 UTC (rev 55677)
@@ -1972,7 +1972,7 @@
self.ResizeColumns()
self.render = True
-
+
self.EnsureVisible(self.selected)
def OnCheckItem(self, index, flag):
Modified: grass/trunk/gui/wxpython/gui_core/forms.py
===================================================================
--- grass/trunk/gui/wxpython/gui_core/forms.py 2013-04-09 18:48:30 UTC (rev 55676)
+++ grass/trunk/gui/wxpython/gui_core/forms.py 2013-04-09 21:13:17 UTC (rev 55677)
@@ -588,7 +588,7 @@
min(height, 500)))
# fix goutput's pane size (required for Mac OSX)
- if self.goutput:
+ if self.goutput:
self.goutput.SetSashPosition(int(self.GetSize()[1] * .75))
def updateValuesHook(self, event = None):
Modified: grass/trunk/gui/wxpython/gui_core/toolbars.py
===================================================================
--- grass/trunk/gui/wxpython/gui_core/toolbars.py 2013-04-09 18:48:30 UTC (rev 55676)
+++ grass/trunk/gui/wxpython/gui_core/toolbars.py 2013-04-09 21:13:17 UTC (rev 55677)
@@ -81,16 +81,16 @@
Following code shows how to create new basic toolbar:
@code
- class MyToolbar(BaseToolbar):
- def __init__(self, parent):
- BaseToolbar.__init__(self, parent)
- self.InitToolbar(self._toolbarData())
- self.Realize()
-
- def _toolbarData(self):
- return self._getToolbarData((("help", Icons["help"],
- self.parent.OnHelp),
- ))
+ class MyToolbar(BaseToolbar):
+ def __init__(self, parent):
+ BaseToolbar.__init__(self, parent)
+ self.InitToolbar(self._toolbarData())
+ self.Realize()
+
+ def _toolbarData(self):
+ return self._getToolbarData((("help", Icons["help"],
+ self.parent.OnHelp),
+ ))
@endcode
"""
def __init__(self, parent):
Modified: grass/trunk/gui/wxpython/modules/mcalc_builder.py
===================================================================
--- grass/trunk/gui/wxpython/modules/mcalc_builder.py 2013-04-09 18:48:30 UTC (rev 55676)
+++ grass/trunk/gui/wxpython/modules/mcalc_builder.py 2013-04-09 21:13:17 UTC (rev 55677)
@@ -260,8 +260,8 @@
self.SetMinSize(self.GetBestSize())
def _return_funct(self,event):
- i = event.GetString()
- self._addSomething(self.funct_dict[i])
+ i = event.GetString()
+ self._addSomething(self.funct_dict[i])
def _layout(self):
sizer = wx.BoxSizer(wx.VERTICAL)
@@ -323,7 +323,7 @@
threebutton.Add(item = self.btn_clear, pos = (0,2),
span = (1,1), flag = wx.ALIGN_RIGHT)
buttonSizer3.Add(item = threebutton, pos = (4,0),
- span = (1,1), flag = wx.ALIGN_CENTER)
+ span = (1,1), flag = wx.ALIGN_CENTER)
buttonSizer4 = wx.BoxSizer(wx.HORIZONTAL)
buttonSizer4.Add(item = self.btn_load,
Modified: grass/trunk/gui/wxpython/vdigit/wxdigit.py
===================================================================
--- grass/trunk/gui/wxpython/vdigit/wxdigit.py 2013-04-09 18:48:30 UTC (rev 55676)
+++ grass/trunk/gui/wxpython/vdigit/wxdigit.py 2013-04-09 21:13:17 UTC (rev 55677)
@@ -223,7 +223,7 @@
self.poBgMapInfo = pointer(self.bgMapInfo)
self.popoBgMapInfo = pointer(self.poBgMapInfo)
- if Vect_open_old(self.poBgMapInfo, name, mapset) == -1:
+ if Vect_open_old(self.poBgMapInfo, name, mapset) == -1:
self.poBgMapInfo = self.popoBgMapInfo = None
self._error.NoMap(bgmap)
return
@@ -304,7 +304,7 @@
for i in range(listLine.contents.n_values):
lineBreak = listLine.contents.id[i]
if lineBreak == line:
- continue
+ continue
ltype = Vect_read_line(self.poMapInfo, pointsCheck, None, lineBreak)
if not (ltype & GV_LINES):
@@ -1016,7 +1016,7 @@
Vect_append_point(self.poPoints, x2, y2, z1)
Vect_append_point(self.poPoints, x1, y2, z2)
Vect_append_point(self.poPoints, x1, y1, z1)
-
+
Vect_select_lines_by_polygon(self.poMapInfo, self.poPoints, 0, None,
ftype, poList)
@@ -1148,7 +1148,7 @@
if line == -1:
update = True
line = self._display.selected['ids'][0]
-
+
if not Vect_line_alive(self.poMapInfo, line):
return -1
@@ -1349,7 +1349,7 @@
for field, cat in self.cats.iteritems():
if cat == None:
self.cats[field] = 0 # first category 1
- Debug.msg(3, "wxDigit.InitCats(): layer=%d, cat=%d", field, self.cats[field])
+ Debug.msg(3, "wxDigit.InitCats(): layer=%d, cat=%d", field, self.cats[field])
def _checkMap(self):
"""!Check if map is open
Modified: grass/trunk/gui/wxpython/vdigit/wxdisplay.py
===================================================================
--- grass/trunk/gui/wxpython/vdigit/wxdisplay.py 2013-04-09 18:48:30 UTC (rev 55676)
+++ grass/trunk/gui/wxpython/vdigit/wxdisplay.py 2013-04-09 21:13:17 UTC (rev 55677)
@@ -621,24 +621,24 @@
pz = c_double()
if not self._validLine(lineNearest):
return { 'line' : -1, 'point': None }
- ftype = Vect_read_line(poMapInfo, self.poPoints, self.poCats, lineNearest)
- Vect_line_distance (self.poPoints, point[0], point[1], 0.0, self.is3D,
- byref(px), byref(py), byref(pz),
- None, None, None)
-
- # check for duplicates
- if self.settings['highlightDupl']['enabled']:
+ ftype = Vect_read_line(poMapInfo, self.poPoints, self.poCats, lineNearest)
+ Vect_line_distance(self.poPoints, point[0], point[1], 0.0, self.is3D,
+ byref(px), byref(py), byref(pz),
+ None, None, None)
+
+ # check for duplicates
+ if self.settings['highlightDupl']['enabled']:
found = poFound.contents
- for i in range(found.n_values):
- line = found.value[i]
- if line != lineNearest:
+ for i in range(found.n_values):
+ line = found.value[i]
+ if line != lineNearest:
self.selected['ids'].append(line)
-
+
self.GetDuplicates()
-
- for i in range(found.n_values):
- line = found.value[i]
- if line != lineNearest and not self._isDuplicated(line):
+
+ for i in range(found.n_values):
+ line = found.value[i]
+ if line != lineNearest and not self._isDuplicated(line):
self.selected['ids'].remove(line)
Vect_destroy_list(poFound)
@@ -804,7 +804,7 @@
def GetRegionSelected(self):
"""!Get minimal region extent of selected features
-
+
@return n,s,w,e
"""
regionBox = bound_box()
@@ -1002,7 +1002,7 @@
continue
Vect_read_line(self.poMapInfo, BPoints, None, line2)
-
+
if Vect_line_check_duplicate(APoints, BPoints, WITHOUT_Z):
if i not in ids:
ids[i] = list()
More information about the grass-commit
mailing list