[QGIS Commit] r8624 - in docs/trunk/english_us/user_guide: . images
svn_qgis at osgeo.org
svn_qgis at osgeo.org
Sun Jun 8 04:54:04 EDT 2008
Author: dassau
Date: 2008-06-08 04:54:04 -0400 (Sun, 08 Jun 2008)
New Revision: 8624
Modified:
docs/trunk/english_us/user_guide/grass_integration.tex
docs/trunk/english_us/user_guide/images/Makefile
docs/trunk/english_us/user_guide/map_composer.tex
docs/trunk/english_us/user_guide/mapserver_export.tex
Log:
updated chapters 8-10 to new conventions
Modified: docs/trunk/english_us/user_guide/grass_integration.tex
===================================================================
--- docs/trunk/english_us/user_guide/grass_integration.tex 2008-06-08 01:08:29 UTC (rev 8623)
+++ docs/trunk/english_us/user_guide/grass_integration.tex 2008-06-08 08:54:04 UTC (rev 8624)
@@ -9,16 +9,16 @@
plugin:
\begin{itemize}
-\item \toolbox{add_grass_vector}{Add GRASS vector layer}
-\item \toolbox{add_grass_raster}{Add GRASS raster layer}
-\item \toolbox{grass_tools}{Open GRASS tools}
-\item \toolbox{grass_region}{Display current GRASS region}
-\item \toolbox{grass_region_edit}{Edit current GRASS region}
-\item \toolbox{grass_edit}{Edit GRASS vector layer}
-\item \toolbox{grass_open_mapset}{Open mapset}
-\item \toolbox{grass_new_mapset}{New mapset}
-\item \toolbox{grass_new_vector_layer}{Create new GRASS vector}
-\item \toolbox{grass_close_mapset}{Close mapset}
+\item \toolbtntwo{add_grass_vector}{Add GRASS vector layer}
+\item \toolbtntwo{add_grass_raster}{Add GRASS raster layer}
+\item \toolbtntwo{grass_tools}{Open GRASS tools}
+\item \toolbtntwo{grass_region}{Display current GRASS region}
+\item \toolbtntwo{grass_region_edit}{Edit current GRASS region}
+\item \toolbtntwo{grass_edit}{Edit GRASS vector layer}
+\item \toolbtntwo{grass_open_mapset}{Open mapset}
+\item \toolbtntwo{grass_new_mapset}{New mapset}
+\item \toolbtntwo{grass_new_vector_layer}{Create new GRASS vector}
+\item \toolbtntwo{grass_close_mapset}{Close mapset}
\end{itemize}
\subsection{Starting QGIS with GRASS}\label{sec:starting_grass}
@@ -44,7 +44,7 @@
\item Download the spearfish\_grass60data-0.3.zip file
\item Create a new folder \filename{grassdata} and unzip the spearfish\_grass60data-0.3.zip into it.
\item Start QGIS
- \item In the GRASS toolbar, click on the \toolbox{grass_open_mapset}{Open
+ \item In the GRASS toolbar, click on the \toolbtntwo{grass_open_mapset}{Open
mapset} icon to bring up the mapset wizard.
\item For \filename{Gisdbase} browse and enter the path to the newly
created folder \filename{grassdata}.
@@ -52,9 +52,9 @@
and the mapset \filename{PERMANENT} or \filename{user1}.
\item Click \button{OK}. Notice that some of the tools in the GRASS toolbar
that were disabled are now enabled.
- \item Click on \toolbox{add_grass_raster}{Add GRASS raster layer}, choose
+ \item Click on \toolbtntwo{add_grass_raster}{Add GRASS raster layer}, choose
the \filename{map name} geology and click \button{OK}. The geology map will be visualized.
- \item Click on \toolbox{add_grass_vector}{Add GRASS vector layer}, choose
+ \item Click on \toolbtntwo{add_grass_vector}{Add GRASS vector layer}, choose
the \filename{map name} roads and click \button{OK}. Now the roads map will
be overlayed on top of the geology.
\end{enumerate}
@@ -90,7 +90,7 @@
\item Start QGIS
\item Make sure the GRASS plugin is loaded
\item Load the \filename{alaska.shp} shapefile (see Section \ref{sec:load_shapefile}).
- \item In the GRASS toolbar, click on the \toolbox{grass_open_mapset}{Open
+ \item In the GRASS toolbar, click on the \toolbtntwo{grass_open_mapset}{Open
mapset} icon to bring up the mapset wizard.
\item Each location is stored in a directory. Select an existing data
directory or create a new one for storing the location
@@ -123,7 +123,7 @@
If that seemed like a lot of steps, it's really not all that bad and a very
quick way to create a location. Our location is now ready for use. To view
-the default region, zoom out. Clicking the \toolbox{grass_region}{Display
+the default region, zoom out. Clicking the \toolbtntwo{grass_region}{Display
current GRASS region} icon toggles the display region on and off.
\subsection{Vector Data Model}\label{label_vectmodel}\index{GRASS!vector data
@@ -176,11 +176,11 @@
\label{grass_digitising}
The digitizing tools for GRASS vector layers are accessed using the
-\toolbox{grass_edit}{Edit GRASS vector layer} icon on the toolbar. Make sure
+\toolbtntwo{grass_edit}{Edit GRASS vector layer} icon on the toolbar. Make sure
you have loaded a GRASS vector and it is the selected layer in the legend before
clicking on the edit tool. If you would like to create a new GRASS vector,
-you need to use the toolbar-entry \menuopt{Plugins} -> \menuopt{GRASS} ->
-\menuopt{Create new GRASS vector}.
+you need to use the toolbar-entry \mainmenuopt{Plugins} >
+\dropmenuopt{GRASS} > \dropmenuopttwo{grass_new_vector_layer}{Create new GRASS vector}.
Figure \ref{fig:grass_edit} shows the GRASS Edit dialog that is displayed
when you click on the edit tool.
@@ -284,9 +284,9 @@
horizontal and vertical spatial resolution.
It is possible to switch on/off the GRASS region in the QGIS canvas
-using the \toolbox{grass_region}{Display current GRASS region} button. \index{GRASS!region!display}
+using the \toolbtntwo{grass_region}{Display current GRASS region} button. \index{GRASS!region!display}
-With the \toolbox{grass_region_edit}{Edit current GRASS region} you can open a tool
+With the \toolbtntwo{grass_region_edit}{Edit current GRASS region} you can open a tool
in which you can change the current region and symbology
of the GRASS region rectangle on the QGIS canvas. When the tool is running,
it is also possible to select a new region interactively with your mouse
@@ -300,8 +300,8 @@
\subsection{GRASS Toolbox}\index{GRASS!toolbox}
-\includegraphics[width=0.7cm]{grass_tools} The GRASS toolbox provides
-analytic functions from GRASS within QGIS. To
+The \toolbtntwo{grass_tools}{Open GRASS Tools} box provides analytic
+functions from GRASS within QGIS. To
use the GRASS toolbox you need to have opened a mapset where you have
write-permission. This is needed because QGIS will most probably create
new datasets which need to be written to a valid mapset.
@@ -375,14 +375,14 @@
The right side of the browser window shows some meta information for the selected dataset, e.g. resolution,
bounding box, data source, attribute table for vector data\dots
-The toolbar inside the browser tab gives you the following tools for the selected dataset:
+The toolbar inside the \tab{browser} tab gives you the following tools for the selected dataset:
\begin{itemize}
-\item \toolbox{grass_add_map}{Add selected map to canvas}
-\item \toolbox{grass_copy_map}{Copy selected map}
-\item \toolbox{grass_rename_map}{Rename selected map}
-\item \toolbox{grass_delete_map}{Delete selected map}
-\item \toolbox{grass_set_region}{Set current region to selected map}
-\item \toolbox{grass_refresh}{Refresh browser window}
+\item \toolboxtwo{grass_add_map}{Add selected map to canvas}
+\item \toolboxtwo{grass_copy_map}{Copy selected map}
+\item \toolboxtwo{grass_rename_map}{Rename selected map}
+\item \toolboxtwo{grass_delete_map}{Delete selected map}
+\item \toolboxtwo{grass_set_region}{Set current region to selected map}
+\item \toolboxtwo{grass_refresh}{Refresh browser window}
\end{itemize}
The 'Rename' and 'Delete' buttons are only available in your current mapset. All other tools also work on
@@ -433,8 +433,8 @@
With this version of QGIS it is also possible to create new vectors from within GRASS very
easily.
-Just select \menuopt{Plugins} -> \menuopt{GRASS} -> \menuopt{Create new GRASS
-layer} from the toolbar, give a new name in the text box and start digitizing.
+Just select \mainmenuopt{Plugins} > \dropmenuopt{GRASS} >
+\dropmenuopttwo{grass_new_vector_layer}{Create new GRASS layer} from the toolbar, give a new name in the text box and start digitizing.
If you encounter a greyed-out button, make sure you have a working mapset enabled. If you forgot
how to enable a mapset have a look at Section \ref{sec:load_grassdata}.
Modified: docs/trunk/english_us/user_guide/images/Makefile
===================================================================
--- docs/trunk/english_us/user_guide/images/Makefile 2008-06-08 01:08:29 UTC (rev 8623)
+++ docs/trunk/english_us/user_guide/images/Makefile 2008-06-08 08:54:04 UTC (rev 8624)
@@ -56,6 +56,7 @@
wfs_dmsolutions.eps \
wfs-icon.eps \
identify_action.eps\
+ mActionFileSave.eps\
##### TARGETS #####
Modified: docs/trunk/english_us/user_guide/map_composer.tex
===================================================================
--- docs/trunk/english_us/user_guide/map_composer.tex 2008-06-08 01:08:29 UTC (rev 8623)
+++ docs/trunk/english_us/user_guide/map_composer.tex 2008-06-08 08:54:04 UTC (rev 8624)
@@ -8,8 +8,8 @@
adjust the properties to create your layout. The result can be printed,
exported as an image, or exported to SVG.
-To access the map composer, click on the \toolbox{mActionFilePrint}{Print}
-button in the toolbar or choose \menuopt{Print} from the \menuopt{File} menu.
+To access the map composer, click on the \toolbtntwo{mActionFilePrint}{Print}
+button in the toolbar or choose \mainmenuopt{File} > \dropmenuopttwo{mActionFilePrint}{Print}.
\subsection{Using Map Composer}\label{label_usemapcomposer}
@@ -42,7 +42,7 @@
\subsubsection{Adding a Map to the Composer}
To add the QGIS map canvas to the map composer, click on the
-\toolbox{composer_add_image}{Add a new map} button in toolbar. Drag a rectangle on the composer canvas to add the
+\toolbtntwo{composer_add_image}{Add a new map} button in toolbar. Drag a rectangle on the composer canvas to add the
map. You can resize the map later by clicking on the \button{Select/move item}
button, clicking on the map, and dragging one of the handles in the corner of
the map. With the map selected, you can also resize the map by specifying the
@@ -55,8 +55,7 @@
view to a specific scale:
\begin{enumerate}
-\item Choose \menuopt{Scale (calculate extent)} from the \button{Set} drop-down
-box
+\item Choose \selectstring{Set}{Scale (calculate extent)}
\item Enter the scale denominator in the scale box
\item Press Enter
\end{enumerate}
@@ -65,27 +64,27 @@
Already existing QGIS templates can be used to easily load and adapt map
layouts. To open an existing template, click on the
-\toolbox{composer_open_template}{Open Template} button. Choose a template and
+\toolbtntwo{composer_open_template}{Open Template} button. Choose a template and
customize its appearance.
To add a logo, north arrow or any kind of image to the composer, click on
-the \toolbox{composer_add_image}{Add Image} button. The image will
+the \toolbtntwo{composer_add_image}{Add Image} button. The image will
be placed on the composer canvas and you can move it where you like.
A legend can be added to the composer canvas and customized to show only the
desired layers. To add a legend, click on the
-\toolbox{composer_add_legend08}{Add Vector Legend} button. The legend will be
+\toolbtntwo{composer_add_legend08}{Add Vector Legend} button. The legend will be
placed on the composer canvas and you can move it where you like. Click on
the \tab{Items} tab to customize the appearance of the legend, including
which layers are shown.
To add a scalebar to the composer, click on the
-\toolbox{composer_add_scalebar08}{Add Scalebar} button. Use the \tab{Item}
+\toolbtntwo{composer_add_scalebar08}{Add Scalebar} button. Use the \tab{Item}
tab to customize the segment size, number of segments, scalebar units, size,
and font for the scalebar.
You can add text labels to the composer by clicking on the
-\toolbox{composer_add_label}{Add New Label} button. Use the \tab{Item} tab
+\toolbtntwo{composer_add_label}{Add New Label} button. Use the \tab{Item} tab
while the text is selected to customize the settings or change the default text.
Figure \ref{fig:map_composer_complete} shows the map composer after adding
@@ -113,14 +112,14 @@
export to SVG. Each of these functions is available from the composer toolbar.
To save the composer canvas as a templates, click on the
-\toolbox{composer_save_template}{Save Template As} button. Browse to the directory
+\toolbtntwo{composer_save_template}{Save Template As} button. Browse to the directory
you like and save a template to use it again for another map canvas.
It is possible to export the result as an image by clicking on the
-\toolbox{composer_export_image}{Export as image} button.
+\toolbtntwo{composer_export_image}{Export as image} button.
To export the composer canvas as an SVG (Scalable Vector Graphic), click on
-the \toolbox{composer_export_svg}{Export as SVG} button. \textbf{Note:}
+the \toolbtntwo{composer_export_svg}{Export as SVG} button. \textbf{Note:}
Currently the SVG output is very basic. This is not a QGIS problem, but a
problem of the underlaying Qt library. This will be sorted out in future versions.
Modified: docs/trunk/english_us/user_guide/mapserver_export.tex
===================================================================
--- docs/trunk/english_us/user_guide/mapserver_export.tex 2008-06-08 01:08:29 UTC (rev 8623)
+++ docs/trunk/english_us/user_guide/mapserver_export.tex 2008-06-08 08:54:04 UTC (rev 8624)
@@ -30,11 +30,9 @@
\subsection{Creating the Map File}
-The exporter tool (\filename{msexport}) is installed in your QGIS binary directory and can be
-used independently of QGIS.
+The exporter tool (\filename{msexport}) is installed in your QGIS binary directory and can be used independently of QGIS.
-From QGIS you can start the exporter by choosing \menuopt{Export to MapServer
-Map...} from the \menuopt{File} menu.
+From QGIS you can start the exporter by choosing \mainmenuopt{File} > \dropmenuopt{Export to MapServer Map...}.
Here is a summary of the input fields:
@@ -78,10 +76,10 @@
\item Load the \filename{alaska}, \filename{rivers} and \filename{lakes}
layers into QGIS
\item Change the colors and symbolize the data as you like
- \item Save the project using \menuopt{Save Project} from the
- \menuopt{File} menu
- \item Open the exporter by clicking on \menuopt{Export to MapServer
- Map...} in the \menuopt{File} menu
+ \item Save the project using \mainmenuopt{File} >
+ \dropmenuopttwo{mActionFileSave}{Save Project}.
+ \item Open the exporter by clicking mainmenuopt{File} > \dropmenuopt{Export
+ to MapServer Map...}.
\item Enter a name for your new map file
\item Browse and find the project file you just saved
\item Enter a name for the map
@@ -117,7 +115,7 @@
\item Open a terminal window
\item If you didn't save your map file in your home directory, change to
the directory where you saved it
-\item Run shp2img
+\item Run \filename{shp2img}
\item View the created image
\end{itemize}
More information about the QGIS-commit
mailing list