[QGIS Commit] r15896 - in docs/trunk/english_us/user_guide: .
grass_integration_screenies images
plugins_delimited_text_images plugins_screenies
print_composer_screenies working_with_ogc_screenies
svn_qgis at osgeo.org
svn_qgis at osgeo.org
Thu Jul 28 11:57:49 EDT 2011
Author: dassau
Date: 2011-07-28 08:57:49 -0700 (Thu, 28 Jul 2011)
New Revision: 15896
Added:
docs/trunk/english_us/user_guide/images/raster-info.png
docs/trunk/english_us/user_guide/plugins_sql_anywhere.tex
docs/trunk/english_us/user_guide/print_composer_screenies/command_hist.png
Removed:
docs/trunk/english_us/user_guide/images/grass_location.png
Modified:
docs/trunk/english_us/user_guide/core_plugins.tex
docs/trunk/english_us/user_guide/grass_integration.tex
docs/trunk/english_us/user_guide/grass_integration_screenies/grass_toolbox_modulelist.png
docs/trunk/english_us/user_guide/grass_integration_screenies/grass_toolbox_moduletree.png
docs/trunk/english_us/user_guide/grass_integration_screenies/grass_toolbox_shell.png
docs/trunk/english_us/user_guide/plugins.tex
docs/trunk/english_us/user_guide/plugins_coordinate_capture.tex
docs/trunk/english_us/user_guide/plugins_decorations.tex
docs/trunk/english_us/user_guide/plugins_delimited_text.tex
docs/trunk/english_us/user_guide/plugins_delimited_text_images/delimited_text_dialog.png
docs/trunk/english_us/user_guide/plugins_screenies/plugininstaller.png
docs/trunk/english_us/user_guide/plugins_screenies/pluginmanager.png
docs/trunk/english_us/user_guide/print_composer.tex
docs/trunk/english_us/user_guide/print_composer_screenies/print_composer_blank.png
docs/trunk/english_us/user_guide/print_composer_screenies/print_composer_complete.png
docs/trunk/english_us/user_guide/qgis_mapserver.tex
docs/trunk/english_us/user_guide/user_guide.tex
docs/trunk/english_us/user_guide/working_with_ogc.tex
docs/trunk/english_us/user_guide/working_with_ogc_screenies/connection_wfs.png
docs/trunk/english_us/user_guide/working_with_ogc_screenies/connection_wms.png
docs/trunk/english_us/user_guide/working_with_ogc_screenies/wms_server-search.png
docs/trunk/english_us/user_guide/working_with_projections.tex
docs/trunk/english_us/user_guide/working_with_raster.tex
docs/trunk/english_us/user_guide/working_with_vector.tex
Log:
update
Modified: docs/trunk/english_us/user_guide/core_plugins.tex
===================================================================
--- docs/trunk/english_us/user_guide/core_plugins.tex 2011-07-28 10:41:31 UTC (rev 15895)
+++ docs/trunk/english_us/user_guide/core_plugins.tex 2011-07-28 15:57:49 UTC (rev 15896)
@@ -4,13 +4,12 @@
% when the revision of a section has been finalized,
% comment out the following line:
-\updatedisclaimer
+% \updatedisclaimer
-
{\setlength{\extrarowheight}{15pt}
\small
\begin{longtable}{|p{1.2cm}|p{3.8cm}|p{7.5cm}|p{3cm}|}
-\caption{22 QGIS Core Plugins}\label{tab:core_plugins} \\
+\caption{26 QGIS Core Plugins}\label{tab:core_plugins} \\
\hline
\textbf{Icon} & \textbf{Plugin} & \textbf{Description} & \textbf{Manual Reference}\\
\endfirsthead
@@ -42,25 +41,21 @@
\includegraphics[width=0.6cm, height=0.6cm]{ftoolslogo}
& fTools \index{plugins!ftools}& A suite of analysis, geometry, geoprocessing, and research tools & Chapter \ref{sec:ftools}\\
\hline
-% \includegraphics[width=0.6cm, height=0.6cm]{plugin}
- & GDAL Tools \index{plugins!gdaltools} & Raster tools: simplified graphical interface for most commonly used programs & Chapter \ref{label_plugingdaltools}\\
-\hline
\includegraphics[width=0.6cm]{gps_importer}
& GPS Tools \index{plugins!gps}& Tools for loading and importing GPS data & Chapter \ref{label_plugingps}\\
\hline
\includegraphics[width=0.6cm]{grass}
& GRASS \index{plugin!grass toolbox} & Activates the mighty GRASS Toolbox & Chapter \ref{sec:grass}\\
\hline
+\includegraphics[width=0.6cm, height=0.6cm]{raster-info}
+ & GDAL Tools \index{plugins!gdaltools} & Raster tools: simplified graphical interface for most commonly used programs & Chapter \ref{label_plugingdaltools}\\
+\hline
\includegraphics[width=0.6cm]{georeferencer}
& Georeferencer GDAL \index{plugin!georeferencer} & Adding projection info to Rasterfiles using GDAL & Chapter \ref{sec:georef}\\
\hline
\includegraphics[width=0.6cm]{interpolation}
& Interpolation plugin \index{plugins!Interpolation}& Interpolation on base of vertices of a vector layer & Chapter \ref{sec:interpol}\\
\hline
-\includegraphics[width=0.6cm]{raster_terrain}
-& Raster Terrain Modelling \index{plugins!Raster Terrain Modelling}& Compute slope, aspect,
-ruggedness and total curvature of DEMs & Chapter \ref{sec:rasterrain}\\
-\hline
\includegraphics[width=0.6cm]{mapserver_export}
& MapServer Export Plugin \index{plugins!MapServer Export}& Export a saved QGIS project file to a MapServer map file & Chapter \ref{sec:mapserver_export} \\
\hline
@@ -74,24 +69,32 @@
& OpenStreetMap & Visualize and edit OpenStreetMap data & Chapter \ref{plugins_osm}\\
\hline
\includegraphics[width=0.6cm]{oracle_raster}
- & Oracle Georaster \index{plugins!georaster}& Access Oracle Spatial GeoRasters & Chapter
+ & Oracle Spatial Georaster \index{plugins!georaster}& Access Oracle Spatial GeoRasters & Chapter
\ref{sec:oracleraster}\\
\hline
\includegraphics[width=0.6cm]{plugin_installer}
& Plugin Installer \index{plugins!Plugin Installer} & Download and install python plugins & Chapter \ref{sec:python_plugin_installer}\\
\hline
+\includegraphics[width=0.6cm]{raster_terrain}
+& Raster Terrain Modelling \index{plugins!Raster Terrain Modelling}& Compute slope, aspect,
+ruggedness and total curvature of DEMs & Chapter \ref{sec:rasterrain}\\
+\hline
\includegraphics[width=0.6cm]{plugin}
& Road graph Plugin \index{plugins!road graph} & Solve shortest path problem & Chapter \ref{sec:roadgraph} \\
\hline
+\includegraphics[width=0.6cm]{spiticon}
+ & SPIT \index{plugins!spit} & Shapefile to Postgres/PostGIS Import Tool & Chapter \ref{sec:loading_postgis_data} \\
+ \hline
+\includegraphics[width=0.6cm]{plugin}
+ & SQL Anywhere plugin \index{plugins!SQL anywhere} & Store vector layers
+within a SQL anywhere database & Chapter \ref{sec:sqlanywhere} \\
+ \hline
\includegraphics[width=0.6cm]{scale_bar}
& Scalebar \index{plugins!scalebar}& Draws a scale bar & Chapter \ref{scalebar} \\
\hline
\includegraphics[width=0.6cm]{spatialquery}
& Spatial Query & Make spatial queries on vector layers & Chapter \ref{sec:spatial_query} \\
\hline
-\includegraphics[width=0.6cm]{spiticon}
- & SPIT \index{plugins!spit} & Shapefile to Postgres/PostGIS Import Tool & Chapter \ref{sec:loading_postgis_data} \\
- \hline
\includegraphics[width=0.6cm]{mIconAddWfsLayer}
& WFS Plugin & Add WFS layers to the QGIS canvas & Chapter \ref{sec:ogc-wfs} \\
\hline
Modified: docs/trunk/english_us/user_guide/grass_integration.tex
===================================================================
--- docs/trunk/english_us/user_guide/grass_integration.tex 2011-07-28 10:41:31 UTC (rev 15895)
+++ docs/trunk/english_us/user_guide/grass_integration.tex 2011-07-28 15:57:49 UTC (rev 15896)
@@ -4,7 +4,7 @@
% when the revision of a section has been finalized,
% comment out the following line:
-\updatedisclaimer
+% \updatedisclaimer
The GRASS plugin provides access to GRASS GIS~\cite{GRASSweb} databases and
functionalities. This includes visualization of GRASS raster and vector
Modified: docs/trunk/english_us/user_guide/grass_integration_screenies/grass_toolbox_modulelist.png
===================================================================
(Binary files differ)
Modified: docs/trunk/english_us/user_guide/grass_integration_screenies/grass_toolbox_moduletree.png
===================================================================
(Binary files differ)
Modified: docs/trunk/english_us/user_guide/grass_integration_screenies/grass_toolbox_shell.png
===================================================================
(Binary files differ)
Deleted: docs/trunk/english_us/user_guide/images/grass_location.png
===================================================================
(Binary files differ)
Added: docs/trunk/english_us/user_guide/images/raster-info.png
===================================================================
(Binary files differ)
Property changes on: docs/trunk/english_us/user_guide/images/raster-info.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Modified: docs/trunk/english_us/user_guide/plugins.tex
===================================================================
--- docs/trunk/english_us/user_guide/plugins.tex 2011-07-28 10:41:31 UTC (rev 15895)
+++ docs/trunk/english_us/user_guide/plugins.tex 2011-07-28 15:57:49 UTC (rev 15896)
@@ -4,7 +4,7 @@
% when the revision of a section has been finalized,
% comment out the following line:
-\updatedisclaimer
+% \updatedisclaimer
QGIS has been designed with a plugin architecture.
This allows many new features/functions to be easily added to the application.
Modified: docs/trunk/english_us/user_guide/plugins_coordinate_capture.tex
===================================================================
--- docs/trunk/english_us/user_guide/plugins_coordinate_capture.tex 2011-07-28 10:41:31 UTC (rev 15895)
+++ docs/trunk/english_us/user_guide/plugins_coordinate_capture.tex 2011-07-28 15:57:49 UTC (rev 15896)
@@ -4,7 +4,7 @@
% when the revision of a section has been finalized,
% comment out the following line:
-\updatedisclaimer
+% \updatedisclaimer
The coordinate capture plugin is easy to use and provides the
ability to display coordinates on the map canvas for two
Modified: docs/trunk/english_us/user_guide/plugins_decorations.tex
===================================================================
--- docs/trunk/english_us/user_guide/plugins_decorations.tex 2011-07-28 10:41:31 UTC (rev 15895)
+++ docs/trunk/english_us/user_guide/plugins_decorations.tex 2011-07-28 15:57:49 UTC (rev 15896)
@@ -4,7 +4,7 @@
% when the revision of a section has been finalized,
% comment out the following line:
-\updatedisclaimer
+% \updatedisclaimer
The Decorations Plugins includes the Copyright Label Plugin, the North
Arrow Plugin and the Scale Bar Plugin. They are used to ``decorate'' the
Modified: docs/trunk/english_us/user_guide/plugins_delimited_text.tex
===================================================================
--- docs/trunk/english_us/user_guide/plugins_delimited_text.tex 2011-07-28 10:41:31 UTC (rev 15895)
+++ docs/trunk/english_us/user_guide/plugins_delimited_text.tex 2011-07-28 15:57:49 UTC (rev 15896)
@@ -4,7 +4,7 @@
% when the revision of a section has been finalized,
% comment out the following line:
-\updatedisclaimer
+% \updatedisclaimer
The Delimited Text plugin allows you to load a delimited text file as a layer in QGIS.
@@ -32,7 +32,8 @@
Some items of note about the text file are:
\begin{enumerate}
-\item The example text file uses \mbox{$;$} as delimiter. Any character can be used to delimit the fields.
+\item The example text file uses \mbox{$;$} as delimiter. Any character can be
+used to delimit the fields.
\item The first row is the header row. It contains the fields X, Y and ELEV.
\item No quotes ({\tt{}"{}}) are used to delimit text fields.
\item The x coordinates are contained in the {\em X} field.
@@ -40,9 +41,12 @@
\end{enumerate}
\minisec{Using the Plugin}
-To use the plugin you must first enable it as described in Section \ref{sec:managing_plugins}.
+To use the plugin you must first enable it as described in Section
+\ref{sec:managing_plugins}.
-Click the new toolbar icon \toolbtntwo{delimited_text}{Add Delimited Text Layer} to open the Delimited Text dialog as shown in Figure \ref{fig:delim_text_plugin_dialog}.
+Click the new toolbar icon \toolbtntwo{delimited_text}{Add Delimited Text Layer}
+to open the Delimited Text dialog as shown in figure
+\ref{fig:delim_text_plugin_dialog}.
\begin{figure}[ht]
\centering
@@ -50,16 +54,17 @@
\caption{Delimited Text Dialog \nixcaption}\label{fig:delim_text_plugin_dialog}
\end{figure}
-First select the file (e.g., \filename{qgis\_sample\_data/csv/elevp.csv}) to import by clicking
-on the \button{Browse} button. Once the file is selected, the plugin attempts to parse the file
-using the last used delimiter, in this case a semi-colon (\mbox{$;$}). To properly parse the file, it
+First select the file (e.g., \filename{qgis\_sample\_data/csv/elevp.csv}) to
+import by clicking on the \button{Browse} button. Once the file is selected,
+the plugin attempts to parse the file using the last used delimiter, in this
+case a semi-colon (\mbox{$;$}). To properly parse the file, it
is important to select the correct delimiter. To change the delimiter to tab use
\mbox{$\backslash$}t (this is a regular expression for the tab character).
-After changing the delimiter, click \button{Parse}.
-Once you have parsed the file, choose the X and Y fields from the drop down lists and
-enter a Layer name (e.g., \filename{elevp} ) as shown in Figure
-\ref{fig:delim_text_plugin_dialog}. To add the layer to the map, click
-\button{Add Layer}. The delimited text file now behaves as any other map layer in QGIS.
+Once the file is parsed, choose the X and Y fields from the drop down lists and
+if available also the WKT field for the CRS information. Finally enter a Layer
+name (e.g., \filename{elevp} ) as shown in Figure \ref{fig:delim_text_plugin_dialog}. T
+o add the layer to the map, click \button{OK}. The delimited text file now
+behaves as any other map layer in QGIS.
\FloatBarrier
Modified: docs/trunk/english_us/user_guide/plugins_delimited_text_images/delimited_text_dialog.png
===================================================================
(Binary files differ)
Modified: docs/trunk/english_us/user_guide/plugins_screenies/plugininstaller.png
===================================================================
(Binary files differ)
Modified: docs/trunk/english_us/user_guide/plugins_screenies/pluginmanager.png
===================================================================
(Binary files differ)
Added: docs/trunk/english_us/user_guide/plugins_sql_anywhere.tex
===================================================================
--- docs/trunk/english_us/user_guide/plugins_sql_anywhere.tex (rev 0)
+++ docs/trunk/english_us/user_guide/plugins_sql_anywhere.tex 2011-07-28 15:57:49 UTC (rev 15896)
@@ -0,0 +1,11 @@
+% !TeX root = user_guide.tex
+
+\section{SQL Anywhere Plugin}\label{sec:sqlanywhere}
+
+% when the revision of a section has been finalized,
+% comment out the following line:
+\updatedisclaimer
+
+The \toolbtntwo{plugin}{SQL Anywhere} Plugin ...
+
+\FloatBarrier
Modified: docs/trunk/english_us/user_guide/print_composer.tex
===================================================================
--- docs/trunk/english_us/user_guide/print_composer.tex 2011-07-28 10:41:31 UTC (rev 15895)
+++ docs/trunk/english_us/user_guide/print_composer.tex 2011-07-28 15:57:49 UTC (rev 15896)
@@ -4,7 +4,7 @@
% when the revision of a section has been finalized,
% comment out the following line:
-\updatedisclaimer
+% \updatedisclaimer
The print composer provides growing layout and printing
capabilities. It allows you to add elements such as the QGIS map canvas,
@@ -23,57 +23,62 @@
\begin{tabular}{|m{1cm}|m{5.4cm}|m{1cm}|m{5.4cm}|}
\hline \textbf{Icon} & \textbf{Purpose} & \textbf{Icon} &
\textbf{Purpose} \\
- \hline \includegraphics[width=0.7cm]{mActionFolder}
+ \hline \includegraphics[width=0.6cm]{mActionFolder}
& Load from template &
- \includegraphics[width=0.7cm]{mActionFileSaveAs} & Save as template \\
- \hline \includegraphics[width=0.7cm]{mActionExportMapServer}
+ \includegraphics[width=0.6cm]{mActionFileSaveAs} & Save as template \\
+ \hline \includegraphics[width=0.6cm]{mActionExportMapServer}
& Export to an image format &
- \includegraphics[width=0.7cm]{mActionSaveAsPDF} & Export as PDF \\
- \hline \includegraphics[width=0.7cm]{mActionSaveAsSVG} & Export print
- composition to SVG & \includegraphics[width=0.7cm]{mActionFilePrint}
+ \includegraphics[width=0.6cm]{mActionSaveAsPDF} & Export as PDF \\
+ \hline \includegraphics[width=0.6cm]{mActionSaveAsSVG} & Export print
+ composition to SVG & \includegraphics[width=0.6cm]{mActionFilePrint}
& Print or export as Postscript \\
- \hline \includegraphics[width=0.7cm]{mActionZoomFullExtent} & Zoom to
- full extend & \includegraphics[width=0.7cm]{mActionZoomIn} & Zoom in \\
- \hline \includegraphics[width=0.7cm]{mActionZoomOut} & Zoom out &
- \includegraphics[width=0.7cm]{mActionDraw} & Refresh view \\
- \hline \includegraphics[width=0.7cm]{mActionAddMap} & Add new map from
- QGIS map canvas & \includegraphics[width=0.7cm]{mActionSaveMapAsImage}
+ \hline \includegraphics[width=0.6cm]{mActionZoomFullExtent} & Zoom to
+ full extend & \includegraphics[width=0.6cm]{mActionZoomIn} & Zoom in \\
+ \hline \includegraphics[width=0.6cm]{mActionZoomOut} & Zoom out &
+ \includegraphics[width=0.6cm]{mActionDraw} & Refresh view \\
+ \hline \includegraphics[width=0.6cm]{mActionUndo} & Revert last change & \includegraphics[width=0.6cm]{mActionRedo}
+ & Restore last change \\
+ \hline \includegraphics[width=0.6cm]{mActionAddMap} & Add new map from
+ QGIS map canvas & \includegraphics[width=0.6cm]{mActionSaveMapAsImage}
& Add Image to print composition \\
- \hline \includegraphics[width=0.7cm]{mActionLabel} & Add label to print
- composition & \includegraphics[width=0.7cm]{mActionAddLegend} & Add new
+ \hline \includegraphics[width=0.6cm]{mActionAddMap} & Add new map from
+ QGIS map canvas & \includegraphics[width=0.6cm]{mActionSaveMapAsImage}
+ & Add Image to print composition \\
+ \hline \includegraphics[width=0.6cm]{mActionLabel} & Add label to print
+ composition & \includegraphics[width=0.6cm]{mActionAddLegend} & Add new
legend to print composition \\
- \hline \includegraphics[width=0.7cm]{mActionScaleBar} & Add new scalebar
- to print composition & \includegraphics[width=0.7cm]{mActionAddBasicShape}
+ \hline \includegraphics[width=0.6cm]{mActionScaleBar} & Add new scalebar
+ to print composition & \includegraphics[width=0.6cm]{mActionAddBasicShape}
& Add basic shape to print composition \\
- \hline \includegraphics[width=0.7cm]{mActionAddArrow} & Add arrow to print
- composition & \includegraphics[width=0.7cm]{mActionOpenTable} & Add attribute
+ \hline \includegraphics[width=0.6cm]{mActionAddArrow} & Add arrow to print
+ composition & \includegraphics[width=0.6cm]{mActionOpenTable} & Add attribute
table to print composition \\
- \hline \includegraphics[width=0.7cm]{mActionSelectPan} & Select/Move item in
+ \hline \includegraphics[width=0.6cm]{mActionSelectPan} & Select/Move item in
print composition &
- \includegraphics[width=0.7cm]{mActionMoveItemContent} & Move content within
+ \includegraphics[width=0.6cm]{mActionMoveItemContent} & Move content within
an item \\
- \hline \includegraphics[width=0.7cm]{mActionGroupItems} & Group items of
+ \hline \includegraphics[width=0.6cm]{mActionGroupItems} & Group items of
print composition &
- \includegraphics[width=0.7cm]{mActionUngroupItems} & Ungroup items of print
+ \includegraphics[width=0.6cm]{mActionUngroupItems} & Ungroup items of print
composition \\
- \hline \includegraphics[width=0.7cm]{mActionRaiseItems} & Raise selected
+ \hline \includegraphics[width=0.6cm]{mActionRaiseItems} & Raise selected
items &
- \includegraphics[width=0.7cm]{mActionLowerItems} & Lower selected items \\
- \hline \includegraphics[width=0.7cm]{mActionMoveItemsToTop} & Move selected
+ \includegraphics[width=0.6cm]{mActionLowerItems} & Lower selected items \\
+ \hline \includegraphics[width=0.6cm]{mActionMoveItemsToTop} & Move selected
items to top &
- \includegraphics[width=0.7cm]{mActionMoveItemsToBottom} & Move selected
+ \includegraphics[width=0.6cm]{mActionMoveItemsToBottom} & Move selected
items to bottom \\
- \hline \includegraphics[width=0.7cm]{mActionAlignLeft} & Align selected
+ \hline \includegraphics[width=0.6cm]{mActionAlignLeft} & Align selected
items left &
- \includegraphics[width=0.7cm]{mActionAlignRight} & Align selected items
+ \includegraphics[width=0.6cm]{mActionAlignRight} & Align selected items
right \\
- \hline \includegraphics[width=0.7cm]{mActionAlignHCenter} & Align selected
+ \hline \includegraphics[width=0.6cm]{mActionAlignHCenter} & Align selected
items center &
- \includegraphics[width=0.7cm]{mActionAlignVCenter} & Align selected items
+ \includegraphics[width=0.6cm]{mActionAlignVCenter} & Align selected items
center vertical \\
- \hline \includegraphics[width=0.7cm]{mActionAlignTop} & Align selected
+ \hline \includegraphics[width=0.6cm]{mActionAlignTop} & Align selected
items top &
- \includegraphics[width=0.7cm]{mActionAlignBottom} & Align selected
+ \includegraphics[width=0.6cm]{mActionAlignBottom} & Align selected
items bottom \\
\hline
\end{tabular}
@@ -119,6 +124,9 @@
icon to select an element (e.g. legend, scalebar or label) on the canvas.
Then click the Item tab and customize the settings for the selected
element.
+\item The \tab{Command history} tab displays a history of all changes applied
+to the print composer layout. With a mouse click it is possible to undo and
+redo layout steps back and forth to a certain status.
\end{itemize}
You can add multiple elements to the composer. It is also possible to have
@@ -456,6 +464,26 @@
inconsistent state.
\end{itemize}
+\section{Revert and Restore tools}
+
+During the layout process it is possible to revert and restore changes. This
+can be done with the revert and restore tools:
+
+\begin{itemize}[label=--]
+\item \toolbtntwo{mActionUndo}{Revert last changes},
+\item \toolbtntwo{mActionRedo}{Restore last changes}.
+\end{itemize}
+
+or by mouse click within the \tab{Command history} tab (see
+figure~\ref{fig:commandhist}).
+
+\begin{figure}[ht]
+ \centering
+ \includegraphics[clip=true, width=14cm]{command_hist}
+ \caption{Command history in the Print Composer \nixcaption}\label
+ {fig:commandhist}
+\end{figure}
+
\section{Add Basic shape and Arrow}
It is possible to add basic shapes (Ellipse, Rectangle, Triangle) and arrows
Added: docs/trunk/english_us/user_guide/print_composer_screenies/command_hist.png
===================================================================
(Binary files differ)
Property changes on: docs/trunk/english_us/user_guide/print_composer_screenies/command_hist.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Modified: docs/trunk/english_us/user_guide/print_composer_screenies/print_composer_blank.png
===================================================================
(Binary files differ)
Modified: docs/trunk/english_us/user_guide/print_composer_screenies/print_composer_complete.png
===================================================================
(Binary files differ)
Modified: docs/trunk/english_us/user_guide/qgis_mapserver.tex
===================================================================
--- docs/trunk/english_us/user_guide/qgis_mapserver.tex 2011-07-28 10:41:31 UTC (rev 15895)
+++ docs/trunk/english_us/user_guide/qgis_mapserver.tex 2011-07-28 15:57:49 UTC (rev 15896)
@@ -33,10 +33,15 @@
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/}
+In one of the following manuals we will provide a sample configuration to
+set up a QGIS mapserver. But for now we recommend to read one of the following
+URLs to get more information:
+\begin{itemize}
+\item \url{http://karlinapp.ethz.ch/qgis\_wms/} \\
+\item \url{http://www.qgis.org/wiki/QGIS\_mapserver\_tutorial} \\
+\item \url{http://linfiniti.com/2010/08/qgis-mapserver-a-wms-server-for-the-masses/}
+\end{itemize}
+
\FloatBarrier
Modified: docs/trunk/english_us/user_guide/user_guide.tex
===================================================================
--- docs/trunk/english_us/user_guide/user_guide.tex 2011-07-28 10:41:31 UTC (rev 15895)
+++ docs/trunk/english_us/user_guide/user_guide.tex 2011-07-28 15:57:49 UTC (rev 15896)
@@ -57,6 +57,7 @@
\input{plugins_raster_terrain}
\input{plugins_road_graph}
\input{plugins_spatial_query}
+\input{plugins_sql_anywhere}
%\input{plugins_table_manager}
%\input{plugins_raster_algebra}
%end of plugin docs
Modified: docs/trunk/english_us/user_guide/working_with_ogc.tex
===================================================================
--- docs/trunk/english_us/user_guide/working_with_ogc.tex 2011-07-28 10:41:31 UTC (rev 15895)
+++ docs/trunk/english_us/user_guide/working_with_ogc.tex 2011-07-28 15:57:49 UTC (rev 15896)
@@ -3,7 +3,7 @@
% when the revision of a section has been finalized,
% comment out the following line:
-\updatedisclaimer
+% \updatedisclaimer
QGIS supports WMS and WFS as data sources. WMS-support is native; WFS and WFS-T is
implemented as a plugin.
@@ -119,11 +119,11 @@
Once you have successfully filled in your parameters you can select the
\button{Connect}
-button to retrieve the capabilities of the selected server. This includes the Image encoding,
-Layers, Layer Styles and Projections. Since this
-is a network operation, the speed of the response depends on the quality of your network
-connection to the WMS server. While downloading data from the WMS server, the download progress
-is visualized in the left bottom of the WMS Plugin dialog.
+button to retrieve the capabilities of the selected server. This includes the
+Image encoding, Layers, Layer Styles and Projections. Since this is a network
+operation, the speed of the response depends on the quality of your network
+connection to the WMS server. While downloading data from the WMS server, the
+download progress is visualized in the left bottom of the WMS Plugin dialog.
Your screen should now look a bit like Figure \ref{fig:connection_wms}, which shows the
response provided by the NASA JPL OnEarth WMS server.
@@ -155,24 +155,20 @@
\minisec{Options}
-The\tab{Options} section provides a text-field where you can add a name
+The Options field provides a text-field where you can add a layer name
for the WMS-layer. This name will be presented in the legend after loading
the layer.
-If the OnlineRessource-URL from the GetCapabilities-document is different
-from the given URL inside the connection-parameters, QGIS will ask you
-which URL it should use. Depending on your answer QGIS will check the
-checkboxes for yourself based on your answere. This can also be tweaked with a
-\checkbox{Ignore GetMap URL} checkbox and a
-\checkbox{Ignore GetFeatureInfo URL} checkbox separately, also later on.
+Below the layer name you find the default projection, provided by the mapserver.
+If the \button{Change\dots} button is active, you can click on it and change the
+default projection of the WMS to another CRS, provided by the WMS server.
+\minisec{Layer Order} \label{ogc-wms-layers}
-\minisec{Layers} \label{ogc-wms-layers}
+The \tab{Layer Order} tab lists the selected layers available from the current
+connected WMS server. You may notice that some layers are expandible, this
+means that the layer can be displayed in a choice of image styles.
-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.
-
You can select several layers at once, but only one image style per layer.
When several layers are selected, they will be combined at the WMS Server
and transmitted to QGIS in one go.
@@ -212,16 +208,15 @@
A Coordinate Reference System (CRS) is the OGC terminology for a QGIS Projection.
Each WMS Layer can be presented in multiple CRSs, depending
-on the capability of the WMS server. You may notice that the \textsl{x} changes in
-the \textsl{Coordinate Reference System (x available)} header as you
+on the capability of the WMS server. You may notice that the \textsl{x}
+changes in the \textsl{Coordinate Reference System (x available)} header as you
select and deselect layers from the \tab{Layers} section.
-To choose a CRS, select \button{Change...} and a screen similar to
+To choose a CRS, select \button{Change\dots} and a dialog similar to
Figure \ref{fig:projections} in Section \ref{label_projstart} will appear.
The main difference with the WMS version of the screen is that only
those CRSs supported by the WMS Server will be shown.
-
\begin{Tip}[ht]\caption{\textsc{WMS Projections}}
For best results, make the WMS layer the first layer
you add to your project. This allows the project
@@ -540,14 +535,16 @@
\index{WFS!remote server!}
\end{Tip}
-\begin{Tip}[htb]\caption{\textsc{Accessing secure WFS Servers}}
-Within the dialog \dialog{Create a new WFS-connection} QGIS does not support
-authenficated WFS-connections yet. Within one of the next releases we expect
-to also support authenticated WFS-servers. Meanwhile you could use InteProxy
-(\url{http://inteproxy.wald.intevation.org}) for accessing authenticated
-WFS-servers.
-\index{WFS!authenticate remote server!}
-\index{WFS!secured WFS server!}
-\end{Tip}
+%% FIXME This is no longer true, I guess (Otto)
+%
+%\begin{Tip}[htb]\caption{\textsc{Accessing secure WFS Servers}}
+%Within the dialog \dialog{Create a new WFS-connection} QGIS does not support
+%authenficated WFS-connections yet. Within one of the next releases we expect
+%to also support authenticated WFS-servers. Meanwhile you could use InteProxy
+%(\url{http://inteproxy.wald.intevation.org}) for accessing authenticated
+% WFS-servers.
+%\index{WFS!authenticate remote server!}
+%\index{WFS!secured WFS server!}
+%\end{Tip}
\FloatBarrier
Modified: docs/trunk/english_us/user_guide/working_with_ogc_screenies/connection_wfs.png
===================================================================
(Binary files differ)
Modified: docs/trunk/english_us/user_guide/working_with_ogc_screenies/connection_wms.png
===================================================================
(Binary files differ)
Modified: docs/trunk/english_us/user_guide/working_with_ogc_screenies/wms_server-search.png
===================================================================
(Binary files differ)
Modified: docs/trunk/english_us/user_guide/working_with_projections.tex
===================================================================
--- docs/trunk/english_us/user_guide/working_with_projections.tex 2011-07-28 10:41:31 UTC (rev 15895)
+++ docs/trunk/english_us/user_guide/working_with_projections.tex 2011-07-28 15:57:49 UTC (rev 15896)
@@ -5,7 +5,7 @@
% when the revision of a section has been finalized,
% comment out the following line:
-\updatedisclaimer
+%\updatedisclaimer
QGIS allows users to define a global and project-wide CRS (Coordinate
Reference System) for layers without a pre-defined CRS. It also allows
@@ -26,8 +26,8 @@
The CRS available in QGIS are based on those defined by the European
Petroleum Group (ESPG)\index{ESPG} and the Institut Geographique
National of France (IGNF)\index{IGNF} and are largely abstracted
-from the spatial reference tables used in GDAL\index{GDAL}. EPSG identifiers are present in the database and can be used
-to specify a CRS in QGIS.
+from the spatial reference tables used in GDAL\index{GDAL}. EPSG identifiers
+are present in the database and can be used to specify a CRS in QGIS.
In order to use OTF projection, your data must contain information about its
coordinate reference system or you have to define a global, layer or
Modified: docs/trunk/english_us/user_guide/working_with_raster.tex
===================================================================
--- docs/trunk/english_us/user_guide/working_with_raster.tex 2011-07-28 10:41:31 UTC (rev 15895)
+++ docs/trunk/english_us/user_guide/working_with_raster.tex 2011-07-28 15:57:49 UTC (rev 15896)
@@ -5,7 +5,7 @@
% when the revision of a section has been finalized,
% comment out the following line:
-\updatedisclaimer
+%\updatedisclaimer
This Section describes how to visualize and set raster layer properties.
\qg uses the GDAL library to read and write raster data formats
Modified: docs/trunk/english_us/user_guide/working_with_vector.tex
===================================================================
--- docs/trunk/english_us/user_guide/working_with_vector.tex 2011-07-28 10:41:31 UTC (rev 15895)
+++ docs/trunk/english_us/user_guide/working_with_vector.tex 2011-07-28 15:57:49 UTC (rev 15896)
@@ -5,7 +5,7 @@
% when the revision of a section has been finalized,
% comment out the following line:
-\updatedisclaimer
+%\updatedisclaimer
\qg uses the OGR library to read and write vector data formats
\footnote{GRASS vector and PostgreSQL support is supplied by native
@@ -51,7 +51,11 @@
\end{itemize}
Shapefiles also can include a file with a \filename{.prj} suffix, which contains
-the projection information. While it is very useful to have a projection file, it is not mandatory. A shapefile dataset can contain additional files. For further details see the ESRI technical specification at \url{http://www.esri.com/library/whitepapers/pdfs/shapefile.pdf} \index{shapefile!specification}.
+the projection information. While it is very useful to have a projection file,
+it is not mandatory. A shapefile dataset can contain additional files. For
+further details see the ESRI technical specification at
+\url{http://www.esri.com/library/whitepapers/pdfs/shapefile.pdf}
+\index{shapefile!specification}.
\minisec{Problem loading a shape .prj file}
@@ -97,12 +101,14 @@
That will bring up a standard open file dialog (see Figure
\ref{fig:openshapefile}) which allows you to navigate the file system and load
a shapefile or other supported data source.
-The selection box \selectstring{Files of type}{\ldots} allows you to preselect some OGR supported file formats.
+The selection box \selectstring{Files of type}{\ldots} allows you to preselect
+some OGR supported file formats.
You can also select the Encoding type for the shapefile if desired.
-Selecting a shapefile from the list and clicking \button{Open} loads it into \qg. Figure
-\ref{fig:loadedshapefile} shows \qg after loading the \filename{alaska.shp} file.
+Selecting a shapefile from the list and clicking \button{Open} loads it into
+\qg. Figure \ref{fig:loadedshapefile} shows \qg after loading the
+\filename{alaska.shp} file.
\begin{Tip}\caption{\textsc{Layer Colors}}
@@ -146,22 +152,24 @@
\subsection{Loading a MapInfo Layer}
\index{vector layers!MapInfo}
-\includegraphics[width=0.7cm]{mActionAddNonDbLayer} To load a MapInfo layer, click on the \toolbtntwo{mActionAddNonDbLayer}{Add
-Vector Layer} toolbar bar button or type \keystroke{Ctrl-Shift-V}, change the
-file type filter to \selectstring{Files of Type}{[OGR] MapInfo (*.mif
-*.tab *.MIF *.TAB)} and select the .TAB or .tab layer you want to load.
+\includegraphics[width=0.7cm]{mActionAddNonDbLayer} To load a MapInfo layer,
+click on the \toolbtntwo{mActionAddNonDbLayer}{Add Vector Layer} toolbar bar
+button or type \keystroke{Ctrl-Shift-V}, change the file type filter to
+\selectstring{Files of Type}{[OGR] MapInfo (*.mif *.tab *.MIF *.TAB)} and
+select the .TAB or .tab layer you want to load.
\subsection{Loading an ArcInfo Binary Coverage}
\index{vector layers!ArcInfo Binary Coverage}
-\includegraphics[width=0.7cm]{mActionAddNonDbLayer} To load an ArcInfo binary coverage, click on the
-\toolbtntwo{mActionAddNonDbLayer}{Add Vector Layer} toolbar button or type
-\keystroke{Ctrl-Shift-V} to open the \dialog{Add Vector Layer} dialog. Select
-\radiobuttonon{Directory}. Change to \selectstring {Type}{Arc/Info Binary Coverage}.
-Navigate to the directory that contains the coverage files and select it.
+\includegraphics[width=0.7cm]{mActionAddNonDbLayer} To load an ArcInfo binary
+coverage, click on the \toolbtntwo{mActionAddNonDbLayer}{Add Vector Layer}
+toolbar button or type \keystroke{Ctrl-Shift-V} to open the \dialog{Add Vector
+Layer} dialog. Select \radiobuttonon{Directory}. Change to
+\selectstring{Type}{Arc/Info Binary Coverage}. Navigate to the directory that
+contains the coverage files and select it.
-Similarly, you can load directory based vector files in the UK National Transfer Format as well as the
-raw TIGER Format of the US Census Bureau.
+Similarly, you can load directory based vector files in the UK National
+Transfer Format as well as the raw TIGER Format of the US Census Bureau.
\section{PostGIS Layers}
\index{vector layers!PostGIS|see{PostGIS}}
@@ -195,7 +203,8 @@
Parameters}\label{tab:postgis_connection_parms}\medskip
\begin{tabular}{|l|p{5in}|}
\hline Name & A name for this connection. Can be the same as \textsl{Database}. \\
-\hline Service & Service parameter to be used alternatively to hostname/port (and potentially database). This can be defined in pg\_service.conf \\
+\hline Service & Service parameter to be used alternatively to hostname/port
+(and potentially database). This can be defined in pg\_service.conf \\
\hline Host \index{PostgreSQL!host}
& Name of the database host. This must be a resolvable host name the same as
would be used to open a telnet connection or ping the host. If the database is
@@ -203,14 +212,16 @@
\hline Port \index{PostgreSQL!port}& Port number the PostgreSQL database
server listens on. The default port is 5432.\\
\hline Database \index{PostgreSQL!database} & Name of the database. \\
-\hline SSL mode \index{PostgreSQL!sslmode}& How the SSL connection will be negotiated with the server. These are the options:
+\hline SSL mode \index{PostgreSQL!sslmode}& How the SSL connection will be
+negotiated with the server. These are the options:
\begin {itemize}
\item disable: only try an unencrypted SSL connection;
\item allow: try a non-SSL connection, if that fails, try an SSL connection;
\item prefer (the default): try an SSL connection, if that fails, try a non-SSL connection;
\item require: only try an SSL connection.
\end {itemize}
-Note that massive speedups in PostGIS layer rendering can be achieved by disabling SSL in the connection editor. \\
+Note that massive speedups in PostGIS layer rendering can be achieved by
+disabling SSL in the connection editor. \\
\hline Username \index{PostgreSQL!username}& User name used to login to the
database. \\
\hline Password \index{PostgreSQL!password}& Password used with
@@ -471,7 +482,8 @@
\begin{figure}[ht]
\centering
\includegraphics[clip=true, width=9cm]{vectorWrapping}
- \caption{Map crossing \degrees{180} longitude applying the ST\textunderscore Shift\textunderscore Longitude function \nixcaption}
+ \caption{Map crossing \degrees{180} longitude applying the ST\textunderscore
+ Shift\textunderscore Longitude function \nixcaption}
\label{fig:vector_wrapping}
\end{figure}
@@ -496,8 +508,8 @@
\includegraphics[width=0.7cm]{mActionAddSpatiaLiteLayer}
The first time you load data from a SpatiaLite database, begin by clicking on the
-\toolbtntwo{mActionAddSpatiaLiteLayer}{Add SpatiaLite Layer} toolbar button or by selecting the
-\dropmenuopttwo{mActionAddSpatiaLiteLayer}{Add SpatiaLite Layer...}
+\toolbtntwo{mActionAddSpatiaLiteLayer}{Add SpatiaLite Layer} toolbar button or
+by selecting the \dropmenuopttwo{mActionAddSpatiaLiteLayer}{Add SpatiaLite Layer...}
option from the \mainmenuopt{Layer} menu or by typing \keystroke{L}.
This will bring up a window, which will allow you to either connect to a SpatiaLite
database already known to \qg, which you can choose from the dropdown menu or to define
More information about the QGIS-commit
mailing list