[GRASS-SVN] r44951 - in grass/trunk/gui/wxpython: . docs
gui_modules icons
svn_grass at osgeo.org
svn_grass at osgeo.org
Tue Jan 11 07:29:16 EST 2011
Author: martinl
Date: 2011-01-11 04:29:16 -0800 (Tue, 11 Jan 2011)
New Revision: 44951
Added:
grass/trunk/gui/wxpython/docs/wxGUI.Vector_Digitizer.html
Removed:
grass/trunk/gui/wxpython/docs/wxGUI.Vector_Digitizing_Tool.html
Modified:
grass/trunk/gui/wxpython/docs/Makefile
grass/trunk/gui/wxpython/docs/wxGUI.Attribute_Table_Manager.html
grass/trunk/gui/wxpython/docs/wxGUI.GCP_Manager.html
grass/trunk/gui/wxpython/docs/wxGUI.Modeler.html
grass/trunk/gui/wxpython/docs/wxGUI.Nviz.html
grass/trunk/gui/wxpython/docs/wxGUI.html
grass/trunk/gui/wxpython/docs/wxGUI_layer_manager.jpg
grass/trunk/gui/wxpython/docs/wxGUI_map_display.jpg
grass/trunk/gui/wxpython/gui_modules/toolbars.py
grass/trunk/gui/wxpython/icons/icon.py
grass/trunk/gui/wxpython/wxgui.py
Log:
wxGUI: update wxGUI docs
Modified: grass/trunk/gui/wxpython/docs/Makefile
===================================================================
--- grass/trunk/gui/wxpython/docs/Makefile 2011-01-11 08:55:07 UTC (rev 44950)
+++ grass/trunk/gui/wxpython/docs/Makefile 2011-01-11 12:29:16 UTC (rev 44951)
@@ -3,7 +3,7 @@
include $(MODULE_TOPDIR)/include/Make/Other.make
FILES = wxGUI \
- wxGUI.Vector_Digitizing_Tool \
+ wxGUI.Vector_Digitizer \
wxGUI.Attribute_Table_Manager \
wxGUI.Nviz \
wxGUI.GCP_Manager \
Modified: grass/trunk/gui/wxpython/docs/wxGUI.Attribute_Table_Manager.html
===================================================================
--- grass/trunk/gui/wxpython/docs/wxGUI.Attribute_Table_Manager.html 2011-01-11 08:55:07 UTC (rev 44950)
+++ grass/trunk/gui/wxpython/docs/wxGUI.Attribute_Table_Manager.html 2011-01-11 12:29:16 UTC (rev 44951)
@@ -17,6 +17,20 @@
<h2>SEE ALSO</h2>
<em>
+ <a href="wxGUI.html">wxGUI</a>
+</em>
+
+<p>
+Other wxGUI components:<br>
+<em
+ <a href="wxGUI.Vector_Digitizer.html">Vector Digitizer</a><br>
+ <a href="wxGUI.Nviz.html">3D Viewer</a><br>
+ <a href="wxGUI.Modeler.html">Graphical Modeler</a><br>
+ <a href="wxGUI.GCP_Manager.html">Manage Ground Control Points</a><br>
+</em>
+
+<p>
+<em>
<a href="db.columns.html">db.columns</a>,
<a href="db.connect.html">db.connect</a>,
<a href="db.describe.html">db.describe</a>,
Modified: grass/trunk/gui/wxpython/docs/wxGUI.GCP_Manager.html
===================================================================
--- grass/trunk/gui/wxpython/docs/wxGUI.GCP_Manager.html 2011-01-11 08:55:07 UTC (rev 44950)
+++ grass/trunk/gui/wxpython/docs/wxGUI.GCP_Manager.html 2011-01-11 12:29:16 UTC (rev 44951)
@@ -292,15 +292,28 @@
<h2>SEE ALSO</h2>
<em>
- <a href="wxGUI.html">wxGUI</a><br>
- <a href="i.rectify.html">i.rectify</a><br>
+ <a href="wxGUI.html">wxGUI</a>
+</em>
+
+<p>
+Other wxGUI components:<br>
+<em
+ <a href="wxGUI.Vector_Digitizer.html">Vector Digitizer</a><br>
+ <a href="wxGUI.Attribute_Table_Manager.html">Attribute Table Manager</a><br>
+ <a href="wxGUI.Nviz.html">3D Viewer</a><br>
+ <a href="wxGUI.Modeler.html">Graphical Modeler</a><br>
+</em>
+
+<p>
+<em>
+ <a href="i.rectify.html">i.rectify</a>,
<a href="g.transform.html">g.transform</a>
</em>
<h2>AUTHORS</h2>
Markus Metz<br><br>
-<em>Based on the Georectifier by</em><br>
+<em>Based on the Georectifier (GRASS 6.4.0) by</em><br>
Michael Barton<br>
Martin Landa<br>
Modified: grass/trunk/gui/wxpython/docs/wxGUI.Modeler.html
===================================================================
--- grass/trunk/gui/wxpython/docs/wxGUI.Modeler.html 2011-01-11 08:55:07 UTC (rev 44950)
+++ grass/trunk/gui/wxpython/docs/wxGUI.Modeler.html 2011-01-11 12:29:16 UTC (rev 44951)
@@ -30,11 +30,19 @@
<h2>SEE ALSO</h2>
<em>
- <a href="wxGUI.html">wxGUI</a>,
- <a href="wxGUI.Icons.html">Icon themes</a>
+ <a href="wxGUI.html">wxGUI</a>
</em>
<p>
+Other wxGUI components:<br>
+<em
+ <a href="wxGUI.Vector_Digitizer.html">Vector Digitizer</a><br>
+ <a href="wxGUI.Attribute_Table_Manager.html">Attribute Table Manager</a><br>
+ <a href="wxGUI.Nviz.html">3D Viewer</a><br>
+ <a href="wxGUI.GCP_Manager.html">Manage Ground Control Points</a><br>
+</em>
+
+<p>
See also user <a href="http://grass.osgeo.org/wiki/WxGUI_Modeler">wiki</a> page.
<h2>AUTHORS</h2>
Modified: grass/trunk/gui/wxpython/docs/wxGUI.Nviz.html
===================================================================
--- grass/trunk/gui/wxpython/docs/wxGUI.Nviz.html 2011-01-11 08:55:07 UTC (rev 44950)
+++ grass/trunk/gui/wxpython/docs/wxGUI.Nviz.html 2011-01-11 12:29:16 UTC (rev 44951)
@@ -294,6 +294,20 @@
<h2>SEE ALSO</h2>
+<em>
+ <a href="wxGUI.html">wxGUI</a>
+</em>
+
+<p>
+Other wxGUI components:<br>
+<em
+ <a href="wxGUI.Vector_Digitizer.html">Vector Digitizer</a><br>
+ <a href="wxGUI.Attribute_Table_Manager.html">Attribute Table Manager</a><br>
+ <a href="wxGUI.Modeler.html">Graphical Modeler</a><br>
+ <a href="wxGUI.GCP_Manager.html">Manage Ground Control Points</a><br>
+</em>
+
+<p>
See also <a href="http://grass.osgeo.org/wiki/WxNVIZ">wiki</a> page.
<br><br>
Copied: grass/trunk/gui/wxpython/docs/wxGUI.Vector_Digitizer.html (from rev 44906, grass/trunk/gui/wxpython/docs/wxGUI.Vector_Digitizing_Tool.html)
===================================================================
--- grass/trunk/gui/wxpython/docs/wxGUI.Vector_Digitizer.html (rev 0)
+++ grass/trunk/gui/wxpython/docs/wxGUI.Vector_Digitizer.html 2011-01-11 12:29:16 UTC (rev 44951)
@@ -0,0 +1,252 @@
+<h2>DESCRIPTION</h2>
+
+<b>Vector digitizer</b> is
+a <em><a href="wxGUI.html">wxGUI</a></em> component intended for
+interactive editing vector maps
+(see <em><a href="v.edit.html">v.edit</a></em> for non-interactive
+vector editing GRASS capabilities).
+
+<p>
+Currently, only 2D vector features (points, lines, centroids and
+boundaries) can be edited.
+
+Vector features can be selected using mouse or by query (e.g. minimal
+vector line length). Vector features can be selected by bounding box
+or simply by mouse click (based on 'Settings->General->Select
+threshold' value).
+
+<p>
+Vector digitizer can be activated from Main toolbar in Map Display by
+selecting "Digitize" from "Tools" combobox. Vector map to be edited
+can be afterwards selected from digitizer toolbar ("Select vector map"
+combobox, note that only vector maps from the current layer tree in Layer
+Manager are available).
+
+Vector digitizer can be alternatively also activated from contextual
+menu in Layer Manager by selecting "Start editing" on selected vector
+map in the layer tree.
+
+<p>
+New vector map can be easily created from digitizer toolbar by
+selecting "New vector map" in "Select vector map" combobox. A new
+vector map is created, added to the current layer tree in Layer
+Manager and opened for editing. "Select vector map" combobox in
+digitizer toolbar also allows switching easily between vector maps to be
+edited.
+<p>
+The wxGUI vector digitizer draws all maps in the Layer Manager in the Map
+Display window; in addition, the digitizer also recognizes a special
+"background" vector map. This map is selected from the Layer Manager by
+right-clicking on the map and selecting "Use as Background Map" from the
+contextual menu. The features of the background map may then be copied into
+the currently edited vector map using the "Copy features from (background)
+vector map" button in the "Additional Tools" menu on the Digitzer Toolbar.
+
+<h3>DIGITIZER TOOLBAR</h3>
+
+<center>
+<br><img src="wxGUI_vector_digitizer_toolbar.jpg" border="1"><br><br>
+</center>
+
+<dl>
+ <dt><img src="icons/grass2/point-create.png">
+ <em>Digitize new point</em></dt>
+ <dd>Add new point to vector map and optionally define its
+ attributes.</dd>
+
+ <dt><img src="icons/grass2/line-create.png">
+ <em>Digitize new line</em></dt>
+ <dd>Add new line to vector map and optionally define its
+ attributes.</dd>
+
+ <dt><img src="icons/grass2/polygon-create.png">
+ <em>Digitize new boundary</em></dt>
+ <dd>Add new boundary to vector map and optionally define its
+ attributes.</dd>
+
+ <dt><img src="icons/grass2/centroid-create.png">
+ <em>Digitize new centroid</em></dt>
+ <dd>Add new centroid to vector map and optionally define its
+ attributes.</dd>
+
+ <dt><img src="icons/grass2/vertex-move.png">
+ <em>Move vertex</em></dt>
+ <dd>Move selected vertex of linear feature. Thus shape of linear
+ feature is changed.</dd>
+
+ <dt><img src="icons/grass2/vertex-create.png">
+ <em>Add vertex</em></dt>
+ <dd>Add new vertex to selected linear feature (shape not
+ changed).</dd>
+
+ <dt><img src="icons/grass2/vertex-delete.png">
+ <em>Remove vertex</em></dt>
+ <dd>Remove selected vertex from linear feature. Thus shape of selected
+ feature can be changed.</dd>
+
+ <dt><img src="icons/grass2/line-split.png">
+ <em>Split line/boundary</em></dt>
+ <dd>Split selected linear feature on given position to separate
+ vector features.</dd>
+
+ <dt><img src="icons/grass2/line-edit.png">
+ <em>Edit line/boundary</em></dt>
+ <dd>Edit selected linear feature, add new segments or remove
+ existing segments of linear feature.</dd>
+
+ <dt><img src="icons/grass2/line-move.png">
+ <em>Move feature(s)</em></dt>
+ <dd>Move selected vector features. Selection can be done by mouse or
+ by query.</dd>
+
+ <dt><img src="icons/grass2/line-delete.png">
+ <em>Delete feature(s)</em></dt>
+ <dd>Delete selected vector features. Selection can be done by mouse
+ or by query.</dd>
+
+ <dt><img src="icons/grass2/cats-display.png">
+ <em>Display/update categories</em></dt>
+ <dd>Display categories of selected vector feature. Category settings
+ can be modified, new layer/category pairs added or already defined pairs
+ removed.</dd>
+
+ <dt><img src="icons/grass2/cats-copy.png">
+ <em>Copy categories / Duplicate attributes</em></dt>
+ <dd><ul>
+ <li>Copy category settings of selected vector feature to other
+ vector features. Layer/category pairs of source vector features are
+ appended to the target feature category settings. Existing
+ layer/category pairs are not removed from category settings of the
+ target features.</li>
+ <li>Duplicate attributes settings of selected vector feature to
+ other vector features. New category(ies) is appended to the
+ target feature category settings and attributes duplicated
+ based on category settings of source vector features. Existing
+ layer/category pairs are not removed from category settings of
+ the target features.</li>
+ </ul>
+ </dd>
+
+ <dt><img src="icons/grass2/attributes-display.png">
+ <em>Display/update attributes</em></dt>
+ <dd>Display attributes of selected vector feature (based on its
+ category settings). Attributes can be also modified. Same
+ functionality is accessible from Main toolbar "Query vector map
+ (editable mode)".</dd>
+
+ <dt><img src="icons/grass2/tools.png">
+ <em>Additional tools</em></dt>
+ <dd>
+ <ul>
+ <li>Copy features from (background) map<br> Make identical copy of
+ selected vector features. If a background vector map has been
+ selected from the Layer Manager, copy features from background
+ vector map, not from the currently modified vector map.</li>
+ <li>Flip selected lines/boundaries<br> Flip direction of
+ selected linear features (lines or boundaries).</li>
+ <li>Merge selected lines/boundaries<br> Merge (at least two)
+ selected vector lines or boundaries. The geometry of the
+ merged vector lines can be changed. If the second line from
+ two selected lines is in opposite direction to the first, it
+ will be flipped. See also
+ module <em><a href="v.build.polylines.html">v.build.polylines</a></em>.</li>
+ <li>Break selected lines/boundaries at intersection<br> Split
+ given vector line or boundary into two lines on given position
+ (based on <em><a href="v.clean.html">v.clean</a></em>,
+ tool=break).</li>
+ <li>Snap selected lines/boundaries (only to nodes)<br> Snap
+ vector features in given threshold. See also
+ module <em><a href="v.clean.html">v.clean</a></em>. Note that
+ this tool supports only snapping to nodes. Snapping to vector
+ features from background vector map is not currently
+ supported.</li>
+ <li>Connect two selected lines/boundaries<br> Connect selected
+ lines or boundaries, the first given line is connected to the
+ second one. The second line is broken if necessary. The lines
+ are connected only if distance between them is not greater
+ than snapping threshold value.</li>
+ <li>Query tool<br>Select vector features by min/max length value
+ (linear features or dangles).</li>
+ <li>Z-bulk labeling of 3D lines<br> Assign z coordinate to 3D
+ vector lines in bounding box.</li>
+ <li>Feature type conversion<br> Change feature type of selected
+ geometry features. Points are converted to centroids,
+ centroids to points, lines to boundaries and boundaries to
+ lines.</li>
+ </ul>
+ </dd>
+
+ <dt><img src="icons/grass2/undo.png">
+ <em>Undo</em></dt>
+ <dd>Undo previous operations.</dd>
+
+ <dt><img src="icons/grass2/settings.png">
+ <em>Settings</em></dt>
+ <dd>Dialog for vector digitizer settings.</dd>
+
+ <dt><img src="icons/grass2/quit.png">
+ <em>Quit digitizing tool</em></dt>
+ <dd>Changes in vector map can be optionally discarded when
+ digitizing session is quited.</dd>
+
+</dl>
+
+<h2>NOTES</h2>
+
+<dl><dt><b>Mouse button Functions:</b><dd>
+ <dt><i>Left</i> - select/deselect features</dt>
+ <dt><i>Middle</i> - cancel action</dt>
+ <dt><i>Right</i> - confirm action</dt>
+</dl>
+
+<p>
+<i>Dead (deleted)</i> are internally only marked in the geometry file
+as 'dead' but it remains there and occupies space. Any vector module
+used afterwards on this vector map which really reads and writes
+vector geometry (so not <em><a href="g.copy.html">g.copy</a></em>)
+will writes only features which are 'alive'.
+
+<p>
+<i>Added or modified</i> vector features are <i>snapped</i> to
+existing vector features ('Settings->General->Snapping', nodes or vertices)
+based on 'Settings->General->Snapping threshold' value. To
+disable snapping set the snapping threshold to '0'.
+
+<p>
+If the digitizer crashes for some reason you can repair the vector map
+which was left open with the <em>v.build</em> module.
+
+<p>
+<b>Please note that vector digitizer is under active development and
+distributed as "Experimental Prototype".</b>
+
+<h2>SEE ALSO</h2>
+
+<em>
+ <a href="wxGUI.html">wxGUI</a>
+</em>
+
+<p>
+Other wxGUI components:<br>
+<em>
+ <a href="wxGUI.Attribute_Table_Manager.html">Attribute Table Manager</a><br>
+ <a href="wxGUI.Nviz.html">3D Viewer</a><br>
+ <a href="wxGUI.Modeler.html">Graphical Modeler</a><br>
+ <a href="wxGUI.GCP_Manager.html">Manage Ground Control Points</a><br>
+</em>
+
+<p>
+<em>
+<a href="v.edit.html">v.edit</a>,
+<a href="v.category.html">v.category</a>
+</em>
+
+<p>
+See also <a href="http://grass.osgeo.org/wiki/WxPython-based_GUI_for_GRASS#Vector_digitizer">wiki</a> page.
+
+<h2>AUTHORS</h2>
+
+Martin Landa, FBK-irst, Trento, Italy
+
+<p>
+<i>$Date$</i>
Deleted: grass/trunk/gui/wxpython/docs/wxGUI.Vector_Digitizing_Tool.html
===================================================================
--- grass/trunk/gui/wxpython/docs/wxGUI.Vector_Digitizing_Tool.html 2011-01-11 08:55:07 UTC (rev 44950)
+++ grass/trunk/gui/wxpython/docs/wxGUI.Vector_Digitizing_Tool.html 2011-01-11 12:29:16 UTC (rev 44951)
@@ -1,238 +0,0 @@
-<h2>DESCRIPTION</h2>
-
-<b>Vector digitizing tool</b> is
-a <em><a href="wxGUI.html">wxGUI</a></em> component intended for
-interactive editing vector maps
-(see <em><a href="v.edit.html">v.edit</a></em> for non-interactive
-vector editing GRASS capabilities).
-
-<p>
-Currently, only 2D vector features (points, lines, centroids and
-boundaries) can be edited.
-
-Vector features can be selected using mouse or by query (e.g. minimal
-vector line length). Vector features can be selected by bounding box
-or simply by mouse click (based on 'Settings->General->Select
-threshold' value).
-
-<p>
-Vector digitizer can be activated from Main toolbar in Map Display by
-selecting "Digitize" from "Tools" combobox. Vector map to be edited
-can be afterwards selected from digitizer toolbar ("Select vector map"
-combobox, note that only vector maps from the current layer tree in Layer
-Manager are available).
-
-Vector digitizer can be alternatively also activated from contextual
-menu in Layer Manager by selecting "Start editing" on selected vector
-map in the layer tree.
-
-<p>
-New vector map can be easily created from digitizer toolbar by
-selecting "New vector map" in "Select vector map" combobox. A new
-vector map is created, added to the current layer tree in Layer
-Manager and opened for editing. "Select vector map" combobox in
-digitizer toolbar also allows switching easily between vector maps to be
-edited.
-<p>
-The wxGUI vector digitizer draws all maps in the Layer Manager in the Map
-Display window; in addition, the digitizer also recognizes a special
-"background" vector map. This map is selected from the Layer Manager by
-right-clicking on the map and selecting "Use as Background Map" from the
-contextual menu. The features of the background map may then be copied into
-the currently edited vector map using the "Copy features from (background)
-vector map" button in the "Additional Tools" menu on the Digitzer Toolbar.
-
-<h3>DIGITIZER TOOLBAR</h3>
-
-<center>
-<br><img src="wxGUI_vector_digitizer_toolbar.jpg" border="1"><br><br>
-</center>
-
-<dl>
- <dt><img src="icons/grass2/point-create.png">
- <em>Digitize new point</em></dt>
- <dd>Add new point to vector map and optionally define its
- attributes.</dd>
-
- <dt><img src="icons/grass2/line-create.png">
- <em>Digitize new line</em></dt>
- <dd>Add new line to vector map and optionally define its
- attributes.</dd>
-
- <dt><img src="icons/grass2/polygon-create.png">
- <em>Digitize new boundary</em></dt>
- <dd>Add new boundary to vector map and optionally define its
- attributes.</dd>
-
- <dt><img src="icons/grass2/centroid-create.png">
- <em>Digitize new centroid</em></dt>
- <dd>Add new centroid to vector map and optionally define its
- attributes.</dd>
-
- <dt><img src="icons/grass2/vertex-move.png">
- <em>Move vertex</em></dt>
- <dd>Move selected vertex of linear feature. Thus shape of linear
- feature is changed.</dd>
-
- <dt><img src="icons/grass2/vertex-create.png">
- <em>Add vertex</em></dt>
- <dd>Add new vertex to selected linear feature (shape not
- changed).</dd>
-
- <dt><img src="icons/grass2/vertex-delete.png">
- <em>Remove vertex</em></dt>
- <dd>Remove selected vertex from linear feature. Thus shape of selected
- feature can be changed.</dd>
-
- <dt><img src="icons/grass2/line-split.png">
- <em>Split line/boundary</em></dt>
- <dd>Split selected linear feature on given position to separate
- vector features.</dd>
-
- <dt><img src="icons/grass2/line-edit.png">
- <em>Edit line/boundary</em></dt>
- <dd>Edit selected linear feature, add new segments or remove
- existing segments of linear feature.</dd>
-
- <dt><img src="icons/grass2/line-move.png">
- <em>Move feature(s)</em></dt>
- <dd>Move selected vector features. Selection can be done by mouse or
- by query.</dd>
-
- <dt><img src="icons/grass2/line-delete.png">
- <em>Delete feature(s)</em></dt>
- <dd>Delete selected vector features. Selection can be done by mouse
- or by query.</dd>
-
- <dt><img src="icons/grass2/cats-display.png">
- <em>Display/update categories</em></dt>
- <dd>Display categories of selected vector feature. Category settings
- can be modified, new layer/category pairs added or already defined pairs
- removed.</dd>
-
- <dt><img src="icons/grass2/cats-copy.png">
- <em>Copy categories / Duplicate attributes</em></dt>
- <dd><ul>
- <li>Copy category settings of selected vector feature to other
- vector features. Layer/category pairs of source vector features are
- appended to the target feature category settings. Existing
- layer/category pairs are not removed from category settings of the
- target features.</li>
- <li>Duplicate attributes settings of selected vector feature to
- other vector features. New category(ies) is appended to the
- target feature category settings and attributes duplicated
- based on category settings of source vector features. Existing
- layer/category pairs are not removed from category settings of
- the target features.</li>
- </ul>
- </dd>
-
- <dt><img src="icons/grass2/attributes-display.png">
- <em>Display/update attributes</em></dt>
- <dd>Display attributes of selected vector feature (based on its
- category settings). Attributes can be also modified. Same
- functionality is accessible from Main toolbar "Query vector map
- (editable mode)".</dd>
-
- <dt><img src="icons/grass2/tools.png">
- <em>Additional tools</em></dt>
- <dd>
- <ul>
- <li>Copy features from (background) map<br> Make identical copy of
- selected vector features. If a background vector map has been
- selected from the Layer Manager, copy features from background
- vector map, not from the currently modified vector map.</li>
- <li>Flip selected lines/boundaries<br> Flip direction of
- selected linear features (lines or boundaries).</li>
- <li>Merge selected lines/boundaries<br> Merge (at least two)
- selected vector lines or boundaries. The geometry of the
- merged vector lines can be changed. If the second line from
- two selected lines is in opposite direction to the first, it
- will be flipped. See also
- module <em><a href="v.build.polylines.html">v.build.polylines</a></em>.</li>
- <li>Break selected lines/boundaries at intersection<br> Split
- given vector line or boundary into two lines on given position
- (based on <em><a href="v.clean.html">v.clean</a></em>,
- tool=break).</li>
- <li>Snap selected lines/boundaries (only to nodes)<br> Snap
- vector features in given threshold. See also
- module <em><a href="v.clean.html">v.clean</a></em>. Note that
- this tool supports only snapping to nodes. Snapping to vector
- features from background vector map is not currently
- supported.</li>
- <li>Connect two selected lines/boundaries<br> Connect selected
- lines or boundaries, the first given line is connected to the
- second one. The second line is broken if necessary. The lines
- are connected only if distance between them is not greater
- than snapping threshold value.</li>
- <li>Query tool<br>Select vector features by min/max length value
- (linear features or dangles).</li>
- <li>Z-bulk labeling of 3D lines<br> Assign z coordinate to 3D
- vector lines in bounding box.</li>
- <li>Feature type conversion<br> Change feature type of selected
- geometry features. Points are converted to centroids,
- centroids to points, lines to boundaries and boundaries to
- lines.</li>
- </ul>
- </dd>
-
- <dt><img src="icons/grass2/undo.png">
- <em>Undo</em></dt>
- <dd>Undo previous operations.</dd>
-
- <dt><img src="icons/grass2/settings.png">
- <em>Settings</em></dt>
- <dd>Dialog for vector digitizer settings.</dd>
-
- <dt><img src="icons/grass2/quit.png">
- <em>Quit digitizing tool</em></dt>
- <dd>Changes in vector map can be optionally discarded when
- digitizing session is quited.</dd>
-
-</dl>
-
-<h2>NOTES</h2>
-
-<dl><dt><b>Mouse button Functions:</b><dd>
- <dt><i>Left</i> - select/deselect features</dt>
- <dt><i>Middle</i> - cancel action</dt>
- <dt><i>Right</i> - confirm action</dt>
-</dl>
-
-<p>
-<i>Dead (deleted)</i> are internally only marked in the geometry file
-as 'dead' but it remains there and occupies space. Any vector module
-used afterwards on this vector map which really reads and writes
-vector geometry (so not <em><a href="g.copy.html">g.copy</a></em>)
-will writes only features which are 'alive'.
-
-<p>
-<i>Added or modified</i> vector features are <i>snapped</i> to
-existing vector features ('Settings->General->Snapping', nodes or vertices)
-based on 'Settings->General->Snapping threshold' value. To
-disable snapping set the snapping threshold to '0'.
-
-<p>
-If the digitizer crashes for some reason you can repair the vector map
-which was left open with the <em>v.build</em> module.
-
-<p>
-<b>Please note that vector digitizer is under active development and
-distributed as "Experimental Prototype".</b>
-
-<h2>SEE ALSO</h2>
-
-<em>
-<a href="v.edit.html">v.edit</a>,
-<a href="v.category.html">v.category</a>
-</em>
-
-<p>
-See also <a href="http://grass.osgeo.org/wiki/WxPython-based_GUI_for_GRASS#Vector_digitizer">wiki</a> page.
-
-<h2>AUTHORS</h2>
-
-Martin Landa, FBK-irst, Trento, Italy
-
-<p>
-<i>$Date$</i>
Modified: grass/trunk/gui/wxpython/docs/wxGUI.html
===================================================================
--- grass/trunk/gui/wxpython/docs/wxGUI.html 2011-01-11 08:55:07 UTC (rev 44950)
+++ grass/trunk/gui/wxpython/docs/wxGUI.html 2011-01-11 12:29:16 UTC (rev 44951)
@@ -107,58 +107,94 @@
<dl>
<dt><img src="icons/grass2/monitor-create.png">
-<em>Open new Map Display Window</em></dt>
-<dd>Opens a new map display and creates empty layer tree tab in Layer Manager.</dd>
+<em>Start new display / create new workspace</em></dt>
+<dd>Opens a new map display and creates empty layer tree tab in Layer Manager or creates new workspace for the current layer tree.</dd>
-<dt><img src="icons/grass2/create.png">
-<em>Create new workspace file</em></dt>
-<dd>Removes all layers in the layer tree and creates a new, empty tree
-where new layers can be added.</dd>
+<dl>
+ <dt><img src="icons/grass2/monitor-create.png">
+ <em>Start new map display</em></dt>
+ <dd>Opens a new map display and creates empty layer tree tab in Layer Manager.</dd>
+ <dt><img src="icons/grass2/create.png">
+ <em>Create new workspace</em></dt>
+ <dd>Removes all layers from the layer tree and creates a new, empty tree
+ where new layers can be added.</dd>
+</dl>
<dt><img src="icons/grass2/layer-open.png">
-<em>Load map layers (raster, vector) into workspace</em></dt>
-<dd>Loads selected raster or vector maps into current layer tree.</dd>
+ <em>Load / import map layers into workspace</em></dt>
+<dd>Loads or imports selected raster or vector maps into current layer tree.</dd>
+<dl>
+ <dt><img src="icons/grass2/layer-open.png">
+ <em>Load map layers into workspace</em></dt>
+ <dd>Loads selected raster or vector maps into current layer tree.</dd>
+
+ <dt><img src="icons/grass2/layer-import.png">
+ <em>Import raster data</em></dt>
+ <dd>Import selected raster data into GRASS and load them into current layer tree.</dd>
+
+ <dt><img src="icons/grass2/layer-import.png">
+ <em>Import vector data</em></dt>
+ <dd>Import selected vector data into GRASS and load them into current layer tree.</dd>
+
+ <dt><img src="icons/grass2/layer-import.png">
+ <em>Link external raster data</em></dt>
+ <dd>Link selected external raster data as GRASS raster maps and load them into current layer tree.</dd>
+
+ <dt><img src="icons/grass2/layer-import.png">
+ <em>Link external vector data</em></dt>
+ <dd>Link selected external vector data as GRASS vector maps and load them into current layer tree.</dd>
+</dl>
+
<dt><img src="icons/grass2/open.png">
-<em>Open an existing workspace file</em></dt>
+ <em>Open existing workspace file</em></dt>
<dd>Opens an previously saved workspace file, containing a set of display
layers and their option settings.</dd>
<dt><img src="icons/grass2/save.png">
-<em>Save workspace file</em></dt>
+ <em>Save current workspace to file</em></dt>
<dd>Saves current set of layers and their options to a workspace
file.</dd>
<dt><img src="icons/grass2/layer-raster-add.png">
-<em>Add raster map layer</em></dt>
-<dd>Adds raster map to layer tree, see <em><a href="d.rast.html">d.rast</a></em>.
+ <em>Add raster map layer</em></dt>
+<dd>Adds raster map to layer tree, see <em><a href="d.rast.html">d.rast</a></em>.
</dd>
-<dt><img src="icons/grass2/layer-shaded-relief-add.png">
-<em>Add various raster-based map layers</em></dt>
+<dt><img src="icons/grass2/layer-raster-more.png">
+<em>Add various raster map layers (RGB, HIS, shaded relief...)</em></dt>
<dd>Opens a dropdown menu that allows user to select to:<br>
<dl>
- <dt><img src="icons/grass2/layer-shaded-relief-add.png">
- <em>Add shaded relief raster map layer </em></dt>
- <dd>Adds shaded relief raster map layer,
- see <em><a href="d.shadedmap.html">d.shadedmap</a></em>
+ <dt><img src="icons/grass2/layer-raster3d-add.png">
+ <em>Add 3D raster map layer</em></dt>
+ <dd>Adds 3D raster map to layer tree.</dd>
+ </dd>
+
<dt><img src="icons/grass2/layer-rgb-add.png">
<em>Add RGB raster layer</em></dt>
<dd>Combines and displays three raster maps defined as red, green,
and blue channels to create an RGB color map,
see <em><a href="d.rgb.html">d.rgb</a></em>.</dd>
+
<dt><img src="icons/grass2/layer-his-add.png">
<em>Add HIS raster layer</em></dt>
<dd>Combines and displays two or three raster maps defined as hue,
intensity, and (optionally) saturation channels to create a color map,
see <em><a href="d.his.html">d.his</a></em>.</dd>
- <dt><img src="icons/grass2/layer-cell-cats-add.png">
+
+ <dt><img src="icons/grass2/layer-shaded-relief-add.png">
+ <em>Add shaded relief raster map layer </em></dt>
+ <dd>Adds shaded relief raster map layer,
+ see <em><a href="d.shadedmap.html">d.shadedmap</a></em>.</dd>
+
+ <dt><img src="icons/grass2/layer-aspect-arrow-add.png">
<em>Add raster arrows layer</em></dt>
<dd>Adds map of raster cells with directional arrows drawn. Arrow
direction and length are determined by separate aspect/directional map
and (optional) slope/intensity map,
see <em><a href="d.rast.arrow.html">d.rast.arrow</a></em>.</dd>
+
<dt><img src="icons/grass2/layer-cell-cats-add.png">
<em>Add raster numbers layer</em></dt>
<dd>Adds map of raster cells with numbers representing the cell values,
@@ -170,13 +206,13 @@
<dd>Adds a vector map layer, see <em><a href="d.vect.html">d.vect</a></em>.
</dd>
-<dt><img src="icons/grass2/layer-vector-thematic-add.png">
-<em>Add various vector-based map layers </em></dt>
+<dt><img src="icons/grass2/layer-vector-more.png">
+<em>Add various vector map layers (thematic, chart...)</em></dt>
<dd>Opens a dropdown menu that allows user to select to:<br>
<dl>
<dt><img src="icons/grass2/layer-vector-thematic-add.png">
- <em>Add thematic map layer
+ <em>Add thematic area (choropleth) map layer
(for all vector types)</em></dt>
<dd>Adds layer for thematic display values from a numeric attribute
column associated with a vector map. Options include: thematic display
@@ -189,7 +225,7 @@
see <em><a href="d.vect.thematic.html">d.vect.thematic</a></em>.</dd>
<dt><img src="icons/grass2/layer-vector-chart-add.png">
- <em>Add thematic charts layer (for vector points)</em></dt>
+ <em>Add thematic chart layer (for vector points)</em></dt>
<dd>Adds layer in which pie or bar charts can be automatically created
at vector point locations. Charts display values from selected columns
in the associated attribute table. Options include: chart type, layer
@@ -198,28 +234,11 @@
see <em><a href="d.vect.chart.html">d.vect.chart</a></em>.</dd>
</dl>
-<dt><img src="icons/grass2/layer-command-add.png">
-<em>Add command layer</em></dt>
-<dd>Adds a layer in which a GRASS GIS command or command list can be entered.
-For a command list use the semi-colon (";") symbol as a separator.
-For example:
-
-<div class="code"><pre>
-d.rast soils;d.rast -o roads;d.vect streams col=blue
-</pre></div>
-
-Note that when an option of the command contains spaces, you need to
-"escape" them with the backslash ('\') character, for example:
-<div class="code"><pre>
-d.text text=Population\ density
-</pre></div>
-</dd>
-
<dt><img src="icons/grass2/layer-group-add.png">
-<em>Add layer group</em></dt>
-<dd>Adds an empty layer group. Layers can then be added to the group.</dd>
+<em>Add group</em></dt>
+<dd>Adds an empty group. Layers can then be added to the group.</dd>
-<dt><img src="icons/grass2/layer-grid-add.png">
+<dt><img src="icons/grass2/layer-more.png">
<em>Add grid or vector labels overlay</em></dt>
<dd>Opens a dropdown menu that allows user to select to:<br>
@@ -245,16 +264,45 @@
<em>Add rhumbline layer</em>
<dd>Add layer to display rhumblines (for latitude/longitude locations only),
see <em><a href="d.rhumbline.html">d.rhumbline</a></em>.</dd>
+
+ <dt><img src="icons/grass2/layer-command-add.png">
+ <em>Add command layer</em></dt>
+ <dd>Adds a layer in which a GRASS GIS command or command list can be entered.
+ For a command list use the semi-colon (";") symbol as a separator.
+ For example:
+
+<div class="code"><pre>
+d.rast soils;d.rast -o roads;d.vect streams col=blue
+</pre></div>
+
+Note that when an option of the command contains spaces, you need to
+"escape" them with the backslash ('\') character, for example:
+<div class="code"><pre>
+d.text text=Population\ density
+</pre></div>
+ </dd>
</dl>
<dt><img src="icons/grass2/layer-remove.png">
<em>Delete selected layer</em></dt>
<dd>Removes selected map layer or map layer group from layer tree.</dd>
+<dt><img src="icons/grass2/edit.png">
+ <em>Edit vector maps</em></dt>
+<dd>Opens <em><a href="wxGUI.Vector_Digitizer.html">vector digitizer</a></em> to allow editing selected vector map.</dd>
+
<dt><img src="icons/grass2/table.png">
- <em>Show <a href="wxGUI.Attribute_Table_Manager.html">Attribute Table Manager</a> for selected vector map</em></dt>
-<dd>Displays attribute data of selected vector map.</dd>
+ <em>Show attribute table</em></dt>
+<dd>Opens <em><a href="wxGUI.Attribute_Table_Manager.html">attribute table manager</a></em> for selected vector map.</dd>
+<dt><img src="icons/grass2/modeler-main.png">
+ <em>Start Graphical Modeler</em></dt>
+<dd>Opens <em><a href="wxGUI.Modeler.html">graphical modeler</a></em> to create models and run them.</dd>
+
+<dt><img src="icons/grass2/settings.png">
+ <em>Show GUI settings</em></dt>
+<dd>Opens dialog to change GUI preferences.</dd>
+
</dl>
<h4>Key shortcuts</h4>
@@ -511,12 +559,17 @@
<h2>SEE ALSO</h2>
+wxGUI components:<br>
<em>
- <a href="wxGUI.Vector_Digitizing_Tool.html">Vector Digitizer</a><br>
+ <a href="wxGUI.Vector_Digitizer.html">Vector Digitizer</a><br>
<a href="wxGUI.Attribute_Table_Manager.html">Attribute Table Manager</a><br>
<a href="wxGUI.Nviz.html">3D Viewer</a><br>
<a href="wxGUI.Modeler.html">Graphical Modeler</a><br>
<a href="wxGUI.GCP_Manager.html">Manage Ground Control Points</a><br>
+</em>
+
+<p>
+<em>
<a href="wxGUI.Icons.html">Icon themes</a>
</em>
Modified: grass/trunk/gui/wxpython/docs/wxGUI_layer_manager.jpg
===================================================================
(Binary files differ)
Modified: grass/trunk/gui/wxpython/docs/wxGUI_map_display.jpg
===================================================================
(Binary files differ)
Modified: grass/trunk/gui/wxpython/gui_modules/toolbars.py
===================================================================
--- grass/trunk/gui/wxpython/gui_modules/toolbars.py 2011-01-11 08:55:07 UTC (rev 44950)
+++ grass/trunk/gui/wxpython/gui_modules/toolbars.py 2011-01-11 12:29:16 UTC (rev 44951)
@@ -1773,12 +1773,12 @@
# tool, label, bitmap, kind, shortHelp, longHelp, handler
return (
(self.newdisplay, 'newdisplay', Icons["newdisplay"].GetBitmap(),
- wx.ITEM_NORMAL, Icons["newdisplay"].GetLabel(), Icons["newdisplay"].GetDesc(),
- self.parent.OnNewDisplay),
+ wx.ITEM_NORMAL, _("Start new display / create new workspace"), '',
+ self.parent.OnNewMenu),
('', '', '', '', '', '', ''),
(self.workspaceLoad, 'workspaceLoad', Icons["workspaceLoad"].GetBitmap(),
- wx.ITEM_NORMAL, Icons["workspaceLoad"].GetLabel(), Icons["workspaceLoad"].GetDesc(),
- self.parent.OnWorkspace),
+ wx.ITEM_NORMAL, _("Load (and import) map layers into workspace"), '',
+ self.parent.OnLoadMenu),
(self.workspaceOpen, 'workspaceOpen', Icons["workspaceOpen"].GetBitmap(),
wx.ITEM_NORMAL, Icons["workspaceOpen"].GetLabel(), Icons["workspaceOpen"].GetDesc(),
self.parent.OnWorkspaceOpen),
Modified: grass/trunk/gui/wxpython/icons/icon.py
===================================================================
--- grass/trunk/gui/wxpython/icons/icon.py 2011-01-11 08:55:07 UTC (rev 44950)
+++ grass/trunk/gui/wxpython/icons/icon.py 2011-01-11 12:29:16 UTC (rev 44951)
@@ -177,9 +177,9 @@
label=_("Print display")),
# layer manager
"newdisplay" : MetaIcon (img=Icons["newdisplay"],
- label=_("Start new display")),
+ label=_("Start new map display")),
"workspaceNew" : MetaIcon (img=Icons["fileNew"],
- label=_("Create new workspace file (Ctrl+N)")),
+ label=_("Create new workspace (Ctrl+N)")),
"workspaceLoad" : MetaIcon (img=Icons["fileLoad"],
label=_("Load map layers into workspace (Ctrl+L)")),
"workspaceOpen" : MetaIcon (img=Icons["fileOpen"],
Modified: grass/trunk/gui/wxpython/wxgui.py
===================================================================
--- grass/trunk/gui/wxpython/wxgui.py 2011-01-11 08:55:07 UTC (rev 44950)
+++ grass/trunk/gui/wxpython/wxgui.py 2011-01-11 12:29:16 UTC (rev 44951)
@@ -554,19 +554,13 @@
win.CentreOnScreen()
win.Show(True)
- def OnWorkspace(self, event):
- """!Workspace menu (new, load, import)"""
+ def _popupMenu(self, data):
+ """!Create popup menu
+ """
point = wx.GetMousePosition()
menu = wx.Menu()
-
- for key, handler in (('workspaceNew', self.OnWorkspaceNew),
- ('workspaceLoad', self.OnWorkspaceLoad),
- (None, None),
- ('rastImport', self.OnImportGdalLayers),
- ('rastLink', self.OnLinkGdalLayers),
- (None, None),
- ('vectImport', self.OnImportOgrLayers),
- ('vectLink', self.OnLinkOgrLayers)):
+
+ for key, handler in data:
if key is None:
menu.AppendSeparator()
continue
@@ -579,6 +573,23 @@
self.PopupMenu(menu)
menu.Destroy()
+ def OnNewMenu(self, event):
+ """!New display/workspace menu
+ """
+ self._popupMenu((('newdisplay', self.OnNewDisplay),
+ ('workspaceNew', self.OnWorkspaceNew)))
+
+ def OnLoadMenu(self, event):
+ """!Load maps menu (new, load, import, link)
+ """
+ self._popupMenu((('workspaceLoad', self.OnWorkspaceLoad),
+ (None, None),
+ ('rastImport', self.OnImportGdalLayers),
+ ('rastLink', self.OnLinkGdalLayers),
+ (None, None),
+ ('vectImport', self.OnImportOgrLayers),
+ ('vectLink', self.OnLinkOgrLayers)))
+
def OnWorkspaceNew(self, event = None):
"""!Create new workspace file
@@ -1181,32 +1192,16 @@
if not self.curr_page:
self.NewDisplay(show = True)
- point = wx.GetMousePosition()
- rastmenu = wx.Menu()
+ self._popupMenu((('addrast3d', self.OnAddRaster3D),
+ (None, None),
+ ('addrgb', self.OnAddRasterRGB),
+ ('addhis', self.OnAddRasterHIS),
+ (None, None),
+ ('addshaded', self.OnAddRasterShaded),
+ (None, None),
+ ('addrarrow', self.OnAddRasterArrow),
+ ('addrnum', self.OnAddRasterNum)))
- for key, handler in (('addrast3d', self.OnAddRaster3D),
- (None, None),
- ('addrgb', self.OnAddRasterRGB),
- ('addhis', self.OnAddRasterHIS),
- (None, None),
- ('addshaded', self.OnAddRasterShaded),
- (None, None),
- ('addrarrow', self.OnAddRasterArrow),
- ('addrnum', self.OnAddRasterNum)):
- if key is None:
- rastmenu.AppendSeparator()
- continue
-
- item = wx.MenuItem(rastmenu, wx.ID_ANY, Icons[key].GetLabel())
- item.SetBitmap(Icons[key].GetBitmap(self.iconsize))
- rastmenu.AppendItem(item)
- self.Bind(wx.EVT_MENU, handler, item)
-
- # Popup the menu. If an item is selected then its handler
- # will be called before PopupMenu returns.
- self.PopupMenu(rastmenu)
- rastmenu.Destroy()
-
# show map display
self.curr_page.maptree.mapdisplay.Show()
@@ -1225,25 +1220,9 @@
if not self.curr_page:
self.NewDisplay(show = True)
- point = wx.GetMousePosition()
- vectmenu = wx.Menu()
+ self._popupMenu((('addthematic', self.OnAddVectorTheme),
+ ('addchart', self.OnAddVectorChart)))
- for key, handler in (('addthematic', self.OnAddVectorTheme),
- ('addchart', self.OnAddVectorChart)):
- if key is None:
- rastmenu.AppendSeparator()
- continue
-
- item = wx.MenuItem(vectmenu, wx.ID_ANY, Icons[key].GetLabel())
- item.SetBitmap(Icons[key].GetBitmap(self.iconsize))
- vectmenu.AppendItem(item)
- self.Bind(wx.EVT_MENU, handler, item)
-
- # Popup the menu. If an item is selected then its handler
- # will be called before PopupMenu returns.
- self.PopupMenu(vectmenu)
- vectmenu.Destroy()
-
# show map display
self.curr_page.maptree.mapdisplay.Show()
@@ -1263,29 +1242,13 @@
if not self.curr_page:
self.NewDisplay(show = True)
- point = wx.GetMousePosition()
- ovlmenu = wx.Menu()
-
- for key, handler in (('addgrid', self.OnAddGrid),
- ('addlabels', self.OnAddLabels),
- ('addgeodesic', self.OnAddGeodesic),
- ('addrhumb', self.OnAddRhumb),
- (None, None),
- ('addcmd', self.OnAddCommand)):
- if key is None:
- ovlmenu.AppendSeparator()
- continue
-
- item = wx.MenuItem(ovlmenu, wx.ID_ANY, Icons[key].GetLabel())
- item.SetBitmap(Icons[key].GetBitmap(self.iconsize))
- ovlmenu.AppendItem(item)
- self.Bind(wx.EVT_MENU, handler, item)
+ self._popupMenu((('addgrid', self.OnAddGrid),
+ ('addlabels', self.OnAddLabels),
+ ('addgeodesic', self.OnAddGeodesic),
+ ('addrhumb', self.OnAddRhumb),
+ (None, None),
+ ('addcmd', self.OnAddCommand)))
- # Popup the menu. If an item is selected then its handler
- # will be called before PopupMenu returns.
- self.PopupMenu(ovlmenu)
- ovlmenu.Destroy()
-
# show map display
self.curr_page.maptree.mapdisplay.Show()
More information about the grass-commit
mailing list