Merged changes from the 0.6.0 release branch

git-svn-id: http://svn.osgeo.org/qgis/trunk@2526 c8812cc2-4d05-0410-92ff-de0c093fc19c
qgis · Dec 20, 2004 · fcf4f35 · fcf4f35
1 parent 448f075
commit fcf4f35
Show file tree

Hide file tree

Showing 178 changed files with 234,629 additions and 52,180 deletions.
diff --git a/AUTHORS b/AUTHORS
@@ -1,16 +1,27 @@
-The following have contributed to QGis:
-Carl Anderson
-Christoph Spoerri <spoerri at users.sourceforge.net>
-Denis Antipov <rawbytes at users.sourceforge.net>
-Gary E.Sherman <sherman at mrcc dot com>
-Gavin Macaulay <g_j_m at users.sourceforge.net>
-Jens Oberender <j.obi at troja.net>
-Lars Luthman <larsl at users.sourceforge.net>
-Marco Hugentobler <mhugent at users.sourceforge.net>
-Mark Coletti <mcoletti at users.sourceforge.net>
-Masaru Hoshi <hoshi at users.sourceforge.net>
-Peter Brewer <p.w.brewer at rdg dot ac dot uk>
-Radim Blazek <blazek at itc.it>
-Steve Halasz <stevehalasz at users.sourceforge.net>
-Tim Sutton <tim at linfiniti.com>
-Tom Elwertowski <telwertowski at users.sourceforge.net>
+# The following have contributed to QGis:
+# --------------------------------------------------------
+# Please note that this file is parsed by the about box 
+# for the contributors list, so names should be strictly 
+# in the format:
+# name [tab] <email>
+#
+# The name will be used to infer the image name, with spaces 
+# replaced by underscores. If no matching image is found
+# a blank image will be displayed.
+# Images are read out of $PREFIX/share/images/contributors/
+# ---------------------------------------------------------
+Gary E.Sherman	<sherman at mrcc dot com>
+Steve Halasz	<stevehalasz at users.sourceforge.net>
+Marco Hugentobler	<mhugent at users.sourceforge.net>
+Tim Sutton	<tim at linfiniti.com>
+Denis Antipov	<rawbytes at users.sourceforge.net>
+Mark Coletti	<mcoletti at users.sourceforge.net>
+Lars Luthman	<larsl at users.sourceforge.net>
+Jens Oberender	<j.obi at troja.net>
+Christoph Spoerri	<spoerri at users.sourceforge.net>
+Carl Anderson	<>
+Gavin Macaulay	<g_j_m at users.sourceforge.net>
+Masaru Hoshi	<hoshi at users.sourceforge.net>
+Peter Brewer	<p.w.brewer at rdg dot ac dot uk>
+Radim Blazek	<blazek at itc.it>
+Tom Elwertowski	<telwertowski at users.sourceforge.net>
diff --git a/ChangeLog b/ChangeLog
@@ -3,24 +3,75 @@ QGIS Change Log
 ------------------------------------------------------------------------------
 Version 0.6 'Simon' .... development version
 
+2004-12-19 [gsherman] 0.6.0rc2
+** Updated README
+** Added main.cpp so spit builds as standalone and plugin. Makefile.am modified
+   so spit binary installs in PREFIX dir
+
+2004-12-19 [timlinux] 0.6.0rc2
+** Added Slovak translation from Lubos Balazovic
+** Massive documentation updates
+** Updates to developer pictures and the about box
+
+2004-12-19 [mhugent]
+** providers/ogr/qgsshapefileprovider.cpp: fix for attribute problem
+    in ogr provider
+2004-12-05 [gsherman] 0.6.0rc2
+** Fixed bug 1079392 that caused QGIS to crash when a query was entered that
+   resulted in the layer being created with no records  
+** Additional validation of the SQL query was added to the query builder.
+   When Ok is clicked on the builder dialog, the query is sent to the
+   database and the result checked to ensure that it will create a valid
+   PostreSQL layer
+** Added tr to a number of strings that weren't prepared for translation in
+   the vector dialog properties code
+** Created QgsDataSourceURI structure to hold all the pertinent information
+   associated with a PostgreSQL layer connection, including host, database,
+   table, geometry column, username, password, port, and sql where clause.
+
+2004-12-03 [gsherman] 0.6.0rc1
+** Commented out excessive debug statements in the postgres provider
+
+2004-12-03 [gsherman] 0.6.0rc1
+** Changing the SQL query for a PostgreSQL layer using the query builder 
+   from the vector layer properties dialog now properly updates the mapcanvas
+   extents and feature count.
+** Fix for crash in pg buffer plugin (bug 1077412). Crash is due to the
+   addition of sql where clause support in the postgres provider. The provider
+   was not checking to see if a sql key was included in the datasource uri and
+   thus copying the entire URI as the where clause.
+** The .shp extension is now added the new vector layer name (if not specified
+   by the user).  The .qgs extension is now added to a project file when using
+   save or save as (if not specified by the user). 
+
+2004-12-01 [gsherman] 0.5.0devel30
+** Added functions to qgsdataprovider.h to support updating the feature count
+   and extents. To be supported, these functions must be implemented in the data
+   provider implementation. The default implementations don't do anything useful.
+** QgsVectorLayer now has functions for requesting feature count, extent
+   update, and the subset defintiion string (usually sql) from the underlying
+   data provider. Providers do not need to implement these functions unless they
+   want to support subsetting the layer via a layer definition query or other
+   means.
+
 2004-11-27 [larsl] 0.5.0devel30
 ** Fixed feature addition in GPX layers, it now works again
 
 2004-11-22 [mcoletti] 0.5.0devel29
 ** QgsProject properties now re-designed to be similar to QSettings
-	
+  
 2004-11-20 [timlinux] 0.5.0devel28
 ** Added the capability to interrupt the rendering of the currently drawing map
 layer by pressing the escape key. Repeat and rinse to interrupt drawing of all
 vector layers. Not implemented for raster layers yet.
 
 2004-11-11 [gsherman] 0.5.0devel27
 ** First pass at a PostgreSQL query builder. This is not entirely
-	 functional yet. Fields for a table are displayed and sample or all
-	 values can be displayed. Double-clicking on a field name or sample
-	 value pastes it into the sql query box at the current cursor
-	 position. The test function is not implemented yet nor is the type
-	 checking to allow auto quoting of text values in the sql statement.
+   functional yet. Fields for a table are displayed and sample or all
+   values can be displayed. Double-clicking on a field name or sample
+   value pastes it into the sql query box at the current cursor
+   position. The test function is not implemented yet nor is the type
+   checking to allow auto quoting of text values in the sql statement.
 
 2004-11-19 [mcoletti] 0.5.devel26
 ** Changed QgsProject properties interface to be more similar to
@@ -45,8 +96,8 @@ caused by rerendering everything after each change you make.
 
 2004-11-11 [gsherman] 0.5.0devel22
 ** Added ifdef's for WIN32 around dynamic_casts in the vector renderer
-	dialogs. Even though rtti is enabled, use of dynamic casts causes seg
-	faults under WIN32.
+  dialogs. Even though rtti is enabled, use of dynamic casts causes seg
+  faults under WIN32.
 
 2004-11-09 [timlinux] 0.5.0devel21
 ** Added options to graticule builder to allow you to define origin and
@@ -96,7 +147,7 @@ qgis to crash.
 
 2004-10-20 [mcoletti] 0.5.0devel10
 ** merged in qgsproject-branch
-	
+  
 2004-10-19 [larsl] 0.5.0devel9
 ** Changed GPX attribute names from three letter abbreviations to more
    userfriendly whole words
@@ -538,20 +589,20 @@ All that remains to do now is sort out syncronisation of layer ordering between
 ** Implemented map overview using maplayers rather than snapshots of a raster layer.
 
 ** Implemented QgsMapLayerRegistry  - s singleton object that keeps track of
-	 loaded layers. When a layer is added an entry is made in the registry. When a
-	 layer is removed, the registry emits a layerWillBeRemoved signal that is
-	 connected to any mapvcanvas, legend etc that may be using the layer. The
-	 objects using the layer can then remove any reference they make to the layer -
-	 after which the registry deletes the layer object.
+   loaded layers. When a layer is added an entry is made in the registry. When a
+   layer is removed, the registry emits a layerWillBeRemoved signal that is
+   connected to any mapvcanvas, legend etc that may be using the layer. The
+   objects using the layer can then remove any reference they make to the layer -
+   after which the registry deletes the layer object.
 
 ** This fixes a problem with adding an overview map which caused qgis to crash
-	 when a layer was removed because it was trying to delete the same pointer
-	 twice.
+   when a layer was removed because it was trying to delete the same pointer
+   twice.
 
 ** Added a better implementation of the overview map below map legend.
 
 ** Refactoring in qgis app - all private members now adhere to qgis naming
-	 conventions (prefixed with m).
+   conventions (prefixed with m).
 
 
 ** Import Note *** ONLY THE MAPLAYER REGISTRY SHOULD DELETE LAYERS NOW ***
@@ -585,7 +636,7 @@ not need src parameter (this can be obtained from painter->device()).
 ** Added basic print capability to qgis....consider this a work in progress.
 2004-05-31 [gsherman] 0.3.0devel9
 **Changed QgsIdentifyResultsBase to inherit from QWidget instead of QDialog
-	so window position can be saved/restored from user settings each time.
+  so window position can be saved/restored from user settings each time.
 **Changed qgis.h int version number to 300 (should have been done at release) 
 
 2004-05-30 [ts] 0.3.0devel8
@@ -961,7 +1012,7 @@ Added qgiscommit tool
 ** Fixed a bug in the drawing of pseudocolor single band grayscale images that
    prevented all class breaks being displayed.
 
-  	
+    
 2004-03-10 [gs] 0.1.0devel7
 ** Added delimited text plugin which provides gui to add delimited text
    layers using the delimited_text data provider
@@ -1161,25 +1212,26 @@ Version 0.0.3-alpha August 10, 2002
   * Other internal changes
 
 July 26, 2002
-	Drawing code now properly displays layers and calculates extents when
-	zooming. Zoom is still fixed zoom in rather than interactive.
-	
+  Drawing code now properly displays layers and calculates extents when
+  zooming. Zoom is still fixed zoom in rather than interactive.
+  
 July 20, 2002
-	Repaint automatic for layers.
-	
+  Repaint automatic for layers.
+  
 July 18, 2002
-	Point, line and polygon PostGis layers can be drawn. Still issues with
-	map exent and positioning of layers on the canvas. Drawing is manual and
-	not tied to the paint event. No zooming or panning yet.
-	
+  Point, line and polygon PostGis layers can be drawn. Still issues with
+  map exent and positioning of layers on the canvas. Drawing is manual and
+  not tied to the paint event. No zooming or panning yet.
+  
 July 10, 2002
-	Layers can be selected and added to the map canvas collection however
-	the rendering code is currently disabled and being reorganized. So if
-	you add a layer, nothing will be drawn...
-	
+  Layers can be selected and added to the map canvas collection however
+  the rendering code is currently disabled and being reorganized. So if
+  you add a layer, nothing will be drawn...
+  
 July 6, 2002
-	This code is preliminary and really has no true functionality other than
-	the ability to define a PostGIS connection and display the spatially enabled
-	tables that could be loaded. 
+  This code is preliminary and really has no true functionality other than
+  the ability to define a PostGIS connection and display the spatially enabled
+  tables that could be loaded. 
 
-	This is the initial import of the code base into CVS on Sourceforge.net.
+  This is the initial import of the code base into CVS on Sourceforge.net.
+ vim: set shiftwidth=3 textwidth=75 autoindent:
diff --git a/Makefile.am b/Makefile.am
@@ -24,7 +24,12 @@ EXTRA_DIST = \
 	TODO \
 	update_ts_files.sh
 
-man1_MANS = qgis.man
+man1_MANS = qgis.man 
+
+docdatadir = $(datadir)/$(PACKAGE)/doc
+
+docdata_DATA = AUTHORS
+
 
 SUBDIRS = src providers plugins doc tools i18n
 

diff --git a/README b/README
@@ -1,19 +1,59 @@
-README for QGIS version 0.5 'Bandit'
-Quantum GIS (QGIS) is designed to be a Geographic Information System (GIS) 
-built for Linux/Unix. QGIS offers support for vector and raster formats. 
-Currently QGIS supports many common vector and raster formats shapefiles
-and PostgreSQL/PostGIS layers. 
+README for QGIS version 0.6 'Simon'
+
+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, Window, and OS X. QGIS is
+developed using the Qt toolkit (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.
+
+QGIS is released under the GNU Public License (GPL). Devloping 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.
 
 This release adds:
-  * Windows version
-  * Feature labeling with optional buffering
-  * Preliminary digitizing support for shapefiles
-  * GRASS digitizing support
-  * GPS SVG icons 
-  * Unique value renderers
-  * User interface improvements
-  * Specify a query when loading a PostGIS layer
-  * Italian translation 
+  * GEOS support in the OGR provider to refine selection of features
+    via identify. This improves over the previous method of feature
+    selection which used a simple MBR intersection check.
+  * PostGIS editing support in provider
+  * Vector dialog redesign to improve usability
+  * Improvement in project handling (loading and saving)
+  * Scale dependent rendering
+  * User option to load layers with out drawing them, thus allowing
+    you to set scale dependency, etc without waiting for the initial draw to
+    complete
+  * Interrupt drawing of features by hitting ESC
+  * Attribute actions - the ability to run an external program based
+    on the contents of an attribute field in a layer
+  * Create new vector layer (shapefile) for editing
+  * Windows installer
+  * Mac OSX binary
+  * New options in the graticule builder plugin
+  * Enhancements to the GPS plugin
+  * Man page
+  * Save delimited text as shapefile
+  * Improved Delimited Text plugin, including preview of text file
+  * Improved SPIT handling of PostgreSQL reserved words and shapefiles
+    with multiple geometry types
+  * Display SQL query used to create a PostGIS layer
+  * PostgreSQL query builder
+  * Ability to redefine the query used for PostgreSQL layers from the
+    layer properties dialog
+  * North arrow, scalebar, and copyright plugins save their state in
+    the project file
+  * Datasets with UTF8, Kanjii and CJK filenames now load properly
 
 Supported raster formats include:
   Grass

diff --git a/configure.in b/configure.in
@@ -24,9 +24,9 @@ dnl ---------------------------------------------------------------------------
 dnl version number
 dnl ---------------------------------------------------------------------------
 MAJOR_VERSION=0
-MINOR_VERSION=5
+MINOR_VERSION=6
 MICRO_VERSION=0
-EXTRA_VERSION=30
+EXTRA_VERSION=0
 if test $EXTRA_VERSION -eq 0; then
     VERSION=${MAJOR_VERSION}.${MINOR_VERSION}.${MICRO_VERSION}
 else
@@ -119,6 +119,7 @@ if test x"$PG_CONFIG" != "xno" ; then
     [Define to 1 if PostgreSQL is available])
   ac_postgresql="yes"
   ac_postgresql_version=`$PG_CONFIG --version | sed -e 's#PostgreSQL ##'`
+  postgresql_version_string="(Version $ac_postgresql_version)"
 else
   ac_postgresql="no"
 fi
@@ -174,6 +175,9 @@ AC_ARG_WITH(grass,
 
 if test -n "$with_grass" -a x"$with_grass" != "xno"; then
     # I don't know how to add library path to AC_CHECK_LIB()
+    if test ! -f "$GISLIB"; then
+      GISLIB=`ls $with_grass/lib/libgrass_gis.dylib 2> /dev/null`
+    fi
     if test ! -f "$GISLIB"; then
       GISLIB=`ls $with_grass/lib/libgrass_gis.so 2> /dev/null`
     fi
@@ -246,6 +250,7 @@ AC_CONFIG_FILES([
   src/images/north_arrows/Makefile
   src/images/splash/Makefile
   src/images/icons/Makefile
+  src/images/developers/Makefile
   src/themes/Makefile
   src/themes/default/Makefile
   providers/Makefile 
@@ -288,7 +293,7 @@ echo "$PACKAGE $VERSION"
 echo "------------------------------------------"
 echo "GDAL/OGR      : $ac_gdalogr (Version $ac_gdalogr_version)"
 echo "GEOS          : $ac_geos (Version $ac_geos_version)"
-echo "PostgreSQL    : $ac_postgresql (Version $ac_postgresql_version)"
+echo "PostgreSQL    : $ac_postgresql $postgresql_version_string"
 echo "GRASS         : $ac_grass"
 echo "SPIT          : $ac_spit"
 echo ""

diff --git a/doc/images/qgis_new_80pct.png b/doc/images/qgis_new_80pct.png