Merged changes in the 0.7 release candidate branch (as at "Release-0_…

…7-candidate-pre1") back into the trunk. git-svn-id: http://svn.osgeo.org/qgis/trunk@3691 c8812cc2-4d05-0410-92ff-de0c093fc19c
qgis · Jul 3, 2005 · ac10199 · ac10199
1 parent 348dd98
commit ac10199
Show file tree

Hide file tree

Showing 80 changed files with 8,262 additions and 795 deletions.
diff --git a/ChangeLog b/ChangeLog
@@ -2,7 +2,9 @@
 ------------------------------------------------------------------------------
 Version 0.6 'Simon' .... development version
 QGIS Change Log
-
+2005-05-23 [gsherman 0.7rc1
+** Fixed bookmarks bug related to non-existent user database. The
+   database is now properly created if it doesn't exist.
 2005-04-12 [timlinux] 0.6devel26
 ** Added option to vector props dlg to let user change projection
 2005-04-21 [timlinux] 0.6devel25

diff --git a/configure.in b/configure.in
@@ -85,7 +85,18 @@ dnl ---------------------------------------------------------------------------
 dnl Qt check
 dnl ---------------------------------------------------------------------------
 AQ_CHECK_QT
-AM_CONDITIONAL([HAVE_QTMAC], [test x$QTDIR != x -a -f "$QTDIR/config.tests/mac/tst_mac_version"])
+
+dnl ---------------------------------------------------------------------------
+dnl Qt/Mac check (install everything into application bundle)
+dnl ---------------------------------------------------------------------------
+if test x$QTDIR != x -a -f "$QTDIR/config.tests/mac/tst_mac_version"; then
+  have_qtmac=yes
+  bundle_suffix=$PACKAGE.app/Contents/MacOS
+  if test `expr "$prefix" : ".*$bundle_suffix$"` -eq 0; then
+    prefix="$prefix/$bundle_suffix"
+  fi
+fi
+AM_CONDITIONAL([HAVE_QTMAC], [test "$have_qtmac" = "yes"])
 
 dnl ---------------------------------------------------------------------------
 dnl GDAL/OGR
@@ -411,6 +422,9 @@ AC_CONFIG_FILES([
   src/resources/Makefile
   src/themes/Makefile
   src/themes/default/Makefile
+  src/mac/Makefile
+  src/mac/Contents/Makefile
+  src/mac/Contents/Resources/Makefile
   providers/Makefile 
   providers/ogr/Makefile
   providers/postgres/Makefile
@@ -472,7 +486,11 @@ echo ""
 echo "Debug         : $ac_debug"
 echo "Plugin dir    : ${libdir}/$PACKAGE"
 echo ""
-echo "The binary will be installed in $prefix/bin"
+if test "$have_qtmac" = "yes"; then
+  echo "The binary will be installed in $prefix"
+else
+  echo "The binary will be installed in $prefix/bin"
+fi
 echo ""
 echo "The build is using Qt in $QTDIR"
 echo "------------------------------------------"

diff --git a/doc/source/user_guide/forward.tex b/doc/source/user_guide/forward.tex
@@ -0,0 +1,87 @@
+% vim: set textwidth=78 autoindent:
+\chapter{Forward}
+
+Welcome to the wonderful world of Geographical Information Systems (GIS)!
+Quantum GIS (QGIS) is an Open Source Geographic Information System. The project
+was born in May of 2002 and was established as a project on SourceForge in June
+of the same year. We've worked hard to make GIS software (which is traditionaly
+expensive commerical software) a viable prospect for anyone with basic access
+to a Personal Computer. QGIS currently runs on most Unix platforms, Windows, and
+OS X. QGIS is developed using the Qt toolkit (\url{http://www.trolltech.com})
+and C++. This means that QGIS feels snappy to use and has a pleasing, easy to
+use graphical user interface. 
+
+QGIS aims to be an easy to use GIS, providing common functions and features.
+The initial goal was to provide a GIS data viewer. QGIS has reached that point
+in its evolution and is being used by many for their daily GIS data viewing
+needs. QGIS supports a number of raster and vector data formats, with new
+support easily added using the plugin architecture (see Appendix
+\ref{appdx_data_formats} for a full list of currenly supported data formats).
+QGIS is released under the GNU Public License (GPL). Developing QGIS under this
+license means that you can (if you want to) inspect and modify the source code
+and guarantees that you, our happy user will always have access to a GIS
+program that is free of cost and can be freely modified. You should have
+received a full copy of the license with your copy of QGIS, and is also
+available as Appendix \ref{gpl_appendix}.  
+\begin{quote}
+\begin{center}
+\textbf{Note:} The latest version of this document can always be found at \newline
+http://qgis.sourceforge.net/docs/userguide.html 
+\end{center}
+\end{quote}
+
+\section{Major Features}
+
+QGIS has many common GIS features and functions. The major features
+are listed below. 
+
+\begin{compactenum}
+\item Support for spatially enabled PostgreSQL tables using PostGIS 
+\item Support for ESRI shapefiles and other vector formats support by the
+OGR library, including MapInfo files 
+\item GRASS integration, including view, edit, and analysis
+\item On the fly projection of vector layers
+\item Map composer
+\item Identify features 
+\item Display attribute table 
+\item Select features 
+\item Label features
+\item Persistent selections 
+\item Save and restore projects
+\item Support for raster formats supported by the GDAL library 
+\item Change vector symbology (single, graduated, unique value, and continuous) 
+\item SVG markers symbology (single, unique value, and graduated) 
+\item Display raster data such as digital elevation models, aerial photography
+or landsat imagery 
+\item Change raster symbology (grayscale, pseudocolor and multiband RGB) 
+\item Export to Mapserver map file 
+\item Digitizing support
+\item Map overview
+\item Plugins 
+\end{compactenum}
+
+
+\section{Whats New in 0.7}
+Version 0.7 brings several important features, including projection support, a map composer, and better integration with GRASS. The major new features in this release include:
+\begin{compactenum}
+  \item On the fly projection for reprojecting layers in different coordinate systems
+  \item Map Composer for creating print layouts
+  \item Toolbox for running GRASS tools from QGIS
+  \item Raster graphing tool to produce a histogram for a raster layer.
+  \item Raster query using the identify tool to get the pixel
+  values from a raster 
+  \item New customizable settings for the digitizing line width, color, and selection color  
+  \item New symbols for use with point layers are available from the layer properties dialog 
+  \item Spatial bookmarks allow you to create and manage bookmarks for an area on the map
+  \item Measure tool to measure distances on the map with both
+  segment length and total length displayed as you click
+  \item GPX loading times and memory consumption for large GPX (GPS) files
+  has been drastically reduced.  
+  \item Digitizing enhancements, including the ability to capture data straight
+  into PostgreSQL/PostGIS, and improvements to the definition of attribute tables
+  for newly created layers.
+  \item Raster Georeferencing plugin can be used
+  to generate a world file for a raster by defining known
+  control points in the raster coordinate system.
+\end{compactenum}
+
diff --git a/doc/source/user_guide/getting_started.tex b/doc/source/user_guide/getting_started.tex
@@ -1,15 +1,16 @@
-% vim: set textwidth=78 autoindent:
+% vim:autoindent:set textwidth=78:
 \chapter{Getting Started}
 
-This chapter gives you a quick overview of running QGIS and examining data available on the QGIS web page.
+This chapter gives you a quick overview of running QGIS and examining data
+available on the QGIS web page.
 
 
 \section{Installation}
 \index{installation}
 Installation of QGIS is documented in Appendix \ref{install_guide}. The
 Installation Guide is distributed with the QGIS source code and is also
-available at \url{http://qgis.org}. Under Windows and Mac OSX, QGIS is
-available as a standard installer package for these platforms. Packages for
+available at \url{http://qgis.org}. Under Windows and Mac OS X, QGIS is
+available as a standard installer package. Packages for
 many flavors of Linux are also available. 
 
 
@@ -25,7 +26,7 @@ \section{Starting QGIS}
 Assuming that QGIS is installed in the PATH, you can start QGIS by typing:
 \textbf{qgis}  at a command prompt or by double clicking on the QGIS
 application link (or shortcut) on the desktop. Under MS Windows, start QGIS
-using the Start menu shortcut, and under Mac OSX, double click the icon in
+using the Start menu shortcut, and under Mac OS X, double click the icon in
 your Applications folder.
 %\begin{figure}
 %\caption{QGIS Main Window}
@@ -86,11 +87,12 @@ \section{The QGIS Main Window}\index{main window}
 \item The status bar
 \end{compactenum}
 
-These six components of the QGIS interface are described in more detail in the following sections
+These six components of the QGIS interface are described in more detail in the
+following sections 
 \subsection{The QGIS menu bar}
 \index{menus}
 The menu bar provides access to various QGIS features using a standard 
-heirachical menu. The top-level menus and a summary of some of the functions provided are:
+hierarchical menu. The top-level menus and a summary of some of the functions provided are:
 \begin{compactitem}
 \item File (project open, save, export image, properties)
 \item View (zoom, refresh)
@@ -141,7 +143,7 @@ \subsection{The QGIS map view}
 \index{map!view}
 This is the 'business end' of QGIS - maps are displayed in this area! The map
 displayed in this window will depend on the vector and raster layers you have
-chosen to load (see sections that follow for more info on how to load layers).
+chosen to load (see sections that follow for more information on how to load layers).
 The map view can be panned (shifting the focus of the map display to another
 region) and zoomed in and out. Various other operations can be performed on
 the map as described in the toolbar description above.  The map view and the
@@ -158,22 +160,22 @@ \subsection{The QGIS map overview}
 Within the view is a rectangle showing the current map extent. This allows you
 to quickly determine which area of the map you are currently viewing. Note
 that labels are not rendered to the map overview even if the layers in the map
-overview have been set up for labelling. You can add a single layer to the
+overview have been set up for labeling. You can add a single layer to the
 overview by right-clicking on it in the legend and choosing \textit{Toggle in
 Overview}. You can also add or remove all layers to the overview using the
 \textit{Add to Overview tool} on the toolbar.
 
 \subsection{The QGIS map status bar} 
 The status bar shows you your current position in map coordinates (e.g. meters
-or decimal degress) as the mouse pointer is moved accross the map view. The
+or decimal degrees) as the mouse pointer is moved across the map view. The
 status bar also shows the view extents of the map view as you pan and zoom in
 and out. A progress bar in the status bar shows progress of rendering as each
 layer is drawn to the map view. In some cases, such as the gathering of
 statistics in raster layers, the progress bar will be used to show the status
 of lengthy operations. On the right side of the status bar is a small checkbox which
-can be used to temporarily prevent layers being rendered to the map view )see
-Section \ref{subsec:redraw_events} below. At the far right of the status bar
-is a projector icon. Clicking on this opens the projection properies for the
+can be used to temporarily prevent layers being rendered to the map view (see
+Section \ref{subsec:redraw_events} below). At the far right of the status bar
+is a projector icon. Clicking on this opens the projection properties for the
 current project.
 
 \section{Rendering}\label{subsec:redraw_events}\index{rendering}
@@ -211,7 +213,7 @@ \subsection{Suspending Rendering}\index{rendering!suspending}
 To suspend rendering, click the \textit{Render} checkbox in the lower right
 corner of the statusbar. When the \textit{Render} box is not checked, QGIS does
 not redraw the canvas in response to any of the events described in Section
-\ref{sec:redraw_events}. Examples of when you might want to suspend rendering
+\ref{subsec:redraw_events}. Examples of when you might want to suspend rendering
 include:
 \begin{compactitem}
 \item Add many layers and symbolize them prior to drawing

diff --git a/doc/source/user_guide/grass_integration.tex b/doc/source/user_guide/grass_integration.tex
@@ -69,7 +69,7 @@ \section{Vector Data Model}\index{GRASS!vector data model}
 \qgistip{The best way to learn the GRASS vector model and its capabilities
 is to download the demo mapset from \url{http://mpa.itc.it/radim/g51/g51test-12-multi.tar.gz}.
 Extract the mapset, add all layers from vector 'multi' to QGIS, and query attributes.
-Finaly start editing of vector 'multi', to see how those layers are stored.
+Finally start editing of vector 'multi', to see how those layers are stored.
 }
 \end{Tip} 
 \section{Digitizing and Editing Tools}\index{GRASS!digitizing tools}
@@ -150,7 +150,7 @@ \subsection{Region Tool}\index{GRASS!region}
 on the QGIS canvas.\index{GRASS!region!editing}
 
 Both tools are available only if QGIS was started from a GRASS 
-shell or if the GISRC enviroment variable pointing to a
+shell or if the GISRC environment variable pointing to a
 valid GISRC file was set (i.e. only if you are running 
 GRASS within your mapset).