[GRASS-SVN] r41799 - in grass/trunk/gui: scripts wxpython/scripts

svn_grass at osgeo.org svn_grass at osgeo.org
Sun Apr 11 09:23:28 EDT 2010


Author: martinl
Date: 2010-04-11 09:23:27 -0400 (Sun, 11 Apr 2010)
New Revision: 41799

Added:
   grass/trunk/gui/scripts/d.rast3.py
   grass/trunk/gui/scripts/p.cmd.py
   grass/trunk/gui/scripts/p.db.py
   grass/trunk/gui/scripts/p.mon.py
   grass/trunk/gui/scripts/p.rast.py
   grass/trunk/gui/scripts/p.vect.py
Removed:
   grass/trunk/gui/wxpython/scripts/d.rast3.py
   grass/trunk/gui/wxpython/scripts/p.cmd.py
   grass/trunk/gui/wxpython/scripts/p.db.py
   grass/trunk/gui/wxpython/scripts/p.mon.py
   grass/trunk/gui/wxpython/scripts/p.rast.py
   grass/trunk/gui/wxpython/scripts/p.vect.py
Modified:
   grass/trunk/gui/scripts/Makefile
Log:
some scripts moved from gui/wxpython/scripts -> gui/scripts


Modified: grass/trunk/gui/scripts/Makefile
===================================================================
--- grass/trunk/gui/scripts/Makefile	2010-04-10 21:29:46 UTC (rev 41798)
+++ grass/trunk/gui/scripts/Makefile	2010-04-11 13:23:27 UTC (rev 41799)
@@ -1,14 +1,17 @@
 MODULE_TOPDIR = ../..
 
 include $(MODULE_TOPDIR)/include/Make/Dir.make
+include $(MODULE_TOPDIR)/include/Make/Python.make
 
-SRCFILES := $(wildcard *.*)
-DSTFILES := $(patsubst %,$(ETC)/gui/scripts/%,$(SRCFILES))
+ETCDIR = $(ETC)/gui/scripts
 
+SRCFILES := $(wildcard *.py)
+DSTFILES := $(patsubst %,$(ETCDIR)/%,$(SRCFILES)) $(patsubst %.py,$(ETCDIR)/%.pyc,$(filter %.py,$(SRCFILES)))
+
 default: $(DSTFILES)
 
-$(ETC)/gui/scripts/%: % | $(ETC)/gui/scripts
+$(ETCDIR)/%: % | $(ETCDIR)
 	$(INSTALL) $< $@
 
-$(ETC)/gui/scripts:
+$(ETCDIR):
 	$(MKDIR) $@

Copied: grass/trunk/gui/scripts/d.rast3.py (from rev 41797, grass/trunk/gui/wxpython/scripts/d.rast3.py)
===================================================================
--- grass/trunk/gui/scripts/d.rast3.py	                        (rev 0)
+++ grass/trunk/gui/scripts/d.rast3.py	2010-04-11 13:23:27 UTC (rev 41799)
@@ -0,0 +1,36 @@
+#!/usr/bin/env python
+#
+############################################################################
+#
+# MODULE:       d.rast3d
+#
+# AUTHOR(S):    Martin Landa <landa.martin gmail.com>
+#
+# PURPOSE:	Wrapper for wxGUI -- add 3d raster map layer into layer tree
+#
+# COPYRIGHT:	(C) 2008 by the GRASS Development Team
+#
+#		This program is free software under the GNU General Public
+#		License (>=v2). Read the file COPYING that comes with GRASS
+#		for details.
+#
+#############################################################################
+
+#%module
+#%  description: Displays 3d raster data in the active frame on the graphics monitor.
+#%  keywords: display, raster3d
+#%end
+
+#%option
+#% key: map
+#% type: string
+#% gisprompt: old,grid3,3d-raster
+#% description: 3D raster map to be displayed
+#% required : yes
+#%end
+
+from grass.script import core as grass
+
+if __name__ == "__main__":
+    options, flags = grass.parser()
+    main()

Copied: grass/trunk/gui/scripts/p.cmd.py (from rev 41798, grass/trunk/gui/wxpython/scripts/p.cmd.py)
===================================================================
--- grass/trunk/gui/scripts/p.cmd.py	                        (rev 0)
+++ grass/trunk/gui/scripts/p.cmd.py	2010-04-11 13:23:27 UTC (rev 41799)
@@ -0,0 +1,65 @@
+#!/usr/bin/env python
+############################################################################
+#
+# MODULE:       p.cmd
+# AUTHOR(S):    Martin Landa, Hamish Bowman
+#               Converted to Python by Huidae Cho
+# PURPOSE:      Wrapper for display commands and pX monitors
+# COPYRIGHT:    (C) 2009 by The GRASS Development Team
+#
+#  This program is free software; you can redistribute it and/or modify
+#  it under the terms of the GNU General Public License as published by
+#  the Free Software Foundation; either version 2 of the License, or
+#  (at your option) any later version.
+#
+#  This program is distributed in the hope that it will be useful,
+#  but WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#  GNU General Public License for more details.
+#
+############################################################################
+
+#%Module
+#% description: Wrapper for display commands and pX monitors
+#% keywords: display
+#%End
+
+#%Option
+#% key: cmd
+#% type: string
+#% required: yes
+#% multiple: no
+#% label: Command to be performed
+#% description: Example: "d.rast map=elevation.dem at PERMANENT catlist=1300-1400 -i"
+#%End
+
+#%Option
+#% key: opacity
+#% type: string
+#% required: no
+#% multiple: no
+#% key_desc: val
+#% description: Opacity level in percentage
+#% answer: 100
+#%End
+
+import os
+import grass.script as grass
+
+def main():
+    cmd_file = grass.gisenv()["GRASS_PYCMDFILE"]
+
+    if cmd_file == "" or os.path.exists(cmd_file) == False:
+        grass.message(_("GRASS_PYCMDFILE - File not found. Run p.mon."), "e")
+        return
+
+    cmd = options["cmd"]
+    opacity = options["opacity"]
+
+    fp = open(cmd_file, "a")
+    fp.write("%s opacity=%s\n" % (cmd, opacity))
+    fp.close()
+
+if __name__ == "__main__":
+    options, flags = grass.parser()
+    main()

Copied: grass/trunk/gui/scripts/p.db.py (from rev 41798, grass/trunk/gui/wxpython/scripts/p.db.py)
===================================================================
--- grass/trunk/gui/scripts/p.db.py	                        (rev 0)
+++ grass/trunk/gui/scripts/p.db.py	2010-04-11 13:23:27 UTC (rev 41799)
@@ -0,0 +1,44 @@
+#!/usr/bin/env python
+############################################################################
+#
+# MODULE:       p.db
+# AUTHOR(S):    Jachym Cepicky, Markus Neteler, Hamish Bowman
+#               Converted to Python by Huidae Cho
+# PURPOSE:      Start stand-alone attribute table manager
+# COPYRIGHT:    (C) 2009 by The GRASS Development Team
+#
+#  This program is free software; you can redistribute it and/or modify
+#  it under the terms of the GNU General Public License as published by
+#  the Free Software Foundation; either version 2 of the License, or
+#  (at your option) any later version.
+#
+#  This program is distributed in the hope that it will be useful,
+#  but WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#  GNU General Public License for more details.
+#
+############################################################################
+
+#%Module
+#% description: Start stand-alone attribute table manager
+#% keywords: database
+#%End
+#%Option
+#% key: table
+#% type: string
+#% required: yes
+#% multiple: no
+#% description: Table name
+#%End
+
+import os
+import grass.script as grass
+
+def main():
+    table = options["table"]
+
+    os.spawnlp(os.P_NOWAIT, os.environ["GRASS_PYTHON"], os.environ["GRASS_PYTHON"], "%s/etc/wxpython/gui_modules/dbm.py" % os.environ["GISBASE"], table)
+
+if __name__ == "__main__":
+    options, flags = grass.parser()
+    main()

Copied: grass/trunk/gui/scripts/p.mon.py (from rev 41798, grass/trunk/gui/wxpython/scripts/p.mon.py)
===================================================================
--- grass/trunk/gui/scripts/p.mon.py	                        (rev 0)
+++ grass/trunk/gui/scripts/p.mon.py	2010-04-11 13:23:27 UTC (rev 41799)
@@ -0,0 +1,107 @@
+#!/usr/bin/env python
+############################################################################
+#
+# MODULE:       p.mon
+# AUTHOR(S):    Jachym Cepicky, Michael Barton, Martin Landa, Markus Neteler,
+#               Hamish Bowman
+#               Converted to Python by Huidae Cho
+# PURPOSE:      To establish and control use of a graphics display monitor.
+# COPYRIGHT:    (C) 2009 by The GRASS Development Team
+#
+#  This program is free software; you can redistribute it and/or modify
+#  it under the terms of the GNU General Public License as published by
+#  the Free Software Foundation; either version 2 of the License, or
+#  (at your option) any later version.
+#
+#  This program is distributed in the hope that it will be useful,
+#  but WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#  GNU General Public License for more details.
+#
+############################################################################
+
+#%Module
+#% description: To establish and control use of a graphics display monitor.
+#% keywords: display
+#%End
+
+##%Flag
+##% key: l
+##% description: List all monitors
+##%End
+
+##%Flag
+##% key: L
+##% description: List all monitors (with current status)
+##%End
+
+##%Flag
+##% key: p
+##% description: Print name of currently selected monitor
+##%End
+
+##%Flag
+##% key: r
+##% description: Release currently selected monitor
+##%End
+
+##%Flag
+##% key: s
+##% description: Do not automatically select when starting
+##%End
+
+#%Option
+#% key: start
+#% type: string
+#% required: no
+#% multiple: no
+#% description: Name of graphics monitor to start (p0-p9)
+#%End
+
+##%Option
+##% key: stop
+##% type: string
+##% required: no
+##% multiple: no
+##% description: Name of graphics monitor to stop
+##%End
+
+##%Option
+##% key: select
+##% type: string
+##% required: no
+##% multiple: no
+##% description: Name of graphics monitor to select
+##%End
+
+##%Option
+##% key: unlock
+##% type: string
+##% required: no
+##% multiple: no
+##% description: Name of graphics monitor to unlock
+##%End
+
+import os
+import grass.script as grass
+
+def main():
+    start = options["start"]
+#    select = options["select"]
+#    stop = options["stop"]
+#    unlock = options["unlock"]
+
+    # create the command file
+    command_file = grass.tempfile()
+    os.system("g.gisenv set=GRASS_PYCMDFILE=%s" % command_file)
+
+    if start != "":
+        os.spawnlp(os.P_NOWAIT, os.environ["GRASS_PYTHON"], os.environ["GRASS_PYTHON"], "%s/etc/wxpython/gui_modules/mapdisp.py" % os.environ["GISBASE"], start, command_file)
+        return
+
+#    if stop != "" or select != "" or unlock != "":
+#        grass.message(_("Not implemented yet"), "w")
+
+if __name__ == "__main__":
+    options, flags = grass.parser()
+    main()

Copied: grass/trunk/gui/scripts/p.rast.py (from rev 41798, grass/trunk/gui/wxpython/scripts/p.rast.py)
===================================================================
--- grass/trunk/gui/scripts/p.rast.py	                        (rev 0)
+++ grass/trunk/gui/scripts/p.rast.py	2010-04-11 13:23:27 UTC (rev 41799)
@@ -0,0 +1,110 @@
+#!/usr/bin/env python
+############################################################################
+#
+# MODULE:       p.rast
+# AUTHOR(S):    Jachym Cepicky, Martin Landa, Hamish Bowman
+#               Converted to Python by Huidae Cho
+# PURPOSE:      Displays raster map layer in the active map display window.
+# COPYRIGHT:    (C) 2009 by The GRASS Development Team
+#
+#  This program is free software; you can redistribute it and/or modify
+#  it under the terms of the GNU General Public License as published by
+#  the Free Software Foundation; either version 2 of the License, or
+#  (at your option) any later version.
+#
+#  This program is distributed in the hope that it will be useful,
+#  but WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#  GNU General Public License for more details.
+#
+############################################################################
+
+#%module
+#% description: Displays raster map layer in the active map display window.
+#% keywords: display, raster
+#%end
+#%flag
+#% key: n
+#% description: Make null cells opaque
+#%end
+#%flag
+#% key: i
+#% description: Invert catlist
+#% guisection: Selection
+#%end
+#%option
+#% key: map
+#% type: string
+#% required: yes
+#% multiple: no
+#% key_desc: name
+#% description: Raster map to be displayed
+#% gisprompt: old,cell,raster
+#%end
+#%option
+#% key: catlist
+#% type: string
+#% required: no
+#% multiple: yes
+#% key_desc: cat[-cat]
+#% description: List of categories to be displayed (INT maps)
+#% guisection: Selection
+#%end
+#%option
+#% key: vallist
+#% type: string
+#% required: no
+#% multiple: yes
+#% key_desc: val[-val]
+#% description: List of values to be displayed (FP maps)
+#% guisection: Selection
+#%end
+#%option
+#% key: bg
+#% type: string
+#% required: no
+#% multiple: no
+#% key_desc: color
+#% description: Background color (for null)
+#% gisprompt: old_color,color,color
+#%end
+#%option
+#% key: opacity
+#% type: string
+#% required: no
+#% multiple: no
+#% key_desc: val
+#% answer: 100
+#% description: Set opacity between 0-100%
+#%end
+
+import sys
+import os
+import grass.script as grass
+
+def construct_command(cmd):
+    line = cmd
+    for key, val in options.iteritems():
+        if val != "":
+            line += " %s=%s" % (key, val)
+    for key, val in flags.iteritems():
+        if val == True:
+            line += " -%s" % key
+    return line
+
+def main():
+    cmd_file = grass.gisenv()["GRASS_PYCMDFILE"]
+
+    if cmd_file == "" or os.path.exists(cmd_file) == False:
+        grass.message(_("GRASS_PYCMDFILE - File not found. Run p.mon."), "e")
+        return
+
+    cmd = construct_command("d"+os.path.basename(sys.argv[0])[1:-3])
+
+    fp = open(cmd_file, "a")
+    fp.write("%s\n" % cmd)
+    fp.close()
+
+if __name__ == "__main__":
+    options, flags = grass.parser()
+    main()

Copied: grass/trunk/gui/scripts/p.vect.py (from rev 41798, grass/trunk/gui/wxpython/scripts/p.vect.py)
===================================================================
--- grass/trunk/gui/scripts/p.vect.py	                        (rev 0)
+++ grass/trunk/gui/scripts/p.vect.py	2010-04-11 13:23:27 UTC (rev 41799)
@@ -0,0 +1,367 @@
+#!/usr/bin/env python
+############################################################################
+#
+# MODULE:       p.vect
+# AUTHOR(S):    Jachym Cepicky, Hamish Bowman
+#               Converted to Python by Huidae Cho
+# PURPOSE:      Displays vector map layer in the active map display window.
+# COPYRIGHT:    (C) 2009 by The GRASS Development Team
+#
+#  This program is free software; you can redistribute it and/or modify
+#  it under the terms of the GNU General Public License as published by
+#  the Free Software Foundation; either version 2 of the License, or
+#  (at your option) any later version.
+#
+#  This program is distributed in the hope that it will be useful,
+#  but WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#  GNU General Public License for more details.
+#
+############################################################################
+
+#%module
+#% description: Displays vector map layer in the active map display window.
+#% keywords: display, vector
+#%end
+#%flag
+#% key: a
+#% description: Get colors from map table column (of form RRR:GGG:BBB)
+#% guisection: Colors
+#%end
+#%flag
+#% key: c
+#% description: Random colors according to category number (or layer number if 'layer=-1' is given)
+#% guisection: Colors
+#%end
+#%flag
+#% key: i
+#% description: Use values from 'cats' option as feature id
+#% guisection: Selection
+#%end
+#%flag
+#% key: z
+#% description: Colorize polygons according to z height
+#%end
+#%option
+#% key: map
+#% type: string
+#% required: yes
+#% multiple: no
+#% key_desc: name
+#% description: Name of input vector map
+#% gisprompt: old,vector,vector
+#%end
+#%option
+#% key: display
+#% type: string
+#% required: no
+#% multiple: yes
+#% options: shape,cat,topo,dir,attr,zcoor
+#% description: Display
+#% answer: shape
+#%end
+#%option
+#% key: type
+#% type: string
+#% required: no
+#% multiple: yes
+#% options: point,line,boundary,centroid,area,face
+#% description: Feature type
+#% answer: point,line,boundary,centroid,area,face
+#% guisection: Selection
+#%end
+#%option
+#% key: layer
+#% type: string
+#% required: no
+#% multiple: no
+#% label: Layer number (if -1, all layers are displayed)
+#% description: A single vector map can be connected to multiple database tables. This number determines which table to use.
+#% answer: 1
+#% gisprompt: old_layer,layer,layer_all
+#% guisection: Selection
+#%end
+#%option
+#% key: cats
+#% type: string
+#% required: no
+#% multiple: no
+#% key_desc: range
+#% label: Category values
+#% description: Example: 1,3,7-9,13
+#% guisection: Selection
+#%end
+#%option
+#% key: where
+#% type: string
+#% required: no
+#% multiple: no
+#% key_desc: sql_query
+#% label: WHERE conditions of SQL statement without 'where' keyword
+#% description: Example: income < 1000 and inhab >= 10000
+#% guisection: Selection
+#%end
+#%option
+#% key: color
+#% type: string
+#% required: no
+#% multiple: no
+#% label: Line color
+#% description: Either a standard GRASS color, R:G:B triplet, or "none"
+#% answer: black
+#% gisprompt: old_color,color,color_none
+#% guisection: Colors
+#%end
+#%option
+#% key: fcolor
+#% type: string
+#% required: no
+#% multiple: no
+#% label: Area fill color
+#% description: Either a standard GRASS color, R:G:B triplet, or "none"
+#% answer: 200:200:200
+#% gisprompt: old_color,color,color_none
+#% guisection: Colors
+#%end
+#%option
+#% key: rgb_column
+#% type: string
+#% required: no
+#% multiple: no
+#% key_desc: name
+#% description: Name of color definition column (for use with -a flag)
+#% answer: GRASSRGB
+#% gisprompt: old_dbcolumn,dbcolumn,dbcolumn
+#% guisection: Colors
+#%end
+#%option
+#% key: zcolor
+#% type: string
+#% required: no
+#% multiple: no
+#% key_desc: style
+#% description: Type of color table (for use with -z flag)
+#% answer: terrain
+#% guisection: Colors
+#%end
+#%option
+#% key: width
+#% type: integer
+#% required: no
+#% multiple: no
+#% description: Line width
+#% answer: 0
+#% guisection: Lines
+#%end
+#%option
+#% key: wcolumn
+#% type: string
+#% required: no
+#% multiple: no
+#% key_desc: name
+#% description: Name of column for line widths (these values will be scaled by wscale)
+#% gisprompt: old_dbcolumn,dbcolumn,dbcolumn
+#% guisection: Lines
+#%end
+#%option
+#% key: wscale
+#% type: double
+#% required: no
+#% multiple: no
+#% description: Scale factor for wcolumn
+#% answer: 1
+#% guisection: Lines
+#%end
+#%option
+#% key: icon
+#% type: string
+#% required: no
+#% multiple: no
+#% options: basic/marker,basic/circle,basic/arrow1,basic/star,basic/point,basic/triangle,basic/box,basic/arrow2,basic/octagon,basic/cross2,basic/pushpin,basic/diamond,basic/cross1,basic/x,demo/smrk,demo/muchomurka,extra/dive_flag,extra/half-box,extra/bridge,extra/fiducial,extra/ping,extra/offbox_ne,extra/adcp,extra/alpha_flag,extra/4pt_star,extra/half-circle,extra/offbox_nw,extra/fancy_compass,extra/airport,extra/compass,extra/offbox_se,extra/fish,extra/target,extra/offbox_sw,extra/n_arrow1,extra/pentagon,extra/n_arrow2,geology/strike_circle,geology/strike_box,geology/strike_line,geology/strike_triangle
+#% description: Point and centroid symbol
+#% answer: basic/x
+#% guisection: Symbols
+#%end
+#%option
+#% key: size
+#% type: integer
+#% required: no
+#% multiple: no
+#% description: Symbol size
+#% answer: 5
+#% guisection: Symbols
+#%end
+#%option
+#% key: size_column
+#% type: string
+#% required: no
+#% multiple: no
+#% key_desc: name
+#% description: Name of numeric column containing symbol size
+#% gisprompt: old_dbcolumn,dbcolumn,dbcolumn
+#% guisection: Symbols
+#%end
+#%option
+#% key: rot_column
+#% type: string
+#% required: no
+#% multiple: no
+#% key_desc: name
+#% label: Name of numeric column containing symbol rotation angle
+#% description: Measured in degrees CCW from east
+#% gisprompt: old_dbcolumn,dbcolumn,dbcolumn
+#% guisection: Symbols
+#%end
+#%option
+#% key: llayer
+#% type: string
+#% required: no
+#% multiple: no
+#% label: Layer number or name
+#% description: Layer number for labels (default: the given layer number)
+#% answer: 1
+#% gisprompt: old_layer,layer,layer
+#% guisection: Labels
+#%end
+#%option
+#% key: attrcol
+#% type: string
+#% required: no
+#% multiple: no
+#% key_desc: name
+#% description: Name of column to be displayed
+#% gisprompt: old_dbcolumn,dbcolumn,dbcolumn
+#% guisection: Labels
+#%end
+#%option
+#% key: lcolor
+#% type: string
+#% required: no
+#% multiple: no
+#% label: Label color
+#% description: Either a standard color name or R:G:B triplet
+#% answer: red
+#% gisprompt: old_color,color,color
+#% guisection: Labels
+#%end
+#%option
+#% key: bgcolor
+#% type: string
+#% required: no
+#% multiple: no
+#% label: Label background color
+#% description: Either a standard GRASS color, R:G:B triplet, or "none"
+#% answer: none
+#% gisprompt: old_color,color,color_none
+#% guisection: Labels
+#%end
+#%option
+#% key: bcolor
+#% type: string
+#% required: no
+#% multiple: no
+#% label: Label border color
+#% description: Either a standard GRASS color, R:G:B triplet, or "none"
+#% answer: none
+#% gisprompt: old_color,color,color_none
+#% guisection: Labels
+#%end
+#%option
+#% key: lsize
+#% type: integer
+#% required: no
+#% multiple: no
+#% description: Label size (pixels)
+#% answer: 8
+#% guisection: Labels
+#%end
+#%option
+#% key: font
+#% type: string
+#% required: no
+#% multiple: no
+#% description: Font name
+#% guisection: Labels
+#%end
+#%option
+#% key: encoding
+#% type: string
+#% required: no
+#% multiple: no
+#% description: Text encoding
+#% guisection: Labels
+#%end
+#%option
+#% key: xref
+#% type: string
+#% required: no
+#% multiple: no
+#% options: left,center,right
+#% description: Label horizontal justification
+#% answer: left
+#% guisection: Labels
+#%end
+#%option
+#% key: yref
+#% type: string
+#% required: no
+#% multiple: no
+#% options: top,center,bottom
+#% description: Label vertical justification
+#% answer: center
+#% guisection: Labels
+#%end
+#%option
+#% key: minreg
+#% type: double
+#% required: no
+#% multiple: no
+#% description: Minimum region size (average from height and width) when map is displayed
+#%end
+#%option
+#% key: maxreg
+#% type: double
+#% required: no
+#% multiple: no
+#% description: Maximum region size (average from height and width) when map is displayed
+#%end
+#%option
+#% key: opacity
+#% type: string
+#% required: no
+#% multiple: no
+#% key_desc: val
+#% answer: 100
+#% description: Set opacity between 0-100%
+#%end
+
+import sys
+import os
+import grass.script as grass
+
+def construct_command(cmd):
+    line = cmd
+    for key, val in options.iteritems():
+        if val != "":
+            line += " %s=%s" % (key, val)
+    for key, val in flags.iteritems():
+        if val == True:
+            line += " -%s" % key
+    return line
+
+def main():
+    cmd_file = grass.gisenv()["GRASS_PYCMDFILE"]
+
+    if cmd_file == "" or os.path.exists(cmd_file) == False:
+        grass.message(_("GRASS_PYCMDFILE - File not found. Run p.mon."), "e")
+        return
+
+    cmd = construct_command("d"+os.path.basename(sys.argv[0])[1:-3])
+
+    fp = open(cmd_file, "a")
+    fp.write("%s\n" % cmd)
+    fp.close()
+
+if __name__ == "__main__":
+    options, flags = grass.parser()
+    main()

Deleted: grass/trunk/gui/wxpython/scripts/d.rast3.py
===================================================================
--- grass/trunk/gui/wxpython/scripts/d.rast3.py	2010-04-10 21:29:46 UTC (rev 41798)
+++ grass/trunk/gui/wxpython/scripts/d.rast3.py	2010-04-11 13:23:27 UTC (rev 41799)
@@ -1,36 +0,0 @@
-#!/usr/bin/env python
-#
-############################################################################
-#
-# MODULE:       d.rast3d
-#
-# AUTHOR(S):    Martin Landa <landa.martin gmail.com>
-#
-# PURPOSE:	Wrapper for wxGUI -- add 3d raster map layer into layer tree
-#
-# COPYRIGHT:	(C) 2008 by the GRASS Development Team
-#
-#		This program is free software under the GNU General Public
-#		License (>=v2). Read the file COPYING that comes with GRASS
-#		for details.
-#
-#############################################################################
-
-#%module
-#%  description: Displays 3d raster data in the active frame on the graphics monitor.
-#%  keywords: display, raster3d
-#%end
-
-#%option
-#% key: map
-#% type: string
-#% gisprompt: old,grid3,3d-raster
-#% description: 3D raster map to be displayed
-#% required : yes
-#%end
-
-from grass.script import core as grass
-
-if __name__ == "__main__":
-    options, flags = grass.parser()
-    main()

Deleted: grass/trunk/gui/wxpython/scripts/p.cmd.py
===================================================================
--- grass/trunk/gui/wxpython/scripts/p.cmd.py	2010-04-10 21:29:46 UTC (rev 41798)
+++ grass/trunk/gui/wxpython/scripts/p.cmd.py	2010-04-11 13:23:27 UTC (rev 41799)
@@ -1,65 +0,0 @@
-#!/usr/bin/env python
-############################################################################
-#
-# MODULE:       p.cmd
-# AUTHOR(S):    Martin Landa, Hamish Bowman
-#               Converted to Python by Huidae Cho
-# PURPOSE:      Wrapper for display commands and pX monitors
-# COPYRIGHT:    (C) 2009 by The GRASS Development Team
-#
-#  This program is free software; you can redistribute it and/or modify
-#  it under the terms of the GNU General Public License as published by
-#  the Free Software Foundation; either version 2 of the License, or
-#  (at your option) any later version.
-#
-#  This program is distributed in the hope that it will be useful,
-#  but WITHOUT ANY WARRANTY; without even the implied warranty of
-#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#  GNU General Public License for more details.
-#
-############################################################################
-
-#%Module
-#% description: Wrapper for display commands and pX monitors
-#% keywords: display
-#%End
-
-#%Option
-#% key: cmd
-#% type: string
-#% required: yes
-#% multiple: no
-#% label: Command to be performed
-#% description: Example: "d.rast map=elevation.dem at PERMANENT catlist=1300-1400 -i"
-#%End
-
-#%Option
-#% key: opacity
-#% type: string
-#% required: no
-#% multiple: no
-#% key_desc: val
-#% description: Opacity level in percentage
-#% answer: 100
-#%End
-
-import os
-import grass.script as grass
-
-def main():
-    cmd_file = grass.gisenv()["GRASS_PYCMDFILE"]
-
-    if cmd_file == "" or os.path.exists(cmd_file) == False:
-        grass.message(_("GRASS_PYCMDFILE - File not found. Run p.mon."), "e")
-        return
-
-    cmd = options["cmd"]
-    opacity = options["opacity"]
-
-    fp = open(cmd_file, "a")
-    fp.write("%s opacity=%s\n" % (cmd, opacity))
-    fp.close()
-
-if __name__ == "__main__":
-    options, flags = grass.parser()
-    main()

Deleted: grass/trunk/gui/wxpython/scripts/p.db.py
===================================================================
--- grass/trunk/gui/wxpython/scripts/p.db.py	2010-04-10 21:29:46 UTC (rev 41798)
+++ grass/trunk/gui/wxpython/scripts/p.db.py	2010-04-11 13:23:27 UTC (rev 41799)
@@ -1,44 +0,0 @@
-#!/usr/bin/env python
-############################################################################
-#
-# MODULE:       p.db
-# AUTHOR(S):    Jachym Cepicky, Markus Neteler, Hamish Bowman
-#               Converted to Python by Huidae Cho
-# PURPOSE:      Start stand-alone attribute table manager
-# COPYRIGHT:    (C) 2009 by The GRASS Development Team
-#
-#  This program is free software; you can redistribute it and/or modify
-#  it under the terms of the GNU General Public License as published by
-#  the Free Software Foundation; either version 2 of the License, or
-#  (at your option) any later version.
-#
-#  This program is distributed in the hope that it will be useful,
-#  but WITHOUT ANY WARRANTY; without even the implied warranty of
-#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#  GNU General Public License for more details.
-#
-############################################################################
-
-#%Module
-#% description: Start stand-alone attribute table manager
-#% keywords: database
-#%End
-#%Option
-#% key: table
-#% type: string
-#% required: yes
-#% multiple: no
-#% description: Table name
-#%End
-
-import os
-import grass.script as grass
-
-def main():
-    table = options["table"]
-
-    os.spawnlp(os.P_NOWAIT, os.environ["GRASS_PYTHON"], os.environ["GRASS_PYTHON"], "%s/etc/wxpython/gui_modules/dbm.py" % os.environ["GISBASE"], table)
-
-if __name__ == "__main__":
-    options, flags = grass.parser()
-    main()

Deleted: grass/trunk/gui/wxpython/scripts/p.mon.py
===================================================================
--- grass/trunk/gui/wxpython/scripts/p.mon.py	2010-04-10 21:29:46 UTC (rev 41798)
+++ grass/trunk/gui/wxpython/scripts/p.mon.py	2010-04-11 13:23:27 UTC (rev 41799)
@@ -1,107 +0,0 @@
-#!/usr/bin/env python
-############################################################################
-#
-# MODULE:       p.mon
-# AUTHOR(S):    Jachym Cepicky, Michael Barton, Martin Landa, Markus Neteler,
-#               Hamish Bowman
-#               Converted to Python by Huidae Cho
-# PURPOSE:      To establish and control use of a graphics display monitor.
-# COPYRIGHT:    (C) 2009 by The GRASS Development Team
-#
-#  This program is free software; you can redistribute it and/or modify
-#  it under the terms of the GNU General Public License as published by
-#  the Free Software Foundation; either version 2 of the License, or
-#  (at your option) any later version.
-#
-#  This program is distributed in the hope that it will be useful,
-#  but WITHOUT ANY WARRANTY; without even the implied warranty of
-#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#  GNU General Public License for more details.
-#
-############################################################################
-
-#%Module
-#% description: To establish and control use of a graphics display monitor.
-#% keywords: display
-#%End
-
-##%Flag
-##% key: l
-##% description: List all monitors
-##%End
-
-##%Flag
-##% key: L
-##% description: List all monitors (with current status)
-##%End
-
-##%Flag
-##% key: p
-##% description: Print name of currently selected monitor
-##%End
-
-##%Flag
-##% key: r
-##% description: Release currently selected monitor
-##%End
-
-##%Flag
-##% key: s
-##% description: Do not automatically select when starting
-##%End
-
-#%Option
-#% key: start
-#% type: string
-#% required: no
-#% multiple: no
-#% description: Name of graphics monitor to start (p0-p9)
-#%End
-
-##%Option
-##% key: stop
-##% type: string
-##% required: no
-##% multiple: no
-##% description: Name of graphics monitor to stop
-##%End
-
-##%Option
-##% key: select
-##% type: string
-##% required: no
-##% multiple: no
-##% description: Name of graphics monitor to select
-##%End
-
-##%Option
-##% key: unlock
-##% type: string
-##% required: no
-##% multiple: no
-##% description: Name of graphics monitor to unlock
-##%End
-
-import os
-import grass.script as grass
-
-def main():
-    start = options["start"]
-#    select = options["select"]
-#    stop = options["stop"]
-#    unlock = options["unlock"]
-
-    # create the command file
-    command_file = grass.tempfile()
-    os.system("g.gisenv set=GRASS_PYCMDFILE=%s" % command_file)
-
-    if start != "":
-        os.spawnlp(os.P_NOWAIT, os.environ["GRASS_PYTHON"], os.environ["GRASS_PYTHON"], "%s/etc/wxpython/gui_modules/mapdisp.py" % os.environ["GISBASE"], start, command_file)
-        return
-
-#    if stop != "" or select != "" or unlock != "":
-#        grass.message(_("Not implemented yet"), "w")
-
-if __name__ == "__main__":
-    options, flags = grass.parser()
-    main()

Deleted: grass/trunk/gui/wxpython/scripts/p.rast.py
===================================================================
--- grass/trunk/gui/wxpython/scripts/p.rast.py	2010-04-10 21:29:46 UTC (rev 41798)
+++ grass/trunk/gui/wxpython/scripts/p.rast.py	2010-04-11 13:23:27 UTC (rev 41799)
@@ -1,110 +0,0 @@
-#!/usr/bin/env python
-############################################################################
-#
-# MODULE:       p.rast
-# AUTHOR(S):    Jachym Cepicky, Martin Landa, Hamish Bowman
-#               Converted to Python by Huidae Cho
-# PURPOSE:      Displays raster map layer in the active map display window.
-# COPYRIGHT:    (C) 2009 by The GRASS Development Team
-#
-#  This program is free software; you can redistribute it and/or modify
-#  it under the terms of the GNU General Public License as published by
-#  the Free Software Foundation; either version 2 of the License, or
-#  (at your option) any later version.
-#
-#  This program is distributed in the hope that it will be useful,
-#  but WITHOUT ANY WARRANTY; without even the implied warranty of
-#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#  GNU General Public License for more details.
-#
-############################################################################
-
-#%module
-#% description: Displays raster map layer in the active map display window.
-#% keywords: display, raster
-#%end
-#%flag
-#% key: n
-#% description: Make null cells opaque
-#%end
-#%flag
-#% key: i
-#% description: Invert catlist
-#% guisection: Selection
-#%end
-#%option
-#% key: map
-#% type: string
-#% required: yes
-#% multiple: no
-#% key_desc: name
-#% description: Raster map to be displayed
-#% gisprompt: old,cell,raster
-#%end
-#%option
-#% key: catlist
-#% type: string
-#% required: no
-#% multiple: yes
-#% key_desc: cat[-cat]
-#% description: List of categories to be displayed (INT maps)
-#% guisection: Selection
-#%end
-#%option
-#% key: vallist
-#% type: string
-#% required: no
-#% multiple: yes
-#% key_desc: val[-val]
-#% description: List of values to be displayed (FP maps)
-#% guisection: Selection
-#%end
-#%option
-#% key: bg
-#% type: string
-#% required: no
-#% multiple: no
-#% key_desc: color
-#% description: Background color (for null)
-#% gisprompt: old_color,color,color
-#%end
-#%option
-#% key: opacity
-#% type: string
-#% required: no
-#% multiple: no
-#% key_desc: val
-#% answer: 100
-#% description: Set opacity between 0-100%
-#%end
-
-import sys
-import os
-import grass.script as grass
-
-def construct_command(cmd):
-    line = cmd
-    for key, val in options.iteritems():
-        if val != "":
-            line += " %s=%s" % (key, val)
-    for key, val in flags.iteritems():
-        if val == True:
-            line += " -%s" % key
-    return line
-
-def main():
-    cmd_file = grass.gisenv()["GRASS_PYCMDFILE"]
-
-    if cmd_file == "" or os.path.exists(cmd_file) == False:
-        grass.message(_("GRASS_PYCMDFILE - File not found. Run p.mon."), "e")
-        return
-
-    cmd = construct_command("d"+os.path.basename(sys.argv[0])[1:-3])
-
-    fp = open(cmd_file, "a")
-    fp.write("%s\n" % cmd)
-    fp.close()
-
-if __name__ == "__main__":
-    options, flags = grass.parser()
-    main()

Deleted: grass/trunk/gui/wxpython/scripts/p.vect.py
===================================================================
--- grass/trunk/gui/wxpython/scripts/p.vect.py	2010-04-10 21:29:46 UTC (rev 41798)
+++ grass/trunk/gui/wxpython/scripts/p.vect.py	2010-04-11 13:23:27 UTC (rev 41799)
@@ -1,367 +0,0 @@
-#!/usr/bin/env python
-############################################################################
-#
-# MODULE:       p.vect
-# AUTHOR(S):    Jachym Cepicky, Hamish Bowman
-#               Converted to Python by Huidae Cho
-# PURPOSE:      Displays vector map layer in the active map display window.
-# COPYRIGHT:    (C) 2009 by The GRASS Development Team
-#
-#  This program is free software; you can redistribute it and/or modify
-#  it under the terms of the GNU General Public License as published by
-#  the Free Software Foundation; either version 2 of the License, or
-#  (at your option) any later version.
-#
-#  This program is distributed in the hope that it will be useful,
-#  but WITHOUT ANY WARRANTY; without even the implied warranty of
-#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#  GNU General Public License for more details.
-#
-############################################################################
-
-#%module
-#% description: Displays vector map layer in the active map display window.
-#% keywords: display, vector
-#%end
-#%flag
-#% key: a
-#% description: Get colors from map table column (of form RRR:GGG:BBB)
-#% guisection: Colors
-#%end
-#%flag
-#% key: c
-#% description: Random colors according to category number (or layer number if 'layer=-1' is given)
-#% guisection: Colors
-#%end
-#%flag
-#% key: i
-#% description: Use values from 'cats' option as feature id
-#% guisection: Selection
-#%end
-#%flag
-#% key: z
-#% description: Colorize polygons according to z height
-#%end
-#%option
-#% key: map
-#% type: string
-#% required: yes
-#% multiple: no
-#% key_desc: name
-#% description: Name of input vector map
-#% gisprompt: old,vector,vector
-#%end
-#%option
-#% key: display
-#% type: string
-#% required: no
-#% multiple: yes
-#% options: shape,cat,topo,dir,attr,zcoor
-#% description: Display
-#% answer: shape
-#%end
-#%option
-#% key: type
-#% type: string
-#% required: no
-#% multiple: yes
-#% options: point,line,boundary,centroid,area,face
-#% description: Feature type
-#% answer: point,line,boundary,centroid,area,face
-#% guisection: Selection
-#%end
-#%option
-#% key: layer
-#% type: string
-#% required: no
-#% multiple: no
-#% label: Layer number (if -1, all layers are displayed)
-#% description: A single vector map can be connected to multiple database tables. This number determines which table to use.
-#% answer: 1
-#% gisprompt: old_layer,layer,layer_all
-#% guisection: Selection
-#%end
-#%option
-#% key: cats
-#% type: string
-#% required: no
-#% multiple: no
-#% key_desc: range
-#% label: Category values
-#% description: Example: 1,3,7-9,13
-#% guisection: Selection
-#%end
-#%option
-#% key: where
-#% type: string
-#% required: no
-#% multiple: no
-#% key_desc: sql_query
-#% label: WHERE conditions of SQL statement without 'where' keyword
-#% description: Example: income < 1000 and inhab >= 10000
-#% guisection: Selection
-#%end
-#%option
-#% key: color
-#% type: string
-#% required: no
-#% multiple: no
-#% label: Line color
-#% description: Either a standard GRASS color, R:G:B triplet, or "none"
-#% answer: black
-#% gisprompt: old_color,color,color_none
-#% guisection: Colors
-#%end
-#%option
-#% key: fcolor
-#% type: string
-#% required: no
-#% multiple: no
-#% label: Area fill color
-#% description: Either a standard GRASS color, R:G:B triplet, or "none"
-#% answer: 200:200:200
-#% gisprompt: old_color,color,color_none
-#% guisection: Colors
-#%end
-#%option
-#% key: rgb_column
-#% type: string
-#% required: no
-#% multiple: no
-#% key_desc: name
-#% description: Name of color definition column (for use with -a flag)
-#% answer: GRASSRGB
-#% gisprompt: old_dbcolumn,dbcolumn,dbcolumn
-#% guisection: Colors
-#%end
-#%option
-#% key: zcolor
-#% type: string
-#% required: no
-#% multiple: no
-#% key_desc: style
-#% description: Type of color table (for use with -z flag)
-#% answer: terrain
-#% guisection: Colors
-#%end
-#%option
-#% key: width
-#% type: integer
-#% required: no
-#% multiple: no
-#% description: Line width
-#% answer: 0
-#% guisection: Lines
-#%end
-#%option
-#% key: wcolumn
-#% type: string
-#% required: no
-#% multiple: no
-#% key_desc: name
-#% description: Name of column for line widths (these values will be scaled by wscale)
-#% gisprompt: old_dbcolumn,dbcolumn,dbcolumn
-#% guisection: Lines
-#%end
-#%option
-#% key: wscale
-#% type: double
-#% required: no
-#% multiple: no
-#% description: Scale factor for wcolumn
-#% answer: 1
-#% guisection: Lines
-#%end
-#%option
-#% key: icon
-#% type: string
-#% required: no
-#% multiple: no
-#% options: basic/marker,basic/circle,basic/arrow1,basic/star,basic/point,basic/triangle,basic/box,basic/arrow2,basic/octagon,basic/cross2,basic/pushpin,basic/diamond,basic/cross1,basic/x,demo/smrk,demo/muchomurka,extra/dive_flag,extra/half-box,extra/bridge,extra/fiducial,extra/ping,extra/offbox_ne,extra/adcp,extra/alpha_flag,extra/4pt_star,extra/half-circle,extra/offbox_nw,extra/fancy_compass,extra/airport,extra/compass,extra/offbox_se,extra/fish,extra/target,extra/offbox_sw,extra/n_arrow1,extra/pentagon,extra/n_arrow2,geology/strike_circle,geology/strike_box,geology/strike_line,geology/strike_triangle
-#% description: Point and centroid symbol
-#% answer: basic/x
-#% guisection: Symbols
-#%end
-#%option
-#% key: size
-#% type: integer
-#% required: no
-#% multiple: no
-#% description: Symbol size
-#% answer: 5
-#% guisection: Symbols
-#%end
-#%option
-#% key: size_column
-#% type: string
-#% required: no
-#% multiple: no
-#% key_desc: name
-#% description: Name of numeric column containing symbol size
-#% gisprompt: old_dbcolumn,dbcolumn,dbcolumn
-#% guisection: Symbols
-#%end
-#%option
-#% key: rot_column
-#% type: string
-#% required: no
-#% multiple: no
-#% key_desc: name
-#% label: Name of numeric column containing symbol rotation angle
-#% description: Measured in degrees CCW from east
-#% gisprompt: old_dbcolumn,dbcolumn,dbcolumn
-#% guisection: Symbols
-#%end
-#%option
-#% key: llayer
-#% type: string
-#% required: no
-#% multiple: no
-#% label: Layer number or name
-#% description: Layer number for labels (default: the given layer number)
-#% answer: 1
-#% gisprompt: old_layer,layer,layer
-#% guisection: Labels
-#%end
-#%option
-#% key: attrcol
-#% type: string
-#% required: no
-#% multiple: no
-#% key_desc: name
-#% description: Name of column to be displayed
-#% gisprompt: old_dbcolumn,dbcolumn,dbcolumn
-#% guisection: Labels
-#%end
-#%option
-#% key: lcolor
-#% type: string
-#% required: no
-#% multiple: no
-#% label: Label color
-#% description: Either a standard color name or R:G:B triplet
-#% answer: red
-#% gisprompt: old_color,color,color
-#% guisection: Labels
-#%end
-#%option
-#% key: bgcolor
-#% type: string
-#% required: no
-#% multiple: no
-#% label: Label background color
-#% description: Either a standard GRASS color, R:G:B triplet, or "none"
-#% answer: none
-#% gisprompt: old_color,color,color_none
-#% guisection: Labels
-#%end
-#%option
-#% key: bcolor
-#% type: string
-#% required: no
-#% multiple: no
-#% label: Label border color
-#% description: Either a standard GRASS color, R:G:B triplet, or "none"
-#% answer: none
-#% gisprompt: old_color,color,color_none
-#% guisection: Labels
-#%end
-#%option
-#% key: lsize
-#% type: integer
-#% required: no
-#% multiple: no
-#% description: Label size (pixels)
-#% answer: 8
-#% guisection: Labels
-#%end
-#%option
-#% key: font
-#% type: string
-#% required: no
-#% multiple: no
-#% description: Font name
-#% guisection: Labels
-#%end
-#%option
-#% key: encoding
-#% type: string
-#% required: no
-#% multiple: no
-#% description: Text encoding
-#% guisection: Labels
-#%end
-#%option
-#% key: xref
-#% type: string
-#% required: no
-#% multiple: no
-#% options: left,center,right
-#% description: Label horizontal justification
-#% answer: left
-#% guisection: Labels
-#%end
-#%option
-#% key: yref
-#% type: string
-#% required: no
-#% multiple: no
-#% options: top,center,bottom
-#% description: Label vertical justification
-#% answer: center
-#% guisection: Labels
-#%end
-#%option
-#% key: minreg
-#% type: double
-#% required: no
-#% multiple: no
-#% description: Minimum region size (average from height and width) when map is displayed
-#%end
-#%option
-#% key: maxreg
-#% type: double
-#% required: no
-#% multiple: no
-#% description: Maximum region size (average from height and width) when map is displayed
-#%end
-#%option
-#% key: opacity
-#% type: string
-#% required: no
-#% multiple: no
-#% key_desc: val
-#% answer: 100
-#% description: Set opacity between 0-100%
-#%end
-
-import sys
-import os
-import grass.script as grass
-
-def construct_command(cmd):
-    line = cmd
-    for key, val in options.iteritems():
-        if val != "":
-            line += " %s=%s" % (key, val)
-    for key, val in flags.iteritems():
-        if val == True:
-            line += " -%s" % key
-    return line
-
-def main():
-    cmd_file = grass.gisenv()["GRASS_PYCMDFILE"]
-
-    if cmd_file == "" or os.path.exists(cmd_file) == False:
-        grass.message(_("GRASS_PYCMDFILE - File not found. Run p.mon."), "e")
-        return
-
-    cmd = construct_command("d"+os.path.basename(sys.argv[0])[1:-3])
-
-    fp = open(cmd_file, "a")
-    fp.write("%s\n" % cmd)
-    fp.close()
-
-if __name__ == "__main__":
-    options, flags = grass.parser()
-    main()



More information about the grass-commit mailing list