[QGIS Commit] r13996 - in docs/trunk/english_us/user_guide: . features_at_a_glance_screenies images

Mon Aug 2 05:00:59 EDT 2010

Author: dassau
Date: 2010-08-02 09:00:59 +0000 (Mon, 02 Aug 2010)
New Revision: 13996

Added:
   docs/trunk/english_us/user_guide/features_at_a_glance_screenies/annotation.png
   docs/trunk/english_us/user_guide/features_at_a_glance_screenies/custom_annotation.png
   docs/trunk/english_us/user_guide/images/mActionAnnotation.png
   docs/trunk/english_us/user_guide/images/mActionFormAnnotation.png
   docs/trunk/english_us/user_guide/images/mActionTextAnnotation.png
Modified:
   docs/trunk/english_us/user_guide/features_at_a_glance.tex
   docs/trunk/english_us/user_guide/foreword.tex
   docs/trunk/english_us/user_guide/working_with_vector.tex
Log:
added annotation tool to manual

Modified: docs/trunk/english_us/user_guide/features_at_a_glance.tex
===================================================================

--- docs/trunk/english_us/user_guide/features_at_a_glance.tex	2010-08-02 08:44:52 UTC (rev 13995)
+++ docs/trunk/english_us/user_guide/features_at_a_glance.tex	2010-08-02 09:00:59 UTC (rev 13996)
@@ -1076,7 +1076,6 @@
    \includegraphics[clip=true, width=10cm]{proxy-settings}
    \caption{Proxy-settings in \qg \nixcaption}
    \label{fig:proxy-settings}
- 
 \end{figure}
 
 \begin{Tip} \caption{\textsc{Using Proxies}}
@@ -1096,7 +1095,49 @@
 \end{verbatim}
 \end{itemize}
 
+\section{Annotation Tools}\label{sec:annotations}
+\index{annotations}
+\index{text annotation|\see{annotations}}
 
+The \includegraphics[width=0.7cm,clip=true]{mActionTextAnnotation} text 
+annotation tools in the attribute toolbar provides the possibility to 
+place formated text in a balloon on the QGIS map canvas. Use the text 
+annotation tool and click into the map canvas. 
+
+\begin{figure}[ht]
+   \centering
+   \includegraphics[clip=true, width=10cm]{annotation}
+   \caption{Annotation text dialog \nixcaption}
+   \label{fig:annotation}
+\end{figure}
+
+Double click on the item opens a dialog with various options. There is the 
+text editor to enter the formated text and other item settings. E.g. there 
+is the choice of having the item placed on a map position (displayed by 
+a marker symbol) or to have the item on a screen position (not related 
+to the map). The item can be moved by map position (drag the map marker) 
+or by moving only the balloon.
+
+The \includegraphics[width=0.7cm,clip=true]{mActionAnnotation} move annotation 
+tool allows to move the annotation on the map canvas.  
+
+\minisec{Form annotations}\index{annotations}
+\index{form annotation|\see{annotations}}
+
+Additionally you can also create your own annotation forms. The 
+\includegraphics[width=0.7cm,clip=true]{mActionFormAnnotation} form annotation 
+tool is useful to display attributes of a vector layer in a customised qt 
+designer form (see Figure \ref{fig:custom-annotations}). It is similar to the 
+designer forms for the identify tool, but displayed in an annotation item. 
+Also see QGIS blog \url{http://blog.qgis.org/node/143} for more information.
+
+\begin{figure}[ht]
+   \centering
+   \includegraphics[clip=true, width=10cm]{custom_annotation}
+   \caption{Customized qt designer annotation form \nixcaption}
+   \label{fig:custom-annotations}
+\end{figure}
+
 \section{Spatial Bookmarks}\label{sec:bookmarks}
 \index{bookmarks}
 \index{spatial bookmarks|\see{bookmarks}}

Added: docs/trunk/english_us/user_guide/features_at_a_glance_screenies/annotation.png
===================================================================
(Binary files differ)


Property changes on: docs/trunk/english_us/user_guide/features_at_a_glance_screenies/annotation.png
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Added: docs/trunk/english_us/user_guide/features_at_a_glance_screenies/custom_annotation.png
===================================================================
(Binary files differ)


Property changes on: docs/trunk/english_us/user_guide/features_at_a_glance_screenies/custom_annotation.png
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Modified: docs/trunk/english_us/user_guide/foreword.tex
===================================================================
--- docs/trunk/english_us/user_guide/foreword.tex	2010-08-02 08:44:52 UTC (rev 13995)
+++ docs/trunk/english_us/user_guide/foreword.tex	2010-08-02 09:00:59 UTC (rev 13996)
@@ -171,20 +171,14 @@
 \begin{itemize}[label=--]
 %  \item TODO(anne): rearrange the list on ManualTasks wikipage!
  \item added context help to dialogs
- \item show classification attribute above the classes in legend %(new symbology, enable via Options..)
  \item measure angle tool
-% composer attr tables ?
  \item GPS tracker widget
  \item Spatial Query plugin
  \item GDAL Tools plugin
  \item Google Earth plugin
  \item moved Labeling-ng plugin to core
-% composer table select display attribs (r12709) ?
  \item added "Drag and drop support" for composer legend model
  \item show labels from labeling plugin also in map composer (though not scaled correctly)
-% Added vertical line to simple marker symbol layer ?
-% Added rotation for ellipse, cross and line markers ?
-%  \item added scroll area, 'select all' and 'clear' buttons to attribute dialog 
  \item update georeferencer from gislab SVN, which adds GCP table with errors, new user interface
  \item Georeferencer: support custom projection strings.
  \item Georeferencer: Implement resampling with user-specified target resolution (enhancement request \#2447)
@@ -192,6 +186,7 @@
  \item join attributes tool now supports both dbf and csv files % table join rulez!
  \item show feature count in attribute table title
  \item Python console runnable also outside QGIS
+ \item New text annotation tool
  \item added more geometry validity checks
  \item removed limitation on maximum no of selectable features
  \item GDAL-GRASS driver no more necessary, new requirement: exceptions support for GRASS

Added: docs/trunk/english_us/user_guide/images/mActionAnnotation.png
===================================================================
(Binary files differ)


Property changes on: docs/trunk/english_us/user_guide/images/mActionAnnotation.png
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Added: docs/trunk/english_us/user_guide/images/mActionFormAnnotation.png
===================================================================
(Binary files differ)


Property changes on: docs/trunk/english_us/user_guide/images/mActionFormAnnotation.png
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Added: docs/trunk/english_us/user_guide/images/mActionTextAnnotation.png
===================================================================
(Binary files differ)


Property changes on: docs/trunk/english_us/user_guide/images/mActionTextAnnotation.png
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Modified: docs/trunk/english_us/user_guide/working_with_vector.tex
===================================================================
--- docs/trunk/english_us/user_guide/working_with_vector.tex	2010-08-02 08:44:52 UTC (rev 13995)
+++ docs/trunk/english_us/user_guide/working_with_vector.tex	2010-08-02 09:00:59 UTC (rev 13996)
@@ -604,10 +604,11 @@
 
 \subsection{New Generation Symbology}
 
-In \qg \CURRENT a new symbology was integrated in parallel with the symbology 
+Since \qg 1.4.0  a new symbology was integrated in parallel with the symbology 
 described above. This new generation symbology provides a variety of improvements and 
 new features and will replace the current symbology in one of the upcoming releases. 
-To switch to the new symbolgy you currently have to click on the \button{New symbology} button in the \tab{General} tab of the \dialog{Layer Properties} dialog.  
+To switch to the new symbolgy you currently have to click on the \button{New symbology} button in the \tab{General} tab of the \dialog{Layer Properties} dialog. You can 
+also make the New symobolgy the default, activating \checkbox{Use new generation symbology for rendering} in the \tab{Rendering \& SVG} tab under the \mainmenuopt{Settings} > \dropmenuopt{Options} menu. 
 
 \minisec{Understanding the new generation symbology}
 

