[QGIS Commit] r13980 - in docs/trunk/english_us/user_guide: .
plugins_coordinate_capture_images plugins_oracle_raster_images
svn_qgis at osgeo.org
svn_qgis at osgeo.org
Thu Jul 29 05:39:50 EDT 2010
Author: dassau
Date: 2010-07-29 09:39:50 +0000 (Thu, 29 Jul 2010)
New Revision: 13980
Modified:
docs/trunk/english_us/user_guide/core_plugins.tex
docs/trunk/english_us/user_guide/plugins_coordinate_capture_images/coordinate_capture_dialog.png
docs/trunk/english_us/user_guide/plugins_labeling.tex
docs/trunk/english_us/user_guide/plugins_oracle_raster_images/oracle_create_dialog.png
docs/trunk/english_us/user_guide/user_guide.tex
docs/trunk/english_us/user_guide/working_with_vector.tex
Log:
manual updates
Modified: docs/trunk/english_us/user_guide/core_plugins.tex
===================================================================
--- docs/trunk/english_us/user_guide/core_plugins.tex 2010-07-29 01:32:56 UTC (rev 13979)
+++ docs/trunk/english_us/user_guide/core_plugins.tex 2010-07-29 09:39:50 UTC (rev 13980)
@@ -10,7 +10,7 @@
{\setlength{\extrarowheight}{15pt}
\small
\begin{longtable}{|l|l|p{8cm}|}
-\caption{23 QGIS Core Plugins}\label{tab:core_plugins} \\
+\caption{22 QGIS Core Plugins}\label{tab:core_plugins} \\
\hline
\textbf{Icon} & \textbf{Plugin} & \textbf{Description}\\
\endfirsthead
@@ -51,9 +51,6 @@
\includegraphics[width=0.6cm]{interpolation}
& Interpolation plugin \index{plugins!Interpolation}& Interpolation on base of vertices of a vector layer\\
\hline
-\includegraphics[width=0.6cm]{labeling}
-& Labeling \index{plugins!Labeling}& Smart labeling for vector layers\\
-\hline
\includegraphics[width=0.6cm]{raster_terrain}
& Raster Terrain Modelling \index{plugins!Raster Terrain Modelling}& Compute slope, aspect,
ruggedness and total curvature of DEMs\\
Modified: docs/trunk/english_us/user_guide/plugins_coordinate_capture_images/coordinate_capture_dialog.png
===================================================================
(Binary files differ)
Modified: docs/trunk/english_us/user_guide/plugins_labeling.tex
===================================================================
--- docs/trunk/english_us/user_guide/plugins_labeling.tex 2010-07-29 01:32:56 UTC (rev 13979)
+++ docs/trunk/english_us/user_guide/plugins_labeling.tex 2010-07-29 09:39:50 UTC (rev 13980)
@@ -1,20 +1,20 @@
% !TeX root = user_guide.tex
-\section{Labeling Plugin}
+\section{New Labeling}
% when the revision of a section has been finalized,
% comment out the following line:
%\updatedisclaimer
-The \toolbtntwo{labeling}{Labeling} plugin provides smart labeling for vector point,
-line and polygon layers and only requires a few parameters. This plugin will replace
-the current QGIS labeling and also supports on-the-fly transformated layers.
+The new \toolbtntwo{labeling}{Labeling} core application provides smart labeling
+for vector point, line and polygon layers and only requires a few parameters.
+This new application will replace the current QGIS labeling and also supports
+on-the-fly transformated layers.
\begin{enumerate}
\item Start QGIS and load a vector point, line or polygon layer.
- \item Load the labeling plugin in the Plugin Manager (see Section
- \ref{sec:load_core_plugin}), activate the layer in the legend and click on the
- \toolbtntwo{labeling}{Labeling} icon which appears in the QGIS toolbar menu.
+ \item Activate the layer in the legend and click on the
+ \toolbtntwo{labeling}{Labeling} icon in the QGIS toolbar menu.
\end{enumerate}
\minisec{Labeling point layers}
@@ -74,3 +74,4 @@
candidates for debugging.
\FloatBarrier
+
Modified: docs/trunk/english_us/user_guide/plugins_oracle_raster_images/oracle_create_dialog.png
===================================================================
(Binary files differ)
Modified: docs/trunk/english_us/user_guide/user_guide.tex
===================================================================
--- docs/trunk/english_us/user_guide/user_guide.tex 2010-07-29 01:32:56 UTC (rev 13979)
+++ docs/trunk/english_us/user_guide/user_guide.tex 2010-07-29 09:39:50 UTC (rev 13980)
@@ -48,7 +48,6 @@
\input{plugins_georeferencer}
\input{plugins_gps}
\input{plugins_interpolation}
-\input{plugins_labeling}
\input{plugins_mapserver_export}
\input{plugins_ogr_converter}
\input{plugins_oracle_raster}
Modified: docs/trunk/english_us/user_guide/working_with_vector.tex
===================================================================
--- docs/trunk/english_us/user_guide/working_with_vector.tex 2010-07-29 01:32:56 UTC (rev 13979)
+++ docs/trunk/english_us/user_guide/working_with_vector.tex 2010-07-29 09:39:50 UTC (rev 13980)
@@ -811,7 +811,7 @@
\caption{Style Manager to manage symbols and color ramps \nixcaption}\label{fig:stylemanager}
\end{figure}
-\subsection{Labels Tab}
+\subsection{Labels Tab}\label{labeltab}
The \tab{Labels} tab allows you to enable labeling features and control a number of
options related to fonts, placement, style, alignment and buffering.
@@ -892,6 +892,78 @@
Not that the \tab{Label} tab provides a \classname{preview-box} where your
selected label is shown.
+\subsection{New Labeling}\index{New labeling}\label{newlabel}
+
+The new \toolbtntwo{labeling}{Labeling} core application provides smart labeling
+for vector point, line and polygon layers and only requires a few parameters.
+This new application will replace the current QGIS labeling, described in section
+\ref{labeltab} and also supports on-the-fly transformated layers.
+
+\minisec{Using new labeling}
+
+\begin{enumerate}
+ \item Start QGIS and load a vector point, line or polygon layer.
+ \item Activate the layer in the legend and click on the
+ \toolbtntwo{labeling}{Labeling} icon in the QGIS toolbar menu.
+\end{enumerate}
+
+\minisec{Labeling point layers}
+
+First step is to activate the \checkbox{Label this layer} checkbox and select an attribute
+column to use for labeling. After that you can define the label placement and text style,
+labeling priority, scale-based visibility, if every part of multipart feature is to be
+labeled and if features act as obstacles for labels or not (see
+Figure \ref{fig:pointlabel}).
+
+\begin{figure}[ht]
+\centering
+ \includegraphics[clip=true, width=10cm]{label_points}
+ \caption{Smart labeling of vector point layers \nixcaption}\label{fig:pointlabel}
+\end{figure}
+
+\minisec{Labeling line layers}
+
+First step is to activate the \checkbox{Label this layer} checkbox and select an attribute
+column to use for labeling. After that you can define the label placement, orientation,
+distance to feature, text style, labeling priority, scale-based visibility, if every part
+of a multipart line is to be labeled, if lines shall be merged to avoid duplicate labels
+and if features act as obstacles for labels or not (see Figure \ref{fig:linelabel}).
+
+\begin{figure}[ht]
+\centering
+ \includegraphics[clip=true, width=10cm]{label_line}
+ \caption{Smart labeling of vector line layers \nixcaption}\label{fig:linelabel}
+\end{figure}
+
+\minisec{Labeling polygon layers}
+
+First step is to activate the \checkbox{Label this layer} checkbox and select an attribute
+column to use for labeling. After that you can define the label placement, distance and text
+style, labeling priority, scale-based visibility, if every part of multipart feature is to be
+labeled and if features act as obstacles for labels or not (see Figure \ref{fig:arealabel}).
+
+\begin{figure}[ht]
+\centering
+ \includegraphics[clip=true, width=10cm]{label_area}
+ \caption{Smart labeling of vector polygon layers \nixcaption}\label{fig:arealabel}
+\end{figure}
+
+\minisec{Change engine settings}
+
+Additionally you can click the \button{Engine settings} button and select the search method,
+used to find the best label placement. Available is Chain, Popmusic Tabu, Popmusic Chain,
+Popmusic Tabu Chain and FALP.
+
+\begin{figure}[ht]
+\centering
+ \includegraphics[clip=true, width=5cm]{label_engine}
+ \caption{Dialog to change label engine settings \nixcaption}\label{fig:labelengine}
+\end{figure}
+
+Furthermore the number of candidates can be defined for point, line and polygon features,
+and you can define whether to show all labels (including colliding labels) and label
+candidates for debugging.
+
\subsection{Attributes Tab}\index{Attributes}\label{label_attributes}
Within the \tab{Attributes} tab the attributes of the selected dataset can be
@@ -1726,8 +1798,15 @@
\textbf{Note}: If you hold the \keystroke{Ctrl} key pressed, the rotation will be done
in 15 degree steps.
-\subsection{Creating a new Shape layer}\label{sec:create shape}\index{editing!creating a new shape layer}
+\subsection{Creating a new Shapefile and Spatialite layer}\label{sec:create shape}\index{editing!creating a new shape layer}
+\qg allows to create new Shapefile layers and new Spatialite layers.
+Creation of a new GRASS layer is supported within the GRASS-plugin. Please refer
+to section \ref{sec:creating_new_grass_vectors} for more information on
+creating GRASS vector layers.
+
+\minisec{Creating a new Shape layer}\label{sec:create shape}\index{editing!creating a new shape layer}
+
To create a new Shape layer for editing, choose \button{new} >
\toolbtntwo{mActionNewVectorLayer}{New Shapefile Layer} from the
\mainmenuopt{Layer} menu. The \dialog{New Vector Layer} dialog will be
@@ -1756,7 +1835,7 @@
the layer has been created, it will be added to the map and you can edit it in
the same way as described in Section \ref{sec:edit_existing_layer} above.
-\subsection{Creating a new SpatiaLite layer}\label{sec:create spatialite}\index{editing!creating a new spatialite layer}
+\minisec{Creating a new SpatiaLite layer}\label{sec:create spatialite}\index{editing!creating a new spatialite layer}
To create a new SpatiaLite layer for editing, choose \button{new} >
\toolbtntwo{mActionNewVectorLayer}{New SpatiaLite Layer} from the
@@ -1782,10 +1861,6 @@
layer to the legend and you can edit it in the same way as described in
Section \ref{sec:edit_existing_layer} above.
-\textbf{Note:} Creation of a new GRASS layer is supported within the GRASS-plugin.
-Please refer to section \ref{sec:creating_new_grass_vectors} for more
-information on creating GRASS vector layers.
-
\subsection{Working with the Attribute Table}\label{sec:attribute table}\index{editing!working with the attribute table}
The attribute table displays features of a selected layer. Each row in the table
More information about the QGIS-commit
mailing list