Просмотр исходного кода

helena: updates started, intro and GIS manager section & lists added
to represent drop down menus in layer manager (merge from https://trac.osgeo.org/grass/changeset/39053 &
r39054 from devbr6)


git-svn-id: https://svn.osgeo.org/grass/grass/trunk@39056 15284696-431f-4ddb-bdfa-cd5b030d7da7

Martin Landa 15 лет назад
Родитель
Сommit
266dc38fd1
1 измененных файлов с 130 добавлено и 83 удалено
  1. 130 83
      gui/wxpython/docs/wxGUI.html

+ 130 - 83
gui/wxpython/docs/wxGUI.html

@@ -4,11 +4,11 @@
 of the <em>Tcl/Tk GUI</em> from GRASS 6.
 
 <p>
-To start the wxGUI automatically for each session run GRASS with
-<tt>gui</tt> switch
+If wxGUI is not your default GUI, you can define it as default by
+typing at GRASS command line prompt
 
 <div class="code"><pre>
-    grass -gui
+   g.gui -u wxpython 
 </pre></div>
 
 or define in your <tt>.grassrc7</tt> file 'GRASS_GUI' variable
@@ -18,20 +18,25 @@ or define in your <tt>.grassrc7</tt> file 'GRASS_GUI' variable
 </pre></div>
 
 The GUI can be quit by selecting the 'File->Exit' menu item. The GUI
-can be restarted from the GRASS command line prompt by
-typing
+can be restarted from the GRASS command line prompt by typing
 
 <div class="code"><pre>
     g.gui
 </pre></div>
 
-or 
+or  to restart with previously saved workspace type:
 
 <div class="code"><pre>
     g.gui workspace=file.gxw
 </pre></div>
 
-to launch wxGUI and load workspace file on start-up.
+<p>
+You can also start GRASS from the shell command line with wxGUI
+defined by the <tt>-wxpython</tt> switch:
+
+<div class="code"><pre>
+    grass70 -wxpython
+</pre></div>
 
 <p>
 The GUI is composed by <em>two</em> main components:
@@ -70,9 +75,9 @@ additional buttons for saving or opening workspace file, and others.
 Map layers are listed in the window frame below the toolbar. Layers can
 include raster and vector maps, text, map decorations (scale and
 north arrow, and grids), and commands (where any GRASS command can be
-written). Layers are displayed in as arranged in the layer tree: the
-bottom layer is displayed first and the top is displayed last, as if
-layers are a series of stacked overlays.
+written). Layers are displayed as arranged in the layer tree: the
+bottom layer is displayed first and the top layer is displayed last, as if
+the layers were a series of stacked overlays.
 
 <p>
 The check box to the left of each layer makes it active or inactive
@@ -82,104 +87,129 @@ groups can be activated or deactivated for display. Layer tree
 composition can be saved to a workspace file and opened in subsequent
 sessions, restoring all layers and their display options.
 
+<p>
+Right mouse click on a layer opens a dropdown menu with options to 
+remove or rename the layer (g.remove, g.rename), 
+change its display properties (d.rast and d.vect options such as color, symbol, etc.),
+show its metadata (r.info, v.info) or attributes, if applicable.
+<p>
+Left mouse double click on a layer opens GUI for its display options (d.rast, d.vect).
+
 <h4>Layer Manager Toolbar</h4>
 
+New and old icons and explanation of their functionality:
 <dl>
 
 <dt><img src="icons/grass2/monitor-create.png">&nbsp;
   <img src="icons/grass/gui-startmon.gif">&nbsp;
-  <img src="icons/silk/application_add.png"> <em>Open new Map Display Window</em></dt>
+<em>Open new Map Display Window</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">&nbsp;
   <img src="icons/grass/file-new.gif">&nbsp;
-  <img src="icons/silk/page_white.png"> <em>Creates new workspace file</em></dt>
+<em>Creates 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>
 
 <dt><img src="icons/grass2/layer-open.png">&nbsp;
   <img src="icons/grass/file-new.gif">&nbsp;
-  <img src="icons/silk/page_white_get.png"> <em>Load map layers (raster, vector) into workspace</em></dt>
+<em>Load map layers (raster, vector) into workspace</em></dt>
 <dd>Loads selected raster or vector maps into current layer tree.</dd>
 
 <dt><img src="icons/grass2/open.png">&nbsp;
   <img src="icons/grass/file-open.gif">&nbsp;
-  <img src="icons/silk/folder.png"> <em>Open an existing workspace file</em></dt>
+<em>Open an 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">&nbsp;
   <img src="icons/grass/file-save.gif">&nbsp;
-  <img src="icons/silk/page_save.png"> <em>Save layers composition to workspace
-    file</em></dt>
+<em>Save workspace 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">&nbsp;
   <img src="icons/grass/element-cell.gif">&nbsp;
-  <img src="icons/silk/image_add.png"> <em>Add raster-based map layer</em></dt>
-<dd>Adds raster map to layer tree, see <em><a href="d.rast.html">d.rast</a></em>. Includes also shaded relief map, RGB or HIS map or raster flow arrows map.</dd>
+<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">&nbsp;
   <img src="icons/grass/module-d.shadedmap.gif">&nbsp;
-  <img src="icons/silk/picture_empty.png"> <em>Add shaded relief 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-rgb-add.png">&nbsp;
-  <img src="icons/grass/channel-rgb.gif">&nbsp;
-  <img src="icons/silk/rgb.png"> <em>Add RGB raster layer</em></dt>
-<dd>Combines and displays three raster maps defined as red, green, and blue
-channels, see <em><a href="d.rgb.html">d.rgb</a></em>.</dd>
-
-<dt><img src="icons/grass2/layer-his-add.png">&nbsp;
-  <img src="icons/grass/channel-his.gif">&nbsp;
-  <img src="icons/silk/his.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,
-see <em><a href="d.his.html">d.his</a></em>.</dd>
-
-<dt><img src="icons/grass2/layer-cell-cats-add.png">&nbsp;
-  <img src="icons/grass/module-d.rast.arrow.gif">&nbsp;
-  <img src="icons/silk/arrow_out.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>
+<em>Add various raster-based map layers</em></dt>
+<dd>opens a dropdown menu that allows user to select to:<br> 
+
+  <ul>
+    <li><dt><img src="icons/grass2/layer-shaded-relief-add.png">&nbsp;
+	<img src="icons/grass/module-d.shadedmap.gif">&nbsp;
+	<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></li>
+    <li><dt><img src="icons/grass2/layer-rgb-add.png">&nbsp;
+	<img src="icons/grass/channel-rgb.gif">&nbsp;
+	<em>Add RGB raster layer</em></dt>
+      <dd>Combines and displays three raster maps defined as red, green, and blue
+	channels, see <em><a href="d.rgb.html">d.rgb</a></em>.</dd></li>
+    <li><dt><img src="icons/grass2/layer-his-add.png">&nbsp;
+	<img src="icons/grass/channel-his.gif">&nbsp;
+	<em>Add HIS raster layer</em></dt>
+      <dd>Combines and displays two or three raster maps defined as hue,
+	intensity, and (optionally) saturation channels,
+	see <em><a href="d.his.html">d.his</a></em>.</dd></li>
+    <li><dt><img src="icons/grass2/layer-cell-cats-add.png">&nbsp;
+	<img src="icons/grass/module-d.rast.arrow.gif">&nbsp;
+	<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></li>
+    <li><dt><img src="icons/grass2/layer-cell-cats-add.png">&nbsp;
+	<img src="icons/grass/module-d.rast.num.gif">&nbsp;
+	<em>Add raster numbers layer</em></dt>
+      <dd>Adds map of raster cells with numbers representing the cell values, 
+	see <em><a href="d.rast.num.html">d.rast.num</a></em>.</dd></li>
+  </ul>
 
 <dt><img src="icons/grass2/layer-vector-add.png">&nbsp;
   <img src="icons/grass/element-vector.gif">&nbsp;
-  <img src="icons/silk/map_add.png"> <em>Add vector-based map layer</em></dt>
-<dd>Adds a vector map layer, see <em><a href="d.vect.html">d.vect</a></em>. Includes also thematic vector map or thematic charts layer.</dd>
+<em>Add vector map layer</em></dt>
+<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">&nbsp;
   <img src="icons/grass/module-d.vect.thematic.gif">&nbsp;
-  <img src="icons/silk/thematic.png"> <em>Add thematic 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
-type (graduated colors or point sizes), methods for creating display
-intervals, SQL query of attribute column to limit vector objects to
-display, control of point icon types and sizes, control of thematic
-color schemes, creation of legend for thematic map, and saving the
-results of thematic mapping to a ps.map instructions file for later
-printing,
-see <em><a href="d.vect.thematic.html">d.vect.thematic</a></em>.</dd>
-
-<dt><img src="icons/grass2/layer-vector-chart-add.png">&nbsp;
-  <img src="icons/grass/module-d.vect.chart.gif">&nbsp;
-  <img src="icons/silk/chart_bar.png"> <em>Add thematic charts 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
-and attributes to chart, chart colors, and chart size (fixed or based
-on attribute column),
-see <em><a href="d.vect.chart.html">d.vect.chart</a></em>.</dd>
+<em>Add various vector-based map layers </em></dt>
+<dd>opens a dropdown menu that allows user to select to:<br>
+
+  <ul>
+    <li><dt><img src="icons/grass2/layer-vector-thematic-add.png">&nbsp;
+	<img src="icons/grass/module-d.vect.thematic.gif">&nbsp;
+	<em>Add thematic 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
+	type (graduated colors or point sizes), methods for creating display
+	intervals, SQL query of attribute column to limit vector objects to
+	display, control of point icon types and sizes, control of thematic
+	color schemes, creation of legend for thematic map, and saving the
+	results of thematic mapping to a ps.map instructions file for later
+	printing,
+	see <em><a href="d.vect.thematic.html">d.vect.thematic</a></em>.</dd></li>
+      
+    <li><dt><img src="icons/grass2/layer-vector-chart-add.png">&nbsp;
+	<img src="icons/grass/module-d.vect.chart.gif">&nbsp;
+	<em>Add thematic charts 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
+	and attributes to chart, chart colors, and chart size (fixed or based
+	on attribute column),
+	see <em><a href="d.vect.chart.html">d.vect.chart</a></em>.</dd></li>
+  </ul>
 
 <dt><img src="icons/grass2/layer-command-add.png">&nbsp;
   <img src="icons/grass/gui-cmd.gif">&nbsp;
-  <img src="icons/silk/cog_add.png"> <em>Add command layer</em></dt>
+<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:
@@ -197,33 +227,50 @@ d.text text=Population\ density
 
 <dt><img src="icons/grass2/layer-group-add.png">&nbsp;
   <img src="icons/grass/gui-group.gif">&nbsp;
-  <img src="icons/silk/folder_add.png"> <em>Add layer group</em></dt>
+<em>Add layer group</em></dt>
 <dd>Adds an empty layer group. Layers can then be added to the group.</dd>
 
 <dt><img src="icons/grass2/layer-grid-add.png">&nbsp;
   <img src="icons/grass/module-d.grid.gif">&nbsp;
-  <img src="icons/silk/images.png"> <em>Add overlay grids and lines</em></dt>
-<dd>Adds layer to display regular grid (for all locations), or geodesic and
-rhumblines (for latitude/longitude locations only), see <em><a href="d.grid.html">d.grid</a>, <a href="d.geodesic.html">d.geodesic</a>, <a href="d.rhumbline.html">d.rhumbline</a></em>.</dd>
-
-<dt><img src="icons/grass2/layer-label-add.png">&nbsp;
-  <img src="icons/grass/module-d.labels.gif">&nbsp;
-  <img src="icons/silk/tag_blue_add.png"> <em>Add labels layer for vector
-objects (from existing labels file)</em></dt>
-<dd>Add raster text layer from a labels file for vector objects
-created with the <em><a href="v.label.html">v.label</a></em> module
-(accessed from button in options panel). A labels file can also be
-created with a text editor,
-see <em><a href="d.labels.html">d.labels</a></em>.</dd>
+   <em>Add grid or vector labels overlay</em></dt>
+<dd>opens a dropdown menu that allows user to select to:<br>
+
+<UL>
+<LI><dt><img src="icons/grass2/layer-grid-add.png">&nbsp;
+        <img src="icons/grass/module-d.grid.gif">&nbsp;
+        <em>Add overlay grids and lines</em></dt>
+        <dd>Adds layer to display regular grid (for all locations)
+           see <em><a href="d.grid.html">d.grid</a></em></dd>
+
+<LI><dt><img src="icons/grass2/layer-label-add.png">&nbsp;
+        <img src="icons/grass/module-d.labels.gif">&nbsp;
+        <em>Add labels layer for vector objects (from existing labels file)</em></dt>
+        <dd>Add raster text layer from a labels file for vector objects
+        created with the <em><a href="v.label.html">v.label</a></em> module
+        (accessed from button in options panel). A labels file can also be
+        created with a text editor, see <em><a href="d.labels.html">d.labels</a></em>.</dd>
+
+<LI><dt><img src="icons/grass2/layer-grid-add.png">&nbsp;
+        <img src="icons/grass/module-d.grid.gif">&nbsp;
+        <em>Add geodesic line layer</em></dt>
+        <dd>Add layer to display geodesic line for latitude/longitude locations only,
+        see <em><a href="d.geodesic.html">d.geodesic</a></em></dd> 
+
+<LI><dt><img src="icons/grass2/layer-grid-add.png">&nbsp;
+        <img src="icons/grass/module-d.grid.gif">&nbsp;
+        <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>
+</UL>
 
 <dt><img src="icons/grass2/layer-remove.png">&nbsp;
   <img src="icons/grass/edit-cut.gif">&nbsp;
-  <img src="icons/silk/bin_closed.png"> <em>Remove map layer from layer tree</em></dt>
+   <em>Delete selected layer</em></dt>
 <dd>Removes selected map layer or map layer group from layer tree.</dd>
 
 <dt><img src="icons/grass2/table.png">&nbsp;
   <img src="icons/grass/db-values.gif">&nbsp;
-  <img src="icons/silk/application_view_columns.png"> <em>Open <a href="wxGUI.Attribute_Table_Manager.html">Attribute Table Manager</a> for selected vector map</em></dt>
+  <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>
 
 </dl>