[QGIS Commit] r10747 - in docs/trunk/english_us/user_guide: . plugins_ftools_images plugins_georeferencer_images

svn_qgis at osgeo.org svn_qgis at osgeo.org
Wed May 6 14:33:03 EDT 2009


Author: cfarmer
Date: 2009-05-06 14:33:02 -0400 (Wed, 06 May 2009)
New Revision: 10747

Added:
   docs/trunk/english_us/user_guide/plugins_ftools_images/basic_statistics.png
   docs/trunk/english_us/user_guide/plugins_ftools_images/buffer.png
   docs/trunk/english_us/user_guide/plugins_ftools_images/check_geometry.png
   docs/trunk/english_us/user_guide/plugins_ftools_images/convex_hull.png
   docs/trunk/english_us/user_guide/plugins_ftools_images/define_projection.png
   docs/trunk/english_us/user_guide/plugins_ftools_images/delaunay.png
   docs/trunk/english_us/user_guide/plugins_ftools_images/difference.png
   docs/trunk/english_us/user_guide/plugins_ftools_images/export_geometry.png
   docs/trunk/english_us/user_guide/plugins_ftools_images/export_projection.png
   docs/trunk/english_us/user_guide/plugins_ftools_images/extract_nodes.png
   docs/trunk/english_us/user_guide/plugins_ftools_images/ftools_logo.png
   docs/trunk/english_us/user_guide/plugins_ftools_images/geometry.png
   docs/trunk/english_us/user_guide/plugins_ftools_images/intersections.png
   docs/trunk/english_us/user_guide/plugins_ftools_images/join_attributes.png
   docs/trunk/english_us/user_guide/plugins_ftools_images/join_location.png
   docs/trunk/english_us/user_guide/plugins_ftools_images/layer_extent.png
   docs/trunk/english_us/user_guide/plugins_ftools_images/management.png
   docs/trunk/english_us/user_guide/plugins_ftools_images/matrix.png
   docs/trunk/english_us/user_guide/plugins_ftools_images/mean.png
   docs/trunk/english_us/user_guide/plugins_ftools_images/multi_to_single.png
   docs/trunk/english_us/user_guide/plugins_ftools_images/neighbour.png
   docs/trunk/english_us/user_guide/plugins_ftools_images/random_points.png
   docs/trunk/english_us/user_guide/plugins_ftools_images/random_selection.png
   docs/trunk/english_us/user_guide/plugins_ftools_images/regular_points.png
   docs/trunk/english_us/user_guide/plugins_ftools_images/select_location.png
   docs/trunk/english_us/user_guide/plugins_ftools_images/single_to_multi.png
   docs/trunk/english_us/user_guide/plugins_ftools_images/split_layer.png
   docs/trunk/english_us/user_guide/plugins_ftools_images/sub_selection.png
   docs/trunk/english_us/user_guide/plugins_ftools_images/sum_lines.png
   docs/trunk/english_us/user_guide/plugins_ftools_images/sum_points.png
   docs/trunk/english_us/user_guide/plugins_ftools_images/sym_difference.png
   docs/trunk/english_us/user_guide/plugins_ftools_images/to_lines.png
   docs/trunk/english_us/user_guide/plugins_ftools_images/unique.png
   docs/trunk/english_us/user_guide/plugins_ftools_images/vector_grid.png
Removed:
   docs/trunk/english_us/user_guide/plugins_ftools_images/calcgeom.png
   docs/trunk/english_us/user_guide/plugins_ftools_images/checkgeometry.png
   docs/trunk/english_us/user_guide/plugins_ftools_images/conversion.png
   docs/trunk/english_us/user_guide/plugins_ftools_images/datamanagement.png
   docs/trunk/english_us/user_guide/plugins_ftools_images/define.png
   docs/trunk/english_us/user_guide/plugins_ftools_images/dynamicbuffer.png
   docs/trunk/english_us/user_guide/plugins_ftools_images/erase.png
   docs/trunk/english_us/user_guide/plugins_ftools_images/extractnodes.png
   docs/trunk/english_us/user_guide/plugins_ftools_images/fieldstats.png
   docs/trunk/english_us/user_guide/plugins_ftools_images/ftoolslogo.png
   docs/trunk/english_us/user_guide/plugins_ftools_images/ftoolslogo2.png
   docs/trunk/english_us/user_guide/plugins_ftools_images/intersectlines.png
   docs/trunk/english_us/user_guide/plugins_ftools_images/joinattr.png
   docs/trunk/english_us/user_guide/plugins_ftools_images/listunique.png
   docs/trunk/english_us/user_guide/plugins_ftools_images/meancoords.png
   docs/trunk/english_us/user_guide/plugins_ftools_images/multiconvex.png
   docs/trunk/english_us/user_guide/plugins_ftools_images/multitosingle.png
   docs/trunk/english_us/user_guide/plugins_ftools_images/nearestneigh.png
   docs/trunk/english_us/user_guide/plugins_ftools_images/pointdistance.png
   docs/trunk/english_us/user_guide/plugins_ftools_images/pointpoly.png
   docs/trunk/english_us/user_guide/plugins_ftools_images/polystolines.png
   docs/trunk/english_us/user_guide/plugins_ftools_images/project.png
   docs/trunk/english_us/user_guide/plugins_ftools_images/random.png
   docs/trunk/english_us/user_guide/plugins_ftools_images/randompoints.png
   docs/trunk/english_us/user_guide/plugins_ftools_images/regularpoints.png
   docs/trunk/english_us/user_guide/plugins_ftools_images/remove.png
   docs/trunk/english_us/user_guide/plugins_ftools_images/selectlocation.png
   docs/trunk/english_us/user_guide/plugins_ftools_images/selectsubset.png
   docs/trunk/english_us/user_guide/plugins_ftools_images/singletomulti.png
   docs/trunk/english_us/user_guide/plugins_ftools_images/spatialjoin.png
   docs/trunk/english_us/user_guide/plugins_ftools_images/sumlines.png
   docs/trunk/english_us/user_guide/plugins_ftools_images/symdiff.png
   docs/trunk/english_us/user_guide/plugins_ftools_images/vectorgrid.png
   docs/trunk/english_us/user_guide/plugins_ftools_images/vectorsplit.png
   docs/trunk/english_us/user_guide/plugins_georeferencer_images/select_image.png
Modified:
   docs/trunk/english_us/user_guide/plugins_ftools.tex
   docs/trunk/english_us/user_guide/plugins_ftools_images/Makefile
   docs/trunk/english_us/user_guide/plugins_ftools_images/analysis.png
   docs/trunk/english_us/user_guide/plugins_ftools_images/centroids.png
   docs/trunk/english_us/user_guide/plugins_ftools_images/clip.png
   docs/trunk/english_us/user_guide/plugins_ftools_images/dissolve.png
   docs/trunk/english_us/user_guide/plugins_ftools_images/geoprocessing.png
   docs/trunk/english_us/user_guide/plugins_ftools_images/intersect.png
   docs/trunk/english_us/user_guide/plugins_ftools_images/sampling.png
   docs/trunk/english_us/user_guide/plugins_ftools_images/simplify.png
   docs/trunk/english_us/user_guide/plugins_ftools_images/union.png
   docs/trunk/english_us/user_guide/plugins_georeferencer.tex
   docs/trunk/english_us/user_guide/plugins_georeferencer_images/Makefile
   docs/trunk/english_us/user_guide/plugins_interpolation.tex
   docs/trunk/english_us/user_guide/plugins_mapserver_export.tex
   docs/trunk/english_us/user_guide/plugins_ogr_converter.tex
   docs/trunk/english_us/user_guide/user_guide.tex
   docs/trunk/english_us/user_guide/working_with_ogc.tex
Log:
updates to ftools plugin, georeferencer, ogr converter, and mapserver export


Modified: docs/trunk/english_us/user_guide/plugins_ftools.tex
===================================================================
--- docs/trunk/english_us/user_guide/plugins_ftools.tex	2009-05-06 16:36:27 UTC (rev 10746)
+++ docs/trunk/english_us/user_guide/plugins_ftools.tex	2009-05-06 18:33:02 UTC (rev 10747)
@@ -12,20 +12,12 @@
 
 fTools is now automatically installed and enabled in new versions of QGIS, and as with all plugins, it can 
 be disabled and enabled using the Plugin Manager (See Section \ref{sec:managing_plugins}).
-When enabled, the fTools plugin adds a \mainmenuopt{Tools} menu to QGIS, providing functions in the following 
-five categories:
+When enabled, the fTools plugin adds a \mainmenuopt{Tools} menu to QGIS, providing functions ranging from 
+Analysis and Research Tools to Geometry and Geoprocessing Tools, as well as several useful Data Management Tools.
 
-\begin{enumerate}
-\item Analysis Tools
-\item Research Tools
-\item Geometry Tools
-\item Geoprocessing Tools
-\item Data Management Tools
-\end{enumerate}
-
 \minisec{fTools functions}\label{ftool_functions}
 
-Tables \ref{tab:ftool_analysis} through \ref{tab:fTool_data_management} list the functions available via the fTools plugin, along with a brief description of each function. For further information on an individual fTools function, please click the fTools Information menu item in the \mainmenuopt{Tools} menu.
+Tables \ref{tab:ftool_analysis} through \ref{tab:fTool_data_management} list the functions available via the fTools plugin, along with a brief description of each function. For further information on an individual fTools function, please click the \dropmenuopt{fTools Information} menu item in the \mainmenuopt{Tools} menu.
 
 \begin{table}[ht]\index{Analysis tools}
 \centering
@@ -33,26 +25,26 @@
  \begin{tabular}{|p{0.3in}|p{1.2in}|p{4.7in}|}
  \hline \multicolumn{3}{|c|}{\textbf{Analysis tools available via the fTools plugin}} \\
  \hline \textbf{Icon} & \textbf{Tool} & \textbf{Purpose} \\
- \hline \includegraphics[width=0.7cm]{pointdistance} & Distance Matrix &
+ \hline \includegraphics[width=0.7cm]{matrix} & Distance Matrix &
 Measure distances between two point layers, and output results as a) Square
 distance matrix, b) Linear distance matrix, or c) Summary of distances. Can
 limit distances to the k nearest features. \\ 
- \hline \includegraphics[width=0.7cm]{sumlines} & Sum line length & Calculate
+ \hline \includegraphics[width=0.7cm]{sum_lines} & Sum line length & Calculate
 the total sum of line lengths for each polygon of a polygon vector layer. \\
- \hline \includegraphics[width=0.7cm]{pointpoly} & Points in polygon & Count
+ \hline \includegraphics[width=0.7cm]{sum_points} & Points in polygon & Count
 the number of points that occur in each polygon of an input polygon vector
 layer. \\
- \hline \includegraphics[width=0.7cm]{listunique} & List unique values & List
+ \hline \includegraphics[width=0.7cm]{unique} & List unique values & List
 all unique values in an input vector layer field. \\
- \hline \includegraphics[width=0.7cm]{fieldstats} & Basic statistic & Compute
+ \hline \includegraphics[width=0.7cm]{basic_statistics} & Basic statistic & Compute
 basic statistics (mean, std dev, N, sum, CV) on an input field. \\ 
- \hline \includegraphics[width=0.7cm]{nearestneigh} & Nearest Neighbor analysis
+ \hline \includegraphics[width=0.7cm]{neighbour} & Nearest Neighbor analysis
 & Compute nearest neighbour statistics to assess the level of clustering in a
 point vector layer. \\
- \hline \includegraphics[width=0.7cm]{meancoords} & Mean coordinate(s) &
+ \hline \includegraphics[width=0.7cm]{mean} & Mean coordinate(s) &
 Compute either the normal or weighted mean center of an entire vector layer,
 or multiple features based on a unique ID field. \\ 
- \hline \includegraphics[width=0.7cm]{intersectlines} & Line intersections &
+ \hline \includegraphics[width=0.7cm]{intersections} & Line intersections &
 Locate intersections between lines, and output results as a point shapefile.
 Useful for locating road or stream intersections, ignores line intersections
 with length > 0. \\
@@ -66,19 +58,21 @@
  \begin{tabular}{|p{0.3in}|p{1.3in}|p{4.6in}|}
  \hline \multicolumn{3}{|c|}{\textbf{Research tools available via the fTools plugin}} \\
  \hline \textbf{Icon} & \textbf{Tool} & \textbf{Purpose} \\
- \hline \includegraphics[width=0.7cm]{random} & Random selection & Randomly 
+ \hline \includegraphics[width=0.7cm]{random_selection} & Random selection & Randomly 
 select n number of features, or n percentage of features \\
- \hline \includegraphics[width=0.7cm]{selectsubset} & Random selection within 
+ \hline \includegraphics[width=0.7cm]{sub_selection} & Random selection within 
 subsets & Randomly select features within subsets based on a unique ID field. \\
- \hline \includegraphics[width=0.7cm]{randompoints} & Random points & Generate 
+ \hline \includegraphics[width=0.7cm]{random_points} & Random points & Generate 
 pseudo-random points over a given input layer. \\
- \hline \includegraphics[width=0.7cm]{regularpoints} & Regular points & Generate 
+ \hline \includegraphics[width=0.7cm]{regular_points} & Regular points & Generate 
 a regular grid of points over a specified region and export them as a point shapefile. \\
- \hline \includegraphics[width=0.7cm]{vectorgrid} & Vector grid & Generate a 
+ \hline \includegraphics[width=0.7cm]{vector_grid} & Vector grid & Generate a 
 line or polygon grid based on user specified grid spacing. \\
- \hline \includegraphics[width=0.7cm]{selectlocation} & Select by location & 
+ \hline \includegraphics[width=0.7cm]{select_location} & Select by location & 
 Select features based on their location relative to another layer to form a 
 new selection, or add or subtract from the current selection. \\
+\hline \includegraphics[width=0.7cm]{layer_extent} & Polygon from layer extent & 
+Create a single rectangular polygon layer from the extent of an input raster or vector layer. \\
  \hline
 \end{tabular}
 \end{table}
@@ -89,20 +83,20 @@
  \begin{tabular}{|p{0.3in}|p{0.8in}|p{5.1in}|}
  \hline \multicolumn{3}{|c|}{\textbf{Geoprocessing tools available via the fTools plugin}} \\
  \hline \textbf{Icon} & \textbf{Tool} & \textbf{Purpose} \\
- \hline \includegraphics[width=0.7cm]{multiconvex} & Convex hull & Create 
+ \hline \includegraphics[width=0.7cm]{convex_hull} & Convex hull(s) & Create 
 minimum convex hull(s) for an input layer, or based on an ID field. \\
- \hline \includegraphics[width=0.7cm]{dynamicbuffer} & Buffer & Create 
+ \hline \includegraphics[width=0.7cm]{buffer} & Buffer(s) & Create 
 buffer(s) around features based on distance, or distance field. \\
  \hline \includegraphics[width=0.7cm]{intersect} & Intersect & Overlay 
 layers such that output contains areas where both layers intersect. \\
  \hline \includegraphics[width=0.7cm]{union} & Union & Overlay layers such 
 that output contains intersecting and non-intersecting areas. \\
- \hline \includegraphics[width=0.7cm]{symdiff} & Symetrical difference & 
+ \hline \includegraphics[width=0.7cm]{sym_difference} & Symetrical difference & 
 Overlay layers such that output contains those areas of the input and 
 difference layers that do not intersect. \\
  \hline \includegraphics[width=0.7cm]{clip} & Clip & Overlay layers such 
 that output contains areas that intersect the clip layer. \\
- \hline \includegraphics[width=0.7cm]{erase} & Difference & Overlay layers 
+ \hline \includegraphics[width=0.7cm]{difference} & Difference & Overlay layers 
 such that output contains areas not intersecting the clip layer. \\
  \hline \includegraphics[width=0.7cm]{dissolve} & Dissolve & Merge features 
 based on input field. All features with indentical input values are combined 
@@ -117,24 +111,26 @@
  \begin{tabular}{|p{0.3in}|p{1.2in}|p{4.8in}|}
  \hline \multicolumn{3}{|c|}{\textbf{Geometry tools available via the fTools plugin}} \\
  \hline \textbf{Icon} & \textbf{Tool} & \textbf{Purpose} \\
- \hline \includegraphics[width=0.7cm]{checkgeometry} & Check geometry & 
+ \hline \includegraphics[width=0.7cm]{check_geometry} & Check geometry & 
 Check polygons for intersections, closed-holes, and fix node ordering. \\
- \hline \includegraphics[width=0.7cm]{calcgeom} & Export/Add geometry 
+ \hline \includegraphics[width=0.7cm]{export_geometry} & Export/Add geometry 
 columns & Add vector layer geometry info to point (XCOORD, YCOORD), 
 line (LENGTH), or polygon (AREA, PERIMETER) layer. \\
  \hline \includegraphics[width=0.7cm]{centroids} & Polygon centroids & 
 Calculate the true centroids for each polygon in an input polygon layer. \\
+ \hline \includegraphics[width=0.7cm]{delaunay} & Delaunay triangulation & 
+Calculate and output (as polygons) the delaunay triangulation of an input point vector layer. \\
  \hline \includegraphics[width=0.7cm]{simplify} & Simplify geometry & 
 Generalise lines or polygons with a modified Douglas-Peucker algorithm. \\
- \hline \includegraphics[width=0.7cm]{multitosingle} & Multipart to 
+ \hline \includegraphics[width=0.7cm]{multi_to_single} & Multipart to 
 singleparts & Convert multipart features to multiple singlepart features. 
 Creates simple polygons and lines. \\
- \hline \includegraphics[width=0.7cm]{singletomulti} & Singleparts to 
+ \hline \includegraphics[width=0.7cm]{single_to_multi} & Singleparts to 
 multipart & Merge multiple features to a single multipart feature based 
 on a unique ID field. \\
- \hline \includegraphics[width=0.7cm]{polystolines} & Polygons to lines 
+ \hline \includegraphics[width=0.7cm]{to_lines} & Polygons to lines 
 & Convert polygons to lines, multipart polygons to multiple singlepart lines. \\
- \hline \includegraphics[width=0.7cm]{extractnodes} & Extract nodes & 
+ \hline \includegraphics[width=0.7cm]{extract_nodes} & Extract nodes & 
 Extract nodes from line and polygon layers and output them as points. \\
  \hline
 \end{tabular}
@@ -146,19 +142,19 @@
  \begin{tabular}{|p{0.3in}|p{1.3in}|p{4.6in}|}
  \hline \multicolumn{3}{|c|}{\textbf{Data management tools available via the fTools plugin}} \\
  \hline \textbf{Icon} & \textbf{Tool} & \textbf{Purpose} \\
- \hline \includegraphics[width=0.7cm]{project} & Export to projection & 
+ \hline \includegraphics[width=0.7cm]{export_projection} & Export to projection & 
 Project features to new CRS and export as new shapefile. \\
- \hline \includegraphics[width=0.7cm]{define} & Define projection & 
+ \hline \includegraphics[width=0.7cm]{define_projection} & Define projection & 
 Specify the CRS for shapefiles whose CRS has not been defined. \\
- \hline \includegraphics[width=0.7cm]{joinattr} & Join attributes & Join 
+ \hline \includegraphics[width=0.7cm]{join_attributes} & Join attributes & Join 
 additional attributes to vector layer attribute table and output results 
 to a new shapefile. Additional attributes can be from a vector layer or 
 stand-alone dbf table. \\
- \hline \includegraphics[width=0.7cm]{spatialjoin} & Join attributes by 
+ \hline \includegraphics[width=0.7cm]{join_location} & Join attributes by 
 location & Join additional attributes to vector layer based on spatial 
 relationship. Attributes from one vector layer are appended to the attribute 
 table of another layer and exported as a shapefile \\
- \hline \includegraphics[width=0.7cm]{vectorsplit} & Split vector layer & 
+ \hline \includegraphics[width=0.7cm]{split_layer} & Split vector layer & 
 Split input layer into multiple separate layers based on input field. \\
  \hline
 \end{tabular}

Modified: docs/trunk/english_us/user_guide/plugins_ftools_images/Makefile
===================================================================
--- docs/trunk/english_us/user_guide/plugins_ftools_images/Makefile	2009-05-06 16:36:27 UTC (rev 10746)
+++ docs/trunk/english_us/user_guide/plugins_ftools_images/Makefile	2009-05-06 18:33:02 UTC (rev 10747)
@@ -12,49 +12,49 @@
 #	nextfile.eps
 
 PNG=analysis.eps\
-    calcgeom.eps\
-    centroids.eps\
-    checkgeometry.eps\
-    clip.eps\
-    conversion.eps\
-    datamanagement.eps\
-    define.eps\
-    dissolve.eps\
-    dynamicbuffer.eps\
-    erase.eps\
-    extractnodes.eps\
-    fieldstats.eps\
-    ftoolslogo2.eps\
-    ftoolslogo.eps\
-    geoprocessing.eps\
-    help.eps\
-    intersectlines.eps\
-    intersect.eps\
-    joinattr.eps\
-    listunique.eps\
-    meancoords.eps\
-    multiconvex.eps\
-    multitosingle.eps\
-    nearestneigh.eps\
-    pointdistance.eps\
-    pointpoly.eps\
-    polystolines.eps\
-    project.eps\
-    random.eps\
-    randompoints.eps\
-    regularpoints.eps\
-    remove.eps\
-    sampling.eps\
-    selectlocation.eps\
-    selectsubset.eps\
-    simplify.eps\
-    singletomulti.eps\
-    spatialjoin.eps\
-    sumlines.eps\
-    symdiff.eps\
-    union.eps\
-    vectorgrid.eps\
-    vectorsplit.eps\
+basic_statistics.eps\
+buffer.eps\
+centroids.eps\
+check_geometry.eps\
+clip.eps\
+convex_hull.eps\
+define_projection.eps\
+delaunay.eps\
+difference.eps\
+dissolve.eps\
+export_geometry.eps\
+export_projection.eps\
+extract_nodes.eps\
+ftools_logo.eps\
+geometry.eps\
+geoprocessing.eps\
+help.eps\
+intersections.eps\
+intersect.eps\
+join_attributes.eps\
+join_location.eps\
+layer_extent.eps\
+management.eps\
+matrix.eps\
+mean.eps\
+multi_to_single.eps\
+neighbour.eps\
+random_points.eps\
+random_selection.eps\
+regular_points.eps\
+sampling.eps\
+select_location.eps\
+simplify.eps\
+single_to_multi.eps\
+split_layer.eps\
+sub_selection.eps\
+sum_lines.eps\
+sum_points.eps\
+sym_difference.eps\
+to_lines.eps\
+union.eps\
+unique.eps\
+vector_grid.eps\
     	
 ##### TARGETS #####
 

Modified: docs/trunk/english_us/user_guide/plugins_ftools_images/analysis.png
===================================================================
(Binary files differ)

Added: docs/trunk/english_us/user_guide/plugins_ftools_images/basic_statistics.png
===================================================================
(Binary files differ)


Property changes on: docs/trunk/english_us/user_guide/plugins_ftools_images/basic_statistics.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: docs/trunk/english_us/user_guide/plugins_ftools_images/buffer.png
===================================================================
(Binary files differ)


Property changes on: docs/trunk/english_us/user_guide/plugins_ftools_images/buffer.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Deleted: docs/trunk/english_us/user_guide/plugins_ftools_images/calcgeom.png
===================================================================
(Binary files differ)

Modified: docs/trunk/english_us/user_guide/plugins_ftools_images/centroids.png
===================================================================
(Binary files differ)

Added: docs/trunk/english_us/user_guide/plugins_ftools_images/check_geometry.png
===================================================================
(Binary files differ)


Property changes on: docs/trunk/english_us/user_guide/plugins_ftools_images/check_geometry.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Deleted: docs/trunk/english_us/user_guide/plugins_ftools_images/checkgeometry.png
===================================================================
(Binary files differ)

Modified: docs/trunk/english_us/user_guide/plugins_ftools_images/clip.png
===================================================================
(Binary files differ)

Deleted: docs/trunk/english_us/user_guide/plugins_ftools_images/conversion.png
===================================================================
(Binary files differ)

Added: docs/trunk/english_us/user_guide/plugins_ftools_images/convex_hull.png
===================================================================
(Binary files differ)


Property changes on: docs/trunk/english_us/user_guide/plugins_ftools_images/convex_hull.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Deleted: docs/trunk/english_us/user_guide/plugins_ftools_images/datamanagement.png
===================================================================
(Binary files differ)

Deleted: docs/trunk/english_us/user_guide/plugins_ftools_images/define.png
===================================================================
(Binary files differ)

Added: docs/trunk/english_us/user_guide/plugins_ftools_images/define_projection.png
===================================================================
(Binary files differ)


Property changes on: docs/trunk/english_us/user_guide/plugins_ftools_images/define_projection.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: docs/trunk/english_us/user_guide/plugins_ftools_images/delaunay.png
===================================================================
(Binary files differ)


Property changes on: docs/trunk/english_us/user_guide/plugins_ftools_images/delaunay.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: docs/trunk/english_us/user_guide/plugins_ftools_images/difference.png
===================================================================
(Binary files differ)


Property changes on: docs/trunk/english_us/user_guide/plugins_ftools_images/difference.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Modified: docs/trunk/english_us/user_guide/plugins_ftools_images/dissolve.png
===================================================================
(Binary files differ)

Deleted: docs/trunk/english_us/user_guide/plugins_ftools_images/dynamicbuffer.png
===================================================================
(Binary files differ)

Deleted: docs/trunk/english_us/user_guide/plugins_ftools_images/erase.png
===================================================================
(Binary files differ)

Added: docs/trunk/english_us/user_guide/plugins_ftools_images/export_geometry.png
===================================================================
(Binary files differ)


Property changes on: docs/trunk/english_us/user_guide/plugins_ftools_images/export_geometry.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: docs/trunk/english_us/user_guide/plugins_ftools_images/export_projection.png
===================================================================
(Binary files differ)


Property changes on: docs/trunk/english_us/user_guide/plugins_ftools_images/export_projection.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: docs/trunk/english_us/user_guide/plugins_ftools_images/extract_nodes.png
===================================================================
(Binary files differ)


Property changes on: docs/trunk/english_us/user_guide/plugins_ftools_images/extract_nodes.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Deleted: docs/trunk/english_us/user_guide/plugins_ftools_images/extractnodes.png
===================================================================
(Binary files differ)

Deleted: docs/trunk/english_us/user_guide/plugins_ftools_images/fieldstats.png
===================================================================
(Binary files differ)

Added: docs/trunk/english_us/user_guide/plugins_ftools_images/ftools_logo.png
===================================================================
(Binary files differ)


Property changes on: docs/trunk/english_us/user_guide/plugins_ftools_images/ftools_logo.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Deleted: docs/trunk/english_us/user_guide/plugins_ftools_images/ftoolslogo.png
===================================================================
(Binary files differ)

Deleted: docs/trunk/english_us/user_guide/plugins_ftools_images/ftoolslogo2.png
===================================================================
(Binary files differ)

Added: docs/trunk/english_us/user_guide/plugins_ftools_images/geometry.png
===================================================================
(Binary files differ)


Property changes on: docs/trunk/english_us/user_guide/plugins_ftools_images/geometry.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Modified: docs/trunk/english_us/user_guide/plugins_ftools_images/geoprocessing.png
===================================================================
(Binary files differ)

Modified: docs/trunk/english_us/user_guide/plugins_ftools_images/intersect.png
===================================================================
(Binary files differ)

Added: docs/trunk/english_us/user_guide/plugins_ftools_images/intersections.png
===================================================================
(Binary files differ)


Property changes on: docs/trunk/english_us/user_guide/plugins_ftools_images/intersections.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Deleted: docs/trunk/english_us/user_guide/plugins_ftools_images/intersectlines.png
===================================================================
(Binary files differ)

Added: docs/trunk/english_us/user_guide/plugins_ftools_images/join_attributes.png
===================================================================
(Binary files differ)


Property changes on: docs/trunk/english_us/user_guide/plugins_ftools_images/join_attributes.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: docs/trunk/english_us/user_guide/plugins_ftools_images/join_location.png
===================================================================
(Binary files differ)


Property changes on: docs/trunk/english_us/user_guide/plugins_ftools_images/join_location.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Deleted: docs/trunk/english_us/user_guide/plugins_ftools_images/joinattr.png
===================================================================
(Binary files differ)

Added: docs/trunk/english_us/user_guide/plugins_ftools_images/layer_extent.png
===================================================================
(Binary files differ)


Property changes on: docs/trunk/english_us/user_guide/plugins_ftools_images/layer_extent.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Deleted: docs/trunk/english_us/user_guide/plugins_ftools_images/listunique.png
===================================================================
(Binary files differ)

Added: docs/trunk/english_us/user_guide/plugins_ftools_images/management.png
===================================================================
(Binary files differ)


Property changes on: docs/trunk/english_us/user_guide/plugins_ftools_images/management.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: docs/trunk/english_us/user_guide/plugins_ftools_images/matrix.png
===================================================================
(Binary files differ)


Property changes on: docs/trunk/english_us/user_guide/plugins_ftools_images/matrix.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: docs/trunk/english_us/user_guide/plugins_ftools_images/mean.png
===================================================================
(Binary files differ)


Property changes on: docs/trunk/english_us/user_guide/plugins_ftools_images/mean.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Deleted: docs/trunk/english_us/user_guide/plugins_ftools_images/meancoords.png
===================================================================
(Binary files differ)

Added: docs/trunk/english_us/user_guide/plugins_ftools_images/multi_to_single.png
===================================================================
(Binary files differ)


Property changes on: docs/trunk/english_us/user_guide/plugins_ftools_images/multi_to_single.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Deleted: docs/trunk/english_us/user_guide/plugins_ftools_images/multiconvex.png
===================================================================
(Binary files differ)

Deleted: docs/trunk/english_us/user_guide/plugins_ftools_images/multitosingle.png
===================================================================
(Binary files differ)

Deleted: docs/trunk/english_us/user_guide/plugins_ftools_images/nearestneigh.png
===================================================================
(Binary files differ)

Added: docs/trunk/english_us/user_guide/plugins_ftools_images/neighbour.png
===================================================================
(Binary files differ)


Property changes on: docs/trunk/english_us/user_guide/plugins_ftools_images/neighbour.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Deleted: docs/trunk/english_us/user_guide/plugins_ftools_images/pointdistance.png
===================================================================
(Binary files differ)

Deleted: docs/trunk/english_us/user_guide/plugins_ftools_images/pointpoly.png
===================================================================
(Binary files differ)

Deleted: docs/trunk/english_us/user_guide/plugins_ftools_images/polystolines.png
===================================================================
(Binary files differ)

Deleted: docs/trunk/english_us/user_guide/plugins_ftools_images/project.png
===================================================================
(Binary files differ)

Deleted: docs/trunk/english_us/user_guide/plugins_ftools_images/random.png
===================================================================
(Binary files differ)

Added: docs/trunk/english_us/user_guide/plugins_ftools_images/random_points.png
===================================================================
(Binary files differ)


Property changes on: docs/trunk/english_us/user_guide/plugins_ftools_images/random_points.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: docs/trunk/english_us/user_guide/plugins_ftools_images/random_selection.png
===================================================================
(Binary files differ)


Property changes on: docs/trunk/english_us/user_guide/plugins_ftools_images/random_selection.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Deleted: docs/trunk/english_us/user_guide/plugins_ftools_images/randompoints.png
===================================================================
(Binary files differ)

Added: docs/trunk/english_us/user_guide/plugins_ftools_images/regular_points.png
===================================================================
(Binary files differ)


Property changes on: docs/trunk/english_us/user_guide/plugins_ftools_images/regular_points.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Deleted: docs/trunk/english_us/user_guide/plugins_ftools_images/regularpoints.png
===================================================================
(Binary files differ)

Deleted: docs/trunk/english_us/user_guide/plugins_ftools_images/remove.png
===================================================================
(Binary files differ)

Modified: docs/trunk/english_us/user_guide/plugins_ftools_images/sampling.png
===================================================================
(Binary files differ)

Added: docs/trunk/english_us/user_guide/plugins_ftools_images/select_location.png
===================================================================
(Binary files differ)


Property changes on: docs/trunk/english_us/user_guide/plugins_ftools_images/select_location.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Deleted: docs/trunk/english_us/user_guide/plugins_ftools_images/selectlocation.png
===================================================================
(Binary files differ)

Deleted: docs/trunk/english_us/user_guide/plugins_ftools_images/selectsubset.png
===================================================================
(Binary files differ)

Modified: docs/trunk/english_us/user_guide/plugins_ftools_images/simplify.png
===================================================================
(Binary files differ)

Added: docs/trunk/english_us/user_guide/plugins_ftools_images/single_to_multi.png
===================================================================
(Binary files differ)


Property changes on: docs/trunk/english_us/user_guide/plugins_ftools_images/single_to_multi.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Deleted: docs/trunk/english_us/user_guide/plugins_ftools_images/singletomulti.png
===================================================================
(Binary files differ)

Deleted: docs/trunk/english_us/user_guide/plugins_ftools_images/spatialjoin.png
===================================================================
(Binary files differ)

Added: docs/trunk/english_us/user_guide/plugins_ftools_images/split_layer.png
===================================================================
(Binary files differ)


Property changes on: docs/trunk/english_us/user_guide/plugins_ftools_images/split_layer.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: docs/trunk/english_us/user_guide/plugins_ftools_images/sub_selection.png
===================================================================
(Binary files differ)


Property changes on: docs/trunk/english_us/user_guide/plugins_ftools_images/sub_selection.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: docs/trunk/english_us/user_guide/plugins_ftools_images/sum_lines.png
===================================================================
(Binary files differ)


Property changes on: docs/trunk/english_us/user_guide/plugins_ftools_images/sum_lines.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: docs/trunk/english_us/user_guide/plugins_ftools_images/sum_points.png
===================================================================
(Binary files differ)


Property changes on: docs/trunk/english_us/user_guide/plugins_ftools_images/sum_points.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Deleted: docs/trunk/english_us/user_guide/plugins_ftools_images/sumlines.png
===================================================================
(Binary files differ)

Added: docs/trunk/english_us/user_guide/plugins_ftools_images/sym_difference.png
===================================================================
(Binary files differ)


Property changes on: docs/trunk/english_us/user_guide/plugins_ftools_images/sym_difference.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Deleted: docs/trunk/english_us/user_guide/plugins_ftools_images/symdiff.png
===================================================================
(Binary files differ)

Added: docs/trunk/english_us/user_guide/plugins_ftools_images/to_lines.png
===================================================================
(Binary files differ)


Property changes on: docs/trunk/english_us/user_guide/plugins_ftools_images/to_lines.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Modified: docs/trunk/english_us/user_guide/plugins_ftools_images/union.png
===================================================================
(Binary files differ)

Added: docs/trunk/english_us/user_guide/plugins_ftools_images/unique.png
===================================================================
(Binary files differ)


Property changes on: docs/trunk/english_us/user_guide/plugins_ftools_images/unique.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: docs/trunk/english_us/user_guide/plugins_ftools_images/vector_grid.png
===================================================================
(Binary files differ)


Property changes on: docs/trunk/english_us/user_guide/plugins_ftools_images/vector_grid.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Deleted: docs/trunk/english_us/user_guide/plugins_ftools_images/vectorgrid.png
===================================================================
(Binary files differ)

Deleted: docs/trunk/english_us/user_guide/plugins_ftools_images/vectorsplit.png
===================================================================
(Binary files differ)

Modified: docs/trunk/english_us/user_guide/plugins_georeferencer.tex
===================================================================
--- docs/trunk/english_us/user_guide/plugins_georeferencer.tex	2009-05-06 16:36:27 UTC (rev 10746)
+++ docs/trunk/english_us/user_guide/plugins_georeferencer.tex	2009-05-06 18:33:02 UTC (rev 10747)
@@ -6,12 +6,21 @@
 % comment out the following line:
 %\updatedisclaimer
 
-The \toolbtntwo{georeferencer}{Georeferencer} allows to generate world files for rasters.
-Therefore you select points on the raster, add their coordinates, and the plugin will compute the world file parameters.
-The more coordinates you provide the better the result will be.
+The Georeferencer Plugin is a tool for generating world files for rasters.
+It allows you to reference rasters to geographic or projected coordinate systems by creating a 
+world file, or by transforming the raster to a new coordinate system. The basic approach to georeferencing a raster is to locate points on the raster for which you can accurately determine their coordinates. The source of the coordinates can be:
 
-As an example we will generate a world file for a topo sheet of South Dakota from SDGS.
-It can later be visualized together with in the data of the GRASS spearfish60 location.
+\begin{enumerate}
+\item The raster itself, sometimes coordinates are literally `written' on the raster. 
+In this case you can enter the coordinates manually.
+\item Other georeferenced data, this can be either vector or raster data that contain the same objects/features that you have on the raster that you want to georeference. In this case you can enter the coordinates by clicking on the reference dataset loaded in QGIS map canvas.
+\end{enumerate}
+
+The usual procedure for georeferencing an image involves selecting multiple points on the raster, 
+specifying their coordinates, and choosing a relevant transformation type. Based on the input parameters and data, the plugin will compute the world file parameters. The more coordinates you provide, the better the result will be.
+
+For this example, we will generate a world file for a topo sheet of South Dakota from SDGS.
+It can later be visualized together with the data from the GRASS spearfish60 location.
 You can download the topo sheet here: \url{http://grass.osgeo.org/sampledata/spearfish\_toposheet.tar.gz}
 
 As a first step we download the file and untar it.
@@ -22,34 +31,31 @@
 cd spearfish_toposheet
 \end{verbatim}
 
-The next step is to start QGIS, load the georeferencer plugin and select the file \filename{spearfish\_topo24.tif}.
+The next step is to start QGIS and load the Georeferencer Plugin (see Section 
+  \ref{sec:load_core_plugin}) and click on the \toolbtntwo{georeferencer}{Georeferencer} 
+  icon which appears in the QGIS toolbar menu. The Georeferencer Plugin dialog appears as 
+  shown in Figure \ref{fig:georefplugin}.
 
 \begin{figure}[ht]
 \begin{center}
-\caption{Select an image to georeference \nixcaption}\label{fig:select_image}\smallskip
-  \includegraphics[clip=true, width=12cm]{select_image}
+  \caption{Georeferencer Plugin Dialog \nixcaption}\label{fig:georefplugin}\smallskip
+  \includegraphics[clip=true,width=\textwidth]{georefplugin}
 \end{center}
 \end{figure}
 
-Now click on the button \button{Arrange plugin window} to open the image in
-the georeferencer and to arrange it with the reference map in the qgis map
-canvas on your desktop (see Figure \ref{fig:georefplugin}).
+\minisec{Entering ground control points (GCPs)}\label{georeferencer_entering}
 
-\begin{figure}[ht]
-\begin{center}
-  \caption{Arrange plugin window with the qgis map canvas \nixcaption}\label{fig:georefplugin}\smallskip
-  \includegraphics[clip=true,width=\textwidth]{georefplugin}
-\end{center}
-\end{figure}
+\begin{enumerate}
+\item To start georeferencing an unreferenced raster, we must load it using the \browsebutton browse button. The raster will show up in the main working area of the dialog. Once the raster is loaded, we can start to enter reference points.
 
-With the button \button{Add Point} you can start to add points on the raster image and enter their coordinates, and the plugin will compute the world file parameters (see Figure \ref{fig:choose_points}).
-The more coordinates you provide the better the result will be.
-For the procedure you have two options:
+\item Using the \toolbtntwo{mActionCapturePoint}{Add Point} button, add points to the main working area and enter their coordinates (See Figure \ref{fig:choose_points}). For this procedure you have two options:
 
 \begin{enumerate}
-\item You click on a point in the raster map and enter the X and Y coordinates manually
-\item You click on a point in the raster map and choose the button \button{from map canvas} to add the X and Y coordinates with the help of a georeferenced map already loaded in QGIS.
+\item Click on a point in the raster map and enter the X and Y coordinates manually
+\item Click on a point in the raster map 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 QGIS.
 \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 additional tools on the plugin dialog to zoom and pan the working area in order to locate a relevant set of GCP points.
+\end{enumerate}
 
 \begin{figure}[ht]
 \begin{center}
@@ -58,47 +64,46 @@
 \end{center}
 \end{figure}
 
-For this example we use the second option and enter the coordinates for the selected points with the help of the \filename{roads} map provided with the  \filename{spearfish60} location from: \url{http://grass.osgeo.org/sampledata/spearfish\_grass60data-0.3.tar.gz}
+The points that are added to the map will be stored in a separate text file ([filename].points) which is stored together with the raster image. This allows us to reopen the Georeferencer plugin at a later date and add new points or delete existing ones to optimize the result. The points file contains values of the form: mapX, mapY, pixelX, pixelY. You can also \button{Load GCPs} and \button{Save GCPs} to different directories if you like.
 
-If you don't know how to integrate the \filename{spearfish60} location with
-the GRASS plugin, information are provided in Section \ref{sec:grass}. As you
-can see in Figure \ref{fig:choose_points}, the georeferencer provides buttons to zoom, pan, add and delete points in the image.
+\minisec{Choosing the transformation}\label{georeferencer_transformation}
 
-After you added enough points to the image you need to select the transformation type for the georeferencing process and save the resulting world file together with the Tiff.
-In our example we choose 
-\selectstring{Transform type}{linear transformation} 
-although a 
-\selectstring{Transform type}{Helmert transformation}
-might be sufficient as well.
+After you have added your GCPs to the raster image, you need to select the transformation type for the georeferencing process. Depending on how many ground control point you have captured, you may want to use different transformation algorithms. Choice of transformation algorithm is also dependent on the type and quality of input data and the amount of geometric distortion that you are willing to introduce to final result.
 
+Currently, several algorithms are available:
 
-\begin{Tip}\caption{\textsc{Choosing the transformation type}}
-\qgistip{The linear (affine) transformation is a 1st order transformation and is used for scaling, translation and rotation of geometrically correct images.
-With the Helmert transformation you simply add coordinate information to the image like geocooding.
-If your image is contorted you will need to use software that provides 2nd or 3rd order polynomial transformation, e.g. GRASS GIS.}
-\end{Tip} 
+\begin{enumerate}
+\item Linear
+\item Helmert
+\item Polynomial 1
+\item Polynomial 2
+\item Polynomial 3
+\item Thin plate spline (TPS)
+\end{enumerate}
 
-The points we added to the map will be stored in a \filename{spearfish\_topo24.tif.points} file together with the raster image.
-This allows us to reopen the georeferencer plugin and to add new points or delete existing ones to optimize the result.
-The \filename{spearfish\_topo24.tif.points} file of this example shows the points:
+\begin{itemize}
+\item The Linear algorithm is used to create a world-file, and is different from the other algorithms, as it does not actually transform the raster. This algorithm likely won't be sufficient if you are dealing with scanned material.
+\item The Helmert transformation performs simple scaling and rotation transformations. 
+\item The Polynomial algorithms are among the most widely used algorithms for georeferencing, and each one differs by the degree of distortion introduced to match source and destination ground control points. The most widely used polynomial algorithm is the second order polynomial transformation, which allows some curvature. First order polynomial transformation (affine) preserves colliniarity and allows scaling, translation and rotation only.
+\item The Thin plate spline (TPS) algorithm is a more modern georeferencing method, which is able to introduce local deformations in the data. This algorithm is useful when very low quality originals are being georeferenced.
+\end{itemize}
 
-\begin{verbatim}
-mapX    		mapY    		pixelX  pixelY
-591630.196867999969982  4927104.309682800434530 591647  4.9271e+06
-608453.589164100005291  4924878.995150799863040 608458  4.92487e+06
-602554.903929700027220  4915579.220743400044739 602549  4.91556e+06
-591511.138448899961077  4915952.302661700174212 591563  4.91593e+06
-602649.526155399973504  4919088.353569299913943 602618  4.91907e+06
-\end{verbatim} 
+\minisec{Running the transformation}\label{georeferencer_running}
 
-We used 5 coordinate points to georeference the raster image.
-To get correct results it is important to disperse the points regulary in the image.
-Finally we check the result and load the new georeferenced map \filename{spearfish\_topo24.tif} and overlay it with the map \filename{roads} of the \filename{spearfish60} location.
+\begin{enumerate}
+\item When the GCPs have been collected, and the transformation has been chosen, press either \button{Create} to create a new raster or \button{Create and load layer} to automatically add the new raster to the layer list.
+\item A warning message will appear that will inform you that a new raster (in GeoTIFF format) will be created.
+\item After hitting OK, you will also be asked to choose a resampling method. There are three methods available:
 
-\begin{figure}[ht]
-\begin{center}
-  \caption{Georeferenced map with overlayed roads from spearfish60 location
-  \nixcaption}\label{fig:result_map}\smallskip
-  \includegraphics[clip=true,width=\textwidth]{result_map}
-\end{center}
-\end{figure}
+\begin{enumerate}
+\item Nearest neighbour
+\item Linear
+\item Cubic
+\end{enumerate}
+\end{enumerate}
+
+\begin{Tip}\caption{\textsc{Choosing the resampling method}}
+\qgistip{The type of resampling you choose will likely depending on your input data and the ultimate objective of the exercise. If you don't want to change statistics of the image, you might want to choose Nearest neighbour, whereas a Cubic resampling will likely provide a more smoothed result.}
+\end{Tip}
+
+

Modified: docs/trunk/english_us/user_guide/plugins_georeferencer_images/Makefile
===================================================================
--- docs/trunk/english_us/user_guide/plugins_georeferencer_images/Makefile	2009-05-06 16:36:27 UTC (rev 10746)
+++ docs/trunk/english_us/user_guide/plugins_georeferencer_images/Makefile	2009-05-06 18:33:02 UTC (rev 10747)
@@ -13,7 +13,6 @@
 PNG=georef.eps\
 	georeferencer.eps\
 	pencil.eps\
-	select_image.eps\
 	choose_points.eps\
 	georefplugin.eps\
 	result_map.eps   		

Deleted: docs/trunk/english_us/user_guide/plugins_georeferencer_images/select_image.png
===================================================================
(Binary files differ)

Modified: docs/trunk/english_us/user_guide/plugins_interpolation.tex
===================================================================
--- docs/trunk/english_us/user_guide/plugins_interpolation.tex	2009-05-06 16:36:27 UTC (rev 10746)
+++ docs/trunk/english_us/user_guide/plugins_interpolation.tex	2009-05-06 18:33:02 UTC (rev 10747)
@@ -6,18 +6,19 @@
 % comment out the following line:
 %\updatedisclaimer
 
-The Interplation plugin allows to interpolate a TIN or IDW raster layer from a vector 
-point layer loaded in the QGIS canvas. It is very simple to handle and provides 
-functionalities as shown in Figure \ref{fig:interpolation_dialog}.
+The Interplation plugin can be used to generate a TIN or IDW interpolation of a 
+point vector layer. It is very simple to handle and provides an intiuitive graphical 
+user interface for creating interpolated raster layers (See Figure \ref{fig:interpolation_dialog}).
+The plugin requires the following parameters to be specified before running:
 
 \begin{itemize}
-\item \textbf{Input vector layer}: Select vector point layer loaded in the QGIS canvas.
-\item \textbf{Interpolation attribute}: Select attribute column used for interpolation or 
-enable \checkbox{Use Z-Coordinate} checkbox.
-\item \textbf{Interpolation Method}: Select interpolation method \selectstring{Triangulated Irregular 
+\item \textbf{Input vector layer}: Specify the input point vector layer from a list of loaded point layers.
+\item \textbf{Interpolation attribute}: Select attribute column to be used for interpolation or 
+enable the \checkbox{Use Z-Coordinate} checkbox to use the layers stored Z values.
+\item \textbf{Interpolation Method}: Select interpolation method. This can be either \selectstring{Triangulated Irregular 
 Network (TIN)}{\ldots} or \selectstring{Inverse Distance Weighted (IDW)}{\ldots}.
-\item \textbf{Number of columns/rows}: define number colums and.rows for the output raster file
-\item \textbf{Output file}: Define a name for the output raster file
+\item \textbf{Number of columns/rows}: Specify the number row and colums for the output raster file.
+\item \textbf{Output file}: Specify a name for the output raster file.
 \end{itemize}
 
 \begin{figure}[ht]
@@ -27,26 +28,28 @@
 \end{center}  
 \end{figure}
 
+\minisec{Using the plugin}\label{interpolation_usage}
+
 \begin{enumerate}
-  \item Start QGIS and load the \filename{elevp.csv} CSV table with elevation points in the QGIS 
-  canvas using the delimited text plugin as described in Section \ref{label_dltext}. 
+  \item Start QGIS and load an point vector layer (e.g., \filename{elevp.csv}). 
   \item Load the Interpolation plugin in the Plugin Manager (see Section 
   \ref{sec:load_core_plugin}) and click on the \toolbtntwo{interpolation}{Interpolation} 
-  icon which appears in the QGIS toolbar menu. The Interpolation plugin dialog appears as shown in Figure \ref{fig:interpolation_dialog}.
-  \item Select \selectstring{elevp}{\ldots} as input vector and column \filename{ELEV} for 
+  icon which appears in the QGIS toolbar menu. The Interpolation plugin dialog appears as 
+  shown in Figure \ref{fig:interpolation_dialog}.
+  \item Select an input layer (e.g., \selectstring{elevp}{\ldots}) and column (e.g. \filename{ELEV}) for 
   interpolation.
-  \item Select \selectstring{Triangular interpolation}{\ldots} as interpolation method, define 
-  3663 cols and 1964 rows (this is equivalent to a 1000 meter pixel resolution) as raster 
-  output filename \filename{elevation\_tin}.
+  \item Select an interpolation method (e.g. \selectstring{Triangular interpolation}{\ldots}), and specify 
+  the number of rows and columns (e.g. 3663 cols and 1964 rows (this is equivalent to a 1000 meter pixel resolution))
+  as well as the raster output filename (e.g., \filename{elevation\_tin}).
   \item Click \button{Ok}.
-  \item Double click \filename{elevation\_tin} in the map legend to open the Raster Layer Properties 
+  \item For the current example, double click \filename{elevation\_tin} in the layer list to open the Raster Layer Properties 
   dialog and select \selectstring{Pseudocolor}{\ldots} as Color Map in the \tab{Symbology} tab. Or you 
   can define a new color table as described in Section \ref{label_rasterprop}.
 \end{enumerate}
 
 In Figure \ref{fig:interpolation_idw} you see the IDW interpolation result with a 366 cols x 196 rows (10 km) 
 resolution for the \filename{elevp.csv} data visualized using the Pseudocolor color table. The processing 
-takes a couple of minutes, although the data only cover the northern part of Alaska.
+only takes a few minutes, and covers the northern part of Alaska.
 
 \begin{figure}[ht]
    \begin{center}

Modified: docs/trunk/english_us/user_guide/plugins_mapserver_export.tex
===================================================================
--- docs/trunk/english_us/user_guide/plugins_mapserver_export.tex	2009-05-06 16:36:27 UTC (rev 10746)
+++ docs/trunk/english_us/user_guide/plugins_mapserver_export.tex	2009-05-06 18:33:02 UTC (rev 10747)
@@ -7,23 +7,17 @@
 %\updatedisclaimer
 
 You can use QGIS to ``compose'' your map by adding and arranging layers, 
-symbolizing them, customizing the colors and then create a map file 
-for MapServer. In order to use the MapServer Export plugin, you 
-must have Python >= 2.4 installed on your system and QGIS must have been 
-compiled with support for it. All binary packages include Python Support.
+symbolizing them, customizing the colors and then creating a map file 
+for MapServer.
 
-The MapServer Export plugin in QGIS \CURRENT is a Python Plugin, that is 
-automatically loaded into the \filename{Plugin Manager} as a core plugin 
-(see Section~\ref{sec:core_plugins}).
-
 \subsubsection{Creating the Project File}
 
 The MapServer Export Plugin operates on a saved QGIS project file and 
 \textbf{not} on the current contents of the map canvas and legend. This 
-has been a source of confusion for a number of people. As described below, 
+has been a source of confusion for a number of users. As described below, 
 before you start using the MapServer Export Plugin, you need to arrange 
 the raster and vector layers you want to use in MapServer and save this 
-status in a QGIS project file
+status in a QGIS project file.
 
 \begin{figure}[ht]
 \begin{center}
@@ -33,9 +27,9 @@
 \end{center}
 \end{figure}
 
-In this example we show the four steps to get us to the point where we are 
-ready to create the MapServer map file. We use raster and vector files from 
-the QGIS sample dataset \ref{label_sampledata}.
+In this example, we demonstrate the four steps required to create a simple 
+project file which can be used to create the MapServer map file. 
+We use raster and vector files from the QGIS sample dataset \ref{label_sampledata}.
 
 \begin{enumerate}
 \item Add the raster layer \filename{landcover.tif} clicking on the 
@@ -43,7 +37,7 @@
 \item Add the vector Shapefiles \filename{lakes.shp, majrivers.shp} and 
 \filename{airports.shp} from the QGIS sample dataset clicking on the 
 \toolbtntwo{mActionAddNonDbLayer}{Add Vector Layer} icon.
-\item Change the colors and symbolize the data as you like (see 
+\item Change the colors and symbolize the data as you like (For example see 
 Figure~\ref{fig:mapserver_export_qgs})
 \item Save a new project named \filename{mapserverproject.qgs} using 
 \mainmenuopt{File} > \dropmenuopttwo{mActionFileSave}{Save Project}.
@@ -53,11 +47,7 @@
 
 The tool \filename{msexport} to export a QGIS project file to a MapServer map 
 file is installed in your QGIS binary directory and can be used independently of QGIS. 
-From QGIS you need to load the MapServer Export Plugin first with the Plugin Manager. 
-Click \mainmenuopt{Plugins} > \dropmenuopt{Manage Plugins...} to open the Plugin Manager, 
-choose MapServer export Plugin and click \button{OK}. Now start the 
-\toolbtntwo{mapserver_export}{MapServer Export} dialog (see 
-Figure~\ref{fig:mapserver_export_dialog}) clicking the icon in the toolbar menu.
+To use it from within QGIS, you need to enable the MapServer Export Plugin first using the Plugin Manager (see Section \ref{sec:load_core_plugin}).
 
 \begin{figure}[ht]
 \begin{center}
@@ -93,28 +83,29 @@
 \end{description}
 
 Only the \filename{Map file} and \filename{QGIS project file} inputs are 
-required to create a map file, however you may end up with a non-functional 
-map file, depending on your intended use. Although QGIS is good at creating 
-a map file from your project file, it may require some tweaking to get the 
-results you want. But let's create a map file using the project file 
+required to create a map file, however by omitting the other parameters, 
+you may end up creating a non-functional map file, depending on your intended use. 
+Although QGIS is good at creating a map file from your project file, 
+it may require some tweaking to get the results you want. 
+For this example, we will create a map file using the project file 
 \filename{mapserverproject.qgs} we just created 
 (see Figure~\ref{fig:mapserver_export_dialog}):
 
 \begin{enumerate}
-  \item Open the MapServer Export Plugin clicking the 
-  \toolbtntwo{mapserver_export}{MapServer Export} icon.
-  \item Enter the name \filename{qgisproject.map} for your new map file.
-  \item Browse and find the QGIS project file \filename{mapserverproject.qgs} 
-  you just saved.
-  \item Enter a name \filename{MyMap} for the map.
-  \item Enter \filename{600} for the width and \filename{400} for the height.
-  \item Our layers are in meters so we change the units to meters.
+  \item  Start the MapServer dialog (see 
+Figure \ref{fig:mapserver_export_dialog}) by clicking the \toolbtntwo{mapserver_export}{MapServer Export} icon in the toolbar menu.
+  \item Enter the name (e.g., \filename{qgisproject.map}) for your new map file.
+  \item Browse and find the QGIS project file (e.g., \filename{mapserverproject.qgs}) 
+  you previously saved.
+  \item Enter a name (e.g., \filename{MyMap}) for the map.
+  \item Enter the width and height (e.g., \filename{600} for the width and \filename{400} for the height) for your output image.
+  \item For this example, the layers are in meters, so we change the units to meters.
   \item Choose ``png'' for the image type.
   \item Click \button{OK} to generate the new map file \filename{qgisproject.map}. 
   QGIS displays the success of your efforts.
 \end{enumerate}
 
-You can view the map file in an text editor or visualizer. If you
+You can view the map file in any text editor or visualizer. If you
 take a look, you'll notice that the export tool adds the metadata needed
 to enable our map file for WMS. 
 
@@ -127,7 +118,7 @@
 \begin{itemize}
 \item Open a terminal window
 \item If you didn't save your map file in your home directory, change to
-  the folder where you saved it
+  the folder where you saved it.
 \item Run \filename{shp2img -m qgisproject.map -o mapserver\_test.png} and 
   display the image 
 \end{itemize}
@@ -135,7 +126,7 @@
 This creates a PNG with all the layers included in the QGIS project file. 
 In addition, the extent of the PNG will be the same as when we saved the 
 project. As you can see in Figure~\ref{fig:mapserver_export_test}, all 
-inforamtion except the airport symbols are included.
+information except the airport symbols are included.
 
 \begin{figure}[ht]
 \begin{center}
@@ -149,6 +140,5 @@
 have to tweak anything. If you plan to use it with a mapping template or a
 custom interface, you may have a bit of manual work to do. To see how easy
 it is to go from QGIS to serving maps on the web, take a look at
-Christopher Schmidt's 5 minute flash video. He used QGIS version 0.8, but it 
-is still useful.
+Christopher Schmidt's 5 minute flash video. He used an older version of QGIS (version 0.8), but the demo applies equally well to newer versions.
 \footnote{\url{http://openlayers.org/presentations/mappingyourdata/}}

Modified: docs/trunk/english_us/user_guide/plugins_ogr_converter.tex
===================================================================
--- docs/trunk/english_us/user_guide/plugins_ogr_converter.tex	2009-05-06 16:36:27 UTC (rev 10746)
+++ docs/trunk/english_us/user_guide/plugins_ogr_converter.tex	2009-05-06 18:33:02 UTC (rev 10747)
@@ -6,10 +6,11 @@
 % comment out the following line:
 %\updatedisclaimer
 
-The OGR layer converter plugin allows to convert vector data from one OGR-supported 
-vector format to another OGR-supported vector format. It is very simple to handle and 
-provides functionalities as shown in Figure \ref{fig:ogrconverter_dialog}. The 
-supported formats can vary according to the installed GDAL/OGR package.
+The OGR Layer Converter plugin adds the ability to convert vector data from one OGR-supported 
+vector format to another.\footnotetext{Supported formats may vary according to the installed 
+GDAL/OGR package.}
+The plugin is very simple to run, and only requires a few parameters to be 
+specified before running:
 
 \begin{itemize}
 \item \textbf{Source Format/Datset/Layer}: Enter OGR format and path to the vector file to be converted
@@ -23,16 +24,15 @@
 \end{center}  
 \end{figure}
 
+\minisec{Using the Plugin}
+
 \begin{enumerate}
   \item Start QGIS, load the OGR converter plugin in the Plugin Manager (see Section 
   \ref{sec:load_core_plugin}) and click on the \toolbtntwo{ogr_converter}{OGR Layer Converter} 
   icon which appears in the QGIS toolbar menu. The OGR Layer Converter plugin dialog appears as shown in Figure \ref{fig:ogrconverter_dialog}.
-  \item Select the OGR-supported format \selectstring{ESRI Shapefile}{\ldots} and the path to the vector input file \filename{alaska.shp} in the Source area.
-  \item Select the OGR-supported format \selectstring{GML}{\ldots} and define a path and the vector output filename \filename{alaska.gml} in the Target area.
+  \item Select the OGR-supported format (e.g., \selectstring{ESRI Shapefile}{\ldots}) and the path to the vector input file (e.g., \filename{alaska.shp}) in the Source area.
+  \item Select the OGR-supported format (e.g., \selectstring{GML}{\ldots}) and define a path and the vector output filename (e.g., \filename{alaska.gml}) in the Target area.
   \item Click \button{Ok}.
 \end{enumerate}
 
 \newpage
-
-
-

Modified: docs/trunk/english_us/user_guide/user_guide.tex
===================================================================
--- docs/trunk/english_us/user_guide/user_guide.tex	2009-05-06 16:36:27 UTC (rev 10746)
+++ docs/trunk/english_us/user_guide/user_guide.tex	2009-05-06 18:33:02 UTC (rev 10747)
@@ -26,9 +26,9 @@
 %in the plugins chapter
 \include{plugins}
 \include{core_plugins}
+\include{plugins_delimited_text}
 \include{plugins_coordinate_capture}
 \include{plugins_decorations}
-\include{plugins_delimited_text}
 \include{plugins_dxf2shape_converter}
 \include{plugins_georeferencer}
 \include{plugins_quick_print}
@@ -37,6 +37,7 @@
 \include{plugins_interpolation}
 \include{plugins_mapserver_export}
 \include{plugins_ogr_converter}
+\include{other_core_plugins}
 \include{external_plugins}
 %\include{plugins_ftools}
 %\include{plugins_table_manager}

Modified: docs/trunk/english_us/user_guide/working_with_ogc.tex
===================================================================
--- docs/trunk/english_us/user_guide/working_with_ogc.tex	2009-05-06 16:36:27 UTC (rev 10746)
+++ docs/trunk/english_us/user_guide/working_with_ogc.tex	2009-05-06 18:33:02 UTC (rev 10747)
@@ -432,7 +432,7 @@
 \end{Tip}
 
 
-\subsection{WFS Client}
+\subsection{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 



More information about the QGIS-commit mailing list