[QGIS Commit] r14822 - in docs/branches/1.6.0/french/user_guide: .
diff
svn_qgis at osgeo.org
svn_qgis at osgeo.org
Wed Dec 1 12:00:57 EST 2010
Author: jrm
Date: 2010-12-01 09:00:57 -0800 (Wed, 01 Dec 2010)
New Revision: 14822
Added:
docs/branches/1.6.0/french/user_guide/diff/
docs/branches/1.6.0/french/user_guide/diff/features_at_a_glance.diff
docs/branches/1.6.0/french/user_guide/diff/foreword.diff
docs/branches/1.6.0/french/user_guide/diff/getting_started.diff
docs/branches/1.6.0/french/user_guide/diff/grass_integration.diff
docs/branches/1.6.0/french/user_guide/diff/help_and_support.diff
docs/branches/1.6.0/french/user_guide/diff/plugins.diff
docs/branches/1.6.0/french/user_guide/diff/plugins_evis.diff
docs/branches/1.6.0/french/user_guide/diff/plugins_gdaltools.diff
docs/branches/1.6.0/french/user_guide/diff/plugins_georeferencer.diff
docs/branches/1.6.0/french/user_guide/diff/print_composer.diff
docs/branches/1.6.0/french/user_guide/diff/title.diff
docs/branches/1.6.0/french/user_guide/diff/working_with_ogc.diff
docs/branches/1.6.0/french/user_guide/diff/working_with_projections.diff
docs/branches/1.6.0/french/user_guide/diff/working_with_raster.diff
docs/branches/1.6.0/french/user_guide/diff/working_with_vector.diff
Log:
correct diff files
Added: docs/branches/1.6.0/french/user_guide/diff/features_at_a_glance.diff
===================================================================
--- docs/branches/1.6.0/french/user_guide/diff/features_at_a_glance.diff (rev 0)
+++ docs/branches/1.6.0/french/user_guide/diff/features_at_a_glance.diff 2010-12-01 17:00:57 UTC (rev 14822)
@@ -0,0 +1,236 @@
+*** /home/jrm/Documents/QGIS/english/user_guide_1.5/features_at_a_glance.tex 2010-10-04 22:44:16.016095980 +0200
+--- /home/jrm/Documents/QGIS/english/user_guide_1.6/features_at_a_glance.tex 2010-11-29 21:39:56.902084782 +0100
+***************
+*** 51,56 ****
+--- 51,59 ----
+ [--project projectfile] load the given QGIS project
+ [--extent xmin,ymin,xmax,ymax] set initial map extent
+ [--nologo] hide splash screen
++ [--noplugins] don't restore plugins on startup
++ [--optionspath path] use the given QSettings path
++ [--configpath path] use the given path for all user configuration
+ [--help] this text
+
+ FILES:
+***************
+*** 103,108 ****
+--- 106,120 ----
+ \minisec{Command line option \usertext{---nologo}}
+ This command line argument hides the splash screen when you start QGIS.
+
++ \minisec{Command line option \usertext{---noplugins}}
++ If you have trouble at startup with plugins, you can avoid loading them at startup. They will still be available in Plugins Manager afterwards.
++
++ \minisec{Command line option \usertext{---optionspath}}
++ You can have multiple configurations and decide which one to use when starting QGIS using this option. See \ref{subsec:gui_options} to check where does the operating system save the settings files. Presently there is no way to specify in which file where to write the settings, therefore you can create a copy of the original settings file and rename it.
++
++ \minisec{Command line option \usertext{---configpath}}
++ This option is similar to the one above, but furthermore overrides the default path (~/.qgis) for user configuration and forces QSettings to use this directory, too. This allows users to e.g. carry QGIS installation on a flash drive together with all plugins and settings
++
+ \section{QGIS GUI}\index{main window}
+ \label{label_qgismainwindow}
+
+***************
+*** 269,275 ****
+ \> \dropmenucheck{Advanced Digitizing} \\
+ \end{tabbing}
+
+! After activating \toolbtntwo{mActionToggleEditing}{toogle editing} mode
+ for a layer, you will find a capture feature icon in the \mainmenuopt{Edit}
+ menu depending on the layer type (point, line or polygon). \\
+
+--- 281,287 ----
+ \> \dropmenucheck{Advanced Digitizing} \\
+ \end{tabbing}
+
+! After activating \toolbtntwo{mActionToggleEditing}{Toggle editing} mode
+ for a layer, you will find a capture feature icon in the \mainmenuopt{Edit}
+ menu depending on the layer type (point, line or polygon). \\
+
+***************
+*** 303,310 ****
+ \> \keystroke{Ctrl+-}
+ \> \> \dropmenucheck{Map Navigation} \\
+ \dropmenuopttwo{mActionSelect}{Select Features}
+! \>
+! \> \> \dropmenucheck{Attributes} \\
+ \dropmenuopttwo{mActionDeselectAll}{Deselect Features from all layers}
+ \>
+ \> \> \dropmenucheck{Attributes} \\
+--- 315,323 ----
+ \> \keystroke{Ctrl+-}
+ \> \> \dropmenucheck{Map Navigation} \\
+ \dropmenuopttwo{mActionSelect}{Select Features}
+! \>
+! \> see Section \ref{sec:selection}
+! \> \dropmenucheck{Attributes} \\
+ \dropmenuopttwo{mActionDeselectAll}{Deselect Features from all layers}
+ \>
+ \> \> \dropmenucheck{Attributes} \\
+***************
+*** 369,374 ****
+--- 382,391 ----
+ \>
+ \> see Section \ref{sec:create shape}
+ \> \dropmenucheck{Manage Layers} \\
++ \mainmenuopt{Raster calculator}
++ \>
++ \> see Section \ref{sec:raster_calc}
++ \> \\
+ \dropmenuopttwo{mActionAddNonDbLayer}{Add Vector Layer}
+ \> \keystroke{Ctrl+Shift+V}
+ \>
+***************
+*** 406,412 ****
+ \mainmenuopt{Save as...}
+ \\
+ \mainmenuopt{Save selection as vector file...}
+! \\
+ \dropmenuopttwo{mActionRemoveLayer}{Remove Layer}
+ \> \keystroke{Ctrl+D}
+ \>
+--- 423,431 ----
+ \mainmenuopt{Save as...}
+ \\
+ \mainmenuopt{Save selection as vector file...}
+! \>
+! \> See \ref{sec:attribute table}
+! \> \\
+ \dropmenuopttwo{mActionRemoveLayer}{Remove Layer}
+ \> \keystroke{Ctrl+D}
+ \>
+***************
+*** 621,626 ****
+--- 640,654 ----
+ that QGIS only permits the drag if the two layers are able to share
+ symbology (same vector geometry type and same attributes).
+
++ It is also possible to select more than one Layer or Group at the same time
++ by holding down the \keystroke{CTRL}-Key while selecting the Layers with the
++ left mouse button. You can than move all selected Layers to a new Group at
++ the same time.
++
++ You are also able to delete more than one Layer or Group at once by selecting
++ several Layers with the \keystroke{CTRL}-Key and pressing \keystroke{CTRL-D} afterwards.
++ This way all selected Layers or Groups will be removed from the Layerlist.
++
+ %% isn't included in Titan anymore, except for an "toggle overview"
+ %Each legend entry can show the following mini icons:
+ %
+***************
+*** 845,850 ****
+--- 873,881 ----
+ snapping settings from the digitizing module. This is useful, if you want to
+ measure along lines or areas in vector layers.
+
++ To select a measure tool click on \includegraphics[width=0.7cm]{mActionMeasure} and
++ select the tool you want to use.
++
+ \subsection{Measure length, areas and angles}
+ \index{measure:line length}
+ \index{measure:areas}
+***************
+*** 877,882 ****
+--- 908,928 ----
+ \caption{Measure tools in action \nixcaption} \label{fig:measure}
+ \end{figure}
+
++ \subsection{Select and deselect features}\label{sec:selection}
++
++ The QGIS toolbar provides several tools to select features in the map canvas.
++ To select one or several features just click on
++ \includegraphics[width=0.7cm]{mActionSelect} and select the tools:
++
++ \begin{description}
++ \item \radiobuttonon{Select features}
++ \item \radiobuttonoff{Select features by rectangle}
++ \item \radiobuttonoff{Select features by polygon}
++ \item \radiobuttonoff{Select features by freehand}
++ \item \radiobuttonoff{Select features by radius}
++ \end{description}
++
++ To deselect all selected features click on \includegraphics[width=0.7cm]{mActionDeselectAll}.
+
+ \section{Projects}\label{sec:projects}\index{projects}
+
+***************
+*** 1127,1133 ****
+ 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.
+--- 1173,1180 ----
+ 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 icons are part of gis theme, and are used
+! by default in the other themes too.
+
+ The \includegraphics[width=0.7cm,clip=true]{mActionAnnotation} move annotation
+ tool allows to move the annotation on the map canvas.
+***************
+*** 1207,1213 ****
+
+ With a plugged in GPS receiver (has to be supported by your operating system)
+ a simple click on \button{Connect} connects the GPS to QGIS. A second click
+! (now \button{Disconnect} disconnects the GPS-Reciever from you Computer.
+
+ [ IMPORTANT ]: If you want to record your position to the canvas you have to
+ create a new vector layer first and switch it to editable status to be able
+--- 1254,1262 ----
+
+ With a plugged in GPS receiver (has to be supported by your operating system)
+ a simple click on \button{Connect} connects the GPS to QGIS. A second click
+! (now \button{Disconnect} disconnects the GPS-Reciever from you Computer. For
+! GNU/Linux gpsd support is integrated to support connection to most GPS
+! receivers. Therefore you first have to configure gpsd properly to connect QGIS to it.
+
+ [ IMPORTANT ]: If you want to record your position to the canvas you have to
+ create a new vector layer first and switch it to editable status to be able
+***************
+*** 1219,1228 ****
+ \hspace{0.33cm}
+ \subfloat[GPS signal strenght]{\label{subfig:gpstrack_stren}\includegraphics[clip=true, width=0.3\textwidth]{gpstrack_stren}}
+ \hspace{0.33cm}
+! \subfloat[GPS polar window]{\label{subfig:gpstrack_polar}\includegraphics[clip=true, width=0.3\textwidth]{gpstrack_polar}} \\
+ \caption{Live GPS tracking \nixcaption} \label{fig:gpstrack_live}
+ \end{figure}
+
+ \subsection{Position coordinates}
+ \includegraphics[width=0.5cm,clip=true]{mActionToggleEditing} If the GPS is
+ recieving signals from satellites you will see your position in latitude,
+--- 1268,1284 ----
+ \hspace{0.33cm}
+ \subfloat[GPS signal strenght]{\label{subfig:gpstrack_stren}\includegraphics[clip=true, width=0.3\textwidth]{gpstrack_stren}}
+ \hspace{0.33cm}
+! \subfloat[GPS polar window]{\label{subfig:gpstrack_polar}\includegraphics[clip=true, width=0.3\textwidth]{gpstrack_polar}}
+ \caption{Live GPS tracking \nixcaption} \label{fig:gpstrack_live}
+ \end{figure}
+
++ \begin{figure}[ht]
++ \centering
++ \includegraphics[clip=true, width=4cm]{gpstrack_options}
++ \caption{GPS tracking options window \nixcaption}
++ \label{fig:gpstrack_options}
++ \end{figure}
++
+ \subsection{Position coordinates}
+ \includegraphics[width=0.5cm,clip=true]{mActionToggleEditing} If the GPS is
+ recieving signals from satellites you will see your position in latitude,
+***************
+*** 1263,1273 ****
+ and want to record vertices manually you have to go back there and
+ click \button{Add vertex}
+
+- \begin{figure}[ht]
+- \centering
+- \includegraphics[clip=true, width=5cm]{gpstrack_options}
+- \caption{GPS tracking options window \nixcaption}
+- \label{fig:gpstrack_options}
+- \end{figure}
+-
+ \FloatBarrier
+--- 1319,1322 ----
Added: docs/branches/1.6.0/french/user_guide/diff/foreword.diff
===================================================================
--- docs/branches/1.6.0/french/user_guide/diff/foreword.diff (rev 0)
+++ docs/branches/1.6.0/french/user_guide/diff/foreword.diff 2010-12-01 17:00:57 UTC (rev 14822)
@@ -0,0 +1,99 @@
+*** /home/jrm/Documents/QGIS/english/user_guide_1.5/foreword.tex 2010-09-03 22:07:43.401657555 +0200
+--- /home/jrm/Documents/QGIS/english/user_guide_1.6/foreword.tex 2010-11-29 21:39:56.895084724 +0100
+***************
+*** 167,194 ****
+
+ \subsubsection{What's new in version \CURRENT}
+
+! These are the most relevant additions and improvements for QGIS users:
+ \begin{itemize}[label=--]
+! % \item TODO(anne): rearrange the list on ManualTasks wikipage!
+! \item Added context help to dialogs
+! \item Measure angle tool
+! \item GPS tracker widget
+! \item Several new external plugins "Spatial Query, GDAL Tools, Google Earth \dots"
+! \item Add attribute table to the map composer
+! \item Vector layer saving in editing mode
+! \item Moved new labeling plugin to core and show labels from new labeling in map composer (though not scaled correctly)
+! \item Added "Drag and drop support" for composer legend model
+! \item Extended georeferencer plugin with new user interface
+! \item BBOX option for WFS
+! \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 New WMS scale slider
+! \item Projection search improvements (show/hide deprecated projections)
+! \item Add GDAL compatible CRSes (without +towgs84 parameters) for Polish epsg: 2172-2180, 3120, 3328-3335 and 4179 as epsg+40000
+! \item Change map unit in project dialog automatically when user selects a new CRS
+! \item New Oracle raster connection dialog
+! \item Add New Spatialite Layer/Database and allow creation of multiple spatialite layers
+
+ \end{itemize}
+--- 167,232 ----
+
+ \subsubsection{What's new in version \CURRENT}
+
+! Please note that this is a release in our 'cutting edge' release series. As such
+! it contains new features and extends the programmatic interface over QGIS 1.0.x
+! and QGIS 1.5.0. We recommend that you use this version over previous releases.
+!
+! This release includes over 177 bug fixes and many new features and enhancements.
+!
+! \textbf{General Improvements}
+!
+! \begin{itemize}[label=--]
+! \item Added gpsd support to live gps tracking.
+! \item A new plugin has been included that allows for offline editing.
+! \item Field calculator will now insert NULL feature value in case of calculation error instead of stopping and reverting calculation for all features.
+! \item Update srs.db to include grid reference.
+! \item Added a native (C++) raster calculator implementation which can deal with large rasters efficiently.
+! \item Improved interaction with extents widget in statusbar so that the text contents of the widget can be copied and pasted.
+! \item Many improvements and new operators to the field calculator including field concatenation, row counter etc.
+! \item Added --configpath option that overrides the default path (~/.qgis) for user configuration and forces QSettings to use this directory, too. This allows users to e.g. carry QGIS installation on a flash drive together with all plugins and settings.
+! \item Experimental WFS-T support. Additionally ported wfs to network manager.
+! \item Georeferencer has had many tidy ups and improvements.
+! \item Support for long int in attribute dialog and editor.
+! \item The QGIS Mapserver project has been incorporated into the main SVN repository and packages are being made available. QGIS Mapserver allows you to serve your QGIS project files via the OGC WMS protocol.
+! \item Select and measure toolbar flyouts and submenus.
+! \item Support has been added for non-spatial tables (currently OGR, delimited text and PostgreSQL providers). These tables can be used for field lookups or just generally browsed and edited using the table view.
+! \item Added search string support for feature ids (\$id) and various other search related improvements.
+! Added reload method to map layers and provider interface. Like this, caching providers (currently WMS and WFS) can synchronize with changes in the datasource.
+! \end{itemize}
+!
+! \textbf{Table of contents (TOC) improvements}
+!
+ \begin{itemize}[label=--]
+! \item Added a new option to the raster legend menu that will stretch the current layer using the min and max pixel values of the current extent.
+! \item When writing vector files using the table of contents context menu's 'Save as' option, you can now specify OGR creation options.
+! \item In the table of contents, it is now possible to select and remove or move several layers at once.
+! \end{itemize}
+
++ \textbf{Labelling (New generation only)}
++
++ \begin{itemize}[label=--]
++ \item Data defined label position.
++ \item Line wrapping, data defined font and buffer settings.
+ \end{itemize}
++
++ \textbf{Layer properties and symbology}
++
++ \begin{itemize}[label=--]
++ \item Three new classification modes added to graduated symbol renderer (version 2), including Natural Breaks (Jenks), Standard Deviations, and Pretty Breaks (based on pretty from the R statistical environment). Read More.
++ \item Improved loading speed of the symbol properties dialog.
++ \item Data-defined rotation and size for categorized and graduated renderer (symbology-ng).
++ \item Use size scale also for line symbols to modify line width.
++ \item Replaced raster histogram implementation with one based on Qwt. Added option to save histogram as image file. Show actual pixel values on x axis of raster histogram.
++ \item Added ability to interactively select pixels from the canvas to populate the transparency table in the raster layer properties dialog.
++ \item Allow creation of color ramps in vector color ramp combo box.
++ \item Added 'style manager...' button to symbol selector so that users will find the style manager more easily.
++ \end{itemize}
++
++ \textbf{Map Composer}
++
++ \begin{itemize}[label=--]
++ \item add capability to show and manipulate composer item width/ height in item position dialog.
++ \item Composer items can now be deleted with the backspace key.
++ \item Sorting for composer attribute table (several columns and ascending / descending).
++ \end{itemize}
++
Added: docs/branches/1.6.0/french/user_guide/diff/getting_started.diff
===================================================================
--- docs/branches/1.6.0/french/user_guide/diff/getting_started.diff (rev 0)
+++ docs/branches/1.6.0/french/user_guide/diff/getting_started.diff 2010-12-01 17:00:57 UTC (rev 14822)
@@ -0,0 +1,18 @@
+*** /home/jrm/Documents/QGIS/english/user_guide_1.5/getting_started.tex 2010-08-14 13:25:15.764791597 +0200
+--- /home/jrm/Documents/QGIS/english/user_guide_1.6/getting_started.tex 2010-11-29 21:39:56.903084790 +0100
+***************
+*** 26,31 ****
+--- 26,38 ----
+ The installation instructions are also distributed with the \qg source
+ code.
+
++ \minisec{Installation on external media}
++
++ QGIS allows to define a --configpath option that overrides the default path
++ (e.g. ~/.qgis under Linux) for user configuration and forces QSettings to use
++ this directory, too. This allows users to e.g. carry a QGIS installation on a
++ flash drive together with all plugins and settings.
++
+ \section{Sample Data}\label{label_sampledata}
+ \index{data!sample}
+
Added: docs/branches/1.6.0/french/user_guide/diff/grass_integration.diff
===================================================================
--- docs/branches/1.6.0/french/user_guide/diff/grass_integration.diff (rev 0)
+++ docs/branches/1.6.0/french/user_guide/diff/grass_integration.diff 2010-12-01 17:00:57 UTC (rev 14822)
@@ -0,0 +1,103 @@
+*** /home/jrm/Documents/QGIS/english/user_guide_1.5/grass_integration.tex 2010-09-11 20:59:05.934604536 +0200
+--- /home/jrm/Documents/QGIS/english/user_guide_1.6/grass_integration.tex 2010-11-29 21:39:56.886084649 +0100
+***************
+*** 119,125 ****
+
+ \subsection{Creating a new GRASS LOCATION}\label{sec:create_loc}
+
+! As an an example you find the instructions how the sample GRASS
+ \filename{LOCATION alaska}, which is projected in Albers Equal Area
+ projection with unit feet was created for the QGIS sample dataset. This
+ sample GRASS \filename{LOCATION alaska} will be used for all examples and
+--- 119,125 ----
+
+ \subsection{Creating a new GRASS LOCATION}\label{sec:create_loc}
+
+! As an example here is how the sample GRASS
+ \filename{LOCATION alaska}, which is projected in Albers Equal Area
+ projection with unit feet was created for the QGIS sample dataset. This
+ sample GRASS \filename{LOCATION alaska} will be used for all examples and
+***************
+*** 190,196 ****
+ \subsection{Adding a new MAPSET}\label{sec:add_mapset}
+
+ A user has only write access to a GRASS \filename{MAPSET} he created. This
+! means, besides access to his own \filename{MAPSET}, each user can also read
+ maps in other user's \filename{MAPSETs}, but he can modify or remove only
+ the maps in his own \filename{MAPSET}. All \filename{MAPSETs} include a
+ \filename{WIND} file that stores the current boundary coordinate values and
+--- 190,196 ----
+ \subsection{Adding a new MAPSET}\label{sec:add_mapset}
+
+ A user has only write access to a GRASS \filename{MAPSET} he created. This
+! means that besides access to his own \filename{MAPSET}, each user can read
+ maps in other user's \filename{MAPSETs}, but he can modify or remove only
+ the maps in his own \filename{MAPSET}. All \filename{MAPSETs} include a
+ \filename{WIND} file that stores the current boundary coordinate values and
+***************
+*** 270,277 ****
+ vector model.\index{GRASS!topology} This means that areas are not represented
+ as closed polygons, but by one or more boundaries. A boundary between two
+ adjacent areas is digitized only once, and it is shared by both areas.
+! Boundaries must be connected without gaps. An area is identified (labeled)
+! by the centroid of the area.
+
+ Besides boundaries and centroids, a vector map can also contain
+ points and lines. All these geometry elements can be mixed
+--- 270,277 ----
+ vector model.\index{GRASS!topology} This means that areas are not represented
+ as closed polygons, but by one or more boundaries. A boundary between two
+ adjacent areas is digitized only once, and it is shared by both areas.
+! Boundaries must be connected and closed without gaps. An area is identified (and labeled)
+! by the \textbf{centroid} of the area.
+
+ Besides boundaries and centroids, a vector map can also contain
+ points and lines. All these geometry elements can be mixed
+***************
+*** 283,289 ****
+ used in special cases such as vector network analysis. Normally you should
+ prefere to store different geometry elements in different layers.}
+
+! It is possible to store more 'layers' in one vector dataset. For example,
+ fields, forests and lakes can be stored in one vector. Adjacent
+ forest and lake can share the same boundary, but they have separate attribute
+ tables. It is also possible to attach attributes to boundaries. For example,
+--- 283,289 ----
+ used in special cases such as vector network analysis. Normally you should
+ prefere to store different geometry elements in different layers.}
+
+! It is possible to store several 'layers' in one vector dataset. For example,
+ fields, forests and lakes can be stored in one vector. Adjacent
+ forest and lake can share the same boundary, but they have separate attribute
+ tables. It is also possible to attach attributes to boundaries. For example,
+***************
+*** 525,537 ****
+ \end{figure}
+
+ The GRASS Shell inside the GRASS Toolbox provides access to almost all (more
+! than 300) GRASS modules in command line modus. To offer a more user
+ friendly working environment, about 200 of the available GRASS modules and
+ functionalities are also provided by graphical dialogs. These dialogs are
+! grouped in categories, but are searchable as well. You find a complete
+! list of GRASS modules available in QGIS version \CURRENT
+! in appendix \ref{appdx_grass_toolbox_modules}. It is also possible to
+! customize the GRASS Toolbox content. It is described in Section
+ \ref{sec:toolbox-customizing}.
+
+ As shown in Figure \ref{fig:grass_modules}, you can look for the appropriate
+--- 525,539 ----
+ \end{figure}
+
+ The GRASS Shell inside the GRASS Toolbox provides access to almost all (more
+! than 300) GRASS modules in a command line interface. To offer a more user
+ friendly working environment, about 200 of the available GRASS modules and
+ functionalities are also provided by graphical dialogs. These dialogs are
+! grouped in categories, but are searchable as well.
+!
+! A complete list of GRASS modules available in the graphical Toolbox in QGIS version \CURRENT
+! is available in the GRASS wiki ( \url{http://grass.osgeo.org/wiki/GRASS-QGIS_relevant_module_list}.
+!
+! It is also possible to customize the GRASS Toolbox content. This procedure is described in Section
+ \ref{sec:toolbox-customizing}.
+
+ As shown in Figure \ref{fig:grass_modules}, you can look for the appropriate
Added: docs/branches/1.6.0/french/user_guide/diff/help_and_support.diff
===================================================================
--- docs/branches/1.6.0/french/user_guide/diff/help_and_support.diff (rev 0)
+++ docs/branches/1.6.0/french/user_guide/diff/help_and_support.diff 2010-12-01 17:00:57 UTC (rev 14822)
@@ -0,0 +1,24 @@
+*** /home/jrm/Documents/QGIS/english/user_guide_1.5/help_and_support.tex 2010-08-27 19:08:52.999240360 +0200
+--- /home/jrm/Documents/QGIS/english/user_guide_1.6/help_and_support.tex 2010-11-29 21:39:56.911084856 +0100
+***************
+*** 56,61 ****
+--- 56,74 ----
+ subscribe to this list at:\\
+ \url{http://lists.osgeo.org/mailman/listinfo/qgis-release-team}
+
++ \minisec{qgis-tr}
++
++ This list deals with the translation efforts. If you like to work on the translation
++ of the manuals or the graphical user interface (GUI), this list is a good starting
++ point to ask your questions.
++
++ \minisec{qgis-edu}
++
++ This list deals with QGIS education efforts. If you like to work on qgis education
++ materials, this list is a good starting point to ask your questions.
++
++ \url{http://lists.osgeo.org/mailman/listinfo/qgis-edu}
++
+ \minisec{qgis-psc}
+ This list is used to discuss Steering Committee issues related to overall
+ management and direction of Quantum GIS. You can subscribe to this list at:\\
Added: docs/branches/1.6.0/french/user_guide/diff/plugins.diff
===================================================================
--- docs/branches/1.6.0/french/user_guide/diff/plugins.diff (rev 0)
+++ docs/branches/1.6.0/french/user_guide/diff/plugins.diff 2010-12-01 17:00:57 UTC (rev 14822)
@@ -0,0 +1,19 @@
+*** /home/jrm/Documents/QGIS/english/user_guide_1.5/plugins.tex 2010-09-11 20:59:05.933593421 +0200
+--- /home/jrm/Documents/QGIS/english/user_guide_1.6/plugins.tex 2010-11-29 21:39:56.885084641 +0100
+***************
+*** 7,13 ****
+ %\updatedisclaimer
+
+ QGIS has been designed with a plugin architecture.
+! This allows new features/functions to be easily added to the application.
+ Many of the features in QGIS are actually implemented as either \textbf{core}
+ or \textbf{external} plugins.\index{plugins!types}
+
+--- 7,13 ----
+ %\updatedisclaimer
+
+ QGIS has been designed with a plugin architecture.
+! This allows many new features/functions to be easily added to the application.
+ Many of the features in QGIS are actually implemented as either \textbf{core}
+ or \textbf{external} plugins.\index{plugins!types}
+
Added: docs/branches/1.6.0/french/user_guide/diff/plugins_evis.diff
===================================================================
--- docs/branches/1.6.0/french/user_guide/diff/plugins_evis.diff (rev 0)
+++ docs/branches/1.6.0/french/user_guide/diff/plugins_evis.diff 2010-12-01 17:00:57 UTC (rev 14822)
@@ -0,0 +1,78 @@
+*** /home/jrm/Documents/QGIS/english/user_guide_1.5/plugins_evis.tex 2010-09-11 20:59:05.955594516 +0200
+--- /home/jrm/Documents/QGIS/english/user_guide_1.6/plugins_evis.tex 2010-11-29 21:39:56.907084824 +0100
+***************
+*** 84,93 ****
+ directory path or URL for the photographs or other documents being displayed. If the location is a
+ relative path then the checkbox to the right of the dropdown menu must be clicked. The base path for
+ a relative path can be entered in the Base Path text box below. Information about the different
+! options for specifying the file location are noted in the section 4.5 below.
+ \item \textbf{Compass bearing display field}: A dropdown list to specify the attribute field
+ that contains the compass bearing associated with the photograph being displayed. If compass bearing
+! information is available it is necessary to click the radio button to the left of the dropdown menu
+ title.
+ \item \textbf{Compass offset setting}: Compass offsets can be used to compensate for
+ declination (adjust bearings collected using magnetic bearings to true north bearings). Click the
+--- 84,93 ----
+ directory path or URL for the photographs or other documents being displayed. If the location is a
+ relative path then the checkbox to the right of the dropdown menu must be clicked. The base path for
+ a relative path can be entered in the Base Path text box below. Information about the different
+! options for specifying the file location are noted in the section \ref{evis_specifying} below.
+ \item \textbf{Compass bearing display field}: A dropdown list to specify the attribute field
+ that contains the compass bearing associated with the photograph being displayed. If compass bearing
+! information is available it is necessary to click the checkbox to the left of the dropdown menu
+ title.
+ \item \textbf{Compass offset setting}: Compass offsets can be used to compensate for
+ declination (adjust bearings collected using magnetic bearings to true north bearings). Click the
+***************
+*** 260,266 ****
+ \begin{itemize}[label=--]
+ \item \textbf{Database Type}: A dropdown list to specify the type of database that will be used.
+ \item \textbf{Database Host}: The name of the database host.
+! \item \textbf{Port} The port number if a ``MYSQL'' database type is selected.
+ \item \textbf{Database Name} The name of the database.
+ \item \textbf{Connect} A button to connect to the database using the parameters defined above.
+ \item \textbf{Output Console} The console window where messages related to processing are
+--- 260,266 ----
+ \begin{itemize}[label=--]
+ \item \textbf{Database Type}: A dropdown list to specify the type of database that will be used.
+ \item \textbf{Database Host}: The name of the database host.
+! \item \textbf{Port} The port number if a MYSQL or PostgreSQL database type is selected.
+ \item \textbf{Database Name} The name of the database.
+ \item \textbf{Connect} A button to connect to the database using the parameters defined above.
+ \item \textbf{Output Console} The console window where messages related to processing are
+***************
+*** 302,310 ****
+ \item \textbf{Console Window}: The console window where messages related to processing are
+ displayed.
+ \item \textbf{Help}: Displays the on line help.
+! \item \textbf{OK}: If this check-box is checked, only the file name from the A will be appended to
+! the Base Path.
+! \item \textbf{Apply rule to all documents}: Closes the main ``Database Connection'' window.
+ \end{itemize}
+
+ Use the \dropmenuopt{X Coordinate} and \dropmenuopt{Y Coordinate} dropdown menus to select the field
+--- 302,308 ----
+ \item \textbf{Console Window}: The console window where messages related to processing are
+ displayed.
+ \item \textbf{Help}: Displays the on line help.
+! \item \textbf{OK}: Closes the main ``Database Connection'' window.
+ \end{itemize}
+
+ Use the \dropmenuopt{X Coordinate} and \dropmenuopt{Y Coordinate} dropdown menus to select the field
+***************
+*** 312,318 ****
+ on the OK button causes the vector layer created from the SQL query to be displayed in the QGIS map
+ window.
+
+! To save this vector file for future use, you can use the QGIS ``Save as shapefile'' command that is
+ accessed by right clicking on the layer name in the QGIS map legend and then selecting ``Save as
+ shapefile.''
+
+--- 310,316 ----
+ on the OK button causes the vector layer created from the SQL query to be displayed in the QGIS map
+ window.
+
+! To save this vector file for future use, you can use the QGIS ``Save as...'' command that is
+ accessed by right clicking on the layer name in the QGIS map legend and then selecting ``Save as
+ shapefile.''
+
Added: docs/branches/1.6.0/french/user_guide/diff/plugins_gdaltools.diff
===================================================================
--- docs/branches/1.6.0/french/user_guide/diff/plugins_gdaltools.diff (rev 0)
+++ docs/branches/1.6.0/french/user_guide/diff/plugins_gdaltools.diff 2010-12-01 17:00:57 UTC (rev 14822)
@@ -0,0 +1,21 @@
+*** /home/jrm/Documents/QGIS/english/user_guide_1.5/plugins_gdaltools.tex 2010-09-03 21:43:01.888406239 +0200
+--- /home/jrm/Documents/QGIS/english/user_guide_1.6/plugins_gdaltools.tex 2010-11-29 21:39:56.898084749 +0100
+***************
+*** 18,25 ****
+ Build Virtual Raster & This program builds a VRT (Virtual Dataset) that is a mosaic of the list of input gdal datasets. \\
+ \hline Contour & This program generates a vector contour file from the input raster elevation model (DEM).\\
+ \hline Rasterize & This program burns vector geometries (points, lines and polygons) into the raster band(s) of a raster image. Vectors are read from OGR supported vector formats. Note that the vector data must in the same coordinate system as the raster data; on the fly reprojection is not provided.\\
+! \hline Polygonize & This utility creates vector polygons for all connected regions of pixels in the raster sharing a common pixel value. Each polygon is created with an attribute indicating the pixel value of that polygon. A raster mask may also be provided to determine which pixels are eligible for processing.
+! The utility will create the output vector datasource if it does not already exist, defaulting to GML format.\\
+ \hline Merge & This utility will automatically mosaic a set of images. All the images must be in the same coordinate system and have a matching number of bands, but they may be overlapping, and at different resolutions. In areas of overlap, the last image will be copied over earlier ones. \\
+ \hline Sieve & The gdal\_sieve.py script removes raster polygons smaller than a provided threshold size (in pixels) and replaces replaces them with the pixel value of the largest neighbour polygon. The result can be written back to the existing raster band, or copied into a new file.\\
+ \hline Proximity & The gdal\_proximity.py script generates a raster proximity map indicating the distance from the center of each pixel to the center of the nearest pixel identified as a target pixel. Target pixels are those in the source raster for which the raster pixel value is in the set of target pixel values.\\
+--- 18,25 ----
+ Build Virtual Raster & This program builds a VRT (Virtual Dataset) that is a mosaic of the list of input gdal datasets. \\
+ \hline Contour & This program generates a vector contour file from the input raster elevation model (DEM).\\
+ \hline Rasterize & This program burns vector geometries (points, lines and polygons) into the raster band(s) of a raster image. Vectors are read from OGR supported vector formats. Note that the vector data must in the same coordinate system as the raster data; on the fly reprojection is not provided.\\
+! \hline Polygonize & This utility creates vector polygons for all connected regions of pixels in the raster sharing a common pixel value. Each polygon is created with an attribute indicating the pixel value of that polygon.
+! The utility will create the output vector datasource if it does not already exist, defaulting to ESRI shapefile format.\\
+ \hline Merge & This utility will automatically mosaic a set of images. All the images must be in the same coordinate system and have a matching number of bands, but they may be overlapping, and at different resolutions. In areas of overlap, the last image will be copied over earlier ones. \\
+ \hline Sieve & The gdal\_sieve.py script removes raster polygons smaller than a provided threshold size (in pixels) and replaces replaces them with the pixel value of the largest neighbour polygon. The result can be written back to the existing raster band, or copied into a new file.\\
+ \hline Proximity & The gdal\_proximity.py script generates a raster proximity map indicating the distance from the center of each pixel to the center of the nearest pixel identified as a target pixel. Target pixels are those in the source raster for which the raster pixel value is in the set of target pixel values.\\
Added: docs/branches/1.6.0/french/user_guide/diff/plugins_georeferencer.diff
===================================================================
--- docs/branches/1.6.0/french/user_guide/diff/plugins_georeferencer.diff (rev 0)
+++ docs/branches/1.6.0/french/user_guide/diff/plugins_georeferencer.diff 2010-12-01 17:00:57 UTC (rev 14822)
@@ -0,0 +1,145 @@
+*** /home/jrm/Documents/QGIS/english/user_guide_1.5/plugins_georeferencer.tex 2010-08-17 20:15:46.236706226 +0200
+--- /home/jrm/Documents/QGIS/english/user_guide_1.6/plugins_georeferencer.tex 2010-11-29 21:39:56.909084840 +0100
+***************
+*** 26,32 ****
+ \includegraphics[width=0.7cm]{mActionOptions} & Transformation settings \\
+ \hline \includegraphics[width=0.7cm]{mActionCapturePoint} & Add Point &
+ \includegraphics[width=0.7cm]{mActionDeleteSelected} & Delete Point \\
+! \hline \includegraphics[width=0.7cm]{mActionEditPaste} & Move GCP Point &
+ \includegraphics[width=0.7cm]{mActionPan} & Pan \\
+ \hline \includegraphics[width=0.7cm]{mActionZoomIn} & Zoom in &
+ \includegraphics[width=0.7cm]{mActionZoomOut} & Zoom out \\
+--- 26,32 ----
+ \includegraphics[width=0.7cm]{mActionOptions} & Transformation settings \\
+ \hline \includegraphics[width=0.7cm]{mActionCapturePoint} & Add Point &
+ \includegraphics[width=0.7cm]{mActionDeleteSelected} & Delete Point \\
+! \hline \includegraphics[width=0.7cm]{mActionMoveFeature} & Move GCP Point &
+ \includegraphics[width=0.7cm]{mActionPan} & Pan \\
+ \hline \includegraphics[width=0.7cm]{mActionZoomIn} & Zoom in &
+ \includegraphics[width=0.7cm]{mActionZoomOut} & Zoom out \\
+***************
+*** 97,102 ****
+--- 97,104 ----
+ \item Click on a point in the raster image and choose the button
+ \toolbtntwo{pencil}{from map canvas} to add the X and Y coordinates with the help
+ of a georeferenced map already loaded in the QGIS map canvas.
++ \item With the \includegraphics[width=0.7cm]{mActionMoveFeature} button, you can move
++ the GCPs in both windows, if they are at the wrong place.
+ \end{enumerate}
+ \item Continue entering points. You should have at least 4 points, and the
+ more coordinates you can provide, the better the result will be. There are
+***************
+*** 106,112 ****
+
+ \begin{figure}[ht]
+ \centering
+! \includegraphics[clip=true,width=9cm]{choose_points}
+ \caption{Add points to the raster image \nixcaption}\label{fig:choose_points}
+ \end{figure}
+
+--- 108,114 ----
+
+ \begin{figure}[ht]
+ \centering
+! \includegraphics[clip=true,width=5cm]{choose_points}
+ \caption{Add points to the raster image \nixcaption}\label{fig:choose_points}
+ \end{figure}
+
+***************
+*** 117,123 ****
+ contains values of the form: mapX, mapY, pixelX, pixelY. You can use the
+ \includegraphics[width=0.7cm]{mActionFileOpen} 'Load GCP Points' and
+ \includegraphics[width=0.7cm]{mActionFileSave} 'Save GCP Points' buttons to
+! manage the files.
+
+ \minisec{Defining the transformation settings}\label{georeferencer_transformation}
+
+--- 119,126 ----
+ contains values of the form: mapX, mapY, pixelX, pixelY. You can use the
+ \includegraphics[width=0.7cm]{mActionFileOpen} 'Load GCP Points' and
+ \includegraphics[width=0.7cm]{mActionFileSave} 'Save GCP Points' buttons to
+! manage the files. Within the GCP table you can click on a column header and
+! therewith enable e.g. numerical sorting. The GCP list is automatically updated.
+
+ \minisec{Defining the transformation settings}\label{georeferencer_transformation}
+
+***************
+*** 126,132 ****
+
+ \begin{figure}[ht]
+ \centering
+! \includegraphics[clip=true,width=8cm]{transformation_settings}
+ \caption{Defining the georeferencer transformation settings \nixcaption}\label{fig:georef_transform}
+ \end{figure}
+
+--- 129,135 ----
+
+ \begin{figure}[ht]
+ \centering
+! \includegraphics[clip=true,width=5cm]{transformation_settings}
+ \caption{Defining the georeferencer transformation settings \nixcaption}\label{fig:georef_transform}
+ \end{figure}
+
+***************
+*** 178,184 ****
+ \item Lanczos
+ \end{enumerate}
+
+! \minisec{Define the Output raster}
+
+ There are several options that need to be defined for the georeferenced output
+ raster.
+--- 181,187 ----
+ \item Lanczos
+ \end{enumerate}
+
+! \minisec{Define the transformation settings}
+
+ There are several options that need to be defined for the georeferenced output
+ raster.
+***************
+*** 195,203 ****
+ \item As a next step you have to define the \textbf{Target SRS}
+ (Spatial Reference System) for the georeferenced raster
+ (see section \ref{label_projections}).
+! \item If you like, you can also \textbf{generate a pdf report}. It includes
+! information about the used transformation parameters. An image of the
+! residuals and a list with all GCPs and their RMS errors.
+ \item Furthermore you can activate the \checkbox{Set Target Resolution}
+ checkbox and define pixel resolution of the output raster. Default horizontal
+ and vertical resolution is 1,
+--- 198,207 ----
+ \item As a next step you have to define the \textbf{Target SRS}
+ (Spatial Reference System) for the georeferenced raster
+ (see section \ref{label_projections}).
+! \item If you like, you can \textbf{generate a pdf map} and also \textbf{a
+! pdf report}. The report ncludes information about the used transformation
+! parameters. An image of the residuals and a list with all GCPs and their
+! RMS errors.
+ \item Furthermore you can activate the \checkbox{Set Target Resolution}
+ checkbox and define pixel resolution of the output raster. Default horizontal
+ and vertical resolution is 1,
+***************
+*** 208,213 ****
+--- 212,232 ----
+ automatically into the QGIS map canvas when the transformation is done.
+ \end{itemize}
+
++ \minisec{Show and adapt raster properties}
++
++ Clicking on the \dialog{Raster properties} dialog in the \dropmenuopt{Settings} menu
++ opens the raster properties of the layer that you want to georeference.
++
++ \minisec{Configure the georeferencer}
++
++ \begin{itemize}[label=--]
++ \item You can define if you want to show GCP coordiniates and/or IDs.
++ \item As residual units pixels and map units can be chosen.
++ \item For the PDF report a left and right margin can be defined and you can
++ also set the paper size for the PDF map.
++ \item Finally you can activate to \checkbox{show georeferencer window docked}.
++ \end{itemize}
++
+ \minisec{Running the transformation}\label{georeferencer_running}
+
+ After all GCPs have been collected and all transformation settings are
Added: docs/branches/1.6.0/french/user_guide/diff/print_composer.diff
===================================================================
--- docs/branches/1.6.0/french/user_guide/diff/print_composer.diff (rev 0)
+++ docs/branches/1.6.0/french/user_guide/diff/print_composer.diff 2010-12-01 17:00:57 UTC (rev 14822)
@@ -0,0 +1,63 @@
+*** /home/jrm/Documents/QGIS/english/user_guide_1.5/print_composer.tex 2010-09-19 11:15:03.602635279 +0200
+--- /home/jrm/Documents/QGIS/english/user_guide_1.6/print_composer.tex 2010-11-29 21:39:56.901084774 +0100
+***************
+*** 124,130 ****
+ You can add multiple elements to the composer. It is also possible to have
+ more than one map view or legend or scalebar in the print composer canvas.
+ Each element has its own properties and in the case of the map, its own
+! extent.
+
+ \section{Adding a current QGIS map canvas to the Print Composer}
+
+--- 124,131 ----
+ You can add multiple elements to the composer. It is also possible to have
+ more than one map view or legend or scalebar in the print composer canvas.
+ Each element has its own properties and in the case of the map, its own
+! extent. If you want to remove an elements from the composer canvas. you can
+! do that with the \keystroke{delete} or the \keystroke{backspace} key.
+
+ \section{Adding a current QGIS map canvas to the Print Composer}
+
+***************
+*** 281,288 ****
+
+ \begin{itemize}[label=--]
+ \item The \textbf{Label} dialog offers to add text labels to the composer
+! canvas. You can select font and fontcolor for the text and it is possible to
+! define a text margin im mm.
+ \end{itemize}
+
+ \minisec{General options dialog}
+--- 282,289 ----
+
+ \begin{itemize}[label=--]
+ \item The \textbf{Label} dialog offers to add text labels to the composer
+! canvas. You can define the horizontal and vertical alignment, select font
+! and fontcolor for the text and it is possible to define a text margin im mm.
+ \end{itemize}
+
+ \minisec{General options dialog}
+***************
+*** 498,506 ****
+
+ \begin{itemize}[label=--]
+ \item The \textbf{Table} dialog allows to select the vector layer and columns of
+! the attribute table. You can define the maximum number of rows to be displayed
+ and if attributes are only shown for visible features of the current composer
+! canvas. Additionally you can define the grid characteristics of the table and
+ the header and content font.
+ \end{itemize}
+
+--- 499,510 ----
+
+ \begin{itemize}[label=--]
+ \item The \textbf{Table} dialog allows to select the vector layer and columns of
+! the attribute table. Attribute columns can be sorted and you can define to show
+! its values ascending or descending.
+! \item You can define the maximum number of rows to be displayed
+ and if attributes are only shown for visible features of the current composer
+! canvas.
+! \item Additionally you can define the grid characteristics of the table and
+ the header and content font.
+ \end{itemize}
+
Added: docs/branches/1.6.0/french/user_guide/diff/title.diff
===================================================================
--- docs/branches/1.6.0/french/user_guide/diff/title.diff (rev 0)
+++ docs/branches/1.6.0/french/user_guide/diff/title.diff 2010-12-01 17:00:57 UTC (rev 14822)
@@ -0,0 +1,19 @@
+*** /home/jrm/Documents/QGIS/english/user_guide_1.5/title.tex 2010-06-28 21:24:39.644362378 +0200
+--- /home/jrm/Documents/QGIS/english/user_guide_1.6/title.tex 2010-11-29 21:39:56.909084840 +0100
+***************
+*** 15,21 ****
+ \Large{User Guide} \\
+ \vspace{0.5cm}
+ %\includegraphics[clip=true, scale=0.4]{splash}
+! \Large{Version ~\CURRENT \textsl{'Tethys'}}
+
+ \end{center}
+ \end{titlepage}
+--- 15,21 ----
+ \Large{User Guide} \\
+ \vspace{0.5cm}
+ %\includegraphics[clip=true, scale=0.4]{splash}
+! \Large{Version ~\CURRENT \textsl{'Copiapó'}}
+
+ \end{center}
+ \end{titlepage}
Added: docs/branches/1.6.0/french/user_guide/diff/working_with_ogc.diff
===================================================================
--- docs/branches/1.6.0/french/user_guide/diff/working_with_ogc.diff (rev 0)
+++ docs/branches/1.6.0/french/user_guide/diff/working_with_ogc.diff 2010-12-01 17:00:57 UTC (rev 14822)
@@ -0,0 +1,221 @@
+*** /home/jrm/Documents/QGIS/english/user_guide_1.5/working_with_ogc.tex 2010-09-11 20:59:05.939594240 +0200
+--- /home/jrm/Documents/QGIS/english/user_guide_1.6/working_with_ogc.tex 2010-11-29 21:39:56.890084683 +0100
+***************
+*** 5,11 ****
+ % comment out the following line:
+ %\updatedisclaimer
+
+! QGIS supports WMS and WFS as data sources. WMS-support is native; WFS is
+ implemented as a plugin.
+
+ \section{What is OGC Data}\index{OGC!introduction}
+--- 5,11 ----
+ % comment out the following line:
+ %\updatedisclaimer
+
+! QGIS supports WMS and WFS as data sources. WMS-support is native; WFS and WFS-T is
+ implemented as a plugin.
+
+ \section{What is OGC Data}\index{OGC!introduction}
+***************
+*** 63,73 ****
+ \subsection{Selecting WMS Servers}\label{sec:ogc-wms-servers}\index{WMS!remote server!selection}
+
+ The first time you use the WMS feature, there are no servers defined. You
+! can begin by clicking the \toolbtntwo{mActionAddWmsLayer}{Add WMS layer} button inside the toolbar,
+! or through the \mainmenuopt{Layer} \arrow \dropmenuopttwo{mActionAddWmsLayer}{Add
+! WMS Layer...} menu.
+
+! The dialog \dialog{Add Layer(s) from a Server} for adding layers from the WMS server pops up. Fortunately you can
+ add some servers to play with by clicking the \button{Add default servers}
+ button. This will add at least three WMS servers for you to use, including the NASA (JPL)
+ WMS server. To define a new WMS server in the \tab{Layers},
+--- 63,74 ----
+ \subsection{Selecting WMS Servers}\label{sec:ogc-wms-servers}\index{WMS!remote server!selection}
+
+ The first time you use the WMS feature, there are no servers defined. You
+! can begin by clicking the \toolbtntwo{mActionAddWmsLayer}{Add WMS layer}
+! button inside the toolbar, or through the \mainmenuopt{Layer}
+! \arrow \dropmenuopttwo{mActionAddWmsLayer}{Add WMS Layer...} menu.
+
+! The dialog \dialog{Add Layer(s) from a Server} for adding layers from the
+! WMS server pops up. Fortunately you can
+ add some servers to play with by clicking the \button{Add default servers}
+ button. This will add at least three WMS servers for you to use, including the NASA (JPL)
+ WMS server. To define a new WMS server in the \tab{Layers},
+***************
+*** 110,137 ****
+ in your URL.\index{WMS!remote server!URL}
+ \end{Tip}
+
+- % in QGIS 1.1.x not needed anymore since there is a search-interface
+- %%% Table \ref{tab:wms_example_urls} shows some example WMS URLs to get you started.
+- %%% These links were last checked in April 2009, but could change at any time:
+- %%%
+- %%% %FIXME: WMS URLs should be checked again and maybe extended in QGIS
+- %%% \begin{table}[ht]\index{WMS!remote server!URL!examples}
+- %%% \centering
+- %%% \caption{Example Public WMS URLs}\label{tab:wms_example_urls}\medskip
+- %%% \begin{tabular}{|l|l|}
+- %%% \hline \textbf{Name} & \textbf{URL} \\
+- %%% \hline Atlas of Canada & http://atlas.gc.ca/cgi-bin/atlaswms\_en? \\
+- %%% \hline DEMIS & http://www2.demis.nl/wms/wms.asp?wms=WorldMap\& \\
+- %%% \hline Geoscience Australia & http://www.ga.gov.au/wms/getmap?dataset=national\& \\
+- %%% \hline NASA JPL OnEarth & http://wms.jpl.nasa.gov/wms.cgi? \\
+- %%% % \hline QGIS Users & http://qgis.org/cgi-bin/mapserv?map=/var/www/maps/main.map\& \\
+- %%% \hline QGIS Users & http://linfiniti.com:8080/geoserver/wms? \\
+- %%% \hline
+- %%% \end{tabular}
+- %%% \end{table}
+- %%%
+- %%% An exhaustive list of WMS servers can be found at \url{http://wms-sites.com}.
+-
+ \subsection{Loading WMS Layers}\label{sec:ogc-wms-layers}\index{WMS!client!layers}
+
+ Once you have successfully filled in your parameters you can select the
+--- 111,116 ----
+***************
+*** 186,192 ****
+
+ \minisec{Layers} \label{ogc-wms-layers}
+
+! The \tab{Layers} section lists the layers available from the selected
+ WMS server. You may notice that some layers are expandible, this means
+ that the layer can be displayed in a choice of image styles.
+
+--- 165,171 ----
+
+ \minisec{Layers} \label{ogc-wms-layers}
+
+! The \tab{Layers} tab lists the layers available from the selected
+ WMS server. You may notice that some layers are expandible, this means
+ that the layer can be displayed in a choice of image styles.
+
+***************
+*** 453,473 ****
+ \index{WMS!secured layers!}\index{OGC!Authentication}
+ \end{Tip}
+
+ %
+ % WFS-client
+ %
+! \section{WFS Client}\label{sec:ogc-wfs}
+
+ In QGIS, a WFS layer behaves pretty much like any other vector layer. You
+! can identify and select features and view the attribute table. An exception
+! is that editing is not supported at this time (at the time of this writing
+! there will be support for WFS-T in the near future as well).
+! To start the WFS plugin you
+! need to open \mainmenuopt{Plugins} \arrow \dropmenuopttwo{mActionShowPluginManager}{Plugin Manager...},
+! activate the \checkbox{WFS plugin} checkbox and click \button{OK}.
+
+ A new \toolbtntwo{mIconAddWfsLayer}{Add WFS Layer} icon appears next
+! to the WMS icon. Click on it to open the dialog. In General adding a WFS
+ layer is very similar to the procedure used with WMS. The difference is
+ there are no default servers defined, so we have to add our own.
+
+--- 432,493 ----
+ \index{WMS!secured layers!}\index{OGC!Authentication}
+ \end{Tip}
+
++
++ %
++ % WMS-server
++ %
++
++ \section{WMS Server}\label{sec:ogc-wmsserver}
++ \index{WMS!server}
++
++ QGIS mapserver is an open source WMS 1.3 implementation which, in addition,
++ implements advanced cartographic features for thematic mapping. The QGIS
++ mapserver is a FastCGI/CGI (Common Gateway Interface) application written in
++ C++ that works together with a webserver (e.g. Apache, Lighttpd).
++
++
++ It uses QGIS as backend for the GIS logic and for map rendering. Furthermore the
++ Qt library is used for graphics and for platform independent
++ C++ programming. In contrast to other WMS software, the QGIS mapserver uses
++ cartographic rules in SLD/SE as a configuration language, both for the server
++ configuration and for the user-defined cartographic rules.
++
++ Moreover, the QGIS mapserver project provides the “Publish to Web” plugin, a
++ plugin for QGIS desktop which exports the current layers and symbology as a
++ web project for QGIS mapserver (containing cartographic visualisation rules
++ expressed in SLD).
++
++ As QGIS desktop and QGIS mapserver use the same visualization libraries, the
++ maps that are published on the web look the same as in desktop GIS. The
++ Publish to Web plugin currently supports basic symbolization, with more complex
++ cartographic visualisation rules introduced manually. As the configuration is
++ performed with the SLD standard and its documented extensions, there is only
++ one standardised language to learn, which greatly simplifies the complexity
++ of creating maps for the Web.
++
++ Further information is available at: \\
++ \url{http://karlinapp.ethz.ch/qgis\_wms/} \\
++ \url{http://www.qgis.org/wiki/QGIS\_mapserver\_tutorial} \\
++ \url{http://linfiniti.com/2010/08/qgis-mapserver-a-wms-server-for-the-masses/}
++
++
++
+ %
+ % WFS-client
+ %
+! \section{WFS and WFS-T Client}\label{sec:ogc-wfs}
+! \index{WFS!WFS-T}
+! \index{WFS!Transactional}
+
+ In QGIS, a WFS layer behaves pretty much like any other vector layer. You
+! can identify and select features and view the attribute table. Since QGIS 1.6
+! editing (WFS-T) is also supported, if the server provides this feature. To start
+! the WFS plugin you need to open \mainmenuopt{Plugins} \arrow
+! \dropmenuopttwo{mActionShowPluginManager}{Plugin Manager...}, activate the
+! \checkbox{WFS plugin} checkbox and click \button{OK}.
+
+ A new \toolbtntwo{mIconAddWfsLayer}{Add WFS Layer} icon appears next
+! to the WMS icon. Click on it to open the dialog. In general adding a WFS
+ layer is very similar to the procedure used with WMS. The difference is
+ there are no default servers defined, so we have to add our own.
+
+***************
+*** 491,497 ****
+ \item Click \button{Connect}
+ \item Wait for the list of layers to be populated
+ \item Click on the \clicklistitem{Parks} layer
+! \item Click \button{Add} to add the layer to the map
+ \item Wait patiently for the features to appear
+ \end{enumerate}
+
+--- 511,517 ----
+ \item Click \button{Connect}
+ \item Wait for the list of layers to be populated
+ \item Click on the \clicklistitem{Parks} layer
+! \item Click \button{Ok} to add the layer to the map
+ \item Wait patiently for the features to appear
+ \end{enumerate}
+
+***************
+*** 513,523 ****
+ usefull when you only want to request \textbf{some} features from a huge
+ WFS-dataset.
+
+! You'll notice the download progress is visualized in the left bottom of the QGIS main window.
+! Once the layer is loaded, you can identify and select a province or two and view the
+! attribute table.
+
+! Remember this plugin works best with UMN MapServer WFS servers. It still
+ could be, that you might experience random behavior
+ and crashes. You can look forward to improvements in a future version of the plugin.
+
+--- 533,543 ----
+ usefull when you only want to request \textbf{some} features from a huge
+ WFS-dataset.
+
+! You'll notice the download progress is visualized in the left bottom of the
+! QGIS main window. Once the layer is loaded, you can identify and select a
+! province or two and view the attribute table.
+
+! Remember this plugin works best with MapServer WFS servers. It still
+ could be, that you might experience random behavior
+ and crashes. You can look forward to improvements in a future version of the plugin.
+
Added: docs/branches/1.6.0/french/user_guide/diff/working_with_projections.diff
===================================================================
--- docs/branches/1.6.0/french/user_guide/diff/working_with_projections.diff (rev 0)
+++ docs/branches/1.6.0/french/user_guide/diff/working_with_projections.diff 2010-12-01 17:00:57 UTC (rev 14822)
@@ -0,0 +1,36 @@
+*** /home/jrm/Documents/QGIS/english/user_guide_1.5/working_with_projections.tex 2010-09-11 20:59:05.957629034 +0200
+--- /home/jrm/Documents/QGIS/english/user_guide_1.6/working_with_projections.tex 2010-11-29 21:39:56.910084848 +0100
+***************
+*** 102,108 ****
+ defined CRS.
+
+ The \tab{Coordinate Reference System} tab of the \dialog{Project Properties}
+! dialog contains four important components as shown in Figure
+ \ref{fig:projections} and described below.
+
+ \begin{figure}[ht]
+--- 102,108 ----
+ defined CRS.
+
+ The \tab{Coordinate Reference System} tab of the \dialog{Project Properties}
+! dialog contains five important components as shown in Figure
+ \ref{fig:projections} and described below.
+
+ \begin{figure}[ht]
+***************
+*** 129,135 ****
+ Enter the identifier and click on \button{Find}. Use the \checkbox{Hide
+ deprecated CRSs} checkbox to show only the currently valid projections.
+ \item \textbf{Recently used CRS} - if you have certain CRS that you frequently
+! use in your everyday GIS work, these will be displayed as 'quick access' buttons
+ at the bottom of the Projection Dialog. Click on one of these buttons to select
+ the associated CRS.
+ \end{enumerate}
+--- 129,135 ----
+ Enter the identifier and click on \button{Find}. Use the \checkbox{Hide
+ deprecated CRSs} checkbox to show only the currently valid projections.
+ \item \textbf{Recently used CRS} - if you have certain CRS that you frequently
+! use in your everyday GIS work, these will be displayed in the table
+ at the bottom of the Projection Dialog. Click on one of these buttons to select
+ the associated CRS.
+ \end{enumerate}
Added: docs/branches/1.6.0/french/user_guide/diff/working_with_raster.diff
===================================================================
--- docs/branches/1.6.0/french/user_guide/diff/working_with_raster.diff (rev 0)
+++ docs/branches/1.6.0/french/user_guide/diff/working_with_raster.diff 2010-12-01 17:00:57 UTC (rev 14822)
@@ -0,0 +1,60 @@
+*** /home/jrm/Documents/QGIS/english/user_guide_1.5/working_with_raster.tex 2010-09-11 20:59:05.958594121 +0200
+--- /home/jrm/Documents/QGIS/english/user_guide_1.6/working_with_raster.tex 2010-11-29 21:39:56.911084856 +0100
+***************
+*** 171,177 ****
+ more three dimensional.
+
+ Additionally you can enter a rastervalue, which should be treated as
+! {\em NODATA}.
+
+ An even more flexible way to customize the transparency can be done in the
+ \guiheading{Custom transparency options} section.
+--- 171,178 ----
+ more three dimensional.
+
+ Additionally you can enter a rastervalue, which should be treated as
+! {\em NODATA}. This can be done manually or with the
+! \toolbtntwo{mActionContextHelp}{Add values from display} icon.
+
+ An even more flexible way to customize the transparency can be done in the
+ \guiheading{Custom transparency options} section.
+***************
+*** 307,310 ****
+--- 308,344 ----
+ data!\index{raster layers!statistics}
+ \end{Tip}
+
++ \section{Raster Calculator}\label{sec:raster_calc}
++ \index{Raster!raster calculator}
++ \index{Raster calculator}
++
++ The \dialog{Raster Calculator} in the \mainmenuopt{Layer} menu allows to
++ perform calculations on basis of existing raster pixel values. The results
++ are written to a new raster layer with a GDAL supported format.
++
++ \begin{figure}[ht]
++ \centering
++ \includegraphics[clip=true, width=11.5cm]{raster_calculator}
++ \caption{Raster Calculator \nixcaption}\label{fig:raster_calculator}
++ \end{figure}
++
++ The \textbf{Fields list} contains all loaded raster layers that can be used.
++ To add a raster to the raster calculator expression field, double
++ click its name in the Fields list. You can then use the operators to construct
++ calculation expressions or you can just type it into the box.
++
++ In the \textbf{Result layer} section you have to define an output layer. You can
++ then define the extent of the calculation area based on an input raster layer or
++ based on X,Y coordinates and on Columns and Rows to set the resolution of the
++ output layer. If the input layer has a different resolution, the values will be
++ resampled with nearest neighbor algorithm.
++
++ The \textbf{Operators section} contains all usable operators. To add an operator
++ to the raster calculator expression box, click the appropriate button. Mathematical
++ calculations ( + , - , * \dots) and trigonometric functions ( sin, cos, tan, \dots)
++ are available. Stay tuned for more operators to come!
++
++ With the \checkbox{Result to project} checkbox the result layer will automatically
++ added to the legend area and can be visualized.
++
+ \FloatBarrier
Added: docs/branches/1.6.0/french/user_guide/diff/working_with_vector.diff
===================================================================
--- docs/branches/1.6.0/french/user_guide/diff/working_with_vector.diff (rev 0)
+++ docs/branches/1.6.0/french/user_guide/diff/working_with_vector.diff 2010-12-01 17:00:57 UTC (rev 14822)
@@ -0,0 +1,345 @@
+*** /home/jrm/Documents/QGIS/english/user_guide_1.5/working_with_vector.tex 2010-10-03 13:12:02.734041021 +0200
+--- /home/jrm/Documents/QGIS/english/user_guide_1.6/working_with_vector.tex 2010-11-29 21:39:56.900084766 +0100
+***************
+*** 680,686 ****
+ \dialog{Layer Properties} dialog. The new dialog allows to choose one of the
+ three renderers: single symbol, categorized and graduated. Depending on the
+ chosen renderer, the symbology tab provides different settings and options, that
+! will be described in the following sections.
+
+ \minisec{Single Symbol Renderer}
+
+--- 680,689 ----
+ \dialog{Layer Properties} dialog. The new dialog allows to choose one of the
+ three renderers: single symbol, categorized and graduated. Depending on the
+ chosen renderer, the symbology tab provides different settings and options, that
+! will be described in the following sections. The new generation symbology dialog
+! also provides a \button{Style Manager} button which gives access to the Style
+! Manager (see section \ref{subsec:stylemanager}). The Style Manager allows you to
+! edit and remove existing symbols and add new ones.
+
+ \minisec{Single Symbol Renderer}
+
+***************
+*** 697,702 ****
+--- 700,709 ----
+ current style symbols (using the \button{Add to style} button) and then easily
+ be used in the future.
+
++ \textbf{Note}: To modify line width, besides modifying the symbol itself, you
++ can use data-defined Size Scale (available through \button{Advanced} next to
++ \button{Add to Style}).
++
+ \begin{figure}[ht]
+ \centering
+ \subfloat[Single symbol point properties] {\label{subfig:singleNG1}\includegraphics[clip=true, width=0.3\textwidth]{singlesymbol_ng_point}}
+***************
+*** 719,724 ****
+--- 726,733 ----
+ \item The colors (using the Color Ramp listbox)
+ \end{itemize}
+
++ The Advanced button in the lower right corner of the dialog allows to set
++ th fields containing rotation and size scale information.
+ For convenience, the list in the bottom part of the tab lists the values of
+ all currently selected attributes together, including the symbols that will
+ be rendered.
+***************
+*** 732,742 ****
+ \includegraphics[clip=true, width=10cm]{categorysymbol_ng_line}
+ \end{figure}
+
+! \minisec{Graduated rendering}
+
+ The Graduated Renderer is used to render all the features from a layer, using
+ a single user-defined symbol, whose color reflects the classification of a selected
+! feature's attribute to a class.
+
+ Analogue to the categorized rendered, the symbology tab allows you to select:
+
+--- 741,764 ----
+ \includegraphics[clip=true, width=10cm]{categorysymbol_ng_line}
+ \end{figure}
+
+! You can create a custom color ramp choosing New color ramp... from the Color
+! ramp dropdown menu. A dialog will prompt for the ramp type: Gradient, Random,
+! ColorBrewer, then each one has options for number of steps and/or multiple
+! stops in the color ramp. See \ref{fig:ccrg} for an example of custom color
+! ramp.
+!
+! \begin{figure}[ht]
+! \centering
+! \caption{Example of custom gradient color ramp with multiple stops \nixcaption}\label{fig:ccrg}
+! \includegraphics[clip=true, width=10cm]{customColorRampGradient.png}
+! \end{figure}
+!
+! \minisec{Graduated Renderer}
+
+ The Graduated Renderer is used to render all the features from a layer, using
+ a single user-defined symbol, whose color reflects the classification of a selected
+! feature's attribute to a class. Like Categorized Renderer, it allows to define
+! rotation and size scale from specified columns.
+
+ Analogue to the categorized rendered, the symbology tab allows you to select:
+
+***************
+*** 747,754 ****
+ \end{itemize}
+
+ Additionally, you can specify the number of classes and also the mode how to
+! classify features inside the classes (using the Mode list). The listbox in the
+! bottom part of the symbology tab lists the classes together with their ranges,
+ labels and symbols that will be rendered.
+
+ The example in figure \ref{fig:gradsymNG} shows the graduated rendering dialog
+--- 769,784 ----
+ \end{itemize}
+
+ Additionally, you can specify the number of classes and also the mode how to
+! classify features inside the classes (using the Mode list). The available modes are:
+! \begin{itemize}
+! \item Equal Interval
+! \item Quantile
+! \item Natural Breaks (Jenks)
+! \item Standard Deviation
+! \item Pretty Breaks
+! \end{itemize}
+!
+! The listbox in the bottom part of the symbology tab lists the classes together with their ranges,
+ labels and symbols that will be rendered.
+
+ The example in figure \ref{fig:gradsymNG} shows the graduated rendering dialog
+***************
+*** 898,904 ****
+ labels off the marker and make them more readable. Of course if your marker
+ symbol or font is larger, more of an offset will be required.
+
+! The last adjustment we'll make is to \tab{buffer} the labels. This just means
+ putting a backdrop around them to make them stand out better. To buffer the
+ lakes labels:
+
+--- 928,934 ----
+ labels off the marker and make them more readable. Of course if your marker
+ symbol or font is larger, more of an offset will be required.
+
+! The last adjustment we'll make is to \tab{Buffer} the labels. This just means
+ putting a backdrop around them to make them stand out better. To buffer the
+ lakes labels:
+
+***************
+*** 1003,1009 ****
+ Within the \tab{Attributes} tab the attributes of the selected dataset can be
+ manipulated. The buttons \toolbtntwo{mActionNewAttribute}{New Column} and
+ \toolbtntwo{mActionDeleteAttribute}{Delete Column} can be
+! used, when the dataset is \toolbtntwo{mActionToggleEditing}{editing mode}.
+ At the moment only columns from PostGIS layers can be removed and added. The
+ OGR library supports to add new columns, but not to remove them, if you have
+ a GDAL version >= 1.6 installed.
+--- 1033,1039 ----
+ Within the \tab{Attributes} tab the attributes of the selected dataset can be
+ manipulated. The buttons \toolbtntwo{mActionNewAttribute}{New Column} and
+ \toolbtntwo{mActionDeleteAttribute}{Delete Column} can be
+! used, when the dataset is \toolbtntwo{mActionToggleEditing}{Editing mode}.
+ At the moment only columns from PostGIS layers can be removed and added. The
+ OGR library supports to add new columns, but not to remove them, if you have
+ a GDAL version >= 1.6 installed.
+***************
+*** 1039,1045 ****
+ \item File name: Simplifies the selection by adding a file chooser dialog.
+ \item Value map: a combo box with predefined items. The value is stored in
+ the attribute, the description is shown in the comboo box. You can define
+! values manually or load them from a layer or a csv file.
+ \item Enumeration: Opens a combo box with values that can be used within the
+ columns type. This is currently only supported by the postgres provider.
+ \item Immutable: The immutable attribute column is read-only. The user is not
+--- 1069,1075 ----
+ \item File name: Simplifies the selection by adding a file chooser dialog.
+ \item Value map: a combo box with predefined items. The value is stored in
+ the attribute, the description is shown in the comboo box. You can define
+! values manually or load them from a layer or a CSV file.
+ \item Enumeration: Opens a combo box with values that can be used within the
+ columns type. This is currently only supported by the postgres provider.
+ \item Immutable: The immutable attribute column is read-only. The user is not
+***************
+*** 1142,1150 ****
+ \minisec{Using Actions}\index{actions!using}\label{label_usingactions}
+
+ Actions can be invoked from either the \dialog{Identify Results} dialog or an
+! \dialog{Attribute Table} dialog. (Recall that these dialogs can be opened by
+ clicking \toolbtntwo{mActionIdentify}{Identify Features} or
+! \toolbtntwo{mActionOpenTable}{Open Attribute Table}.) To invoke an action,
+ right click on the record and choose the action from the popup menu. Actions
+ are listed in the popup menu by the name you assigned when defining the
+ actions. Click on the action you wish to invoke.
+--- 1172,1180 ----
+ \minisec{Using Actions}\index{actions!using}\label{label_usingactions}
+
+ Actions can be invoked from either the \dialog{Identify Results} dialog or an
+! \dialog{Attribute Table} dialog (recall that these dialogs can be opened by
+ clicking \toolbtntwo{mActionIdentify}{Identify Features} or
+! \toolbtntwo{mActionOpenTable}{Open Attribute Table}). To invoke an action,
+ right click on the record and choose the action from the popup menu. Actions
+ are listed in the popup menu by the name you assigned when defining the
+ actions. Click on the action you wish to invoke.
+***************
+*** 1245,1251 ****
+ \index{vector layers!diagram}
+
+ The \tab{Diagram} tab allows you to add a grahic overlay to a vector layer.
+! To activate this feature, open the Plugin Manager and select the Diagram Overlay'
+ plugin. After this, there is a new tab in the vector \dialog{Layer
+ Properties} dialog where the settings for diagrams may be entered (see
+ figure~\ref{fig:diagramtab}).
+--- 1275,1281 ----
+ \index{vector layers!diagram}
+
+ The \tab{Diagram} tab allows you to add a grahic overlay to a vector layer.
+! To activate this feature, open the Plugin Manager and select the 'Diagram Overlay'
+ plugin. After this, there is a new tab in the vector \dialog{Layer
+ Properties} dialog where the settings for diagrams may be entered (see
+ figure~\ref{fig:diagramtab}).
+***************
+*** 1277,1283 ****
+ \filename{T\_F\_JUL} and finally \filename{T\_F\_MEAN}.
+ \item For linear scaling of the diagram size we define \filename{T\_F\_JUL}
+ as classification attribute.
+! \item Now click on \button{find maximum value}, choose a size value and unit
+ and click \button{Apply} to display the diagram in the \qg main window.
+ \item You can now adapt the chart size, or change the attribute colors double
+ clicking on the color values in the attribute field.
+--- 1307,1313 ----
+ \filename{T\_F\_JUL} and finally \filename{T\_F\_MEAN}.
+ \item For linear scaling of the diagram size we define \filename{T\_F\_JUL}
+ as classification attribute.
+! \item Now click on \button{Find maximum value}, choose a size value and unit
+ and click \button{Apply} to display the diagram in the \qg main window.
+ \item You can now adapt the chart size, or change the attribute colors double
+ clicking on the color values in the attribute field.
+***************
+*** 1519,1525 ****
+ you can move existing features.
+
+ \begin{Tip}\caption{\textsc{Attribute Value Types}}
+! At least for shapefile editing the attribue types are validated during the
+ entry. Because of this, it is not possible to enter a number into the text-column in
+ the dialog \dialog{Enter Attribute Values} or vica versa. If you need to do so,
+ you should edit the attributes in a second step within the \dialog{Attribute
+--- 1549,1555 ----
+ you can move existing features.
+
+ \begin{Tip}\caption{\textsc{Attribute Value Types}}
+! At least for shapefile editing the attribute types are validated during the
+ entry. Because of this, it is not possible to enter a number into the text-column in
+ the dialog \dialog{Enter Attribute Values} or vica versa. If you need to do so,
+ you should edit the attributes in a second step within the \dialog{Attribute
+***************
+*** 1977,1982 ****
+--- 2007,2021 ----
+ \item \toolbtntwo{mActionCalculateField}{Open field calcultor}
+ \end{itemize}
+
++ \minisec{Save selected features as new layer}
++ \index{editing!save selection as new layer}
++
++ The selected features can be saved as any OGR supported vector format and also
++ transformed into another Coordinate Reference System (CRS). Just open the right mouse
++ menu of the layer and click on \dropmenuopt{Save selection as} to define the
++ name of the output file, its format and CRS (see Section \ref{label_legend}). It is
++ also possible to specify OGR creation options within the dialog.
++
+ \begin{Tip}\caption{\textsc{Manipulating Attribute data}}
+ Currently only PostGIS layers are supported for adding or dropping
+ attribute columns within this dialog. In future versions of \qg, other
+***************
+*** 1984,1994 ****
+ in GDAL/OGR > 1.6.0
+ \end{Tip}
+
+ \section{Query Builder}\label{sec:query_builder}
+ \index{Query Builder}
+
+ The \button{Advanced search\dots} button opens the Query Builder and allows you to
+! define a subset of a table using a SQL-like WHERE clause, display the result in the
+ main window and save it as a Shapefile. For example, if you have a
+ \filename{towns} layer
+ with a \usertext{population} field you could select only larger towns by entering
+--- 2023,2047 ----
+ in GDAL/OGR > 1.6.0
+ \end{Tip}
+
++ \minisec{Working with non spatial attribute tables}
++ \index{editing!working with non spatial tables}
++
++ QGIS allows also to load non spatial tables. This includes currently tables supported
++ by OGR, delimited text and the PostgreSQL provider. The tables can be used for field
++ lookups or just generally browsed and edited using the table view. When you load the
++ table you will see it in the legend field. It can be opened e.g. with the
++ \dropmenuopttwo{mActionOpenTable}{Open Attribute Table} tool and is then editable
++ like any other layer attribute table.
++
++ As an example you can use columns of the non spatial table to define attribute values or
++ a range of values that are allowed to be added to a specific vector layer during digitizing.
++ Have a closer look at the edit widget in section~\ref{label_attributes} to find out more.
++
+ \section{Query Builder}\label{sec:query_builder}
+ \index{Query Builder}
+
+ The \button{Advanced search\dots} button opens the Query Builder and allows you to
+! define a subset of a table using a SQL-like WHERE clause, display the result in theh
+ main window and save it as a Shapefile. For example, if you have a
+ \filename{towns} layer
+ with a \usertext{population} field you could select only larger towns by entering
+***************
+*** 2054,2059 ****
+--- 2106,2120 ----
+ that allows to define a subset of a table and display it as described in Section
+ \ref{sec:query_builder}.
+
++ \minisec{Save selected features as new layer}
++ \index{Query Builder!save selection as new layer}
++
++ The selected features can be saved as any OGR supported vector format and also
++ transformed into another Coordinate Reference System (CRS). Just open the right mouse
++ menu of the layer and click on \dropmenuopt{Save selection as} to define the
++ name of the output file, its format and CRS (see Section \ref{label_legend}). It is
++ also possible to specify OGR creation options within the dialog.
++
+ \section{Field Calculator}\label{sec:field_calculator}
+ \index{PostgreSQL!field calculator}
+ \index{PostGIS!field calculator}
+***************
+*** 2072,2078 ****
+
+ You have to bring the vector layer in editing mode, before you can click on
+ the field calculator icon to open the dialog (see Figure
+! \ref{fig:field_calculator}). In the dialog you first have to select, whether
+ you want to update an existing field, only update selected features or
+ create a new attribute field, where the results of the calculation will be added.
+
+--- 2133,2139 ----
+
+ You have to bring the vector layer in editing mode, before you can click on
+ the field calculator icon to open the dialog (see Figure
+! \ref{fig:field_calculator}). In the dialog you first have to select whether
+ you want to update an existing field, only update selected features or
+ create a new attribute field, where the results of the calculation will be added.
+
+***************
+*** 2106,2113 ****
+ The \textbf{Operators section} contains all usable operators. To add an operator
+ to the Field calculator expression box, click the appropriate button. Mathematical
+ calculations ( + , - , * \dots), trigonometric functions ( sin, cos, tan, \dots),
+! extract geometric information ( length and area ) are available and will be
+! extended in future versions.
+
+ A short example illustrates how the field calculator works. We want to calculate
+ the length of the 'railroads' layer from the \filename{\qg\_example\_dataset}:
+--- 2167,2174 ----
+ The \textbf{Operators section} contains all usable operators. To add an operator
+ to the Field calculator expression box, click the appropriate button. Mathematical
+ calculations ( + , - , * \dots), trigonometric functions ( sin, cos, tan, \dots),
+! extract geometric information ( length and area ) are available, together with
+! concatenator (||) and row counter. Stay tuned for more operators to come!
+
+ A short example illustrates how the field calculator works. We want to calculate
+ the length of the 'railroads' layer from the \filename{\qg\_example\_dataset}:
More information about the QGIS-commit
mailing list