diff --git a/README b/README index accde8a41ebc..efff2e14e9a4 100644 --- a/README +++ b/README @@ -1,24 +1,19 @@ -README for QGIS version 0.4 'Baby' +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. This release adds: - Features - Map Overview - Preliminary printing support - Menu cleanups - User interface improvements - Icon Themes (only default theme currently available) - Capture point to clipboard - - Core Plugins - Scale bar plugin - Improved GPS tools plugin - - Known Issues - Map units are not stored when a QGIS project is saved + * 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 Supported raster formats include: Grass diff --git a/configure.in b/configure.in index bff7e490971f..fbb40fccf868 100644 --- a/configure.in +++ b/configure.in @@ -1,6 +1,6 @@ dnl Process this file with autoconf to produce a configure script. -dnl configure.in,v 1.193 2004/09/23 09:07:48 larsl Exp +dnl configure.in,v 1.194 2004/10/04 00:53:40 gsherman Exp @@ -24,9 +24,9 @@ dnl --------------------------------------------------------------------------- dnl version number dnl --------------------------------------------------------------------------- MAJOR_VERSION=0 -MINOR_VERSION=4 +MINOR_VERSION=5 MICRO_VERSION=0 -EXTRA_VERSION=38 +EXTRA_VERSION=0 if test $EXTRA_VERSION -eq 0; then VERSION=${MAJOR_VERSION}.${MINOR_VERSION}.${MICRO_VERSION} else @@ -249,8 +249,7 @@ AC_CONFIG_FILES([ plugins/grid_maker/Makefile plugins/grass/Makefile doc/Makefile - doc/skin/Makefile - doc/skin/images/Makefile + doc/install_guide/Makefile doc/images/Makefile doc/plugins/Makefile doc/plugins/geoprocessing/Makefile diff --git a/doc/Makefile.am b/doc/Makefile.am index 14b313973fbd..0002de314d21 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -11,21 +11,18 @@ docdatadir = $(datadir)/$(PACKAGE)/doc docdata_DATA = \ - README \ - favicon.ico \ - images \ - index.html \ - index.pdf \ - install.html \ - install.css \ - install.pdf \ - plugins \ - skin \ - userguide.html \ - userguide.pdf + favicon.ico \ + images \ + index.html \ + install_guide \ + install.pdf \ + plugins \ + qgisdoc.css \ + README \ + userguide.pdf # generated by ls -1 | sed -e '/CVS/d' -e '/Makefile/d' -e 's#\(.*\)# \1 \\#' -SUBDIRS = images plugins skin +SUBDIRS = images plugins install_guide EXTRA_DIST = $(docdata_DATA) diff --git a/doc/images/Makefile.am b/doc/images/Makefile.am index 9cbd2c103485..fd707e9a6770 100644 --- a/doc/images/Makefile.am +++ b/doc/images/Makefile.am @@ -10,53 +10,7 @@ docdatadir = $(datadir)/$(PACKAGE)/doc/images -docdata_DATA = \ - add_layer_dialog.png \ - back20x20.png \ - checkversion.png \ - configure.png \ - connect_no.png \ - contents.png \ - exit.png \ - filenew.png \ - filesave.png \ - filesaveas.png \ - gis_add_pg_layer.png \ - gis_add_vector_layer.png \ - gis_identify.png \ - gis_pan.png \ - gis_view_all.png \ - gis_zoom_to_selected.png \ - icon_small.png \ - loaded_shapefiles.png \ - mapserver.png \ - open.png \ - package_network.png \ - qgis_vector_layer_properties.png \ - qgis_vector_layer_properties1.png \ - qgis_vector_layer_properties2.png \ - qgis_vector_layer_properties3.png \ - reload20x20.png \ - select_features.png \ - sf.png \ - table.png \ - viewmag-.png \ - zoomin.png \ - gis_add_raster_layer.png \ - change_symbology.gif \ - qgis_raster_properties_symbology_tab.png \ - qgis_mainwindow01.png \ - project.png \ - loaded_shapefiles.gif \ - add_layer_dialog.gif \ - qgis_raster_popup_properties_selected.png \ - built-with-forrest-button.png \ - layer_properties.gif \ - qgis_raster_properties_general_tab.png \ - qgis_raster_properties_statistics_tab.png \ - qgis_load_data_on_startup.png \ - btn_add_layer.gif \ - changed_symbology.gif +docdata_DATA = qgis_new_80pct.png # generated by ls -1 | sed -e '/CVS/d' -e '/Makefile/d' -e 's#\(.*\)# \1 \\#' diff --git a/doc/images/add_layer_dialog.gif b/doc/images/add_layer_dialog.gif deleted file mode 100644 index e9abac64073f..000000000000 Binary files a/doc/images/add_layer_dialog.gif and /dev/null differ diff --git a/doc/images/add_layer_dialog.png b/doc/images/add_layer_dialog.png deleted file mode 100644 index 991c0a221883..000000000000 Binary files a/doc/images/add_layer_dialog.png and /dev/null differ diff --git a/doc/images/back20x20.png b/doc/images/back20x20.png deleted file mode 100644 index 7321d64ea2bf..000000000000 Binary files a/doc/images/back20x20.png and /dev/null differ diff --git a/doc/images/btn_add_layer.gif b/doc/images/btn_add_layer.gif deleted file mode 100644 index 5d561983fa71..000000000000 Binary files a/doc/images/btn_add_layer.gif and /dev/null differ diff --git a/doc/images/built-with-forrest-button.png b/doc/images/built-with-forrest-button.png deleted file mode 100644 index 91603404103e..000000000000 Binary files a/doc/images/built-with-forrest-button.png and /dev/null differ diff --git a/doc/images/change_symbology.gif b/doc/images/change_symbology.gif deleted file mode 100644 index 2a11c1634c05..000000000000 Binary files a/doc/images/change_symbology.gif and /dev/null differ diff --git a/doc/images/changed_symbology.gif b/doc/images/changed_symbology.gif deleted file mode 100644 index 44c98188fc09..000000000000 Binary files a/doc/images/changed_symbology.gif and /dev/null differ diff --git a/doc/images/checkversion.png b/doc/images/checkversion.png deleted file mode 100644 index e8a39823d20e..000000000000 Binary files a/doc/images/checkversion.png and /dev/null differ diff --git a/doc/images/configure.png b/doc/images/configure.png deleted file mode 100644 index 637a99c5949d..000000000000 Binary files a/doc/images/configure.png and /dev/null differ diff --git a/doc/images/connect_no.png b/doc/images/connect_no.png deleted file mode 100644 index ecd475229ac3..000000000000 Binary files a/doc/images/connect_no.png and /dev/null differ diff --git a/doc/images/contents.png b/doc/images/contents.png deleted file mode 100644 index 07833f11fa82..000000000000 Binary files a/doc/images/contents.png and /dev/null differ diff --git a/doc/images/exit.png b/doc/images/exit.png deleted file mode 100644 index bfc66edaf54d..000000000000 Binary files a/doc/images/exit.png and /dev/null differ diff --git a/doc/images/filenew.png b/doc/images/filenew.png deleted file mode 100644 index 055825a9482f..000000000000 Binary files a/doc/images/filenew.png and /dev/null differ diff --git a/doc/images/filesave.png b/doc/images/filesave.png deleted file mode 100644 index 677ce2097d13..000000000000 Binary files a/doc/images/filesave.png and /dev/null differ diff --git a/doc/images/filesaveas.png b/doc/images/filesaveas.png deleted file mode 100644 index fa310a1455f2..000000000000 Binary files a/doc/images/filesaveas.png and /dev/null differ diff --git a/doc/images/gis_add_pg_layer.png b/doc/images/gis_add_pg_layer.png deleted file mode 100644 index 46956e74a149..000000000000 Binary files a/doc/images/gis_add_pg_layer.png and /dev/null differ diff --git a/doc/images/gis_add_raster_layer.png b/doc/images/gis_add_raster_layer.png deleted file mode 100644 index a33754f7ab3b..000000000000 Binary files a/doc/images/gis_add_raster_layer.png and /dev/null differ diff --git a/doc/images/gis_add_vector_layer.png b/doc/images/gis_add_vector_layer.png deleted file mode 100644 index 839405c1add7..000000000000 Binary files a/doc/images/gis_add_vector_layer.png and /dev/null differ diff --git a/doc/images/gis_identify.png b/doc/images/gis_identify.png deleted file mode 100644 index 88ce96c08555..000000000000 Binary files a/doc/images/gis_identify.png and /dev/null differ diff --git a/doc/images/gis_pan.png b/doc/images/gis_pan.png deleted file mode 100644 index 10d22541fc79..000000000000 Binary files a/doc/images/gis_pan.png and /dev/null differ diff --git a/doc/images/gis_view_all.png b/doc/images/gis_view_all.png deleted file mode 100644 index 488073c3e245..000000000000 Binary files a/doc/images/gis_view_all.png and /dev/null differ diff --git a/doc/images/gis_zoom_to_selected.png b/doc/images/gis_zoom_to_selected.png deleted file mode 100644 index 5c245626a5a3..000000000000 Binary files a/doc/images/gis_zoom_to_selected.png and /dev/null differ diff --git a/doc/images/icon_small.png b/doc/images/icon_small.png deleted file mode 100644 index 3cd23a728cd7..000000000000 Binary files a/doc/images/icon_small.png and /dev/null differ diff --git a/doc/images/layer_properties.gif b/doc/images/layer_properties.gif deleted file mode 100644 index 55b2ea5c3644..000000000000 Binary files a/doc/images/layer_properties.gif and /dev/null differ diff --git a/doc/images/loaded_shapefiles.gif b/doc/images/loaded_shapefiles.gif deleted file mode 100644 index 744a2be3841a..000000000000 Binary files a/doc/images/loaded_shapefiles.gif and /dev/null differ diff --git a/doc/images/loaded_shapefiles.png b/doc/images/loaded_shapefiles.png deleted file mode 100644 index bf0b6f1d92ee..000000000000 Binary files a/doc/images/loaded_shapefiles.png and /dev/null differ diff --git a/doc/images/mapserver.png b/doc/images/mapserver.png deleted file mode 100644 index 554e8e4998fa..000000000000 Binary files a/doc/images/mapserver.png and /dev/null differ diff --git a/doc/images/open.png b/doc/images/open.png deleted file mode 100644 index e1314000fc71..000000000000 Binary files a/doc/images/open.png and /dev/null differ diff --git a/doc/images/package_network.png b/doc/images/package_network.png deleted file mode 100644 index ac4c1c41834a..000000000000 Binary files a/doc/images/package_network.png and /dev/null differ diff --git a/doc/images/project.png b/doc/images/project.png deleted file mode 100644 index 3e3ff1dd8411..000000000000 Binary files a/doc/images/project.png and /dev/null differ diff --git a/doc/images/qgis_load_data_on_startup.png b/doc/images/qgis_load_data_on_startup.png deleted file mode 100644 index 8ae4c507c8b7..000000000000 Binary files a/doc/images/qgis_load_data_on_startup.png and /dev/null differ diff --git a/doc/images/qgis_mainwindow01.png b/doc/images/qgis_mainwindow01.png deleted file mode 100644 index 9ef6442a5da9..000000000000 Binary files a/doc/images/qgis_mainwindow01.png and /dev/null differ diff --git a/doc/images/qgis_new_80pct.png b/doc/images/qgis_new_80pct.png new file mode 100644 index 000000000000..33c91ffdccf9 Binary files /dev/null and b/doc/images/qgis_new_80pct.png differ diff --git a/doc/images/qgis_raster_popup_properties_selected.png b/doc/images/qgis_raster_popup_properties_selected.png deleted file mode 100644 index cdbd9557114c..000000000000 Binary files a/doc/images/qgis_raster_popup_properties_selected.png and /dev/null differ diff --git a/doc/images/qgis_raster_properties_general_tab.png b/doc/images/qgis_raster_properties_general_tab.png deleted file mode 100644 index 06b869fa4412..000000000000 Binary files a/doc/images/qgis_raster_properties_general_tab.png and /dev/null differ diff --git a/doc/images/qgis_raster_properties_statistics_tab.png b/doc/images/qgis_raster_properties_statistics_tab.png deleted file mode 100644 index e407fc4b9bdd..000000000000 Binary files a/doc/images/qgis_raster_properties_statistics_tab.png and /dev/null differ diff --git a/doc/images/qgis_raster_properties_symbology_tab.png b/doc/images/qgis_raster_properties_symbology_tab.png deleted file mode 100644 index de3448dfbf43..000000000000 Binary files a/doc/images/qgis_raster_properties_symbology_tab.png and /dev/null differ diff --git a/doc/images/qgis_vector_layer_properties.png b/doc/images/qgis_vector_layer_properties.png deleted file mode 100644 index 998e5ccf1775..000000000000 Binary files a/doc/images/qgis_vector_layer_properties.png and /dev/null differ diff --git a/doc/images/qgis_vector_layer_properties1.png b/doc/images/qgis_vector_layer_properties1.png deleted file mode 100644 index f2e8aed25540..000000000000 Binary files a/doc/images/qgis_vector_layer_properties1.png and /dev/null differ diff --git a/doc/images/qgis_vector_layer_properties2.png b/doc/images/qgis_vector_layer_properties2.png deleted file mode 100644 index 945e66f72dc9..000000000000 Binary files a/doc/images/qgis_vector_layer_properties2.png and /dev/null differ diff --git a/doc/images/qgis_vector_layer_properties3.png b/doc/images/qgis_vector_layer_properties3.png deleted file mode 100644 index fce4102c142f..000000000000 Binary files a/doc/images/qgis_vector_layer_properties3.png and /dev/null differ diff --git a/doc/images/reload20x20.png b/doc/images/reload20x20.png deleted file mode 100644 index fbc6b576f53b..000000000000 Binary files a/doc/images/reload20x20.png and /dev/null differ diff --git a/doc/images/select_features.png b/doc/images/select_features.png deleted file mode 100644 index 86005be7afb1..000000000000 Binary files a/doc/images/select_features.png and /dev/null differ diff --git a/doc/images/sf.png b/doc/images/sf.png deleted file mode 100644 index fddc4ed59f6a..000000000000 Binary files a/doc/images/sf.png and /dev/null differ diff --git a/doc/images/table.png b/doc/images/table.png deleted file mode 100644 index f28f0e2eb739..000000000000 Binary files a/doc/images/table.png and /dev/null differ diff --git a/doc/images/viewmag-.png b/doc/images/viewmag-.png deleted file mode 100644 index 1b4971cd7345..000000000000 Binary files a/doc/images/viewmag-.png and /dev/null differ diff --git a/doc/images/zoomin.png b/doc/images/zoomin.png deleted file mode 100644 index dfdd7126d4cd..000000000000 Binary files a/doc/images/zoomin.png and /dev/null differ diff --git a/doc/index.html b/doc/index.html index 7147902852f8..0f078de849ac 100644 --- a/doc/index.html +++ b/doc/index.html @@ -1,358 +1,57 @@ - - - -Quantum GIS Documentation - - - - - - - - - - - - - - - - - - - - - - -
- -QGIS
- -
- - - - -
- - - - -
Documentation
-
-
- -
- - - - - - - + + + + +
- - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - -
 
-		 - -
-
About
-
-
-
QGIS
-
-
-Introduction -
-
-Whats new in Versio... -
-
-Available Documents... -
-
-
-
- - -
- -
Built with Apache Forrest logo
Sourceforge logo
-		 - - - - - - - - - - - - - - - - - -
- - - - -
-   - Font size: -   -   -  
-		 
-
- - - - -
-

Quantum GIS Documentation

-
- - - - - - - - - - - -
-

Introduction

-
-
- - -

This documentation describes the Quantum GIS (QGIS) application. - Further information on QGIS is available at - http://qgis.org. -

- -
- - - - - - - - - - - -
-

Whats new in Version 0.4

-
-
- - - - - - - - - - - - -
-

New features

-
-
    -
  1. Map Overview
    2. -
  2. Preliminary printing support
    3. -
  3. Menu cleanups
    4. -
  4. User interface improvements
    5. -
  5. Icon Themes (only default theme currently available)
    6. -
  6. Capture point to clipboard
    7. - -
- - - - - - - - - - - -
-

Core Plugins

-
-
    -
  1. Scale bar plugin
    2. -
  2. Improved GPS tools plugin
    3. - -
- - - - - - - - - - - -
-

Known Issues

-
-
    - -
  1. Map units are not stored when a QGIS project is saved
    2. - - -
- -
- - - - - - - - - - - -
-

Available Documents

-
-
- - -

The following documents are available:

- - - -

All documents are available in PDF format in the qgis share/doc subdirectory. If - you have the Adobe PDF plugin for your browser, you can display the PDF version by - clicking on the PDF link in the upper - right corner of each document.

- -
-
Note
-
This documentation is based on QGIS 0.4 (Baby)
-
- -
- -
-
-
+ + + + +
+ + + Quantum GIS Documentation
+ Version 0.5 Bandit +
+Installation Guide   +User Guide
+ +

Whats new in Version 0.5

+Version 0.5 of QGIS contains a number of new features: + + + - -
+
    +
  • Windows version +
  • Feature labeling with optional buffering +
  • Preliminary digitizing support for shapefiles +
  • GRASS digitizing support +
  • GPS SVG icons +
 -
-
-
- - - - - - - - - -
Copyright © - 2004 Micro Resources. All rights reserved. -
-
- - + + + + + +
Installation Guide +
How to build and install QGIS. The guide is available in both + pdf and + HTML format.
+ +
+
User Guide +
A brief guide to using QGIS. The User Guide is available in + pdf format.
+ +
+ All documents are installed in the qgis share/doc subdirectory. + diff --git a/doc/index.pdf b/doc/index.pdf deleted file mode 100644 index e69de29bb2d1..000000000000 diff --git a/doc/install.html b/doc/install.html deleted file mode 100644 index 55effdd0ea3d..000000000000 --- a/doc/install.html +++ /dev/null @@ -1,525 +0,0 @@ - - - - - -Building and Installing QGIS - - - - - - - - - - - - - - - -

- -

-

Building and Installing QGIS

-

Gary Sherman - Tim Sutton

-

-
- -

-Contents -

- - - - -

- -

- -

-
-Introduction -

-This document briefly describes how to build QGIS 0.4 (Baby) from the source distribution. Information on building the GRASS plugin with raster and vector support can be found in the Building QGIS with GRASS Support document, available at http://community.qgis.org/grass_plugin. -
-

-NOTE - IF YOU PLAN TO BUILD THE GRASS PLUGIN, A PATCHED VERSION OF GDAL MUST BE USED. SEE THE BUILDING QGIS WITH GRASS SUPPORT DOCUMENT BEFORE PROCEEDING. -
-

-The latest version of this document can always be found at http://qgis.org/docs/install.html. -
-

-QGIS requires that a number of libraries be installed on your system: - -

- -

-Each of these requirements are discussed below. Note that the information given below is abstracted from the installation documentation for each of the libraries. See the install information for each library to get detailed instructions. In the documentation below, the file names used are examples. - -
-

-If you are building QGIS without PostgreSQL, skip to the section on Installing GDAL/OGR. - -

- -

-PostgreSQL -

- QGIS uses the latest features of PostgreSQL. For this reason, version 7.4.x or higher is recommended with QGIS version 0.4. If you choose to add PostgreSQL, you must also install PostGIS and the GEOS library (see below). - -
    -
  1. Download PostgreSQL source from www.postgresql.org -
    2. -
  2. Extract the source - 
    -  tar -xzf postgresql-7.4.1.tar.gz
-
    - -

    -

    3. -
  3. Change to the source directory - 
    -  cd postgresql-7.4.1
-
    - -

    -

    4. -
  4. Configure PostgreSQL: - 
    -  ./configure --prefix=/usr/local/pgsql
-
    - -

    -

    5. -
  5. Build - 
    -  make
-
    - -

    -

    6. -
  6. Install - 
    -  make install
-
    - -

    -

    7. -
  7. As root, create the postgres user and setup the database (following taken from PostgreSQL INSTALL file with modification) - - -
    8. -
  8. PostgreSQL should now be running. Logon as the postgres user (or use su - postgres). You should be able to connect to the test database and execute a test query with the following commands: - -

    -

    -  psql test
-  select version();
-  version
-  -------------------------------------------------------------------------------------
-  PostgreSQL 7.4.1 on i686-pc-linux-gnu, compiled by GCC gcc (GCC) 3.3.1 (SuSE Linux)
-(1 row)
-
-  \q
-
    - -

    -

    9. -
  9. PostgreSQL install is done - -
    10. -
- -

- -

-GEOS -

- -

-QGIS uses GEOS to properly fetch features from the database when doing an - identify or select. You can still view PostGIS layers without GEOS, but you - will not be able to create a selection or identify a feature. - -

-If you choose to proceed without GEOS support, QGIS will warn you each time you load a layer from the database. - -

-To install GEOS: - -

    -
  1. Download GEOS source from http://geos.refractions.net -
    2. -
  2. Untar GEOS - 
    -  tar -xzf geos-1.0.0.tar.gz
-
    -
    3. -
  3. Change to the GEOS source dir - 
    -  cd geos-1.0-.0
-
    -
    4. -
  4. Follow the instructions in the GEOS README file to complete the installation. Typically the install goes like this: - 
    -  ./configure
-  make
-  make install
-
    - -

    -

    5. -
- -

- -

-PostGIS -

- -

-NOTE - You must edit the PostGIS Makefile and make sure that USE_GEOS=1 is - set. Also adjust GEOS_DIR to point to your GEOS installation directory. - -

    -
  1. Download PostGIS source from http://postgis.refractions.net - -

    -

    2. -
  2. Untar PostGIS into the contrib subdirectory of the postgresql build directory. The contrib subdirectory is located in the directory created in step 3 of the PostgreSQL installation process. -
    3. -
  3. Change to the postgis subdirectory -
    4. -
  4. Edit the Makefile to enable GEOS support (see the note above) -
    5. -
  5. PostGIS provides a manual in the doc/html subdirectory that explains the build process (see the Installation section) -
    6. -
  6. The quick and dirty steps to install PostGIS are: - 
    -   cd contrib
-   gunzip postgis-0.8.0.tar.gz 
-   tar xvf postgis-0.8.0.tar 
-   cd postgis-0.8.0 
-   make 
-   make install 
-   createlang plpgsql yourtestdatabase 
-   psql -d yourtestdatabase -f postgis.sql 
-   psql -d yourtestdatabase -f spatial_ref_sys.sql
-
    - -

    -

    7. -
  7. The better way is to carefully follow the instructions in the PostGIS manual in the doc/html subdirectory or the online manual at http://postgis.refractions.net/docs -
    8. -
- -

- -

-GDAL/OGR -

- The GDAL and OGR libraries provide support for raster and vector data formats. QGIS makes use of both of these libraries (which come bundled in one distribution). - -

-Note: A Linux binary of GDAL is available at http://www.remotesensing.org/gdal. If you choose to install the binary you will also need to download and unpack the source tree since QGIS needs the header files in order to compile. - -

-To install GDAL/OGR from source: - -

    -
  1. Download the GDAL distribution from http://www.remotesensing.org/gdal. You should use version 1.1.9 or higher. Versions prior to 1.1.9 contained a bug that caused problems when a null feature was encountered. If you want to build vector support for GRASS, you must use GDAL 1.2.0 (see note in Section 1). - -

    -

    2. -
  2. Untar the distribution - 
    -    tar xfvz /../path/../gdal-x.x.x.tar.gz
-
    - -

    -

    3. -
  3. Change to the gdal-x.x.x subdirectory that was created by step 2 - 
    -    cd gdal-x.x.x
-
    - -

    -

    4. -
  4. Configure GDAL without PostgreSQL support (necessary): - 
    -    ./configure --without-pg
-
    - -

    -

    5. -
  5. Build and install GDAL: - 
    -    make
-    su
-    make install
-
    - -

    -

    6. -
  6. In order to run GDAL after installing it is necessary for the shared - library to be findable. This can often be accomplished by setting - LD_LIBRARY_PATH to include /usr/local/lib. On Linux, you can add - /usr/local/lib (or whatever path you used for installing GDAL) to - /etc/ld.so.conf and run ldconfig as root. - -

    -

    7. -
  7. Make sure that gdal-config (found in the bin subdirectory where GDAL was installed) is included in the PATH. If necessary, add the path to gdal-config to the PATH environment variable. - 
    -    export PATH=/../path/../gdal-config:$PATH
-
    - -

    -

    8. -
  8. Check the install by running: - 
    -    gdal-config --prefix
-
    - -

    -

    9. -
- -

-If you've had problems during the installation, refer to this manual, where the whole process is described with some more detail: http://www.remotesensing.org/gdal/gdal_building.html - -

- -

-Qt -

- Qt 3.1.2 or higher is required in order to compile QGIS. You may already have Qt on your system. If so, check to see if you have version 3.1.2 or later. If not already installed, you will have to install the Qt development package for your distribution. If you are not able to install the required Qt packages, you will have to build from source. - To install Qt from source: - -
    -
  1. Download Qt from http://www.trolltech.com/developer (choose the Qt/X11 Free Edition) -
    2. -
  2. Unpack the distribution -
    3. -
  3. Follow directions provided in the distribution directory (doc/html/install-x11.html) -
    4. -
  4. Use whatever configure options you like but make sure you include -thread for use with QGIS. You can configure Qt with minimal options: - 
    -    ./configure -thread
-
    - -

    -

    5. -
  5. Complete the installation per the instructions provided in the Qt documentation (see step 3) - -
    6. -
- -

- -

-Building QGIS -

- -

-After you have installed the required libraries, you are ready to build QGIS. Download and untar the QGIS distribution and change to the QGIS source directory. You have two options for building and installing QGIS: Quick and Dirty and the right way. - -

-Quick and Dirty -

- If you don't need PostgreSQL support and have installed GDAL , - you can configure and build QGIS by changing to the distribution directory - and typing: - 
./configure
-    make
-    make install
-
- The above assumes that the gdal-config program is in your PATH - See the next section for the full configuration instructions. - -

-Configuring QGIS the Right Way -

- To see the configure options available, change the the QGIS - directory and enter: - 
-    ./configure --help
-
- Among other options, there are three that are important to - the success of the build: - 
-    --with-qtdir=DIR              Qt installation directory default=$QTDIR
-    --with-gdal=path/gdal-config  Full path to 'gdal-config' script,
-                                  e.g. '--with-gdal=/usr/local/bin/gdal-config'
-    --with-pg=path/pg_config      PostgreSQL (PostGIS) Support
-                                 (full path to pg_config)
-
- -

- -

-Qt -

- The configure script will detect Qt, unless it is installed in a - non-standard location. Setting the QTDIR environment variable will - make ensure that the detection succeeds. You can also specify the - path using the -with-qtdir option. - -

-GDAL -

- If the gdal-config script is in the PATH, configure will automatically - detect and configure GDAL support. If not in the path, you can specify - the full path to gdal-config using the -with-gdal option. For example: - 
-    /configure --with-gdal=/usr/mystuff/bin/gdal-config
-
-

-PostgreSQL -

- If the pg_config script is in the PATH, configure will automatically - detect and configure PostgreSQL support. If not, you can use the - -with-pg option to specify the full path to pg_config. For example: - 
-    ./configure --with-pg=/usr/local/psql/bin/pg_config
-
- -

- -

-Example Use of Configure -

- 
-    ./configure --prefix=/usr/local/qgis 
-    --with-gdal=/usr/local/gdal/bin/gdal-config
-    --with-pg=/usr/local/psql/bin/pg_config
-
- This will configure QGIS to use both GDAL and PostgreSQL. QGIS will be - installed in /usr/local/qgis. - -

-If QTDIR is set and gdal-config and pg_config are both - in the PATH, there is no need to use the -with-gdal and -with-pg - options. The configure script will properly detect and configure - GDAL and PostgreSQL - -

-Compiling and Installing QGIS -

- Once properly configured simply issue the following commands: - 
-    make
-    make install
-
-NOTE - As of version 0.1, you can no longer run QGIS from the src directory. You must do a make install and start QGIS from the installed location. In the case of the example above, the QGIS binary resides in the bin subdirectory of the directory specified with the prefix option (/usr/local/qgis/bin). - -

- -

-Building Plugins -

-The QGIS source distribution contains a number of "core" plugins. These are built along with QGIS using the instructions above. Additional external plugins are available from the QGIS community website at http://community.qgis.org. Instructions for building an external plugin can be found at http://wiki.qgis.org/qgiswiki/StepByStepBuildInstructions. Some external plugins may include instructions on building. If so, follow the instructions provided with the plugin rather than those provided in the wiki. -
-
-Gary Sherman -2004-06-28 -
- - diff --git a/doc/install.pdf b/doc/install.pdf index 18786346a6e1..a5c40945f8b7 100644 Binary files a/doc/install.pdf and b/doc/install.pdf differ diff --git a/doc/install_guide/Makefile.am b/doc/install_guide/Makefile.am new file mode 100644 index 000000000000..1641179cd5f8 --- /dev/null +++ b/doc/install_guide/Makefile.am @@ -0,0 +1,51 @@ +# Copyright (C) 2004 Jens Oberender +# +# This file is free software; as a special exception the author gives +# unlimited permission to copy and/or distribute it, with or without +# modifications, as long as this notice is preserved. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY, to the extent permitted by law; without even the +# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + +docdatadir = $(datadir)/$(PACKAGE)/doc/install_guide + +docdata_DATA = \ + contents.png \ + index.html \ + install.css \ + install.html \ + internals.pl \ + labels.pl \ + next_g.png \ + next.png \ + node10.html \ + node11.html \ + node12.html \ + node13.html \ + node14.html \ + node15.html \ + node16.html \ + node17.html \ + node18.html \ + node19.html \ + node1.html \ + node20.html \ + node2.html \ + node3.html \ + node4.html \ + node5.html \ + node6.html \ + node7.html \ + node8.html \ + node9.html \ + nx_grp_g.png \ + prev_g.png \ + prev.png \ + up_g.png \ + up.png \ + WARNINGS + +# generated by ls -1 | sed -e '/CVS/d' -e '/Makefile/d' -e 's#\(.*\)# \1 \\#' + +EXTRA_DIST = $(docdata_DATA) diff --git a/doc/install_guide/WARNINGS b/doc/install_guide/WARNINGS new file mode 100644 index 000000000000..995fc93713ff --- /dev/null +++ b/doc/install_guide/WARNINGS @@ -0,0 +1,8 @@ +No implementation found for style `graphicx' +No implementation found for style `colortbl' +No implementation found for style `setspace' +No implementation found for style `listings' +No implementation found for style `hyperref' +No implementation found for style `ae' +No implementation found for style `aecompl' +No implementation found for style `fancyhdr' diff --git a/doc/install_guide/contents.png b/doc/install_guide/contents.png new file mode 100644 index 000000000000..0c752c66c876 Binary files /dev/null and b/doc/install_guide/contents.png differ diff --git a/doc/install_guide/index.html b/doc/install_guide/index.html new file mode 100644 index 000000000000..11f3ebdec89f --- /dev/null +++ b/doc/install_guide/index.html @@ -0,0 +1,108 @@ + + + + + +Building and Installing QGIS + + + + + + + + + + + + + + + + + +next +up +previous + +contents +
+ Next: Contents +   Contents +
+
+ + +

+ +

+

Building and Installing QGIS

+

Gary Sherman - Tim Sutton

+

+
+ + + + + +
+
+Gary Sherman +2004-10-01 +
+ + diff --git a/doc/install.css b/doc/install_guide/install.css similarity index 100% rename from doc/install.css rename to doc/install_guide/install.css diff --git a/doc/install_guide/install.html b/doc/install_guide/install.html new file mode 100644 index 000000000000..11f3ebdec89f --- /dev/null +++ b/doc/install_guide/install.html @@ -0,0 +1,108 @@ + + + + + +Building and Installing QGIS + + + + + + + + + + + + + + + + + +next +up +previous + +contents +
+ Next: Contents +   Contents +
+
+ + +

+ +

+

Building and Installing QGIS

+

Gary Sherman - Tim Sutton

+

+
+ + + + + +
+
+Gary Sherman +2004-10-01 +
+ + diff --git a/doc/install_guide/internals.pl b/doc/install_guide/internals.pl new file mode 100644 index 000000000000..39449494925c --- /dev/null +++ b/doc/install_guide/internals.pl @@ -0,0 +1,10 @@ +# LaTeX2HTML 2002-2-1 (1.70) +# Associate internals original text with physical files. + + +$key = q/label_introduction/; +$ref_files{$key} = "$dir".q|node2.html|; +$noresave{$key} = "$nosave"; + +1; + diff --git a/doc/install_guide/labels.pl b/doc/install_guide/labels.pl new file mode 100644 index 000000000000..ab9f27c7499c --- /dev/null +++ b/doc/install_guide/labels.pl @@ -0,0 +1,17 @@ +# LaTeX2HTML 2002-2-1 (1.70) +# Associate labels original text with physical files. + + +$key = q/label_introduction/; +$external_labels{$key} = "$URL/" . q|node2.html|; +$noresave{$key} = "$nosave"; + +1; + + +# LaTeX2HTML 2002-2-1 (1.70) +# labels from external_latex_labels array. + + +1; + diff --git a/doc/install_guide/next.png b/doc/install_guide/next.png new file mode 100644 index 000000000000..1628652aac7c Binary files /dev/null and b/doc/install_guide/next.png differ diff --git a/doc/install_guide/next_g.png b/doc/install_guide/next_g.png new file mode 100644 index 000000000000..9d3f59121e25 Binary files /dev/null and b/doc/install_guide/next_g.png differ diff --git a/doc/install_guide/node1.html b/doc/install_guide/node1.html new file mode 100644 index 000000000000..9c2817d98115 --- /dev/null +++ b/doc/install_guide/node1.html @@ -0,0 +1,95 @@ + + + + + +Contents + + + + + + + + + + + + + + + + + + + + +next + +up + +previous +
+ Next: Introduction + Up: Building and Installing QGIS + Previous: Building and Installing QGIS +
+
+ +
+ +

+Contents +

+ + + + +

+ +

+

+
+Gary Sherman +2004-10-01 +
+ + diff --git a/doc/install_guide/node10.html b/doc/install_guide/node10.html new file mode 100644 index 000000000000..8ce208e03ade --- /dev/null +++ b/doc/install_guide/node10.html @@ -0,0 +1,91 @@ + + + + + +Building QGIS + + + + + + + + + + + + + + + + + + + + +next + +up + +previous + +contents +
+ Next: Quick and Dirty + Up: Building and Installing QGIS + Previous: Qt +   Contents +
+
+ + +

+Building QGIS +

+ +

+After you have installed the required libraries, you are ready to build QGIS. Download and untar the QGIS distribution and change to the QGIS source directory. You have two options for building and installing QGIS: Quick and Dirty and the right way. +

+ +Subsections + + + +
+
+Gary Sherman +2004-10-01 +
+ + diff --git a/doc/install_guide/node11.html b/doc/install_guide/node11.html new file mode 100644 index 000000000000..6da231e3ed69 --- /dev/null +++ b/doc/install_guide/node11.html @@ -0,0 +1,73 @@ + + + + + +Quick and Dirty + + + + + + + + + + + + + + + + + + + + +next + +up + +previous + +contents +
+ Next: Configuring QGIS the Right + Up: Building QGIS + Previous: Building QGIS +   Contents +
+
+ + +

+Quick and Dirty +

+ If you don't need PostgreSQL support and have installed GDAL , + you can configure and build QGIS by changing to the distribution directory + and typing: + 
./configure
+    make
+    make install
+
+ The above assumes that the gdal-config program is in your PATH + See the next section for the full configuration instructions. +
+
+Gary Sherman +2004-10-01 +
+ + diff --git a/doc/install_guide/node12.html b/doc/install_guide/node12.html new file mode 100644 index 000000000000..37b81dc8c034 --- /dev/null +++ b/doc/install_guide/node12.html @@ -0,0 +1,99 @@ + + + + + +Configuring QGIS the Right Way + + + + + + + + + + + + + + + + + + + +next + +up + +previous + +contents +
+ Next: Qt + Up: Building QGIS + Previous: Quick and Dirty +   Contents +
+
+ + +

+Configuring QGIS the Right Way +

+ To see the configure options available, change the the QGIS + directory and enter: + 
+    ./configure --help
+
+ Among other options, there are three that are important to + the success of the build: + 
+    --with-qtdir=DIR              Qt installation directory default=$QTDIR
+    --with-gdal=path/gdal-config  Full path to 'gdal-config' script,
+                                  e.g. '--with-gdal=/usr/local/bin/gdal-config'
+    --with-pg=path/pg_config      PostgreSQL (PostGIS) Support
+                                 (full path to pg_config)
+     --with-grass=DIR             GRASS Support (full path to GRASS binary package)
+
+ +

+

+ +Subsections + + + +
+
+Gary Sherman +2004-10-01 +
+ + diff --git a/doc/install_guide/node13.html b/doc/install_guide/node13.html new file mode 100644 index 000000000000..54874ae3c60b --- /dev/null +++ b/doc/install_guide/node13.html @@ -0,0 +1,68 @@ + + + + + +Qt + + + + + + + + + + + + + + + + + + + + +next + +up + +previous + +contents +
+ Next: GDAL + Up: Configuring QGIS the Right + Previous: Configuring QGIS the Right +   Contents +
+
+ + +

+Qt +

+ The configure script will detect Qt, unless it is installed in a + non-standard location. Setting the QTDIR environment variable will + make ensure that the detection succeeds. You can also specify the + path using the -with-qtdir option. +
+
+Gary Sherman +2004-10-01 +
+ + diff --git a/doc/install_guide/node14.html b/doc/install_guide/node14.html new file mode 100644 index 000000000000..645f0e0bb6c8 --- /dev/null +++ b/doc/install_guide/node14.html @@ -0,0 +1,70 @@ + + + + + +GDAL + + + + + + + + + + + + + + + + + + + + +next + +up + +previous + +contents +
+ Next: PostgreSQL + Up: Configuring QGIS the Right + Previous: Qt +   Contents +
+
+ + +

+GDAL +

+ If the gdal-config script is in the PATH, configure will automatically + detect and configure GDAL support. If not in the path, you can specify + the full path to gdal-config using the -with-gdal option. For example: + 
+    /configure --with-gdal=/usr/mystuff/bin/gdal-config
+
+
+
+Gary Sherman +2004-10-01 +
+ + diff --git a/doc/install_guide/node15.html b/doc/install_guide/node15.html new file mode 100644 index 000000000000..cebbb165eed2 --- /dev/null +++ b/doc/install_guide/node15.html @@ -0,0 +1,70 @@ + + + + + +PostgreSQL + + + + + + + + + + + + + + + + + + + + +next + +up + +previous + +contents +
+ Next: GRASS + Up: Configuring QGIS the Right + Previous: GDAL +   Contents +
+
+ + +

+PostgreSQL +

+ If the pg_config script is in the PATH, configure will automatically + detect and configure PostgreSQL support. If not, you can use the + -with-pg option to specify the full path to pg_config. For example: + 
+    ./configure --with-pg=/usr/local/psql/bin/pg_config
+
+
+
+Gary Sherman +2004-10-01 +
+ + diff --git a/doc/install_guide/node16.html b/doc/install_guide/node16.html new file mode 100644 index 000000000000..870f360e8364 --- /dev/null +++ b/doc/install_guide/node16.html @@ -0,0 +1,69 @@ + + + + + +GRASS + + + + + + + + + + + + + + + + + + + + +next + +up + +previous + +contents +
+ Next: Example Use of Configure + Up: Configuring QGIS the Right + Previous: PostgreSQL +   Contents +
+
+ + +

+GRASS +

+To build QGIS with GRASS support you must specify the full path to the installed GRASS binary package: +
+    ./configure --with-grass=/usr/local/grass-5.7.0
+
+This assumes that GRASS is installed in the default location. Change the path to match the location of your GRASS installation. +
+
+Gary Sherman +2004-10-01 +
+ + diff --git a/doc/install_guide/node17.html b/doc/install_guide/node17.html new file mode 100644 index 000000000000..db240e58718a --- /dev/null +++ b/doc/install_guide/node17.html @@ -0,0 +1,79 @@ + + + + + +Example Use of Configure + + + + + + + + + + + + + + + + + + + + +next + +up + +previous + +contents +
+ Next: Compiling and Installing QGIS + Up: Configuring QGIS the Right + Previous: GRASS +   Contents +
+
+ + +

+Example Use of Configure +

+ An example of use of configure for building QGIS with all options: + 
+    ./configure --prefix=/usr/local/qgis \
+    --with-gdal=/usr/local/gdal/bin/gdal-config \
+    --with-pg=/usr/local/psql/bin/pg_config \
+    --with-grass=/usr/local/grass-5.7.0
+
+ This will configure QGIS to use GDAL, GRASS, and PostgreSQL. QGIS will be + installed in /usr/local/qgis. + +

+If QTDIR is set and gdal-config and pg_config are both + in the PATH, there is no need to use the -with-gdal and -with-pg + options. The configure script will properly detect and configure + GDAL and PostgreSQL. You must still use the -with-grass option if building with GRASS support. +

+
+Gary Sherman +2004-10-01 +
+ + diff --git a/doc/install_guide/node18.html b/doc/install_guide/node18.html new file mode 100644 index 000000000000..a4bd497e415d --- /dev/null +++ b/doc/install_guide/node18.html @@ -0,0 +1,74 @@ + + + + + +Compiling and Installing QGIS + + + + + + + + + + + + + + + + + + + +next + +up + +previous + +contents +
+ Next: Building Plugins + Up: Configuring QGIS the Right + Previous: Example Use of Configure +   Contents +
+
+ + +

+Compiling and Installing QGIS +

+ Once properly configured simply issue the following commands: + 
+    make
+    make install
+
+NOTE - As of version 0.1, you can no longer run QGIS from the src directory. You must do a make install and start QGIS from the installed location. In the case of the example above, the QGIS binary resides in the bin subdirectory of the directory specified with the prefix option (/usr/local/qgis/bin). +
+

+For information on using QGIS see the QGIS User Guide. + +

+

+
+Gary Sherman +2004-10-01 +
+ + diff --git a/doc/install_guide/node19.html b/doc/install_guide/node19.html new file mode 100644 index 000000000000..6d96d62f72ed --- /dev/null +++ b/doc/install_guide/node19.html @@ -0,0 +1,67 @@ + + + + + +Building Plugins + + + + + + + + + + + + + + + + + + + + +next + +up + +previous + +contents +
+ Next: About this document ... + Up: Building and Installing QGIS + Previous: Compiling and Installing QGIS +   Contents +
+
+ + +

+Building Plugins +

+The QGIS source distribution contains a number of "core" plugins. These are built along with QGIS using the instructions above. Additional external plugins are available from the QGIS community website at http://community.qgis.org. Instructions for building an external plugin can be found at http://wiki.qgis.org/qgiswiki/StepByStepBuildInstructions. Some external plugins may include instructions on building. If so, follow the instructions provided with the plugin rather than those provided in the wiki. +
+
+Gary Sherman +2004-10-01 +
+ + diff --git a/doc/install_guide/node2.html b/doc/install_guide/node2.html new file mode 100644 index 000000000000..94babfbf3326 --- /dev/null +++ b/doc/install_guide/node2.html @@ -0,0 +1,127 @@ + + + + + +Introduction + + + + + + + + + + + + + + + + + + + + +next + +up + +previous + +contents +
+ Next: Getting QGIS + Up: Building and Installing QGIS + Previous: Contents +   Contents +
+
+ + +

+
+Introduction +

+This document briefly describes how to build QGIS 0.5 (Bandit) from the source distribution. These instructions are for Linux/Unix and other POSIX systems which have the required build environment. +
+

+Installing the Windows version of QGIS is simply a matter of unzipping the WIN32 distribution and creating a shortcut to the application. See the README.WIN32 file for additional information regarding the Windows version of QGIS. At version 0.5, the GRASS plugin is not available in Windows. +
+

+The latest version of this document can always be found at http://qgis.org/docs/install.html. +
+

+QGIS can be installed with three levels of support for data stores: + +

    +
  1. Basic raster and vector support (GDAL and OGR formats) +
    2. +
  2. PostreSQL/GEOS/PostGIS +
    3. +
  3. GRASS raster and vector support +
    4. +
+ +

+Basic support uses the GDAL/OGR libraries and supports many raster and vector formats. For more information on the available formats, see http://www.remotesensing.org:16080/gdal/formats_list.html and http://www.remotesensing.org:16080/gdal/ogr/ogr_formats.html. +
+

+PostgreSQL/PostGIS support allows you to store spatial data in a PostgreSQL database. GRASS support provides access to GRASS mapsets. +
+

+NOTE - IF YOU PLAN TO BUILD QGIS WITH GRASS SUPPORT, VERSION 1.2.3 OR HIGHER +OF GDAL MUST BE USED. +
+

+Each of the requirements are discussed below. Note that the information given below is abstracted from the installation documentation for each of the libraries. See the install information for each library to get detailed instructions. In the documentation below, the file names and versions used are examples. + +
+

+If you are building QGIS without PostgreSQL or GRASS support, skip to the section on Installing GDAL/OGR. +

+ + +next + +up + +previous + +contents +
+ Next: Getting QGIS + Up: Building and Installing QGIS + Previous: Contents +   Contents + +
+Gary Sherman +2004-10-01 +
+ + diff --git a/doc/install_guide/node20.html b/doc/install_guide/node20.html new file mode 100644 index 000000000000..985793413433 --- /dev/null +++ b/doc/install_guide/node20.html @@ -0,0 +1,74 @@ + + + + + +About this document ... + + + + + + + + + + + + + + + + + +next + +up + +previous + +contents +
+ Up: Building and Installing QGIS + Previous: Building Plugins +   Contents +
+
+ + +

+About this document ... +

+ Building and Installing QGIS

+This document was generated using the +LaTeX2HTML translator Version 2002-2-1 (1.70) +

+Copyright © 1993, 1994, 1995, 1996, +Nikos Drakos, +Computer Based Learning Unit, University of Leeds. +
+Copyright © 1997, 1998, 1999, +Ross Moore, +Mathematics Department, Macquarie University, Sydney. +

+The command line arguments were:
+ latex2html install.tex -local_icons +

+The translation was initiated by Gary Sherman on 2004-10-01 +

+
+Gary Sherman +2004-10-01 +
+ + diff --git a/doc/install_guide/node3.html b/doc/install_guide/node3.html new file mode 100644 index 000000000000..09af7b507271 --- /dev/null +++ b/doc/install_guide/node3.html @@ -0,0 +1,77 @@ + + + + + +Getting QGIS + + + + + + + + + + + + + + + + + + + + +next + +up + +previous + +contents +
+ Next: PostgreSQL + Up: Building and Installing QGIS + Previous: Introduction +   Contents +
+
+ + +

+Getting QGIS +

+QGIS is available in both source and package format from http://qgis.org. +
+

+In addition, packages for many Linux distributions are independently maintained in various locations. See +http://qgis.org/download.php for the latest information on package locations. +
+

+Packages for most of the software/libraries discussed below can be found for almost all Linux distributions. While it is possible to mix compiling from source and installing packages to meet the requirements for QGIS, sometimes this becomes tricky. Following the steps below will generally ensure a successful installation. If you are using SuSE 9.1, the LinGIS distribution ftp://ftp.lingis.org is a good choice for installing QGIS and its dependencies. + +

+

+
+Gary Sherman +2004-10-01 +
+ + diff --git a/doc/install_guide/node4.html b/doc/install_guide/node4.html new file mode 100644 index 000000000000..9fdedde35d52 --- /dev/null +++ b/doc/install_guide/node4.html @@ -0,0 +1,212 @@ + + + + + +PostgreSQL + + + + + + + + + + + + + + + + + + + + +next + +up + +previous + +contents +
+ Next: GEOS + Up: Building and Installing QGIS + Previous: Getting QGIS +   Contents +
+
+ + +

+PostgreSQL +

+ QGIS uses the latest features of PostgreSQL. For this reason, version 7.4.x or higher is recommended with QGIS version 0.5. If you choose to add PostgreSQL, you must also install PostGIS and the GEOS library (see below). + +
    +
  1. Download PostgreSQL source from www.postgresql.org +
    2. +
  2. Extract the source + 
    +  tar -xzf postgresql-7.4.1.tar.gz
+
    + +

    +

    3. +
  3. Change to the source directory + 
    +  cd postgresql-7.4.1
+
    + +

    +

    4. +
  4. Configure PostgreSQL: + 
    +  ./configure --prefix=/usr/local/pgsql
+
    + +

    +

    5. +
  5. Build + 
    +  make
+
    + +

    +

    6. +
  6. Install + 
    +  make install
+
    + +

    +

    7. +
  7. As root, create the postgres user and setup the database (following taken from PostgreSQL INSTALL file with modification) + +
      +
    • Create the postgres user + 
      +  adduser postgres
+
      + +

      +

      • +
    • Create the directory for the PostgreSQL database + 
      +  mkdir /usr/local/pgsql/data
+
      + +

      +

      • +
    • Change ownership of the data directory to the postgres user + 
      +  chown postgres /usr/local/pgsql/data
+
      + +

      +

      • +
    • su to the postgres user (or login as postgres) + 
      +  su - postgres
+
      + +

      +

      • +
    • Change to the PostgreSQL install directory + 
      +  cd /usr/local/pgsql
+
      + +

      +

      • +
    • Initialize the database + 
      +  ./bin/initdb -D /usr/local/pgsql/data
+
      + +

      +

      • +
    • Start the PostgreSQL daemon + 
      +  ./bin/pg_ctl start  -o "-i" -D /usr/local/pgsql/data -l /home/postgres/serverlog
+
      + +

      + +

      • +
    • Create the test database + +

      +

      +  ./bin/createdb test
+
      + +
      • +
    +
    8. +
  8. PostgreSQL should now be running. Logon as the postgres user (or use su - postgres). You should be able to connect to the test database and execute a test query with the following commands: + +

    +

    +  psql test
+  select version();
+  version
+  -------------------------------------------------------------------------------------
+  PostgreSQL 7.4.1 on i686-pc-linux-gnu, compiled by GCC gcc (GCC) 3.3.1 (SuSE Linux)
+(1 row)
+
+  \q
+
    + +

    +

    9. +
  9. PostgreSQL install is done + +
    10. +
+ +

+

+ + +next + +up + +previous + +contents +
+ Next: GEOS + Up: Building and Installing QGIS + Previous: Getting QGIS +   Contents + +
+Gary Sherman +2004-10-01 +
+ + diff --git a/doc/install_guide/node5.html b/doc/install_guide/node5.html new file mode 100644 index 000000000000..d3fa04569e99 --- /dev/null +++ b/doc/install_guide/node5.html @@ -0,0 +1,102 @@ + + + + + +GEOS + + + + + + + + + + + + + + + + + + + + +next + +up + +previous + +contents +
+ Next: PostGIS + Up: Building and Installing QGIS + Previous: PostgreSQL +   Contents +
+
+ + +

+GEOS +

+ +

+QGIS uses GEOS to properly fetch features from the database when doing an + identify or select. You can still view PostGIS layers without GEOS, but you + will not be able to create a selection or identify a feature. + +

+If you choose to proceed without GEOS support, QGIS will warn you each time you load a layer from the database. + +

+To install GEOS: + +

    +
  1. Download GEOS source from http://geos.refractions.net +
    2. +
  2. Untar GEOS + 
    +  tar -xzf geos-1.0.0.tar.gz
+
    +
    3. +
  3. Change to the GEOS source dir + 
    +  cd geos-1.0-.0
+
    +
    4. +
  4. Follow the instructions in the GEOS README file to complete the installation. Typically the install goes like this: + 
    +  ./configure
+  make
+  make install
+
    + +

    +

    5. +
+ +

+

+
+Gary Sherman +2004-10-01 +
+ + diff --git a/doc/install_guide/node6.html b/doc/install_guide/node6.html new file mode 100644 index 000000000000..fcecaa132f68 --- /dev/null +++ b/doc/install_guide/node6.html @@ -0,0 +1,100 @@ + + + + + +PostGIS + + + + + + + + + + + + + + + + + + + + +next + +up + +previous + +contents +
+ Next: GRASS + Up: Building and Installing QGIS + Previous: GEOS +   Contents +
+
+ + +

+PostGIS +

+ +

+NOTE - You must edit the PostGIS Makefile and make sure that USE_GEOS=1 is + set. Also adjust GEOS_DIR to point to your GEOS installation directory. + +

    +
  1. Download PostGIS source from http://postgis.refractions.net + +

    +

    2. +
  2. Untar PostGIS into the contrib subdirectory of the postgresql build directory. The contrib subdirectory is located in the directory created in step 3 of the PostgreSQL installation process. +
    3. +
  3. Change to the postgis subdirectory +
    4. +
  4. Edit the Makefile to enable GEOS support (see the note above) +
    5. +
  5. PostGIS provides a manual in the doc/html subdirectory that explains the build process (see the Installation section) +
    6. +
  6. The quick and dirty steps to install PostGIS are: + 
    +   cd contrib
+   gunzip postgis-0.8.0.tar.gz 
+   tar xvf postgis-0.8.0.tar 
+   cd postgis-0.8.0 
+   make 
+   make install 
+   createlang plpgsql yourtestdatabase 
+   psql -d yourtestdatabase -f postgis.sql 
+   psql -d yourtestdatabase -f spatial_ref_sys.sql
+
    +
    7. +
+The better way to install PostGIS is to carefully follow the instructions in the PostGIS manual in the doc/html subdirectory or the online manual at http://postgis.refractions.net/docs +

+

+
+Gary Sherman +2004-10-01 +
+ + diff --git a/doc/install_guide/node7.html b/doc/install_guide/node7.html new file mode 100644 index 000000000000..9f55e515e640 --- /dev/null +++ b/doc/install_guide/node7.html @@ -0,0 +1,73 @@ + + + + + +GRASS + + + + + + + + + + + + + + + + + + + + +next + +up + +previous + +contents +
+ Next: GDAL/OGR + Up: Building and Installing QGIS + Previous: PostGIS +   Contents +
+
+ + +

+GRASS +

+If you want QGIS to support GRASS vector and raster layers, you must build GRASS prior to proceeding. +Follow the directions on the GRASS website carefully to build version 5.7. Additional information and the build instructions can be found at http://grass.itc.it. +
+

+The GRASS software is available for download at http://grass.itc.it/download.html. + +

+

+
+Gary Sherman +2004-10-01 +
+ + diff --git a/doc/install_guide/node8.html b/doc/install_guide/node8.html new file mode 100644 index 000000000000..02837c7a996b --- /dev/null +++ b/doc/install_guide/node8.html @@ -0,0 +1,166 @@ + + + + + +GDAL/OGR + + + + + + + + + + + + + + + + + + + + +next + +up + +previous + +contents +
+ Next: Qt + Up: Building and Installing QGIS + Previous: GRASS +   Contents +
+
+ + +

+GDAL/OGR +

+ The GDAL and OGR libraries provide support for raster and vector data formats. QGIS makes use of both of these libraries (which come bundled in one distribution). + +

+Note: A Linux binary of GDAL is available at http://www.remotesensing.org/gdal. If you choose to install the binary you will also need to download and unpack the source tree since QGIS needs the header files in order to compile. + +

+To install GDAL/OGR from source: + +

    +
  1. Download the GDAL distribution from http://www.remotesensing.org/gdal. You should use version 1.1.9 or higher. Versions prior to 1.1.9 contained a bug that caused problems when a null feature was encountered. If you want to build vector support for GRASS, you must use GDAL 1.2.3. + +

    +

    2. +
  2. Untar the distribution + 
    +    tar xfvz /../path/../gdal-x.x.x.tar.gz
+
    + +

    +

    3. +
  3. Change to the gdal-x.x.x subdirectory that was created by step 2 + 
    +    cd gdal-x.x.x
+
    + +

    +

    4. +
  4. Configure GDAL + 
    +    ./configure
+
    + or if you want GRASS support + 
    +    ./configure --with-grass=<full path to grass install>
+
    + Depending on the GDAL version you are building, it may be necessary to specify -without-ogdi when running configure if you don't have the OGDI libary avaiable on your system. + +

    +

    5. +
  5. Build and install GDAL: + 
    +    make
+    su
+    make install
+
    + +

    +

    6. +
  6. In order to run GDAL after installing it is necessary for the shared + library to be findable. This can often be accomplished by setting + LD_LIBRARY_PATH to include /usr/local/lib. On Linux, you can add + /usr/local/lib (or whatever path you used for installing GDAL) to + /etc/ld.so.conf and run ldconfig as root. + +

    +

    7. +
  7. Make sure that gdal-config (found in the bin subdirectory where GDAL was installed) is included in the PATH. If necessary, add the path to gdal-config to the PATH environment variable. + 
    +    export PATH=/../path/../gdal-config:$PATH
+
    + +

    +

    8. +
  8. Check the install by running: + 
    +    gdal-config --prefix
+
    + +

    +

    9. +
+ +

+If you've had problems during the installation, refer to this manual, where the whole process is described with some more detail: http://www.remotesensing.org/gdal/gdal_building.html + +

+

+ + +next + +up + +previous + +contents +
+ Next: Qt + Up: Building and Installing QGIS + Previous: GRASS +   Contents + +
+Gary Sherman +2004-10-01 +
+ + diff --git a/doc/install_guide/node9.html b/doc/install_guide/node9.html new file mode 100644 index 000000000000..576735cd2447 --- /dev/null +++ b/doc/install_guide/node9.html @@ -0,0 +1,128 @@ + + + + + +Qt + + + + + + + + + + + + + + + + + + + + +next + +up + +previous + +contents +
+ Next: Building QGIS + Up: Building and Installing QGIS + Previous: GDAL/OGR +   Contents +
+
+ + +

+Qt +

+ Qt 3.1.2 or higher is required in order to compile QGIS. You may already have Qt on your system. If so, check to see if you have version 3.1.2 or later. You can check the Qt version using the find command: + 
+  find ./ -name qglobal.h 2>/dev/null | xargs grep QT_VERSION_STR
+
+ If you have the locate utility installed you can do the same more quickly using: + 
+  locate qglobal.h | xargs grep QT_VERSION_STR
+
+ In either case the result should look something like this: + 
+   #define QT_VERSION_STR   "3.3.1"
+
+ In the example above, Qt 3.3.1 is installed. +
+

+If Qt is not installed, you will have to install the Qt development package for your distribution. If you are not able to install the required Qt packages, you will have to build from source. +
+

+To install Qt from source: + +

    +
  1. Download Qt from http://www.trolltech.com/developer (choose the Qt/X11 Free Edition) +
    2. +
  2. Unpack the distribution +
    3. +
  3. Follow directions provided in the distribution directory (doc/html/install-x11.html) +
    4. +
  4. Use whatever configure options you like but make sure you include -thread for use with QGIS. You can configure Qt with minimal options: + 
    +    ./configure -thread
+
    + +

    +

    5. +
  5. Complete the installation per the instructions provided in the Qt documentation (see step 3) + +
    6. +
+ +

+

+ + +next + +up + +previous + +contents +
+ Next: Building QGIS + Up: Building and Installing QGIS + Previous: GDAL/OGR +   Contents + +
+Gary Sherman +2004-10-01 +
+ + diff --git a/doc/install_guide/nx_grp_g.png b/doc/install_guide/nx_grp_g.png new file mode 100644 index 000000000000..b2277a1d5564 Binary files /dev/null and b/doc/install_guide/nx_grp_g.png differ diff --git a/doc/install_guide/prev.png b/doc/install_guide/prev.png new file mode 100644 index 000000000000..e60b8b407357 Binary files /dev/null and b/doc/install_guide/prev.png differ diff --git a/doc/install_guide/prev_g.png b/doc/install_guide/prev_g.png new file mode 100644 index 000000000000..476d9568c900 Binary files /dev/null and b/doc/install_guide/prev_g.png differ diff --git a/doc/install_guide/up.png b/doc/install_guide/up.png new file mode 100644 index 000000000000..3937e168f44b Binary files /dev/null and b/doc/install_guide/up.png differ diff --git a/doc/install_guide/up_g.png b/doc/install_guide/up_g.png new file mode 100644 index 000000000000..54ceb6830d61 Binary files /dev/null and b/doc/install_guide/up_g.png differ diff --git a/doc/qgisdoc.css b/doc/qgisdoc.css new file mode 100644 index 000000000000..25fe13a18753 --- /dev/null +++ b/doc/qgisdoc.css @@ -0,0 +1,27 @@ +span.header{ + font-family: trebuchet,arial,helvetica,sans; + font-size: 18pt; +} +span.subheader{ + font-family: trebuchet,arial,helvetica,sans; + font-size: 14pt; + font-weight: normal; +} +dt{ + font-size: 10pt; + font-weight: bold; +} +ul.small{ + font-size: 9pt; +} +h2{ + font-size: 14pt; + font-family: trebuchet,arial,helvetica,sans; + font-weight: normal; +} +a.link.bar{ + font-size: 9pt; + font-style: italic; +} + } +} diff --git a/doc/userguide.html b/doc/userguide.html deleted file mode 100644 index 92aea1794688..000000000000 --- a/doc/userguide.html +++ /dev/null @@ -1,911 +0,0 @@ - - - - -QGIS User Guide - - - - - - - - - - - - - - - - - - - - - - -
- -QGIS
- -
- - - - -
- - - - -
Documentation
-
-
- -
- - - - - - - - - -
- - - - - - - - - - - - - - - -
- - - - - - - - - - -
 
-		 - -
- - -
Documentation
-
-
-Installation -
-
-
User Guide
-
-
-Introduction -
-
-Current Features... -
-
-Getting Started -
-
-Working with vector... -
-
-Working with raster... -
-
-Creating a QGIS mim... -
-
-Acknowledgments -
-
-
-
-
- -
-		 - - - - - - - - - - - - - - - - - -
- - - - -
-   - Font size: -   -   -  
-		 
-
- - - - -
-

QGIS User Guide

-		PDF
- PDF
-

Version 0.2 (Pumpkin)

- - - - - - - - - - - -
-

Introduction

-
-
- - - -

Quantum GIS (QGIS) is designed to be a Geographic Information System (GIS) -built for Linux/Unix. QGIS currently offers basic support for vector, raster, and database formats.

- -
-
Note
-
The latest version of this document can always be found at http://qgis.org/docs/userguide.html - -
-
- -
- - - - - - - - - - - -
-

Current Features

-
-
- - -
    - -
  • Support for spatially enabled PostgreSQL tables using PostGIS
    • - -
  • Support for ESRI shapefiles and other vector formats support by the OGR library
    • - -
  • Identify features
    • - -
  • Display attribute table
    • - -
  • Select features
    • - -
  • Persistent selections
    • - -
  • Save projects
    • - -
  • Support for raster formats supported by the GDAL library
    • - -
  • Change vector symbology (single, graduated, and continuous)
    • - -
  • Display raster data such as digital elevation models, aerial photography or - landsat imagery
    • - -
  • Change raster symbology (grayscale, pseudocolor and multiband RGB)
    • - -
  • Export to Mapserver map file
    • - -
- -
- - - - - - - - - - - -
-

Getting Started

-
-
- - -

This section gives you a quick overview of running QGIS and examining data - available on the QGIS web page. -

- - - - - - - - - - - -
-

Installation

-
-

Installation of QGIS is documented in the Installation Guide. -

- - - - - - - - - - - -
-

Sample Data

-
-

If you do not have any GIS data, you can obtain a dataset for Alaska (which will be used as the - basis for the examples and screenshots provided in this document) from the - the QGIS web site -

- - - - - - - - - - - -
-

Starting QGIS

-
-

- Assuming the QGIS is installed in the PATH, you can start QGIS by typing: - qgis.

-

- In addition, you can start QGIS by specifying one or more datafiles on the commandline. For example, - assuming you are in your data directory, you could start QGIS with two shapefiles and a raster file set to - load on startup: -

-

-qgis ak_shade.tif alaska.shp majrivers.shp -

-

-QGIS Load Data On Start

-
-
Note
-
Your window decorations (title bar, etc.) may appear different depending on your operating system - and window manager
-
- - - - - - - - - - - -
-

The QGIS main window

-
-

- When QGIS starts, an empty window is displayed as shown below. - QGIS Main Window -

-

The QGIS main window is divided into five areas:

-
    - -
  1. The menu bar
    2. - -
  2. The tool bar
    3. - -
  3. The map legend
    4. - -
  4. The map view
    5. - -
  5. The status bar
    6. - -
-

These five parts of the main QGIS are described in more detail in the following sections

- -

The QGIS menu bar

-

The menu bar provides access to various QGIS features using a standard windows - heirachical menu.

-

The File Menu:

-
    - -
  • -Open Project - Open a previously saved project.
    • - -
  • -Save Project - Save the current project.
    • - -
  • -Save Project As - Save project under a new file name.
    • - -
  • -Export to mapserver - Export your current project as a mapserver - map file. Note that not all mapserver features are available in the exported mapfile.
    • - -
  • -Exit - Exit the QGIS application.
    • - -
-

The View Menu:

-
    - -
  • -Add Postgis Layer(s) - Add one or more layers - stored in a PostgreSQL/Postgis geodatabase to the map view.
    • - -
  • -Add Vector Layer(s) - Add one or more layers - stored on disk as shapefiles to the map view.
    • - -
  • -Add Raster Layers - Add one or more raster layers - to the map view.
    • - -
-

The Tools Menu:

-
    - -
  • -Plugin Manager - This opens a dialog - that allows you to manage (load and unload) which plugins are used in QGIS.
    • - -
  • -Check Version - This option connects - over the internet to the QGIS server to find out what the latest available version is. No - personal data is sent to the QGIS server.
    • - -
  • -Preferences - Global configuration options - for the QGIS application.
    • - -
-

The Help Menu:

-
    - -
  • -Contents - This opens the help documentation - you are reading right now!.
    • - -
  • -QGIS Home - Clicking this menu option will - take you to the QGIS internet home page using your preferred browser.
    • - -
  • -SourceForge Home - This will take you to the Sourceforge.net - project page for QGIS.
    • - -
  • -About - Click here to find out some useful information - about the current version of QGIS you are using. If you want to frighten yourself silly, take a - look at the Contributors tab to see all the hardworking elves behind the QGIS effort.
    • - -
- -

The QGIS toolbars

-

QGIS has toolbars that provide quick access to commonly used functions. These are:

-
    - -
  • -New Project - Start a new QGIS project. If you - already have a project ope, you will be asked if you would like to save the existing one first.
    • - -
  • -Open Project - Open a previously saved project.
    • - -
  • -Save Project - Save the current project.
    • - -
  • -Save Project As - Save project under a new file name.
    • - -
  • -Add Postgis Layer(s) - Add one or more layers - stored in a PostgreSQL/Postgis geodatabase to the map view.
    • - -
  • -Add Vector Layer(s) - Add one or more layers - stored on disk as shapefiles to the map view.
    • - -
  • -Add Raster Layers - Add one or more raster layers - to the map view.
    • - -
  • -Reload - Reload the current map view (refreshes display)
    • - -
  • -Zoom In - Zoom in the map display by dragging a rectangle
    • - -
  • -Zoom Out - Zoom out of the map display by dragging a rectangle. - Dragging a small rectangle will zoom out a long way, dragging a large rectangle will zoom out a little way.
    • - -
  • -Zoom Full Extent - Zoom out until all features in all map layers - are visible.
    • - -
  • -Zoom to Selected - Zoom to fit all selected features in the - map view.
    • - -
  • -Pan - Pan in the map display area.
    • - -
  • -Zoom to Previous - Zoom to last extents.
    • - -
  • -Identify - Show information about a feature (applies only to vector data).
    • - -
  • -Select Features - Select features in the map display (applies only to vector data).
    • - -
  • -Show Attributes - Show the attribute table for the selected layer (applies only to vector data).
    • - -
- -

The QGIS map legend

-

The map legend area is used to set the visibility and z-ordering of layers. - Z-ordering means that layers listed nearer the top of the legend are drawn over - layers listed lower down in the legend. The checkbox in each legend entry can be useed - to show/hire that layer.

- -

The QGIS 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 this). The map view can be panned (shifting - to focus of the map display to another region), zoomed in and out, and supports various other - actions as described in the toolbar description above.

-

The map view and the legend are tightly bound to each other - the maps in view - reflect changes you make in the legend area.

- -

The QGIS map status bar

-

The status bar shows you your current position in map coordinate (e.g. meters or decimal - degress) as the mouse pointer is moved accross the map view.

- -
- - - - - - - - - - - -
-

Working with vector data

-
-
- - - - - - - - - - - - -
-

Loading vector data

-
-

To load one or more shapefiles, click on the Add Layer button - Add Layer.

-

The Select one or more layers to add dialog box will be displayed. - Select layers

-

Navigate to the directory where the shapefiles reside. Select one or - more files and click ok to load them.

-

When QGIS loads a layer, it assigns a random color to it as shown - below.

-

-Shapefiles loaded into QGIS -

-

- Obviously QGIS's choice of colors is not very pleasing in this case. -

- - - - - - - - - - - -
-

Changing Symbology

-
-

- To make the layer more appealing, open the Layer Properties - dialog by right-clicking on a layer name - in the table of contents (left side of the QGIS window) and - selecting Properties. -

-

If you like, change the display name of the layer by editing - the Display name field.

-

- -Layer Properties -

-

Click on the Legend - tab to display the current symbols used for the layer

-

- -Display name

-

Click on the Outline color and Fill color - and select a new color from the color chooser. You can also change the - line width if desired.

-

- -Changing colors -

-

After making the changes, click Ok to apply the changes to - the layer. Note that the alaska layer has been renamed to Alaska and the - color has been changed to a light green:

-

- -Changing colors -

- - - - - - - - - - - -
-

Identifying a Feature

-
-

QGIS provides a useful tool (Identify - the 'identify' tool) that allows you to click on a vector feature ( - point, line or polygon) and view information about that feautre. The information displayed is - retrieved from the Postgres database (in the case of Postgis layers) or from the .dbf file - associated with the shapefile you are insecting.

- -
- - - - - - - - - - - -
-

Working with raster data

-
-
- - - - - - - - - - - - -
-

What is raster data?

-
-

Raster data in GIS are matrices of discrete cells that represent features on, above or below the earth's surface. Each - cell in the raster grid is the same size, and cells are usually rectangular (in QGIS they will always be rectangular. - Typical raster datasets include 'remote sensing' data (such as aerial photography and satellite imagery) and modelled data - (such as an elevation matrix).

-

Raster data typically do not have an associated database record for each cell (unlike in vector data where it is normal - for each feature to have an associated database record).

-

In GIS, a raster layer would have geopositioning data associated with it which will allow it to be positioned - correctly in the map display to allow other vector and raster data to be overlayed with it. QGIS, can read this - geopositioning data to facilitate properly displaying map overlays.

- - - - - - - - - - - -
-

Raster formats supported in QGIS.

-
-

QGIS supports a number of different raster formats. Currently tested formats include:

-
    - -
  • Arc/Info Binary Grid
    • - -
  • Arc/Info ASCII Grid
    • - -
  • Grass Raster
    • - -
  • GeoTIFF
    • - -
  • Spatial Data Transfer Standard Grids (with some limitations)
    • - -
  • USGS ASCII DEM
    • - -
  • Erdas Imagine
    • - -
-

Because the raster implmentation in QGIS is based on the GDAL abstraction library, orther raster formats implemented - in GDAL are also likely to work, but have not yet been tested. See - the GDAL Raster Formats page for more details.

- - - - - - - - - - - -
-

Loading raster data in QGIS

-
-

Raster layers are loaded either by clicking on the Load Raster icon - or by selecting the View->Add Raster Layer menu option. More than one layer can be loaded at the same time - by holding down the Control key and clicking on multiple items in the file dialog.

- - - - - - - - - - - -
-

Symbolisation and properties for raster layers

-
-

Symbolisation of raster layers is achieved by right clicking on a raster layer legend entry and choosing 'properties': - on the popup menu that appears:

-

- -Raster Properties Popup -

-

On the properties dialog for rasters you will see there are three tabs:

- -

The general properties tab

-

- -Raster Properties Popup -

-

The legend tab displays basic information aboug the selected raster - including its - dimensions (in pixels) and its display name in the legend.

- -

The symbology properties tab

-

- -Raster Properties Popup -

-

QGIS supports three forms of raster layer:

-
    - -
  • Single Band Grayscale Rasters
    • - -
  • Palette Based RGB Rasters
    • - -
  • Multiband RGB Rasters
    • - -
-

From these three basic layer types, eight forms of symbolised raster display can be used:

-
    - -
  1. Single Band Grayscale
    2. - -
  2. Single Band Pseudocolor
    3. - -
  3. Paletted Grayscale (where only the red, green or blue component of the image is displayed)
    4. - -
  4. Paletted Pseudocolor (where only the red, green or blue component of the image is displayed, but using a pseudocolor algorithm)
    5. - -
  5. Paletted RGB
    6. - -
  6. Multiband Grayscale (using only one of the bands to display the image)
    7. - -
  7. Mulitiband Pseudocolor (using only one of the bands shown in pseudocolor)
    8. - -
  8. Multiband RGB (using any combination of three bands)
    9. - -
-

QGIS has the capability to invert the colours in a given layer so that light - colors become dark (and dark colors become light). Use the 'Invert Color Map' checkbox - to enable / disable this behaviour.

-

QGIS has the capability to display each raster layer at varying transparency levels. Use - the transparency slider to indicate to what extent the underlying layers (if any) should - be visible though the current raster layer.

-

QGIS has the capability to restrict the data displayed to show only cells whose values are - within a given number of standard diviations of the mean for the layer. This is useful - when you have one or two cells with abnormally high values in a raster grid that are having a - negative impact on the rendering of the raster. This option is only available for pseudocolor - images.

- -

The raster statistics properties tab

-

- -Raster Properties Popup -

-

This tab displays statistics about each band in the current raster layer. Statistics are - gathered on a 'need to know' basis, so it may well be that a given layer's statistics have - not yet been collected.

-

Statistics for a layer are gathered when pseudocolor rendering is selected and the 'apply' - button is pressed.

-
-
Note
-
Gathering statistics for a layer can be time consuming. Please be patient while - QGIS examines your data!
-
- - -
- - - - - - - - - - - -
-

Creating a QGIS mime type

-
-
- - -

If you are a KDE user, you can create a mime type that associates GIS files with QGIS. This is useful - because it allows you to click on a shapefile (for example) in konqueror and the file will be loaded in a - new instance of QGIS. -

- - -

- - -

- -
- - - - - - - - - - - -
-

Acknowledgments

-
-
- - -

Hosting for the QGIS project is generously provided by Sourceforge. -

- -

- -SourceForge.net Logo - -

- -

Please see the Help->About->Contributors for a list of people who have donated their time to the QGIS project.

- -
- -

-by Gary Sherman, Tim Sutton -

-
-
-
-
-
-
- - - - - - - - - -
Copyright © - 2004 Micro Resources. All rights reserved. -
-
- - - diff --git a/doc/userguide.pdf b/doc/userguide.pdf index b04f3a253a29..b4ef79468322 100644 Binary files a/doc/userguide.pdf and b/doc/userguide.pdf differ diff --git a/i18n/qgis_de.ts b/i18n/qgis_de.ts index bb2101ae686e..8f18c410f956 100644 --- a/i18n/qgis_de.ts +++ b/i18n/qgis_de.ts @@ -223,7 +223,7 @@ <p>Select a GPX or LOC file and then select the feature types that you want to load.</p> </body></html> - <html><head><meta name="qrichtext" content="1" /></head><body style="font-size:12pt;font-family:Arial"> + <html><head><meta name="qrichtext" content="1" /></head><body style="font-size:12pt;font-family:Arial"> <p style="margin-top:16px"><span style="font-size:17pt;font-weight:600">Beschreibung</span></p> <p>GPX ist das <a href="http://www.topografix.com/gpx.asp">GPS eXchange Dateiformt</a>, welches verwendet wird, um Informationen über Wegpunkte, Route und Spuren zu speichern. LOC ist das <a href="http://www.geocaching.com">geocaching.com</a> Wegpunkteformat.</p> <p>Wähle eine GPX oder LOC Datei und dann die Objekttypen zum laden.</p> @@ -364,7 +364,7 @@ Load GPX or LOC - Lade GPX oder LOC + Lade GPX oder LOC Import other file @@ -383,7 +383,7 @@ and a name for the new layer. All file formats can not store waypoints, routes, tracks, so some feature types may be disabled for some file formats.</p> </body></html> - <html><head><meta name="qrichtext" content="1" /></head><body style="font-size:12pt;font-family:Arial"> + <html><head><meta name="qrichtext" content="1" /></head><body style="font-size:12pt;font-family:Arial"> <p style="margin-top:16px"><span style="font-size:17pt;font-weight:600">Beschreibung</span></p> <p>QGIS kann selbst nur GPX und LOC Dateien laden, aber viele andere Formate können mit GPSBabel (<a href="http://gpsbabel.sf.net">http://gpsbabel.sf.net</a>) in GPX @@ -557,6 +557,34 @@ nicht installierz ist, wo es QGIS finden kann, funktioniert dieses Werkzeug nich Automatically snap to round number on resize Automatisch auf runden Zahlen einstellen bei Größenänderung + + Load GPX file + + + + <html><head><meta name="qrichtext" content="1" /></head><body style="font-size:12pt;font-family:Arial"> +<p style="margin-top:16px"><span style="font-size:17pt;font-weight:600">Description</span></p> +<p>GPX is the <a href="http://www.topografix.com/gpx.asp">GPS eXchange file format</a>, which is used to store information about waypoints, routes, and tracks.</p> +<p>Select a GPX file and then select the feature types that you want to load.</p> +</body></html> + + + + + <html><head><meta name="qrichtext" content="1" /></head><body style="font-size:12pt;font-family:Arial"> +<p style="margin-top:16px"><span style="font-size:17pt;font-weight:600">Description</span></p> +<p>QGIS can only load GPX files by itself, but many other formats +can be converted to GPX using GPSBabel (<a href="http://gpsbabel.sf.net"> +http://gpsbabel.sf.net</a>). This requires that you have GPSBabel installed where +QGIS can find it.</p> +<p>Select a GPS file format and the file that you want to import, the feature type +that you want to use, a GPX filename that you want to save the converted file as, +and a name for the new layer. All file formats can not store waypoints, routes, and +tracks, so some feature types may be disabled for some file formats.</p> +</body></html> + + + QFileDialog @@ -568,6 +596,10 @@ nicht installierz ist, wo es QGIS finden kann, funktioniert dieses Werkzeug nich Save file dialog DateispeichernDialog + + Open an OGR Supported Data Source + + QObject @@ -645,7 +677,7 @@ nicht installierz ist, wo es QGIS finden kann, funktioniert dieses Werkzeug nich Sourceforge Project Page: http://sourceforge.net/projects/qgis - Sourceforge Projekt Seite: http://sourceforge.net/projects/qgis + Sourceforge Projekt Seite: http://sourceforge.net/projects/qgis Version @@ -857,7 +889,7 @@ nicht installierz ist, wo es QGIS finden kann, funktioniert dieses Werkzeug nich Web Page: http://qgis.org - Web Page: http://qgis.org + Web Page: http://qgis.org Problem deleting features @@ -879,6 +911,18 @@ nicht installierz ist, wo es QGIS finden kann, funktioniert dieses Werkzeug nich To delete features, you must select a vector layer in the legend + + QGIS ready + + + + Quantum GIS is licensed under the GNU General Public License + Quantum GIS ist unter der GNU General Public License lizenziert + + + http://www.gnu.org/licenses + http://www.gnu.org/licenses + QgisAppBase @@ -1442,6 +1486,22 @@ nicht installierz ist, wo es QGIS finden kann, funktioniert dieses Werkzeug nich Map Edit Tools + + Show all layers + + + + Add to overview + + + + Capture points + + + + Plugins Toolbar + + QgsAbout @@ -1463,7 +1523,7 @@ nicht installierz ist, wo es QGIS finden kann, funktioniert dieses Werkzeug nich Quantum GIS (qgis) - Quantum GIS (qgis) + Quantum GIS (qgis) What's New @@ -1471,15 +1531,15 @@ nicht installierz ist, wo es QGIS finden kann, funktioniert dieses Werkzeug nich License - Lizenz + Lizenz http://www.gnu.org/licenses - http://www.gnu.org/licenses + http://www.gnu.org/licenses Quantum GIS is licensed under the GNU General Public License - Quantum GIS ist unter der GNU General Public License lizenziert + Quantum GIS ist unter der GNU General Public License lizenziert Contributors @@ -1487,7 +1547,7 @@ nicht installierz ist, wo es QGIS finden kann, funktioniert dieses Werkzeug nich Plugins - Plugins + Plugins <h2>QGIS Contributors</h2> @@ -1541,6 +1601,27 @@ nicht installierz ist, wo es QGIS finden kann, funktioniert dieses Werkzeug nich Peter Brewer Peter Brewer + + <h2>Quantum GIS (qgis)</h2> + + + + <p align="center">Quantum GIS is licensed under the GNU General Public License<p> +<p align="center">http://www.gnu.org/licenses</p> + + + + QGIS Home Page + QGIS Homepage + + + Subscribe to the QGIS-User mailing list + + + + Providers + + QgsAttributeTableBase @@ -2044,6 +2125,10 @@ nicht installierz ist, wo es QGIS finden kann, funktioniert dieses Werkzeug nich Unique Value + + Unique Value Marker + + QgsDlgVectorLayerPropertiesBase @@ -2139,10 +2224,6 @@ nicht installierz ist, wo es QGIS finden kann, funktioniert dieses Werkzeug nich Legend type: Legendentyp: - - Display/label field - - Labels Beschriftungen @@ -2219,44 +2300,44 @@ Faktor QgsGraSyExtensionWidget Lower - Untere + Untere Upper - Obere + Obere Label - Beschriftung + Beschriftung Outline Color - Rand- + Rand- Farbe Outline Style - Rand- + Rand- Stil Outline Width - Rand- + Rand- Breite Fill Color - Füll- + Füll- Farbe Fill Pattern - Füll + Füll Muster @@ -2626,6 +2707,228 @@ Muster Schließen + + QgsLUDialogBase + + Enter class bounds + + + + Lower value + + + + - + - + + + OK + OK + + + Cancel + Abbrechen + + + Upper value + + + + + QgsLabelDialogBase + + Form1 + Formular1 + + + Source: + + + + Field containing label: + + + + Default label: + + + + Preview: + + + + QGIS Rocks! + + + + Default Style + + + + Font Style + + + + Font + + + + Font size units are in ... + + + + Points + + + + Map units + + + + % + + + + Transparency: + Transparenz: + + + Colour + + + + Position + + + + X Offset (pts): + + + + Y Offset (pts): + + + + Offset units are in ... + + + + Buffer Settings + + + + Buffer Labels? + + + + Size: + + + + Buffer size is in ... + + + + Size is in map units + + + + Size is in points + + + + Alignment + + + + Above + + + + Over + + + + Left + + + + Below + + + + Right + + + + Above Right + + + + Below Right + + + + Above Left + + + + Below Left + + + + Angle (deg): + + + + ° + + + + Use best judgement when labels collide + + + + Data Defined Style + + + + &Font family: + + + + &Italic: + + + + &Underline: + + + + &Bold: + + + + &Size: + + + + X Coordinate: + + + + Y Coordinate: + + + + Placement: + Platzierung: + + + &Colour: + + + QgsLayerPropertiesBase @@ -3927,6 +4230,10 @@ von Objekten zu beheben, ohne sehr nah heranzuzoomen. Fill Füllen + + Label + Beschriftung + QgsSpitBase @@ -4098,6 +4405,21 @@ von Objekten zu beheben, ohne sehr nah heranzuzoomen. Neuer Eintrag + + QgsUValMaDialogBase + + Form1 + Formular1 + + + Classification Field: + Klassifizierungsfeld: + + + New Item + Neuer Eintrag + + QgsVectorLayer @@ -4141,15 +4463,15 @@ von Objekten zu beheben, ohne sehr nah heranzuzoomen. QgsVectorLayerProperties single symbol - Einfaches Symbol + Einfaches Symbol graduated symbol - abgestuftes Symbol + abgestuftes Symbol continuous color - Fortlaufende Farbe + Fortlaufende Farbe diff --git a/i18n/qgis_fr.ts b/i18n/qgis_fr.ts index 4dc39fdec741..d8fa3f0eea1b 100644 --- a/i18n/qgis_fr.ts +++ b/i18n/qgis_fr.ts @@ -152,15 +152,6 @@ GPS Tools - - <html><head><meta name="qrichtext" content="1" /></head><body style="font-size:12pt;font-family:Arial"> -<p style="margin-top:16px"><span style="font-size:17pt;font-weight:600">Description</span></p> -<p>GPX is the <a href="http://www.topografix.com/gpx.asp">GPS eXchange file format</a>, which is used to store information about waypoints, routes, and tracks. LOC is the <a href="http://www.geocaching.com">geocaching.com</a> waypoint format.</p> -<p>Select a GPX or LOC file and then select the feature types that you want to load.</p> -</body></html> - - - File: @@ -262,29 +253,10 @@ Enable North Arrow - - Load GPX or LOC - - Import other file - - <html><head><meta name="qrichtext" content="1" /></head><body style="font-size:12pt;font-family:Arial"> -<p style="margin-top:16px"><span style="font-size:17pt;font-weight:600">Description</span></p> -<p>QGIS can only load GPX and LOC files by itself, but many other formats -can be converted to GPX using GPSBabel (<a href="http://gpsbabel.sf.net"> -http://gpsbabel.sf.net</a>). This requires that you have GPSBabel installed where -QGIS can find it.</p> -<p>Select a GPS file format and the file that you want to import, the feature type -that you want to use, a GPX filename that you want to save the converted file as, -and a name for the new layer. All file formats can not store waypoints, routes, and -tracks, so some feature types may be disabled for some file formats.</p> -</body></html> - - - File to import: @@ -419,6 +391,34 @@ have GPSBabel installed where QGIS can find it, this tool will not work.</p&g Automatically snap to round number on resize + + Load GPX file + + + + <html><head><meta name="qrichtext" content="1" /></head><body style="font-size:12pt;font-family:Arial"> +<p style="margin-top:16px"><span style="font-size:17pt;font-weight:600">Description</span></p> +<p>GPX is the <a href="http://www.topografix.com/gpx.asp">GPS eXchange file format</a>, which is used to store information about waypoints, routes, and tracks.</p> +<p>Select a GPX file and then select the feature types that you want to load.</p> +</body></html> + + + + + <html><head><meta name="qrichtext" content="1" /></head><body style="font-size:12pt;font-family:Arial"> +<p style="margin-top:16px"><span style="font-size:17pt;font-weight:600">Description</span></p> +<p>QGIS can only load GPX files by itself, but many other formats +can be converted to GPX using GPSBabel (<a href="http://gpsbabel.sf.net"> +http://gpsbabel.sf.net</a>). This requires that you have GPSBabel installed where +QGIS can find it.</p> +<p>Select a GPS file format and the file that you want to import, the feature type +that you want to use, a GPX filename that you want to save the converted file as, +and a name for the new layer. All file formats can not store waypoints, routes, and +tracks, so some feature types may be disabled for some file formats.</p> +</body></html> + + + QFileDialog @@ -430,6 +430,10 @@ have GPSBabel installed where QGIS can find it, this tool will not work.</p&g Save file dialog + + Open an OGR Supported Data Source + + QObject @@ -501,10 +505,6 @@ have GPSBabel installed where QGIS can find it, this tool will not work.</p&g (no PostgreSQL support) - - Sourceforge Project Page: http://sourceforge.net/projects/qgis - - Version @@ -701,10 +701,6 @@ have GPSBabel installed where QGIS can find it, this tool will not work.</p&g Extents: - - Web Page: http://qgis.org - - Problem deleting features @@ -725,6 +721,18 @@ have GPSBabel installed where QGIS can find it, this tool will not work.</p&g To delete features, you must select a vector layer in the legend + + QGIS ready + + + + Quantum GIS is licensed under the GNU General Public License + + + + http://www.gnu.org/licenses + + QgisAppBase @@ -1264,53 +1272,49 @@ have GPSBabel installed where QGIS can find it, this tool will not work.</p&g Map Edit Tools - - - QgsAbout - About Quantum GIS + Show all layers - Ok + Add to overview - About + Capture points - Version + Plugins Toolbar + + + QgsAbout - Quantum GIS (qgis) + About Quantum GIS - What's New + Ok - License + About - http://www.gnu.org/licenses + Version - Quantum GIS is licensed under the GNU General Public License + What's New Contributors - - Plugins - - <h2>QGIS Contributors</h2> @@ -1363,6 +1367,27 @@ have GPSBabel installed where QGIS can find it, this tool will not work.</p&g Peter Brewer + + <h2>Quantum GIS (qgis)</h2> + + + + <p align="center">Quantum GIS is licensed under the GNU General Public License<p> +<p align="center">http://www.gnu.org/licenses</p> + + + + QGIS Home Page + + + + Subscribe to the QGIS-User mailing list + + + + Providers + + QgsAttributeTableBase @@ -1829,6 +1854,10 @@ have GPSBabel installed where QGIS can find it, this tool will not work.</p&g Unique Value + + Unique Value Marker + + QgsDlgVectorLayerPropertiesBase @@ -1924,10 +1953,6 @@ have GPSBabel installed where QGIS can find it, this tool will not work.</p&g Legend type: - - Display/label field - - Labels @@ -2001,43 +2026,6 @@ Factor QgsGraSyExtensionWidget - - Lower - - - - Upper - - - - Label - - - - Outline -Color - - - - Outline -Style - - - - Outline -Width - - - - Fill -Color - - - - Fill -Pattern - - QgsGrassAttributesBase @@ -2393,6 +2381,228 @@ Pattern + + QgsLUDialogBase + + Enter class bounds + + + + Lower value + + + + - + + + + OK + + + + Cancel + + + + Upper value + + + + + QgsLabelDialogBase + + Form1 + + + + Source: + + + + Field containing label: + + + + Default label: + + + + Preview: + + + + QGIS Rocks! + + + + Default Style + + + + Font Style + + + + Font + + + + Font size units are in ... + + + + Points + + + + Map units + + + + % + + + + Transparency: + + + + Colour + + + + Position + + + + X Offset (pts): + + + + Y Offset (pts): + + + + Offset units are in ... + + + + Buffer Settings + + + + Buffer Labels? + + + + Size: + + + + Buffer size is in ... + + + + Size is in map units + + + + Size is in points + + + + Alignment + + + + Above + + + + Over + + + + Left + + + + Below + + + + Right + + + + Above Right + + + + Below Right + + + + Above Left + + + + Below Left + + + + Angle (deg): + + + + ° + + + + Use best judgement when labels collide + + + + Data Defined Style + + + + &Font family: + + + + &Italic: + + + + &Underline: + + + + &Bold: + + + + &Size: + + + + X Coordinate: + + + + Y Coordinate: + + + + Placement: + + + + &Colour: + + + QgsLegendItemBase @@ -3528,6 +3738,10 @@ identifying features without zooming in very close. Fill + + Label + + QgsSpitBase @@ -3675,6 +3889,21 @@ identifying features without zooming in very close. + + QgsUValMaDialogBase + + Form1 + + + + Classification Field: + + + + New Item + + + QgsVectorLayer @@ -3716,18 +3945,6 @@ identifying features without zooming in very close. QgsVectorLayerProperties - - single symbol - - - - graduated symbol - - - - continuous color - - QgsVectorLayerPropertiesBase diff --git a/i18n/qgis_it.ts b/i18n/qgis_it.ts index abceb3a6ca9e..8084beca42f0 100644 --- a/i18n/qgis_it.ts +++ b/i18n/qgis_it.ts @@ -162,7 +162,7 @@ <p>Select a GPX or LOC file and then select the feature types that you want to load.</p> </body></html> - <html><head><meta name="qrichtext" content="1" /></head><body style="font-size:12pt;font-family:Arial">(new line) + <html><head><meta name="qrichtext" content="1" /></head><body style="font-size:12pt;font-family:Arial">(new line) <p style="margin-top:16px"><span style="font-size:17pt;font-weight:600">Descrizione</span></p>(new line) <p><a href="http://www.topografix.com/gpx.asp">GPX</a> è un formato di scambio di file GPS utilizzato per archiviare informazioni riguardo a punti di passaggio, percorsi e tracciati. LOC è il formato utilizzato da <a href="http://www.geocaching.com">geocaching.com</a> per archiviare i punti di passaggio.</p> <p>Selezionare un file GPX o LOC e la tipologia di dato da utilizzare</p> @@ -283,7 +283,7 @@ Load GPX or LOC - Carica GPX o LOC + Carica GPX o LOC Import other file @@ -302,7 +302,7 @@ and a name for the new layer. All file formats can not store waypoints, routes, tracks, so some feature types may be disabled for some file formats.</p> </body></html> - <html><head><meta name="qrichtext" content="1" /></head><body style="font-size:12pt;font-family:Arial"> + <html><head><meta name="qrichtext" content="1" /></head><body style="font-size:12pt;font-family:Arial"> <p style="margin-top:16px"><span style="font-size:17pt;font-weight:600">Descrizione</span></p> <p> QGIS è in grado gestire i file GPX e LOC, per altri tipi di formato fa uso di GPSBabel (<a href="http://gpsbabel.sf.net">http://gpsbabel.sf.net</a>) convertendo in GPX. pertanto necessario che GPSBabel sia installato in un percorso accessibile da QGIS.</p><p>Selezionare: il formato GPS, il file che si vuole convertire, la tipologia di dato, il nome del file GPX da salvare e convertire, e il nome del nuovo livello. Non tutti i formati sono in grado di gestire punti di passaggio, percorsi e tratti, pertanto alcune tipologie di dato potrebbero essere disabilitate.</p></body></html> @@ -450,6 +450,34 @@ have GPSBabel installed where QGIS can find it, this tool will not work.</p&g © QGIS 2004 + + Load GPX file + + + + <html><head><meta name="qrichtext" content="1" /></head><body style="font-size:12pt;font-family:Arial"> +<p style="margin-top:16px"><span style="font-size:17pt;font-weight:600">Description</span></p> +<p>GPX is the <a href="http://www.topografix.com/gpx.asp">GPS eXchange file format</a>, which is used to store information about waypoints, routes, and tracks.</p> +<p>Select a GPX file and then select the feature types that you want to load.</p> +</body></html> + + + + + <html><head><meta name="qrichtext" content="1" /></head><body style="font-size:12pt;font-family:Arial"> +<p style="margin-top:16px"><span style="font-size:17pt;font-weight:600">Description</span></p> +<p>QGIS can only load GPX files by itself, but many other formats +can be converted to GPX using GPSBabel (<a href="http://gpsbabel.sf.net"> +http://gpsbabel.sf.net</a>). This requires that you have GPSBabel installed where +QGIS can find it.</p> +<p>Select a GPS file format and the file that you want to import, the feature type +that you want to use, a GPX filename that you want to save the converted file as, +and a name for the new layer. All file formats can not store waypoints, routes, and +tracks, so some feature types may be disabled for some file formats.</p> +</body></html> + + + QFileDialog @@ -461,6 +489,10 @@ have GPSBabel installed where QGIS can find it, this tool will not work.</p&g Save file dialog Finestra di selezione per salvare un file + + Open an OGR Supported Data Source + + QObject @@ -534,7 +566,7 @@ have GPSBabel installed where QGIS can find it, this tool will not work.</p&g Sourceforge Project Page: http://sourceforge.net/projects/qgis - Pagina Sourceforge del progetto: http://sourceforge.net/projects/qgis + Pagina Sourceforge del progetto: http://sourceforge.net/projects/qgis Version @@ -734,7 +766,7 @@ have GPSBabel installed where QGIS can find it, this tool will not work.</p&g Web Page: http://qgis.org - Pagina web: http://qgis.org + Pagina web: http://qgis.org Problem deleting features @@ -756,6 +788,18 @@ have GPSBabel installed where QGIS can find it, this tool will not work.</p&g To delete features, you must select a vector layer in the legend + + QGIS ready + + + + Quantum GIS is licensed under the GNU General Public License + Quantum GIS è distribuito con la licenza GNU General Public License + + + http://www.gnu.org/licenses + http://www.gnu.org/licenses + QgisAppBase @@ -1299,6 +1343,22 @@ http://www.remotesensing.org/gdal/formats_list.html Map Edit Tools + + Show all layers + + + + Add to overview + + + + Capture points + + + + Plugins Toolbar + + QgsAbout @@ -1320,7 +1380,7 @@ http://www.remotesensing.org/gdal/formats_list.html Quantum GIS (qgis) - Quantum GIS (qgis) + Quantum GIS (qgis) What's New @@ -1328,15 +1388,15 @@ http://www.remotesensing.org/gdal/formats_list.html License - Licenza + Licenza http://www.gnu.org/licenses - http://www.gnu.org/licenses + http://www.gnu.org/licenses Quantum GIS is licensed under the GNU General Public License - Quantum GIS è distribuito con la licenza GNU General Public License + Quantum GIS è distribuito con la licenza GNU General Public License Contributors @@ -1344,7 +1404,7 @@ http://www.remotesensing.org/gdal/formats_list.html Plugins - Plugins + Plugins <h2>QGIS Contributors</h2> @@ -1398,6 +1458,27 @@ http://www.remotesensing.org/gdal/formats_list.html Peter Brewer Peter Brewer + + <h2>Quantum GIS (qgis)</h2> + + + + <p align="center">Quantum GIS is licensed under the GNU General Public License<p> +<p align="center">http://www.gnu.org/licenses</p> + + + + QGIS Home Page + QGIS Home Page + + + Subscribe to the QGIS-User mailing list + + + + Providers + + QgsAttributeTableBase @@ -1871,6 +1952,10 @@ Questo bottone non sarà abilitato fino a quando non sarà inserito il carattere Unique Value + + Unique Value Marker + + QgsDlgVectorLayerPropertiesBase @@ -1966,10 +2051,6 @@ Questo bottone non sarà abilitato fino a quando non sarà inserito il carattere Legend type: Tipo legenda - - Display/label field - - Labels @@ -2046,44 +2127,44 @@ scala QgsGraSyExtensionWidget Lower - Verso il basso + Verso il basso Upper - In alto + In alto Label - Etichetta + Etichetta Outline Color - Colore + Colore linea esterna Outline Style - Stile + Stile linea esterna Outline Width - Dimensioni + Dimensioni linea esterna Fill Color - Riempimento + Riempimento colore Fill Pattern - Riempimento + Riempimento a motivo @@ -2441,6 +2522,228 @@ a motivo Chiudi + + QgsLUDialogBase + + Enter class bounds + + + + Lower value + + + + - + - + + + OK + OK + + + Cancel + + + + Upper value + + + + + QgsLabelDialogBase + + Form1 + Form1 + + + Source: + + + + Field containing label: + + + + Default label: + + + + Preview: + + + + QGIS Rocks! + + + + Default Style + + + + Font Style + + + + Font + + + + Font size units are in ... + + + + Points + + + + Map units + + + + % + + + + Transparency: + Trasparenza: + + + Colour + + + + Position + + + + X Offset (pts): + + + + Y Offset (pts): + + + + Offset units are in ... + + + + Buffer Settings + + + + Buffer Labels? + + + + Size: + + + + Buffer size is in ... + + + + Size is in map units + + + + Size is in points + + + + Alignment + + + + Above + + + + Over + + + + Left + + + + Below + + + + Right + + + + Above Right + + + + Below Right + + + + Above Left + + + + Below Left + + + + Angle (deg): + + + + ° + + + + Use best judgement when labels collide + + + + Data Defined Style + + + + &Font family: + + + + &Italic: + + + + &Underline: + + + + &Bold: + + + + &Size: + + + + X Coordinate: + + + + Y Coordinate: + + + + Placement: + Posizione: + + + &Colour: + + + QgsLegendItemBase @@ -3598,6 +3901,10 @@ Per fare questo occorre avere i diritti di scrittura nella cartella dove sono ca Fill Riempimento + + Label + Etichetta + QgsSpitBase @@ -3745,6 +4052,21 @@ Per fare questo occorre avere i diritti di scrittura nella cartella dove sono ca Nuovo elemento + + QgsUValMaDialogBase + + Form1 + Form1 + + + Classification Field: + Campo classificazione: + + + New Item + Nuovo elemento + + QgsVectorLayer @@ -3788,15 +4110,15 @@ Per fare questo occorre avere i diritti di scrittura nella cartella dove sono ca QgsVectorLayerProperties single symbol - simbolo singolo + simbolo singolo graduated symbol - simbolo graduato + simbolo graduato continuous color - colore continuo + colore continuo diff --git a/i18n/qgis_nl.ts b/i18n/qgis_nl.ts index 4dc39fdec741..d8fa3f0eea1b 100644 --- a/i18n/qgis_nl.ts +++ b/i18n/qgis_nl.ts @@ -152,15 +152,6 @@ GPS Tools - - <html><head><meta name="qrichtext" content="1" /></head><body style="font-size:12pt;font-family:Arial"> -<p style="margin-top:16px"><span style="font-size:17pt;font-weight:600">Description</span></p> -<p>GPX is the <a href="http://www.topografix.com/gpx.asp">GPS eXchange file format</a>, which is used to store information about waypoints, routes, and tracks. LOC is the <a href="http://www.geocaching.com">geocaching.com</a> waypoint format.</p> -<p>Select a GPX or LOC file and then select the feature types that you want to load.</p> -</body></html> - - - File: @@ -262,29 +253,10 @@ Enable North Arrow - - Load GPX or LOC - - Import other file - - <html><head><meta name="qrichtext" content="1" /></head><body style="font-size:12pt;font-family:Arial"> -<p style="margin-top:16px"><span style="font-size:17pt;font-weight:600">Description</span></p> -<p>QGIS can only load GPX and LOC files by itself, but many other formats -can be converted to GPX using GPSBabel (<a href="http://gpsbabel.sf.net"> -http://gpsbabel.sf.net</a>). This requires that you have GPSBabel installed where -QGIS can find it.</p> -<p>Select a GPS file format and the file that you want to import, the feature type -that you want to use, a GPX filename that you want to save the converted file as, -and a name for the new layer. All file formats can not store waypoints, routes, and -tracks, so some feature types may be disabled for some file formats.</p> -</body></html> - - - File to import: @@ -419,6 +391,34 @@ have GPSBabel installed where QGIS can find it, this tool will not work.</p&g Automatically snap to round number on resize + + Load GPX file + + + + <html><head><meta name="qrichtext" content="1" /></head><body style="font-size:12pt;font-family:Arial"> +<p style="margin-top:16px"><span style="font-size:17pt;font-weight:600">Description</span></p> +<p>GPX is the <a href="http://www.topografix.com/gpx.asp">GPS eXchange file format</a>, which is used to store information about waypoints, routes, and tracks.</p> +<p>Select a GPX file and then select the feature types that you want to load.</p> +</body></html> + + + + + <html><head><meta name="qrichtext" content="1" /></head><body style="font-size:12pt;font-family:Arial"> +<p style="margin-top:16px"><span style="font-size:17pt;font-weight:600">Description</span></p> +<p>QGIS can only load GPX files by itself, but many other formats +can be converted to GPX using GPSBabel (<a href="http://gpsbabel.sf.net"> +http://gpsbabel.sf.net</a>). This requires that you have GPSBabel installed where +QGIS can find it.</p> +<p>Select a GPS file format and the file that you want to import, the feature type +that you want to use, a GPX filename that you want to save the converted file as, +and a name for the new layer. All file formats can not store waypoints, routes, and +tracks, so some feature types may be disabled for some file formats.</p> +</body></html> + + + QFileDialog @@ -430,6 +430,10 @@ have GPSBabel installed where QGIS can find it, this tool will not work.</p&g Save file dialog + + Open an OGR Supported Data Source + + QObject @@ -501,10 +505,6 @@ have GPSBabel installed where QGIS can find it, this tool will not work.</p&g (no PostgreSQL support) - - Sourceforge Project Page: http://sourceforge.net/projects/qgis - - Version @@ -701,10 +701,6 @@ have GPSBabel installed where QGIS can find it, this tool will not work.</p&g Extents: - - Web Page: http://qgis.org - - Problem deleting features @@ -725,6 +721,18 @@ have GPSBabel installed where QGIS can find it, this tool will not work.</p&g To delete features, you must select a vector layer in the legend + + QGIS ready + + + + Quantum GIS is licensed under the GNU General Public License + + + + http://www.gnu.org/licenses + + QgisAppBase @@ -1264,53 +1272,49 @@ have GPSBabel installed where QGIS can find it, this tool will not work.</p&g Map Edit Tools - - - QgsAbout - About Quantum GIS + Show all layers - Ok + Add to overview - About + Capture points - Version + Plugins Toolbar + + + QgsAbout - Quantum GIS (qgis) + About Quantum GIS - What's New + Ok - License + About - http://www.gnu.org/licenses + Version - Quantum GIS is licensed under the GNU General Public License + What's New Contributors - - Plugins - - <h2>QGIS Contributors</h2> @@ -1363,6 +1367,27 @@ have GPSBabel installed where QGIS can find it, this tool will not work.</p&g Peter Brewer + + <h2>Quantum GIS (qgis)</h2> + + + + <p align="center">Quantum GIS is licensed under the GNU General Public License<p> +<p align="center">http://www.gnu.org/licenses</p> + + + + QGIS Home Page + + + + Subscribe to the QGIS-User mailing list + + + + Providers + + QgsAttributeTableBase @@ -1829,6 +1854,10 @@ have GPSBabel installed where QGIS can find it, this tool will not work.</p&g Unique Value + + Unique Value Marker + + QgsDlgVectorLayerPropertiesBase @@ -1924,10 +1953,6 @@ have GPSBabel installed where QGIS can find it, this tool will not work.</p&g Legend type: - - Display/label field - - Labels @@ -2001,43 +2026,6 @@ Factor QgsGraSyExtensionWidget - - Lower - - - - Upper - - - - Label - - - - Outline -Color - - - - Outline -Style - - - - Outline -Width - - - - Fill -Color - - - - Fill -Pattern - - QgsGrassAttributesBase @@ -2393,6 +2381,228 @@ Pattern + + QgsLUDialogBase + + Enter class bounds + + + + Lower value + + + + - + + + + OK + + + + Cancel + + + + Upper value + + + + + QgsLabelDialogBase + + Form1 + + + + Source: + + + + Field containing label: + + + + Default label: + + + + Preview: + + + + QGIS Rocks! + + + + Default Style + + + + Font Style + + + + Font + + + + Font size units are in ... + + + + Points + + + + Map units + + + + % + + + + Transparency: + + + + Colour + + + + Position + + + + X Offset (pts): + + + + Y Offset (pts): + + + + Offset units are in ... + + + + Buffer Settings + + + + Buffer Labels? + + + + Size: + + + + Buffer size is in ... + + + + Size is in map units + + + + Size is in points + + + + Alignment + + + + Above + + + + Over + + + + Left + + + + Below + + + + Right + + + + Above Right + + + + Below Right + + + + Above Left + + + + Below Left + + + + Angle (deg): + + + + ° + + + + Use best judgement when labels collide + + + + Data Defined Style + + + + &Font family: + + + + &Italic: + + + + &Underline: + + + + &Bold: + + + + &Size: + + + + X Coordinate: + + + + Y Coordinate: + + + + Placement: + + + + &Colour: + + + QgsLegendItemBase @@ -3528,6 +3738,10 @@ identifying features without zooming in very close. Fill + + Label + + QgsSpitBase @@ -3675,6 +3889,21 @@ identifying features without zooming in very close. + + QgsUValMaDialogBase + + Form1 + + + + Classification Field: + + + + New Item + + + QgsVectorLayer @@ -3716,18 +3945,6 @@ identifying features without zooming in very close. QgsVectorLayerProperties - - single symbol - - - - graduated symbol - - - - continuous color - - QgsVectorLayerPropertiesBase diff --git a/i18n/qgis_pt_BR.ts b/i18n/qgis_pt_BR.ts index 6e073113a7b4..5edc8ea6db9e 100644 --- a/i18n/qgis_pt_BR.ts +++ b/i18n/qgis_pt_BR.ts @@ -209,7 +209,7 @@ <p>Select a GPX or LOC file and then select the feature types that you want to load.</p> </body></html> - <html><head><meta name="qrichtext" content="1" /></head><body style="font-size:12pt;font-family:Arial"> + <html><head><meta name="qrichtext" content="1" /></head><body style="font-size:12pt;font-family:Arial"> <p style="margin-top:16px"><span style="font-size:17pt;font-weight:600">Descrição</span></p> <p>GPX é o <a href="http://www.topografix.com/gpx.asp">formato para troca de dados de GPS</a>, o qual é utilizado para armazenar informações sobre waypoints, rotas e trilhas. LOC é o formato de waypoints do <a href="http://www.geocaching.com">geocaching.com.</a></p> <p>Selecione um arquivo GPX ou LOC e depois selecione o tipo de feição que deseja carregar.</p> @@ -370,7 +370,7 @@ Load GPX or LOC - Carregar GPX ou LOC + Carregar GPX ou LOC Import other file @@ -389,7 +389,7 @@ and a name for the new layer. All file formats can not store waypoints, routes, tracks, so some feature types may be disabled for some file formats.</p> </body></html> - <html><head><meta name="qrichtext" content="1" /></head><body style="font-size:12pt;font-family:Arial"> + <html><head><meta name="qrichtext" content="1" /></head><body style="font-size:12pt;font-family:Arial"> <p style="margin-top:16px"><span style="font-size:17pt;font-weight:600">Descrição</span></p> <p>QGIS pode carregar arquivos GPX e LOC, mas é possível fazer a conversão de outros formatos para GPX utilizando o GPSBabel (<a href="http://gpsbabel.sf.net"> @@ -648,6 +648,34 @@ nas propriedades do projeto.</p> Automatically snap to round number on resize Arredondar números automaticamente ao redimensionar + + Load GPX file + + + + <html><head><meta name="qrichtext" content="1" /></head><body style="font-size:12pt;font-family:Arial"> +<p style="margin-top:16px"><span style="font-size:17pt;font-weight:600">Description</span></p> +<p>GPX is the <a href="http://www.topografix.com/gpx.asp">GPS eXchange file format</a>, which is used to store information about waypoints, routes, and tracks.</p> +<p>Select a GPX file and then select the feature types that you want to load.</p> +</body></html> + + + + + <html><head><meta name="qrichtext" content="1" /></head><body style="font-size:12pt;font-family:Arial"> +<p style="margin-top:16px"><span style="font-size:17pt;font-weight:600">Description</span></p> +<p>QGIS can only load GPX files by itself, but many other formats +can be converted to GPX using GPSBabel (<a href="http://gpsbabel.sf.net"> +http://gpsbabel.sf.net</a>). This requires that you have GPSBabel installed where +QGIS can find it.</p> +<p>Select a GPS file format and the file that you want to import, the feature type +that you want to use, a GPX filename that you want to save the converted file as, +and a name for the new layer. All file formats can not store waypoints, routes, and +tracks, so some feature types may be disabled for some file formats.</p> +</body></html> + + + QFileDialog @@ -659,6 +687,10 @@ nas propriedades do projeto.</p> Save file dialog Salvar Arquivo + + Open an OGR Supported Data Source + + QObject @@ -748,7 +780,7 @@ nas propriedades do projeto.</p> Sourceforge Project Page: http://sourceforge.net/projects/qgis - Página do Projeto no Sourceforge: http://sourceforge.net/projects/qgis + Página do Projeto no Sourceforge: http://sourceforge.net/projects/qgis Version @@ -948,7 +980,7 @@ nas propriedades do projeto.</p> Web Page: http://qgis.org - Site: http://qgis.org + Site: http://qgis.org Problem deleting features @@ -970,6 +1002,18 @@ nas propriedades do projeto.</p> To delete features, you must select a vector layer in the legend + + QGIS ready + + + + Quantum GIS is licensed under the GNU General Public License + Quantum GIS está sob a licença GNU General Public License + + + http://www.gnu.org/licenses + http://www.gnu.org/licenses + QgisAppBase @@ -1533,6 +1577,22 @@ nas propriedades do projeto.</p> Map Edit Tools + + Show all layers + + + + Add to overview + + + + Capture points + + + + Plugins Toolbar + + QgsAbout @@ -1554,7 +1614,7 @@ nas propriedades do projeto.</p> Quantum GIS (qgis) - Quantum GIS (qgis) + Quantum GIS (qgis) What's New @@ -1562,15 +1622,15 @@ nas propriedades do projeto.</p> License - Licença + Licença http://www.gnu.org/licenses - http://www.gnu.org/licenses + http://www.gnu.org/licenses Quantum GIS is licensed under the GNU General Public License - Quantum GIS está sob a licença GNU General Public License + Quantum GIS está sob a licença GNU General Public License Contributors @@ -1626,12 +1686,33 @@ nas propriedades do projeto.</p> Plugins - Plugins + Plugins Peter Brewer Peter Brewer + + <h2>Quantum GIS (qgis)</h2> + + + + <p align="center">Quantum GIS is licensed under the GNU General Public License<p> +<p align="center">http://www.gnu.org/licenses</p> + + + + QGIS Home Page + Página do QGIS + + + Subscribe to the QGIS-User mailing list + + + + Providers + + QgsAttributeTableBase @@ -2139,6 +2220,10 @@ nas propriedades do projeto.</p> Unique Value + + Unique Value Marker + + QgsDlgVectorLayerPropertiesBase @@ -2234,10 +2319,6 @@ nas propriedades do projeto.</p> Legend type: Tipo da legenda: - - Display/label field - - Labels Labels @@ -2314,44 +2395,44 @@ de Escala QgsGraSyExtensionWidget Lower - Limite inferior + Limite inferior Upper - Limite superior + Limite superior Label - Identificação + Identificação Outline Color - Cor da + Cor da borda Outline Style - Estilo da + Estilo da Borda Outline Width - Largura da + Largura da Borda Fill Color - Preencher + Preencher Cor Fill Pattern - Padrão de + Padrão de preenchimento @@ -2722,6 +2803,228 @@ Ajuda do QGIS Fechar + + QgsLUDialogBase + + Enter class bounds + + + + Lower value + + + + - + - + + + OK + OK + + + Cancel + Cancelar + + + Upper value + + + + + QgsLabelDialogBase + + Form1 + Forma1 + + + Source: + + + + Field containing label: + + + + Default label: + + + + Preview: + + + + QGIS Rocks! + + + + Default Style + + + + Font Style + + + + Font + + + + Font size units are in ... + + + + Points + + + + Map units + + + + % + + + + Transparency: + Transparência: + + + Colour + + + + Position + + + + X Offset (pts): + + + + Y Offset (pts): + + + + Offset units are in ... + + + + Buffer Settings + + + + Buffer Labels? + + + + Size: + + + + Buffer size is in ... + + + + Size is in map units + + + + Size is in points + + + + Alignment + + + + Above + + + + Over + + + + Left + + + + Below + + + + Right + + + + Above Right + + + + Below Right + + + + Above Left + + + + Below Left + + + + Angle (deg): + + + + ° + + + + Use best judgement when labels collide + + + + Data Defined Style + + + + &Font family: + + + + &Italic: + + + + &Underline: + + + + &Bold: + + + + &Size: + + + + X Coordinate: + + + + Y Coordinate: + + + + Placement: + Posicionamento: + + + &Colour: + + + QgsLayerPropertiesBase @@ -4026,6 +4329,10 @@ feições sem aumentar o zoom na camada. Fill Preenchimento + + Label + Identificação + QgsSpitBase @@ -4197,6 +4504,21 @@ feições sem aumentar o zoom na camada. Novo Item + + QgsUValMaDialogBase + + Form1 + Forma1 + + + Classification Field: + + + + New Item + Novo Item + + QgsVectorLayer @@ -4240,15 +4562,15 @@ feições sem aumentar o zoom na camada. QgsVectorLayerProperties single symbol - Único Símbolo + Único Símbolo graduated symbol - símbolo graduado + símbolo graduado continuous color - cor contínua + cor contínua diff --git a/i18n/qgis_ru.ts b/i18n/qgis_ru.ts index 46b9bf01369e..3de3d32111a6 100644 --- a/i18n/qgis_ru.ts +++ b/i18n/qgis_ru.ts @@ -152,15 +152,6 @@ GPS Tools - - <html><head><meta name="qrichtext" content="1" /></head><body style="font-size:12pt;font-family:Arial"> -<p style="margin-top:16px"><span style="font-size:17pt;font-weight:600">Description</span></p> -<p>GPX is the <a href="http://www.topografix.com/gpx.asp">GPS eXchange file format</a>, which is used to store information about waypoints, routes, and tracks. LOC is the <a href="http://www.geocaching.com">geocaching.com</a> waypoint format.</p> -<p>Select a GPX or LOC file and then select the feature types that you want to load.</p> -</body></html> - - - File: @@ -262,29 +253,10 @@ Enable North Arrow - - Load GPX or LOC - - Import other file - - <html><head><meta name="qrichtext" content="1" /></head><body style="font-size:12pt;font-family:Arial"> -<p style="margin-top:16px"><span style="font-size:17pt;font-weight:600">Description</span></p> -<p>QGIS can only load GPX and LOC files by itself, but many other formats -can be converted to GPX using GPSBabel (<a href="http://gpsbabel.sf.net"> -http://gpsbabel.sf.net</a>). This requires that you have GPSBabel installed where -QGIS can find it.</p> -<p>Select a GPS file format and the file that you want to import, the feature type -that you want to use, a GPX filename that you want to save the converted file as, -and a name for the new layer. All file formats can not store waypoints, routes, and -tracks, so some feature types may be disabled for some file formats.</p> -</body></html> - - - File to import: @@ -419,6 +391,34 @@ have GPSBabel installed where QGIS can find it, this tool will not work.</p&g Automatically snap to round number on resize + + Load GPX file + + + + <html><head><meta name="qrichtext" content="1" /></head><body style="font-size:12pt;font-family:Arial"> +<p style="margin-top:16px"><span style="font-size:17pt;font-weight:600">Description</span></p> +<p>GPX is the <a href="http://www.topografix.com/gpx.asp">GPS eXchange file format</a>, which is used to store information about waypoints, routes, and tracks.</p> +<p>Select a GPX file and then select the feature types that you want to load.</p> +</body></html> + + + + + <html><head><meta name="qrichtext" content="1" /></head><body style="font-size:12pt;font-family:Arial"> +<p style="margin-top:16px"><span style="font-size:17pt;font-weight:600">Description</span></p> +<p>QGIS can only load GPX files by itself, but many other formats +can be converted to GPX using GPSBabel (<a href="http://gpsbabel.sf.net"> +http://gpsbabel.sf.net</a>). This requires that you have GPSBabel installed where +QGIS can find it.</p> +<p>Select a GPS file format and the file that you want to import, the feature type +that you want to use, a GPX filename that you want to save the converted file as, +and a name for the new layer. All file formats can not store waypoints, routes, and +tracks, so some feature types may be disabled for some file formats.</p> +</body></html> + + + QFileDialog @@ -430,6 +430,10 @@ have GPSBabel installed where QGIS can find it, this tool will not work.</p&g Save file dialog + + Open an OGR Supported Data Source + + QObject @@ -531,7 +535,7 @@ have GPSBabel installed where QGIS can find it, this tool will not work.</p&g Sourceforge Project Page: http://sourceforge.net/projects/qgis - Веб Страничка Проекта: http://sourceforge.net/projects/qgis + Веб Страничка Проекта: http://sourceforge.net/projects/qgis Version @@ -741,10 +745,6 @@ have GPSBabel installed where QGIS can find it, this tool will not work.</p&g Extents: - - Web Page: http://qgis.org - - Problem deleting features @@ -765,6 +765,18 @@ have GPSBabel installed where QGIS can find it, this tool will not work.</p&g To delete features, you must select a vector layer in the legend + + QGIS ready + + + + Quantum GIS is licensed under the GNU General Public License + Данная программа лицнензирована по Универсальной Общественной Лицензии (GNU GPL) + + + http://www.gnu.org/licenses + http://www.gnu.org/licenses + QgisAppBase @@ -1336,6 +1348,22 @@ have GPSBabel installed where QGIS can find it, this tool will not work.</p&g Map Edit Tools + + Show all layers + + + + Add to overview + + + + Capture points + + + + Plugins Toolbar + + QgsAbout @@ -1357,7 +1385,7 @@ have GPSBabel installed where QGIS can find it, this tool will not work.</p&g Quantum GIS (qgis) - Quantum GIS (qgis) + Quantum GIS (qgis) What's New @@ -1365,15 +1393,15 @@ have GPSBabel installed where QGIS can find it, this tool will not work.</p&g License - Лицензия + Лицензия http://www.gnu.org/licenses - http://www.gnu.org/licenses + http://www.gnu.org/licenses Quantum GIS is licensed under the GNU General Public License - Данная программа лицнензирована по Универсальной Общественной Лицензии (GNU GPL) + Данная программа лицнензирована по Универсальной Общественной Лицензии (GNU GPL) Contributors @@ -1411,7 +1439,7 @@ Apologies to anyone not included. Please let the project admin at qgis.sourcefor Plugins - Компоненты (Плагины) + Компоненты (Плагины) <h2>QGIS Contributors</h2> @@ -1465,6 +1493,27 @@ Apologies to anyone not included. Please let the project admin at qgis.sourcefor Peter Brewer + + <h2>Quantum GIS (qgis)</h2> + + + + <p align="center">Quantum GIS is licensed under the GNU General Public License<p> +<p align="center">http://www.gnu.org/licenses</p> + + + + QGIS Home Page + + + + Subscribe to the QGIS-User mailing list + + + + Providers + + QgsAttributeTableBase @@ -1931,6 +1980,10 @@ Apologies to anyone not included. Please let the project admin at qgis.sourcefor Unique Value + + Unique Value Marker + + QgsDlgVectorLayerPropertiesBase @@ -2026,10 +2079,6 @@ Apologies to anyone not included. Please let the project admin at qgis.sourcefor Legend type: - - Display/label field - - Labels @@ -2103,43 +2152,6 @@ Factor QgsGraSyExtensionWidget - - Lower - - - - Upper - - - - Label - - - - Outline -Color - - - - Outline -Style - - - - Outline -Width - - - - Fill -Color - - - - Fill -Pattern - - QgsGrassAttributesBase @@ -2495,6 +2507,228 @@ Pattern + + QgsLUDialogBase + + Enter class bounds + + + + Lower value + + + + - + + + + OK + + + + Cancel + + + + Upper value + + + + + QgsLabelDialogBase + + Form1 + + + + Source: + + + + Field containing label: + + + + Default label: + + + + Preview: + + + + QGIS Rocks! + + + + Default Style + + + + Font Style + + + + Font + + + + Font size units are in ... + + + + Points + + + + Map units + + + + % + + + + Transparency: + + + + Colour + + + + Position + + + + X Offset (pts): + + + + Y Offset (pts): + + + + Offset units are in ... + + + + Buffer Settings + + + + Buffer Labels? + + + + Size: + + + + Buffer size is in ... + + + + Size is in map units + + + + Size is in points + + + + Alignment + + + + Above + + + + Over + + + + Left + + + + Below + + + + Right + + + + Above Right + + + + Below Right + + + + Above Left + + + + Below Left + + + + Angle (deg): + + + + ° + + + + Use best judgement when labels collide + + + + Data Defined Style + + + + &Font family: + + + + &Italic: + + + + &Underline: + + + + &Bold: + + + + &Size: + + + + X Coordinate: + + + + Y Coordinate: + + + + Placement: + + + + &Colour: + + + QgsLegendItemBase @@ -3630,6 +3864,10 @@ identifying features without zooming in very close. Fill + + Label + + QgsSpitBase @@ -3777,6 +4015,21 @@ identifying features without zooming in very close. + + QgsUValMaDialogBase + + Form1 + + + + Classification Field: + + + + New Item + + + QgsVectorLayer @@ -3818,18 +4071,6 @@ identifying features without zooming in very close. QgsVectorLayerProperties - - single symbol - - - - graduated symbol - - - - continuous color - - QgsVectorLayerPropertiesBase diff --git a/i18n/qgis_se.ts b/i18n/qgis_se.ts index 8a7dbad4e222..da1d739bf04d 100644 --- a/i18n/qgis_se.ts +++ b/i18n/qgis_se.ts @@ -226,7 +226,7 @@ <p>Select a GPX or LOC file and then select the feature types that you want to load.</p> </body></html> - <html><head><meta name="qrichtext" content="1" /></head><body style="font-size:12pt;font-family:Arial"> + <html><head><meta name="qrichtext" content="1" /></head><body style="font-size:12pt;font-family:Arial"> <p style="margin-top:16px"><span style="font-size:17pt;font-weight:600">Beskrivning</span></p> <p>GPX står för <a href="http://www.topografix.com/gpx.asp">GPS eXchange file format</a>, och används för att lagra information om waypoints, rutter, och spår. LOC används av <a href="http://www.geocaching.com">geocaching.com</a> för att lagra waypoints.</p> <p>Välj en GPX- eller LOC-fil och välj sedan detaljtyperna som du vill ladda.</p> @@ -239,7 +239,7 @@ Feature types: - Detaljtyper: + Objekttyper: Waypoints @@ -264,8 +264,8 @@ <html><head><meta name="qrichtext" content="1" /></head><body style="font-size:12pt;font-family:Arial"> <p style="margin-top:16px"><span style="font-size:17pt;font-weight:600">Beskrivning</span></p> <p>Välj GPS-dumpfilen som du vill konvertera till en shapefile så gör detta plugin jobbet åt dig! </p> -<p>Använd det minimala tidsgapet för att ange vilket tidsintervall som ska användas för att bestämma när en ny detalj påbörjas. </p> -<p>Använd det minimala avståndsgapet för att ange vilket avståndsintervall som ska användas för att bestämma när en ny detalj påbörjas. </p> +<p>Använd det minimala tidsgapet för att ange vilket tidsintervall som ska användas för att bestämma när ett nytt objekt påbörjas. </p> +<p>Använd det minimala avståndsgapet för att ange vilket avståndsintervall som ska användas för att bestämma när ett nytt objekt påbörjas. </p> </body></html> @@ -371,7 +371,7 @@ Load GPX or LOC - Ladda GPX / LOC + Ladda GPX / LOC Import other file @@ -390,7 +390,7 @@ and a name for the new layer. All file formats can not store waypoints, routes, tracks, so some feature types may be disabled for some file formats.</p> </body></html> - <html><head><meta name="qrichtext" content="1" /></head><body style="font-size:12pt;font-family:Arial"> + <html><head><meta name="qrichtext" content="1" /></head><body style="font-size:12pt;font-family:Arial"> <p style="margin-top:16px"><span style="font-size:17pt;font-weight:600">Beskrivning</span></p> <p>QGIS kan bara ladda GPX- och LOC-filer, men många andra format kan konverteras till GPX med GPSBabel (<a href="http://gpsbabel.sf.net"> @@ -409,7 +409,7 @@ så några detaljtyper är inaktiverade för en del filformat.</p> Feature type: - Detaljtyp: + Objekttyp: GPX output file: @@ -438,7 +438,7 @@ don't have GPSBabel installed where QGIS can find it, this tool will not wo <html><head><meta name="qrichtext" content="1" /></head><body style="font-size:12pt;font-family:Arial"> <p style="margin-top:16px"><span style="font-size:17pt;font-weight:600">Beskrivning</span></p> <p>Det här verktyget hjälper dig att hämta data från en GPS-enhet.. Välj ditt protokoll, -porten som din GPS är kopplad till, detaljtypen du vill ladda ner, +porten som din GPS är kopplad till, typen av objekt du vill ladda ner, ett namn för ditt nya lager och namnet på den nya GPX-filen där du vill lagra datan.</p> <p>Detta verktyg använder GPSBabel (<a href="http://gpsbabel.sf.net">http://gpsbabel.sf.net</a>) för att överföra data. Om du inte har GPSBabel installerat där QGIS kan hitta det så kommer @@ -559,6 +559,50 @@ av QGIS beroende på zoomnivån. Storleken mäts i de kartenheter som anges i pr Automatically snap to round number on resize Runda av till vettig storlek + + Load GPX file + Ladda GPX-fil + + + <html><head><meta name="qrichtext" content="1" /></head><body style="font-size:12pt;font-family:Arial"> +<p style="margin-top:16px"><span style="font-size:17pt;font-weight:600">Description</span></p> +<p>GPX is the <a href="http://www.topografix.com/gpx.asp">GPS eXchange file format</a>, which is used to store information about waypoints, routes, and tracks.</p> +<p>Select a GPX file and then select the feature types that you want to load.</p> +</body></html> + + <html><head><meta name="qrichtext" content="1" /></head><body style="font-size:12pt;font-family:Arial"> +<p style="margin-top:16px"><span style="font-size:17pt;font-weight:600">Description</span></p> +<p>GPX står för <a href="http://www.topografix.com/gpx.asp">GPS eXchange file format</a> och används för att lagra information om waypoints, rutter och spår.</p> +<p>Välj en GPX-fil och typen av objekt som du vill ladda.</p> +</body></html> + + + + <html><head><meta name="qrichtext" content="1" /></head><body style="font-size:12pt;font-family:Arial"> +<p style="margin-top:16px"><span style="font-size:17pt;font-weight:600">Description</span></p> +<p>QGIS can only load GPX files by itself, but many other formats +can be converted to GPX using GPSBabel (<a href="http://gpsbabel.sf.net"> +http://gpsbabel.sf.net</a>). This requires that you have GPSBabel installed where +QGIS can find it.</p> +<p>Select a GPS file format and the file that you want to import, the feature type +that you want to use, a GPX filename that you want to save the converted file as, +and a name for the new layer. All file formats can not store waypoints, routes, and +tracks, so some feature types may be disabled for some file formats.</p> +</body></html> + + <html><head><meta name="qrichtext" content="1" /></head><body style="font-size:12pt;font-family:Arial"> +<p style="margin-top:16px"><span style="font-size:17pt;font-weight:600">Description</span></p> +<p>QGIS kan bara ladda GPX-filer, men många andra filformat kan +konverteras till GPX med GPSBabel (<a href="http://gpsbabel.sf.net"> +http://gpsbabel.sf.net</a>). Det kräver att du har GPSBabel installerat någonstans +där QGIS kan hitta det.</p> +<p>Välj ett filformat för GPS-data som du vill importera från, typen av objekt som +du vill använda, ett filnamn som du vill spara den konverterade GPX-filen som och +ett namn för det nya lagret. Alla filformat kan inte lagra waypoints, rutter +och spår, så en del objekttyper är inte tillgängliga för alla filformat.</p> +</body></html> + + QFileDialog @@ -570,6 +614,10 @@ av QGIS beroende på zoomnivån. Storleken mäts i de kartenheter som anges i pr Save file dialog Spara filer-dialog + + Open an OGR Supported Data Source + Öppna en OGR-Stödd Datakälla + QObject @@ -671,7 +719,7 @@ av QGIS beroende på zoomnivån. Storleken mäts i de kartenheter som anges i pr Sourceforge Project Page: http://sourceforge.net/projects/qgis - Projektsida på Sourceforge: http://sourceforge.net/projects/qgis + Projektsida på Sourceforge: http://sourceforge.net/projects/qgis Version @@ -887,27 +935,39 @@ av QGIS beroende på zoomnivån. Storleken mäts i de kartenheter som anges i pr Web Page: http://qgis.org - Websida: http://qgis.org + Websida: http://qgis.org Problem deleting features - + Problem med att radera objekt A problem occured during deletion of features - + Ett problem uppstod under radering av objekt No Vector Layer Selected - + Inget Vektorlager Markerat Deleting features only works on vector layers - + Radering av objekt fungerar bara på vektorlager To delete features, you must select a vector layer in the legend - + För att radera ett objekt så måste du markera ett vektorlager i teckenförklaringen + + + QGIS ready + QGIS redo + + + Quantum GIS is licensed under the GNU General Public License + Quantum GIS är licensierad under GNU General Public License + + + http://www.gnu.org/licenses + http://www.gnu.org/licenses @@ -1006,11 +1066,11 @@ av QGIS beroende på zoomnivån. Storleken mäts i de kartenheter som anges i pr Identify a feature on the active layer - Identifiera en detalj i det aktiva lagret + Identifiera ett objekt i det aktiva lagret select features - markera detaljed + markera objekt &About Quantum GIS @@ -1078,11 +1138,11 @@ av QGIS beroende på zoomnivån. Storleken mäts i de kartenheter som anges i pr Zoom to selected features - Visa markerade detaljer + Visa markerade objekt Zoom to selected features in active layer - Visa markerade detaljer i det aktiva lagret + Visa markerade objekt i det aktiva lagret Add a Vector Layer @@ -1166,15 +1226,15 @@ av QGIS beroende på zoomnivån. Storleken mäts i de kartenheter som anges i pr Zoom to the extent of selected features on the active layer. The view will be zoomed so that all selected features are visible. If there are no selected features, the view is not changed. - Zooma till utsträckningen av de markerade detaljerna i det aktiva lagret. Vyn kommer att zoomas så att alla markerade detaljer blir synliga. Om det inte finns några markerade detaljer så ändras inte vyn. + Zooma till utsträckningen av de markerade objekten i det aktiva lagret. Vyn kommer att zoomas så att alla markerade objekt blir synliga. Om det inte finns några markerade objekt så ändras inte vyn. Identify a feature on the active layer (the active layer is the highlighted layer in the legend). Idenify searches for features near where the mouse is clicked and displays information about the results. The search radius can be customized on the QGIS Preferences dialog. - Identifiera en detalj i det aktiva lagret (det aktiva lagret är markerat i teckenförklaringen). Identifiera söker efter detaljer nära där musen klickas och visar information om resultaten. Sökradien kan ställas in i QGIS' inställningsfönster. + Identifiera ett objekt i det aktiva lagret (det aktiva lagret är markerat i teckenförklaringen). Identifiera söker efter objekt nära där musen klickas och visar information om resultaten. Sökradien kan ställas in i QGIS' inställningsfönster. Select features on the active layer by dragging the mouse to create a box around the features of interest. When the mouse is released, the features are selected and drawn in a different color (default is yellow) - Välj detaljer i det aktiva lagret genom att dra med musen för att skapa en ruta runt de intressanta detaljerna. När musen släpps så markeras detaljerna och ritas i en annan färg (standard är gul) + Välj objekt i det aktiva lagret genom att dra med musen för att skapa en ruta runt de intressanta objekten. När musen släpps så markeras objekten och ritas i en annan färg (standard är gul) Display the About QGIS dialog. About QGIS contains information about the current version, contributors, and available data provider plugins. @@ -1194,7 +1254,7 @@ av QGIS beroende på zoomnivån. Storleken mäts i de kartenheter som anges i pr Open the options dialog to set QGIS preferences like web browser and identify search radius. - Öppna inställningsfönstret för att ange QGIS-inställningar som webläsare och sökradie för identifiering av detaljer. + Öppna inställningsfönstret för att ange QGIS-inställningar som webläsare och sökradie för identifiering av objekt. Save the current map as a QGIS project. A QGIS project can later be opened and all layers and setting will be restored. @@ -1478,15 +1538,31 @@ av QGIS beroende på zoomnivån. Storleken mäts i de kartenheter som anges i pr Capture Line - + Skapa Linje Capture Polygon - + Skapa Polygon Map Edit Tools - + Kartredigeringsverktyg + + + Show all layers + Visa alla lager + + + Add to overview + Lägg till i översikt + + + Capture points + Skapa Punkter + + + Plugins Toolbar + Pluginverktygsrad @@ -1509,7 +1585,7 @@ av QGIS beroende på zoomnivån. Storleken mäts i de kartenheter som anges i pr Quantum GIS (qgis) - Quantum GIS (qgis) + Quantum GIS (qgis) What's New @@ -1517,15 +1593,15 @@ av QGIS beroende på zoomnivån. Storleken mäts i de kartenheter som anges i pr License - Licens + Licens http://www.gnu.org/licenses - http://www.gnu.org/licenses + http://www.gnu.org/licenses Quantum GIS is licensed under the GNU General Public License - Quantum GIS är licensierad med GNU General Public License + Quantum GIS är licensierad med GNU General Public License Contributors @@ -1561,7 +1637,7 @@ Vi ber om ursäkt om någon har glömts bort. Var vänlig kontakta projektadmini Plugins - Plugins + Plugins <h2>QGIS Contributors</h2> @@ -1615,6 +1691,28 @@ Vi ber om ursäkt om någon har glömts bort. Var vänlig kontakta projektadmini Peter Brewer Peter Brewer + + <h2>Quantum GIS (qgis)</h2> + <h2>Quantum GIS (qgis)</h2> + + + <p align="center">Quantum GIS is licensed under the GNU General Public License<p> +<p align="center">http://www.gnu.org/licenses</p> + <p align="center">Quantum GIS är licensierat under GNU General Public License<p> +<p align="center">http://www.gnu.org/licenses</p> + + + QGIS Home Page + QGIS Hemsida + + + Subscribe to the QGIS-User mailing list + Prenumerera på maillistan QGIS-User + + + Providers + Dataplugin + QgsAttributeTableBase @@ -1864,15 +1962,15 @@ Vi ber om ursäkt om någon har glömts bort. Var vänlig kontakta projektadmini Type - Typ + Typ Name - Namn + Namn Sql - + Sql @@ -2062,7 +2160,7 @@ Vi ber om ursäkt om någon har glömts bort. Var vänlig kontakta projektadmini QgsDlgPgBufferBase Buffer features - Bufferdetaljer + Spara objekt i buffer &Help @@ -2110,7 +2208,7 @@ Vi ber om ursäkt om någon har glömts bort. Var vänlig kontakta projektadmini Unique field to use as feature id: - Unikt fält att använda som detalj-ID: + Unikt fält att använda som objekt-ID: Schema: @@ -2122,14 +2220,14 @@ Vi ber om ursäkt om någon har glömts bort. Var vänlig kontakta projektadmini <h2>Buffer the features in layer: </h2> - <h2>Buffra detaljer i lager: </h2> + <h2>Buffra objekt i lager: </h2> QgsDlgVectorLayerProperties Single Symbol - Enstaka Symbol + Enkel Symbol Graduated Symbol @@ -2141,7 +2239,7 @@ Vi ber om ursäkt om någon har glömts bort. Var vänlig kontakta projektadmini Single Marker - Enstaka Markör + Enkel Markör Graduated Marker @@ -2149,7 +2247,11 @@ Vi ber om ursäkt om någon har glömts bort. Var vänlig kontakta projektadmini Unique Value - + Unik Symbol + + + Unique Value Marker + Unik Markör @@ -2204,7 +2306,7 @@ Vi ber om ursäkt om någon har glömts bort. Var vänlig kontakta projektadmini Features - Detaljer + Objekt Count @@ -2246,17 +2348,13 @@ Vi ber om ursäkt om någon har glömts bort. Var vänlig kontakta projektadmini Legend type: Typ av teckenförklaring: - - Display/label field - - Labels - Etiketter + Etiketter Display labels - + Visa etiketter @@ -2390,285 +2488,285 @@ Faktor Lower - Nedre + Nedre Upper - Övre + Övre Label - Etikett + Etikett Outline Color - Kantfärg + Kantfärg Outline Style - Kantstil + Kantstil Outline Width - Kantbredd + Kantbredd Fill Color - Fyllningsfärg + Fyllningsfärg Fill Pattern - Fyllningsmönster + Fyllningsmönster QgsGrassAttributesBase GRASS Attributes - + GRASS-Attribut Tab 1 - + Tab 1 result - + resultat Update - + Uppdatera Update database record - + Uppdatera databas New - Ny + Ny Add new category using settings in GRASS Edit toolbox - + Lägg till ny kategory med inställningarna i GRASS Delete - Radera + Radera Delete selected category - + Lägg till ny kategory med inställningarna i GRASS-Redigering QgsGrassEditBase GRASS Edit - + GRASS-Redigering Category - + Kategori Mode - + Läge Field (layer) - + Fält (lager) Settings - Inställningar + Inställningar Snapping in screen pixels - + Snappning i skärmpixlar Symbology - Symbologi + Symbologi Column 1 - + Kolumn 1 New Item - Ny Post + Ny Post Table - + Tabell Add Column - + Lägg Till Kolumn Create / Alter Table - + Skapa / Ändra Tabell Tools - + Verktyg Toolbar - + Verktygsrad New line - + Ny rad F2 - F2 + F2 Close - Stäng + Stäng New point - + Ny punkt F1 - F1 + F1 New boundary - + Ny gräns F3 - F3 + F3 New centroid - + Ny centroid F4 - F4 + F4 Move vertex - + Flytta nod F5 - F5 + F5 Add vertex - + Lägg till nod F6 - F6 + F6 Delete vertex - + Radera nod F7 - F7 + F7 Split line - + Dela linje F10 - F10 + F10 Move line - + Flytta linje F9 - F9 + F9 Delete line - + Radera linje F11 - F11 + F11 Edit categories - + Redigera kategorier Edit attributes - + Redigera attribut QgsGrassRegionBase GRASS Region Settings - + GRASS Regioninställningar N - + W - + E - + S - S + S N-S Res - + Rows - + Rader Cols - + Kolumner E-W Res - + Color - Färg + Färg Width - Bredd + Bredd OK - OK + OK Cancel - Avbryt + Avbryt @@ -2781,7 +2879,7 @@ Pattern Feature - Detalj + Objekt Value @@ -2792,6 +2890,228 @@ Pattern Stäng + + QgsLUDialogBase + + Enter class bounds + Ange begränsningar + + + Lower value + Lägsta värde + + + - + - + + + OK + OK + + + Cancel + Avbryt + + + Upper value + Högsta värde + + + + QgsLabelDialogBase + + Form1 + Formulär1 + + + Source: + Källa: + + + Field containing label: + Fält med etikett: + + + Default label: + Standardetikett: + + + Preview: + Förhandsvisning: + + + QGIS Rocks! + QGIS Rocks! + + + Default Style + Standardstil + + + Font Style + Typsnittsstil + + + Font + Typsnitt + + + Font size units are in ... + Typsnittsenheter är i ... + + + Points + Punkter + + + Map units + Kartenheter + + + % + % + + + Transparency: + Genomskinlighet: + + + Colour + Färg + + + Position + Position + + + X Offset (pts): + X-Position (pktr): + + + Y Offset (pts): + Y-Position (pktr): + + + Offset units are in ... + Positionsenheter är i ... + + + Buffer Settings + Bufferinställningar + + + Buffer Labels? + Använd Buffer? + + + Size: + Storlek: + + + Buffer size is in ... + Bufferstorlek är i ... + + + Size is in map units + Storlek är i kartenheter + + + Size is in points + Storlek är i punkter + + + Alignment + Justering + + + Above + Ovanför + + + Over + Över + + + Left + Vänster + + + Below + Nedanför + + + Right + Höger + + + Above Right + Ovanför Höger + + + Below Right + Nedanför Höger + + + Above Left + Ovanför Vänster + + + Below Left + Nedanför Vänster + + + Angle (deg): + Vinkel (grader): + + + ° + ° + + + Use best judgement when labels collide + Använd heuristik när etiketter överlappar + + + Data Defined Style + Datadefinierad stil + + + &Font family: + &Typsnitt: + + + &Italic: + &Kursiv: + + + &Underline: + &Understruken: + + + &Bold: + &Fet: + + + &Size: + &Storlek: + + + X Coordinate: + X-Koordinat: + + + Y Coordinate: + Y-Koordinat: + + + Placement: + Placering: + + + &Colour: + &Färg: + + QgsLayerPropertiesBase @@ -2913,11 +3233,11 @@ Pattern To select features, you must choose an layer active by clicking on its name in the legend - För att välja detaljer måste du välja ett aktivt lager genom att klicka på dess namn i teckenförklaringen + För att välja objekt måste du välja ett aktivt lager genom att klicka på dess namn i teckenförklaringen To identify features, you must choose an layer active by clicking on its name in the legend - För att identifiera detaljer måste du välja ett aktivt lager genom att klicka på dess namn i teckenförklaringen + För att identifiera objekt måste du välja ett aktivt lager genom att klicka på dess namn i teckenförklaringen @@ -3250,7 +3570,7 @@ Pattern Search Radius for Identifying Features - Sökradie för identifiering av detaljer + Sökradie för identifiering av objekt Value @@ -3322,15 +3642,15 @@ med att identifiera detaljer utan att zooma in väldigt nära. Map display will be updated (drawn) after this many features have been read from the data source - Kartbilden kommer att uppdateras efter att såhär många detaljer har lästs från datakällan + Kartbilden kommer att uppdateras efter att såhär många objekt har lästs från datakällan features - detaljer + objekt (Set to 0 to not update the display until all features have been read) - (Sätt till 0 för att inte uppdatera förrän alla detaljer har lästs) + (Sätt till 0 för att inte uppdatera förrän alla objekt har lästs) &Selection @@ -3353,24 +3673,24 @@ identifying features without zooming in very close. &nbsp;&nbsp;<i>(Kartvyns bredd) * ( Värde/1000.0)</i> <br> QGIS använder värdet 5 som standard. Öka värdet om du har problem -med att identifiera detaljer utan att zooma in väldigt nära. +med att identifiera objekt utan att zooma in väldigt nära. </html> SVG Options - + SVG-Inställningar SVG oversampling factor - + Översamplingsfaktor <b>Note: </b>A higher value gives smoother SVG symbols, but can slow down rendering - + <b>OBS: </b>Ett högt värde ger mjukare SVG-symboler, men kan göra QGIS långsammare ... - ... + ... @@ -3460,7 +3780,7 @@ med att identifiera detaljer utan att zooma in väldigt nära. QgsPgGeoprocessing Buffer features in layer %1 - Buffra detaljer i lager %1 + Buffra objekt i lager %1 Error connecting to the database @@ -4204,6 +4524,10 @@ med att identifiera detaljer utan att zooma in väldigt nära. Fill Fyllning + + Label + Etikett + QgsSpitBase @@ -4253,11 +4577,11 @@ med att identifiera detaljer utan att zooma in väldigt nära. Feature Class - Detaljklass + Objektklass Features - Detaljer + Objekt DB Relation Name @@ -4364,15 +4688,30 @@ med att identifiera detaljer utan att zooma in väldigt nära. QgsUValDialogBase Form1 - Formulär1 + Formulär1 + + + Classification Field: + Klassifikationsfält: + + + New Item + Ny Post + + + + QgsUValMaDialogBase + + Form1 + Formulär1 Classification Field: - Klassifikationsfält: + Klassifikationsfält: New Item - Ny Post + Ny Post @@ -4422,15 +4761,15 @@ med att identifiera detaljer utan att zooma in väldigt nära. QgsVectorLayerProperties single symbol - Enstaka symbol + Enstaka symbol graduated symbol - graderad symbol + graderad symbol continuous color - kontinuerlig färg + kontinuerlig färg diff --git a/i18n/qgis_zh_CN.ts b/i18n/qgis_zh_CN.ts index 2cf0c697beb2..5f8f254de177 100644 --- a/i18n/qgis_zh_CN.ts +++ b/i18n/qgis_zh_CN.ts @@ -129,19 +129,6 @@ GPS Tools - - Load GPX or LOC - - - - <html><head><meta name="qrichtext" content="1" /></head><body style="font-size:12pt;font-family:Arial"> -<p style="margin-top:16px"><span style="font-size:17pt;font-weight:600">Description</span></p> -<p>GPX is the <a href="http://www.topografix.com/gpx.asp">GPS eXchange file format</a>, which is used to store information about waypoints, routes, and tracks. LOC is the <a href="http://www.geocaching.com">geocaching.com</a> waypoint format.</p> -<p>Select a GPX or LOC file and then select the feature types that you want to load.</p> -</body></html> - - - File: @@ -389,21 +376,6 @@ have GPSBabel installed where QGIS can find it, this tool will not work.</p&g <html><head><meta name="qrichtext" content="1" /></head><body style="font-size:12pt;font-family:Arial"> <p style="margin-top:16px"><span style="font-size:17pt;font-weight:600">Description</span></p> -<p>QGIS can only load GPX and LOC files by itself, but many other formats -can be converted to GPX using GPSBabel (<a href="http://gpsbabel.sf.net"> -http://gpsbabel.sf.net</a>). This requires that you have GPSBabel installed where -QGIS can find it.</p> -<p>Select a GPS file format and the file that you want to import, the feature type -that you want to use, a GPX filename that you want to save the converted file as, -and a name for the new layer. All file formats can not store waypoints, routes, and -tracks, so some feature types may be disabled for some file formats.</p> -</body></html> - - - - - <html><head><meta name="qrichtext" content="1" /></head><body style="font-size:12pt;font-family:Arial"> -<p style="margin-top:16px"><span style="font-size:17pt;font-weight:600">Description</span></p> <p>This tool will help you download data from a GPS device. Choose your protocol, the device your GPS is connected to, the feature type you want to download, a name for your new layer, and the GPX file where @@ -419,6 +391,34 @@ don't have GPSBabel installed where QGIS can find it, this tool will not wo Automatically snap to round number on resize + + Load GPX file + + + + <html><head><meta name="qrichtext" content="1" /></head><body style="font-size:12pt;font-family:Arial"> +<p style="margin-top:16px"><span style="font-size:17pt;font-weight:600">Description</span></p> +<p>GPX is the <a href="http://www.topografix.com/gpx.asp">GPS eXchange file format</a>, which is used to store information about waypoints, routes, and tracks.</p> +<p>Select a GPX file and then select the feature types that you want to load.</p> +</body></html> + + + + + <html><head><meta name="qrichtext" content="1" /></head><body style="font-size:12pt;font-family:Arial"> +<p style="margin-top:16px"><span style="font-size:17pt;font-weight:600">Description</span></p> +<p>QGIS can only load GPX files by itself, but many other formats +can be converted to GPX using GPSBabel (<a href="http://gpsbabel.sf.net"> +http://gpsbabel.sf.net</a>). This requires that you have GPSBabel installed where +QGIS can find it.</p> +<p>Select a GPS file format and the file that you want to import, the feature type +that you want to use, a GPX filename that you want to save the converted file as, +and a name for the new layer. All file formats can not store waypoints, routes, and +tracks, so some feature types may be disabled for some file formats.</p> +</body></html> + + + QFileDialog @@ -430,6 +430,10 @@ don't have GPSBabel installed where QGIS can find it, this tool will not wo Save file dialog + + Open an OGR Supported Data Source + + QObject @@ -513,14 +517,6 @@ don't have GPSBabel installed where QGIS can find it, this tool will not wo (no PostgreSQL support) - - Web Page: http://qgis.org - - - - Sourceforge Project Page: http://sourceforge.net/projects/qgis - - Version @@ -725,6 +721,18 @@ don't have GPSBabel installed where QGIS can find it, this tool will not wo To delete features, you must select a vector layer in the legend + + QGIS ready + + + + Quantum GIS is licensed under the GNU General Public License + + + + http://www.gnu.org/licenses + + QgisAppBase @@ -1264,43 +1272,43 @@ don't have GPSBabel installed where QGIS can find it, this tool will not wo Map Edit Tools - - - QgsAbout - About Quantum GIS + Show all layers - Ok + Add to overview - About + Capture points - Version + Plugins Toolbar + + + QgsAbout - Quantum GIS (qgis) + About Quantum GIS - What's New + Ok - License + About - http://www.gnu.org/licenses + Version - Quantum GIS is licensed under the GNU General Public License + What's New @@ -1361,7 +1369,28 @@ don't have GPSBabel installed where QGIS can find it, this tool will not wo Plugins - 插件 + 插件 + + + <h2>Quantum GIS (qgis)</h2> + + + + <p align="center">Quantum GIS is licensed under the GNU General Public License<p> +<p align="center">http://www.gnu.org/licenses</p> + + + + QGIS Home Page + QGIS主页 + + + Subscribe to the QGIS-User mailing list + + + + Providers + @@ -1829,6 +1858,10 @@ don't have GPSBabel installed where QGIS can find it, this tool will not wo Unique Value + + Unique Value Marker + + QgsDlgVectorLayerPropertiesBase @@ -1924,10 +1957,6 @@ don't have GPSBabel installed where QGIS can find it, this tool will not wo Lower left - - Display/label field - - Labels @@ -2001,43 +2030,6 @@ Factor QgsGraSyExtensionWidget - - Lower - - - - Upper - - - - Label - - - - Outline -Color - - - - Outline -Style - - - - Outline -Width - - - - Fill -Color - - - - Fill -Pattern - - QgsGrassAttributesBase @@ -2393,6 +2385,228 @@ Pattern + + QgsLUDialogBase + + Enter class bounds + + + + Lower value + + + + - + + + + OK + + + + Cancel + + + + Upper value + + + + + QgsLabelDialogBase + + Form1 + + + + Source: + + + + Field containing label: + + + + Default label: + + + + Preview: + + + + QGIS Rocks! + + + + Default Style + + + + Font Style + + + + Font + + + + Font size units are in ... + + + + Points + + + + Map units + + + + % + + + + Transparency: + + + + Colour + + + + Position + + + + X Offset (pts): + + + + Y Offset (pts): + + + + Offset units are in ... + + + + Buffer Settings + + + + Buffer Labels? + + + + Size: + + + + Buffer size is in ... + + + + Size is in map units + + + + Size is in points + + + + Alignment + + + + Above + + + + Over + + + + Left + + + + Below + + + + Right + + + + Above Right + + + + Below Right + + + + Above Left + + + + Below Left + + + + Angle (deg): + + + + ° + + + + Use best judgement when labels collide + + + + Data Defined Style + + + + &Font family: + + + + &Italic: + + + + &Underline: + + + + &Bold: + + + + &Size: + + + + X Coordinate: + + + + Y Coordinate: + + + + Placement: + + + + &Colour: + + + QgsLegendItemBase @@ -3528,6 +3742,10 @@ identifying features without zooming in very close. Pattern + + Label + + QgsSpitBase @@ -3675,6 +3893,21 @@ identifying features without zooming in very close. + + QgsUValMaDialogBase + + Form1 + + + + Classification Field: + + + + New Item + + + QgsVectorLayer @@ -3716,18 +3949,6 @@ identifying features without zooming in very close. QgsVectorLayerProperties - - single symbol - - - - graduated symbol - - - - continuous color - - QgsVectorLayerPropertiesBase diff --git a/plugins/copyright_label/plugin.cpp b/plugins/copyright_label/plugin.cpp index a36bda118410..28fcd194df56 100644 --- a/plugins/copyright_label/plugin.cpp +++ b/plugins/copyright_label/plugin.cpp @@ -24,7 +24,6 @@ email : tim@linfiniti.com #include #include -#include #include "plugin.h" diff --git a/plugins/copyright_label/plugin.h b/plugins/copyright_label/plugin.h index c071b9f7878d..3d399a5da992 100644 --- a/plugins/copyright_label/plugin.h +++ b/plugins/copyright_label/plugin.h @@ -83,8 +83,6 @@ class Plugin:public QObject, public QgisPlugin int pluginType; //! Id of the plugin's menu. Used for unloading int menuIdInt; - //! Pointer to our toolbar - QToolBar *toolBarPointer; //! Pointer to our menu QMenuBar *menuBarPointer; //! Pionter to QGIS main application object diff --git a/plugins/delimited_text/qgsdelimitedtextplugin.h b/plugins/delimited_text/qgsdelimitedtextplugin.h index a52ea0a7d948..6a7c9b7be1d1 100644 --- a/plugins/delimited_text/qgsdelimitedtextplugin.h +++ b/plugins/delimited_text/qgsdelimitedtextplugin.h @@ -82,8 +82,6 @@ class QgsDelimitedTextPlugin:public QObject, public QgisPlugin int pluginType; //! Id of the plugin's menu. Used for unloading int menuIdInt; - //! Pointer to our toolbar - QToolBar *toolBarPointer; //! Pointer to our menu QMenuBar *menuBarPointer; //! Pionter to QGIS main application object diff --git a/plugins/geoprocessing/qgspggeoprocessing.h b/plugins/geoprocessing/qgspggeoprocessing.h index 3d859de8e00b..95204b5c6e00 100644 --- a/plugins/geoprocessing/qgspggeoprocessing.h +++ b/plugins/geoprocessing/qgspggeoprocessing.h @@ -81,8 +81,6 @@ class QgsPgGeoprocessing:public QObject, public QgisPlugin //! Id of the plugin's menu. Used for unloading int menuId; - //! Pointer to our toolbar - QToolBar *toolBar; //! Pointer to our menu QMenuBar *menu; //! Pionter to QGIS main application object diff --git a/plugins/gps_importer/plugin.cpp b/plugins/gps_importer/plugin.cpp index d39bf4f3e4fc..54261e28f36e 100644 --- a/plugins/gps_importer/plugin.cpp +++ b/plugins/gps_importer/plugin.cpp @@ -25,7 +25,6 @@ email : tim@linfiniti.com #include "../../src/qgsmaplayerregistry.h" #include "../../src/qgsmaplayer.h" #include "../../src/qgsvectorlayer.h" -#include "../../src/qgsrasterlayer.h" #include "../../src/qgsdataprovider.h" #include "plugin.h" diff --git a/plugins/gps_importer/plugin.h b/plugins/gps_importer/plugin.h index 17adf4f0f782..7c7e76b6d017 100644 --- a/plugins/gps_importer/plugin.h +++ b/plugins/gps_importer/plugin.h @@ -104,8 +104,6 @@ class Plugin:public QObject, public QgisPlugin int pluginType; //! Id of the plugin's menu. Used for unloading int menuIdInt; - //! Pointer to our toolbar - QToolBar *toolBarPointer; //! Pointer to our menu QMenuBar *menuBarPointer; //! Pionter to QGIS main application object diff --git a/plugins/grass/Makefile.am b/plugins/grass/Makefile.am index 2669ad9104c3..b911294fd6b3 100644 --- a/plugins/grass/Makefile.am +++ b/plugins/grass/Makefile.am @@ -48,8 +48,7 @@ plugin_UIC = qgsgrassselectbase.ui \ qgsgrasseditbase.ui.h \ qgsgrassattributesbase.ui \ qgsgrassattributesbase.ui.h \ - qgsgrassaregionbase.ui \ - qgsgrassaregionbase.ui.h + qgsgrassregionbase.ui grassplugin_la_SOURCES = qgsgrassplugin.cpp \ qgsgrassplugin.h \ diff --git a/plugins/grid_maker/plugin.cpp b/plugins/grid_maker/plugin.cpp index db33d090ed44..08214a1f734e 100644 --- a/plugins/grid_maker/plugin.cpp +++ b/plugins/grid_maker/plugin.cpp @@ -24,7 +24,6 @@ email : tim@linfiniti.com #include "../../src/qgisapp.h" #include "../../src/qgsmaplayer.h" -#include "../../src/qgsrasterlayer.h" #include "plugin.h" diff --git a/plugins/grid_maker/plugin.h b/plugins/grid_maker/plugin.h index b91dd1adb63f..84788423bef6 100644 --- a/plugins/grid_maker/plugin.h +++ b/plugins/grid_maker/plugin.h @@ -83,8 +83,6 @@ class Plugin:public QObject, public QgisPlugin int pluginType; //! Id of the plugin's menu. Used for unloading int menuIdInt; - //! Pointer to our toolbar - QToolBar *toolBarPointer; //! Pointer to our menu QMenuBar *menuBarPointer; //! Pionter to QGIS main application object diff --git a/plugins/north_arrow/plugin.cpp b/plugins/north_arrow/plugin.cpp index 84748d8506a6..2946a6e54830 100644 --- a/plugins/north_arrow/plugin.cpp +++ b/plugins/north_arrow/plugin.cpp @@ -24,7 +24,6 @@ email : tim@linfiniti.com #include #include -#include #include "plugin.h" diff --git a/plugins/scale_bar/plugin.cpp b/plugins/scale_bar/plugin.cpp index be46cf29d0cc..25057ab36465 100644 --- a/plugins/scale_bar/plugin.cpp +++ b/plugins/scale_bar/plugin.cpp @@ -29,7 +29,6 @@ email : sbr00pwb@users.sourceforge.net #include #include -#include #include "plugin.h" diff --git a/src/qgisapp.cpp b/src/qgisapp.cpp index 40c0fb2ba62f..e738ccc072f8 100644 --- a/src/qgisapp.cpp +++ b/src/qgisapp.cpp @@ -266,7 +266,7 @@ QgisApp::QgisApp(QWidget * parent, const char *name, WFlags fl):QgisAppBase(pare // Splash screen global is declared in qgisapp.h header // QSettings settings; - bool myHideSplashFlag = false; + myHideSplashFlag = false; myHideSplashFlag = settings.readBoolEntry("/qgis/hideSplash"); if (!myHideSplashFlag) @@ -274,6 +274,10 @@ QgisApp::QgisApp(QWidget * parent, const char *name, WFlags fl):QgisAppBase(pare gSplashScreen = new SplashScreen(); //this is supposed to be instantiated in main.cpp but we get segfaults... gSplashScreen->setStatus(tr("Loading QGIS...")); qApp->processEvents(); + // Set up the timer so the splash screen stays up for + // another 5 seconds, then kill it. + QTimer::singleShot( 5000, this, SLOT(killSplashScreen()) ); + // gSplashScreen->setStatus(tr("QGIS ready")); } // register all GDAL and OGR plug-ins @@ -453,6 +457,10 @@ QgisApp::QgisApp(QWidget * parent, const char *name, WFlags fl):QgisAppBase(pare connect(mapLayerRegistry, SIGNAL(layerWillBeRemoved(QString)), mOverviewCanvas, SLOT(remove(QString))); + if (! myHideSplashFlag) + { + gSplashScreen->setStatus(tr("Setting theme...")); + } // get the users theme preference from the settings QString themeName = settings.readEntry("/qgis/theme","default"); @@ -460,16 +468,13 @@ QgisApp::QgisApp(QWidget * parent, const char *name, WFlags fl):QgisAppBase(pare setTheme(themeName); setupToolbarPopups(themeName); + if (! myHideSplashFlag) + { + gSplashScreen->setStatus(tr("QGIS Ready")); + } // set the focus to the map canvase mMapCanvas->setFocus(); - if (!myHideSplashFlag) - { - // Set up the timer so the splash screen stays up for - // another 5 seconds, then kill it. - QTimer::singleShot( 5000, this, SLOT(killSplashScreen()) ); - gSplashScreen->setStatus(tr("QGIS ready")); - } } // QgisApp ctor @@ -493,27 +498,28 @@ void QgisApp::about() #endif #ifdef WIN32 // special version stuff for windows (if required) - versionString += "\nThis is a Windows preview release - not for production use"; +// versionString += "\nThis is a Windows preview release - not for production use"; #endif abt->setVersion(versionString); - QString urls = tr("Web Page: http://qgis.org") + - "\n" + tr("Sourceforge Project Page: http://sourceforge.net/projects/qgis"); + QString urls = "

" + + tr("Quantum GIS is licensed under the GNU General Public License") + + "

" + + tr("http://www.gnu.org/licenses") + + "

"; abt->setURLs(urls); QString watsNew = "" + tr("Version") + " "; watsNew += QGis::qgisVersion; watsNew += "

New features

"; watsNew += "
    " - "
  • Map Overview
    • " - "
  • Preliminary printing support
    • " - "
  • Menu cleanups
    • " - "
  • User interface improvements
    • " - "
  • Icon Themes (only default theme currently available)
    • " - "
  • Capture point to clipboard
    • " - "
" - "

Core Plugins

" - "
    " - "
  • Scale bar plugin
    • " - "
  • Improved GPS tools plugin
    • " + "
  • 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" "
" ""; @@ -773,6 +779,7 @@ static void openFilesRememberingFilter_(QString const &filterName, QString const // allow for selection of more than one file openFileDialog->setMode(QFileDialog::ExistingFiles); + openFileDialog->setCaption(QFileDialog::tr("Open an OGR Supported Data Source")); if (haveLastUsedFilter) // set the filter to the last one used { @@ -3316,6 +3323,10 @@ bool QgisApp::addRasterLayer(QStringList const &theFileNameQStringList) void QgisApp::killSplashScreen() { + // Set the hide flag to true in case someone + // tries to set the status after we have killed the splash + // screen + myHideSplashFlag = true; gSplashScreen->finish(this); delete gSplashScreen; } diff --git a/src/qgisapp.h b/src/qgisapp.h index b2264a07ea76..5f7bbb3e8838 100644 --- a/src/qgisapp.h +++ b/src/qgisapp.h @@ -377,6 +377,8 @@ public slots: * before opening/creating a new one or exiting the application */ bool mProjectIsDirtyFlag; + //! Flag to indicate if the splash screen is shown on startup + bool myHideSplashFlag; //! menu map (key is name, value is menu id) std::mapmMenuMapByName; //! menu map (key is menu id, value is name) diff --git a/src/qgislib.pro b/src/qgislib.pro index 1e5a28f4f1e2..b9d4d14d29f4 100644 --- a/src/qgislib.pro +++ b/src/qgislib.pro @@ -4,7 +4,7 @@ INCLUDEPATH += . $(GDAL)\include \ $(POSTGRESQL)\src\interfaces\libpq \ $(POSTGRESQL)\src\include LIBS += $(GDAL)\lib\gdal_i.lib -CONFIG += qt thread +CONFIG += qt thread rtti DLLDESTDIR= ..\..\src\lib\qgis # Input SOURCES += moc_qgisapp.cpp \ @@ -24,7 +24,6 @@ moc_qgsgramadialogbase.cpp \ moc_qgsgramaextensionwidget.cpp \ moc_qgsgrasydialog.cpp \ moc_qgsgrasydialogbase.cpp \ -moc_qgsgrasyextensionwidget.cpp \ moc_qgshelpviewer.cpp \ moc_qgshelpviewerbase.cpp \ moc_qgsidentifyresults.cpp \ @@ -67,6 +66,8 @@ moc_qgsludialogbase.cpp \ moc_qgsludialog.cpp \ moc_qgsvectorlayer.cpp \ moc_splashscreen.cpp \ +moc_qgsuvalmadialog.cpp \ +moc_qgsuvalmadialogbase.cpp \ qgisapp.cpp \ qgisappbase.cpp \ qgisiface.cpp \ @@ -97,7 +98,6 @@ qgsgramadialogbase.cpp \ qgsgramaextensionwidget.cpp \ qgsgrasydialog.cpp \ qgsgrasydialogbase.cpp \ -qgsgrasyextensionwidget.cpp \ qgshelpviewer.cpp \ qgshelpviewerbase.cpp \ qgsidentifyresults.cpp \ @@ -161,4 +161,7 @@ qgsuvaldialogbase.cpp \ qgsvectorfilewriter.cpp \ qgsludialogbase.cpp \ qgsludialog.cpp \ -qgsvectorlayer.cpp +qgsvectorlayer.cpp \ +qgsuvalmadialog.cpp \ +qgsuvalmadialogbase.cpp \ +qgsuvalmarenderer.cpp diff --git a/src/qgsabout.ui b/src/qgsabout.ui index f0384a36c32a..ad2dc3caafbf 100644 --- a/src/qgsabout.ui +++ b/src/qgsabout.ui @@ -1,4 +1,4 @@ - + QgsAbout @@ -79,6 +79,16 @@ tabWidget + + + 235 + 235 + 235 + + + + ParentOrigin + Widget2 @@ -90,29 +100,18 @@ unnamed - - - lblVersion - - - Version - - - AlignCenter - - TextLabel4 - Quantum GIS (qgis) + <h2>Quantum GIS (qgis)</h2> - AlignCenter + WordBreak|AlignCenter - + lblUrls @@ -127,13 +126,13 @@ - 192 - 192 - 192 + 255 + 255 + 255 - WidgetOrigin + WindowOrigin PopupPanel @@ -141,10 +140,50 @@ Sunken + + <p align="center">Quantum GIS is licensed under the GNU General Public License<p> +<p align="center">http://www.gnu.org/licenses</p> + + + WidgetWidth + true + + + btnQgisHome + + + QGIS Home Page + + + false + + + + + btnQgisUser + + + Subscribe to the QGIS-User mailing list + + + false + + + + + lblVersion + + + Version + + + AlignCenter + + @@ -174,89 +213,6 @@ - - - tabLicense - - - License - - - - unnamed - - - 11 - - - 6 - - - - TextLabel2 - - - - - - - http://www.gnu.org/licenses - - - AlignCenter - - - - - TextLabel1 - - - - - - - Quantum GIS is licensed under the GNU General Public License - - - AlignCenter - - - - - Spacer2 - - - Vertical - - - Expanding - - - - 0 - 40 - - - - - - Spacer3 - - - Vertical - - - Expanding - - - - 0 - 16 - - - - - tab @@ -710,6 +666,18 @@ widgetStack1 raiseWidget(int) + + btnQgisUser + clicked() + QgsAbout + qgisUserMailingList() + + + btnQgisHome + clicked() + QgsAbout + qgisHomePage() + qgsabout.ui.h @@ -720,6 +688,9 @@ setWhatsNew( QString txt ) setPluginInfo( QString txt ) showAuthorPic( QListBoxItem * ) + qgisUserMailingList() + qgisHomePage() + openUrl( QString url ) diff --git a/src/qgsabout.ui.h b/src/qgsabout.ui.h index 0d28e2292eba..7514b9807521 100644 --- a/src/qgsabout.ui.h +++ b/src/qgsabout.ui.h @@ -5,6 +5,9 @@ ** update this file, preserving your code. Create an init() slot in place of ** a constructor, and a destroy() slot in place of a destructor. *****************************************************************************/ +#include +#include +#include void QgsAbout::setVersion(QString v){ lblVersion->setText(v) ; } @@ -23,3 +26,56 @@ void QgsAbout::showAuthorPic( QListBoxItem * ) { } + + +void QgsAbout::qgisUserMailingList() +{ + // find a browser + QString url = "http://lists.sourceforge.net/lists/listinfo/qgis-user"; + openUrl(url); +} +void QgsAbout::qgisHomePage() +{ + openUrl("http://qgis.org"); +} +void QgsAbout::openUrl(QString url) +{ + QSettings settings; + QString browser = settings.readEntry("/qgis/browser"); + if (browser.length() == 0) + { + // ask user for browser and use it + bool ok; + QString text = QInputDialog::getText("QGIS Browser Selection", + "Enter the name of a web browser to use (eg. konqueror).\nEnter the full path if the browser is not in your PATH.\nYou can change this option later by selection Options from the Tools menu.", + QLineEdit::Normal, + QString::null, &ok, this); + if (ok && !text.isEmpty()) + { + // user entered something and pressed OK + browser = text; + // save the setting + settings.writeEntry("/qgis/browser", browser); + } else + { + browser = ""; + } + + } + if (browser.length() > 0) + { + // find the installed location of the help files + // open index.html using browser +//XXX for debug on win32 QMessageBox::information(this,"Help opening...", browser + " - " + url); + QProcess *helpProcess = new QProcess(this); + helpProcess->addArgument(browser); + helpProcess->addArgument(url); + helpProcess->start(); + } + /* mHelpViewer = new QgsHelpViewer(this,"helpviewer",false); + mHelpViewer->showContent(mAppDir +"/share/doc","index.html"); + mHelpViewer->show(); */ + +} + + diff --git a/src/qgsdlgvectorlayerproperties.cpp b/src/qgsdlgvectorlayerproperties.cpp index 9716e03d5bb6..0dd877ad0a44 100644 --- a/src/qgsdlgvectorlayerproperties.cpp +++ b/src/qgsdlgvectorlayerproperties.cpp @@ -25,6 +25,7 @@ #include #include #include +#include #include "qgis.h" #include "qgsrect.h" @@ -143,7 +144,23 @@ void QgsDlgVectorLayerProperties::alterLayerDialog(const QString & string) bufferRenderer = new QgsContinuousColRenderer(); } else if (string == tr("Single Marker")) { + // On win32 we can't support svg without qt commercial + // so we beg a bit (i know its tacky to repeat this for + // each case, but i'm in a hurry to get the 0.5 release + // out - besides this will go away when the money roles in...) +#ifdef WIN32 + QMessageBox::warning(this, "No SVG Support", + "In order for QGIS to support SVG markers under Windows, we need to build QGIS\n" + " using the commercial version of Qt. As this project is developed by volunteers\n" + " donating their time, we don't have the financial resources to purchase Qt\n" + " commercial. If you would like to help us, please visit the QGIS sourceforge\n" + " home page to make a donation"); + // use the single symbol renderer + bufferRenderer = new QgsSingleSymRenderer(); + legendtypecombobox->setCurrentText("Single Symbol"); +#else bufferRenderer = new QgsSiMaRenderer(); +#endif } else if (string == tr("Graduated Marker")) { bufferRenderer = new QgsGraduatedMaRenderer(); @@ -152,7 +169,19 @@ void QgsDlgVectorLayerProperties::alterLayerDialog(const QString & string) bufferRenderer = new QgsUniqueValRenderer(); } else if(string == tr("Unique Value Marker")) { +#ifdef WIN32 + QMessageBox::warning(this, "No SVG Support", + "In order for QGIS to support SVG markers under Windows, we need to build QGIS\n" + " using the commercial version of Qt. As this project is developed by volunteers\n" + " donating their time, we don't have the financial resources to purchase Qt\n" + " commercial. If you would like to help us, please visit the QGIS sourceforge\n" + " home page to make a donation"); + // use the single symbol renderer + bufferRenderer = new QgsSingleSymRenderer(); + legendtypecombobox->setCurrentText("Single Symbol"); +#else bufferRenderer = new QgsUValMaRenderer(); +#endif } bufferRenderer->initializeSymbology(layer, this); diff --git a/src/qgsgraduatedsymrenderer.cpp b/src/qgsgraduatedsymrenderer.cpp index 7fbddaaa5c48..5888027a0751 100644 --- a/src/qgsgraduatedsymrenderer.cpp +++ b/src/qgsgraduatedsymrenderer.cpp @@ -188,7 +188,7 @@ void QgsGraduatedSymRenderer::readXML(const QDomNode& rnode, QgsVectorLayer& vl) void QgsGraduatedSymRenderer::writeXML(std::ofstream& xml) { xml << "\t\t\n"; - xml << "\t\t\t" << QString::number(this->classificationField()) + + xml << "\t\t\t" << QString::number(this->classificationField()).ascii() << "\n"; for (std::list < QgsRangeRenderItem * >::iterator it = this->items().begin(); it != this->items().end(); ++it) diff --git a/src/qgsmapcanvas.cpp b/src/qgsmapcanvas.cpp index 47d8ee5d1945..70437b8e458b 100644 --- a/src/qgsmapcanvas.cpp +++ b/src/qgsmapcanvas.cpp @@ -486,7 +486,7 @@ void QgsMapCanvas::render(QPaintDevice * theQPaintDevice) // std::cout << "MAP LAYER COUNT: " << layers.size() << std::endl; while (li != mCanvasProperties->zOrder.end()) { - emit setProgress(myRenderCounter++,mCanvasProperties->zOrder.size()*2); + emit setProgress(myRenderCounter++,mCanvasProperties->zOrder.size()); QgsMapLayer *ml = mCanvasProperties->layers[*li]; if (ml) @@ -512,7 +512,7 @@ void QgsMapCanvas::render(QPaintDevice * theQPaintDevice) // std::cout << "MAP LAYER COUNT: " << layers.size() << std::endl; while (li != mCanvasProperties->zOrder.end()) { - emit setProgress((myRenderCounter++)*2,mCanvasProperties->zOrder.size()*2); + emit setProgress((myRenderCounter++),mCanvasProperties->zOrder.size()); QgsMapLayer *ml = mCanvasProperties->layers[*li]; if (ml) @@ -530,8 +530,7 @@ void QgsMapCanvas::render(QPaintDevice * theQPaintDevice) } //make verys sure progress bar arrives at 100%! - emit setProgress(1,1); - + emit setProgress(1,1); #ifdef QGISDEBUG std::cout << "Done rendering map labels...emitting renderComplete(paint)\n"; #endif diff --git a/src/qgsrasterlayer.cpp b/src/qgsrasterlayer.cpp index a22ba1a02242..4eaccf3e3700 100644 --- a/src/qgsrasterlayer.cpp +++ b/src/qgsrasterlayer.cpp @@ -84,7 +84,7 @@ email : tim at linfiniti.com #include "qgsrect.h" #include "qgisapp.h" #include "qgsrasterlayerproperties.h" -#include "gdal_priv.h" +#include ////////////////////////////////////////////////////////// // @@ -1766,10 +1766,6 @@ const bool QgsRasterLayer::hasStats(int theBandNoInt) Note that this is a cpu intensive /slow task!*/ const RasterBandStats QgsRasterLayer::getRasterBandStats(int theBandNoInt) { - emit setStatus(QString("Retrieving stats for ")+layerName); -#ifdef QGISDEBUG - std::cout << "QgsRasterLayer::retrieve stats for band " << theBandNoInt << std::endl; -#endif //check if we have received a valid band number if ((gdalDataset->GetRasterCount() < theBandNoInt) && rasterLayerType != PALETTE) { @@ -1793,6 +1789,14 @@ const RasterBandStats QgsRasterLayer::getRasterBandStats(int theBandNoInt) { return myRasterBandStats; } + //onyl print message if we are actually gathering the stats + emit setStatus(QString("Retrieving stats for ")+layerName); + qApp->processEvents(); +#ifdef QGISDEBUG + std::cout << "QgsRasterLayer::retrieve stats for band " << theBandNoInt << std::endl; +#endif + + GDALRasterBand *myGdalBand = gdalDataset->GetRasterBand(theBandNoInt); QString myColorInterpretation = GDALGetColorInterpretationName(myGdalBand->GetColorInterpretation()); @@ -2954,7 +2958,6 @@ bool QgsRasterLayer::isEditable() { return false; } - void QgsRasterLayer::readColorTable ( GDALRasterBand *gdalBand, QgsColorTable *theColorTable ) { #ifdef QGISDEBUG @@ -3068,3 +3071,4 @@ double QgsRasterLayer::readValue ( void *data, GDALDataType type, int index ) } return 0.0; } + diff --git a/src/qgsrasterlayer.h b/src/qgsrasterlayer.h index 5b8f662fe01f..96a612a51628 100644 --- a/src/qgsrasterlayer.h +++ b/src/qgsrasterlayer.h @@ -14,7 +14,7 @@ * (at your option) any later version. * * * ***************************************************************************/ -/* $Id */ +/* $Id$ */ /** \file qgsrasterlayer.h * \brief This class provides qgis with the ability to render raster datasets @@ -174,8 +174,7 @@ The [type] part of the variable should be the type class of the variable written #include "qgscolortable.h" #include "qgsrasterlayer.h" -#include "gdal_priv.h" - +#include // // Forward declarations // diff --git a/src/qgssvgcache.cpp b/src/qgssvgcache.cpp index d01a7a73956a..5d950003b3f8 100644 --- a/src/qgssvgcache.cpp +++ b/src/qgssvgcache.cpp @@ -22,6 +22,7 @@ #include #include #include +#include #include "qgssvgcache.h" @@ -45,13 +46,13 @@ QPixmap QgsSVGCache::getPixmap(QString filename, double scaleFactor) { // if we already have the pixmap, return it if (iter != pixmapMap.end()) { - std::cerr<<"SVGCACHE: "<second; } // if not, try to load it - std::cerr<<"SVGCACHE: loading "<\n"; - xml << "\t\t\t" << QString::number(this->classificationField()) + - "\n"; + xml << "\t\t\t" << QString::number(this->classificationField()).ascii() << "\n"; for(std::map::iterator it=mEntries.begin();it!=mEntries.end();++it) { xml << "\t\t\t\n"; - xml << "\t\t\t\t" << it->first << "\n"; + xml << "\t\t\t\t" << QString(it->first).ascii() << "\n"; xml << "\t\t\t\t\n"; QgsSymbol *symbol = (it->second)->getSymbol(); xml << "\t\t\t\t\tpen().color().red()).ascii() << "\" green=\"" << diff --git a/src/qgsvectorlayer.cpp b/src/qgsvectorlayer.cpp index 6341cfa9be66..dafe53000a92 100644 --- a/src/qgsvectorlayer.cpp +++ b/src/qgsvectorlayer.cpp @@ -84,7 +84,7 @@ QgsVectorLayer::QgsVectorLayer(QString vectorLayerPath, QString baseName, QStrin const char *cOgrLib = (const char *) ogrlib; #ifdef TESTPROVIDERLIB // test code to help debug provider loading problems -// void *handle = dlopen(cOgrLib, RTLD_LAZY); + // void *handle = dlopen(cOgrLib, RTLD_LAZY); void *handle = dlopen(cOgrLib, RTLD_LAZY | RTLD_GLOBAL); if (!handle) { @@ -160,10 +160,10 @@ QgsVectorLayer::QgsVectorLayer(QString vectorLayerPath, QString baseName, QStrin // upper case the first letter of the layer name layerTitle = layerTitle.left(1).upper() + layerTitle.mid(1); setLayerName(layerTitle); - - // label + + // label mLabel = new QgsLabel ( dataProvider->fields() ); - mLabelOn = false; + mLabelOn = false; } } else { @@ -180,7 +180,7 @@ QgsVectorLayer::QgsVectorLayer(QString vectorLayerPath, QString baseName, QStrin std::cout << "Failed to load " << "../providers/libproviders.so" << "\n"; #endif } - + //TODO - fix selection code that formerly used // a boolean vector and set every entry to false @@ -189,7 +189,7 @@ QgsVectorLayer::QgsVectorLayer(QString vectorLayerPath, QString baseName, QStrin // Default for the popup menu popMenu = 0; - + // Get the update threshold from user settings. We // do this only on construction to avoid the penality of // fetching this each time the layer is drawn. If the user @@ -253,67 +253,67 @@ void QgsVectorLayer::setDisplayField(QString fldName) // find the index for this field fieldIndex = fldName; /* - for(int i = 0; i < fields.size(); i++) - { - if(QString(fields[i].name()) == fldName) - { - fieldIndex = i; - break; - } - } - */ + for(int i = 0; i < fields.size(); i++) + { + if(QString(fields[i].name()) == fldName) + { + fieldIndex = i; + break; + } + } + */ }else{ - int j = 0; - for (int j = 0; j < fields.size(); j++) - { + int j = 0; + for (int j = 0; j < fields.size(); j++) + { - QString fldName = fields[j].name(); + QString fldName = fields[j].name(); #ifdef QGISDEBUG - std::cerr << "Checking field " << fldName << std::endl; + std::cerr << "Checking field " << fldName << std::endl; #endif - // Check the fields and keep the first one that matches. - // We assume that the user has organized the data with the - // more "interesting" field names first. As such, name should - // be selected before oldname, othername, etc. - if (fldName.find("name", false) > -1) - { - if(idxName.isEmpty()) + // Check the fields and keep the first one that matches. + // We assume that the user has organized the data with the + // more "interesting" field names first. As such, name should + // be selected before oldname, othername, etc. + if (fldName.find("name", false) > -1) { - idxName = fldName; + if(idxName.isEmpty()) + { + idxName = fldName; + } } - } - if (fldName.find("descrip", false) > -1) - { - if(idxName.isEmpty()) + if (fldName.find("descrip", false) > -1) { - idxName = fldName; + if(idxName.isEmpty()) + { + idxName = fldName; + } } - } - if (fldName.find("id", false) > -1) - { - if(idxId.isEmpty()) + if (fldName.find("id", false) > -1) { - idxId = fldName; + if(idxId.isEmpty()) + { + idxId = fldName; + } } } - } - //if there were no fields in the dbf just return - otherwise qgis segfaults! - if (fields.size() == 0) return; + //if there were no fields in the dbf just return - otherwise qgis segfaults! + if (fields.size() == 0) return; - if (idxName.length() > 0) - { - fieldIndex = idxName; - } else - { - if (idxId.length() > 0) + if (idxName.length() > 0) { - fieldIndex = idxId; + fieldIndex = idxName; } else { - fieldIndex = fields[0].name(); + if (idxId.length() > 0) + { + fieldIndex = idxId; + } else + { + fieldIndex = fields[0].name(); + } } - } // set this to be the label field as well setLabelField(fieldIndex); @@ -341,7 +341,7 @@ void QgsVectorLayer::drawLabels(QPainter * p, QgsRect * viewExtent, QgsCoordinat QgsFeature *fet; std::list attributes=m_renderer->classificationAttributes(); if ( mLabelOn ) { // Add fields required for labels - mLabel->addRequiredFields ( &attributes ); + mLabel->addRequiredFields ( &attributes ); } else { @@ -350,23 +350,23 @@ void QgsVectorLayer::drawLabels(QPainter * p, QgsRect * viewExtent, QgsCoordinat //main render loop while((fet = dataProvider->getNextFeature(attributes))) { - // Render label - if ( mLabelOn && (fet != 0)) { - bool sel=selected.find(fet->featureId()) != selected.end(); - mLabel->renderLabel ( p, viewExtent, cXf, dst, fet, sel); - } - delete fet; - featureCount++; + // Render label + if ( mLabelOn && (fet != 0)) { + bool sel=selected.find(fet->featureId()) != selected.end(); + mLabel->renderLabel ( p, viewExtent, cXf, dst, fet, sel); } - + delete fet; + featureCount++; + } + #ifdef QGISDEBUG - std::cerr << "Total features processed is " << featureCount << std::endl; + std::cerr << "Total features processed is " << featureCount << std::endl; #endif - qApp->processEvents(); - + qApp->processEvents(); + } } - + void QgsVectorLayer::draw(QPainter * p, QgsRect * viewExtent, QgsCoordinateTransform * cXf, QPaintDevice* dst) { if ( /*1 == 1 */ m_renderer) @@ -414,9 +414,9 @@ void QgsVectorLayer::draw(QPainter * p, QgsRect * viewExtent, QgsCoordinateTrans QgsPoint pt; QPointArray *pa; int wkbType; - + std::list attributes=m_renderer->classificationAttributes(); - + while((fet = dataProvider->getNextFeature(attributes))) { // If update threshold is greater than 0, check to see if @@ -437,8 +437,8 @@ void QgsVectorLayer::draw(QPainter * p, QgsRect * viewExtent, QgsCoordinateTrans #endif } else { - bool sel=selected.find(fet->featureId()) != selected.end(); - m_renderer->renderFeature(p, fet, &marker, &markerScaleFactor, sel); + bool sel=selected.find(fet->featureId()) != selected.end(); + m_renderer->renderFeature(p, fet, &marker, &markerScaleFactor, sel); // get the wkb representation feature = fet->getGeometry(); @@ -562,15 +562,15 @@ void QgsVectorLayer::draw(QPainter * p, QgsRect * viewExtent, QgsCoordinateTrans x = (double *) ptr; ptr += sizeof(double); y = (double *) ptr; -#ifdef QGISDEBUG - std::cout << "Transforming " << *x << "," << *y << " to "; +#ifdef QGISX11DEBUG + std::cout << "Transforming " << *x << "," << *y << " to "; #endif ptr += sizeof(double); pt.setX(*x); pt.setY(*y); cXf->transform(&pt); -#ifdef QGISDEBUG - std::cout << pt.xToInt() << "," << pt.yToInt() << std::endl; +#ifdef QGISX11DEBUG + std::cout << pt.xToInt() << "," << pt.yToInt() << std::endl; #endif pa->setPoint(pdx++, pt.xToInt(), pt.yToInt()); } @@ -625,13 +625,13 @@ void QgsVectorLayer::draw(QPainter * p, QgsRect * viewExtent, QgsCoordinateTrans ptr += sizeof(double); y = (double *) ptr; ptr += sizeof(double); -#ifdef QGISDEBUG - std::cout << "Transforming " << *x << "," << *y << " to "; +#ifdef QGISX11DEBUG + std::cout << "Transforming " << *x << "," << *y << " to "; #endif pt.setX(*x); pt.setY(*y); cXf->transform(&pt); -#ifdef QGISDEBUG +#ifdef QGISX11DEBUG std::cout << pt.xToInt() << "," << pt.yToInt() << std::endl; #endif pa->setPoint(jdx, pt.xToInt(), pt.yToInt()); @@ -652,7 +652,7 @@ void QgsVectorLayer::draw(QPainter * p, QgsRect * viewExtent, QgsCoordinateTrans } - delete fet; + delete fet; //std::cout << "deleting feature[]\n"; // std::cout << geom->getGeometryName() << std::endl; @@ -671,8 +671,8 @@ void QgsVectorLayer::draw(QPainter * p, QgsRect * viewExtent, QgsCoordinateTrans #endif } } - - + + int QgsVectorLayer::endian() { char *chkEndian = new char[4]; @@ -888,13 +888,13 @@ QObject:connect(tabledisplay, SIGNAL(deleted()), this, SLOT(invalidateTableDispl { if (m_propertiesDialog) { - m_propertiesDialog->reset(); + m_propertiesDialog->reset(); m_propertiesDialog->raise(); m_propertiesDialog->show(); } else { m_propertiesDialog = new QgsDlgVectorLayerProperties(this); - m_propertiesDialog->reset(); + m_propertiesDialog->reset(); m_propertiesDialog->show(); } } @@ -1299,116 +1299,116 @@ QObject:connect(tabledisplay, SIGNAL(deleted()), this, SLOT(invalidateTableDispl } // QgsVectorLayer::fields() -bool QgsVectorLayer::addFeature(QgsFeature* f) -{ - if(dataProvider) + bool QgsVectorLayer::addFeature(QgsFeature* f) { - int end=endian(); - memcpy(f->getGeometry(),&end,1); - if(dataProvider->addFeature(f)) - { - if (tabledisplay) - { - tabledisplay->close(); - delete tabledisplay; - tabledisplay=0; - } - return true; - } + if(dataProvider) + { + int end=endian(); + memcpy(f->getGeometry(),&end,1); + if(dataProvider->addFeature(f)) + { + if (tabledisplay) + { + tabledisplay->close(); + delete tabledisplay; + tabledisplay=0; + } + return true; + } + } + return false; } - return false; -} -bool QgsVectorLayer::deleteSelectedFeatures() -{ + bool QgsVectorLayer::deleteSelectedFeatures() + { #ifdef QGISDEBUG - qWarning("entering QgsVectorLayer::deleteSelectedFeatures"); + qWarning("entering QgsVectorLayer::deleteSelectedFeatures"); #endif - bool resvalue=true; - for(std::map::iterator it=selected.begin();it!=selected.end();++it) - { - if(it->second==true) - { + bool resvalue=true; + for(std::map::iterator it=selected.begin();it!=selected.end();++it) + { + if(it->second==true) + { #ifdef QGISDEBUG - qWarning("selected feature detected"); -#endif - if(!dataProvider->deleteFeature(it->first)) - { - resvalue=false; - } - } + qWarning("selected feature detected"); +#endif + if(!dataProvider->deleteFeature(it->first)) + { + resvalue=false; + } + } + } + triggerRepaint(); + return resvalue; } - triggerRepaint(); - return resvalue; -} -QgsLabel * QgsVectorLayer::label() -{ - return mLabel; -} - -void QgsVectorLayer::setLabelOn ( bool on ) -{ - mLabelOn = on; -} + QgsLabel * QgsVectorLayer::label() + { + return mLabel; + } -bool QgsVectorLayer::labelOn ( void ) -{ - return mLabelOn; -} + void QgsVectorLayer::setLabelOn ( bool on ) + { + mLabelOn = on; + } -void QgsVectorLayer::startEditing() -{ - if(dataProvider) + bool QgsVectorLayer::labelOn ( void ) { - if(!dataProvider->startEditing()) - { - QMessageBox::information(0,"Start editing failed","Provider cannot be opened for editing",QMessageBox::Ok); - } - else - { - updateItemPixmap(); - } + return mLabelOn; } -} -void QgsVectorLayer::stopEditing() -{ - if(dataProvider) + void QgsVectorLayer::startEditing() { - if(dataProvider->isModified()) - { - //commit or roll back? - int commit=QMessageBox::information(0,"Stop editing","Do you want to save the changes?",QMessageBox::Yes,QMessageBox::No); - if(commit==QMessageBox::Yes) - { - if(!dataProvider->commitChanges()) - { - QMessageBox::information(0,"Error","Could not commit changes",QMessageBox::Ok); - } - } - else if(commit==QMessageBox::No) - { - if(!dataProvider->rollBack()) - { - QMessageBox::information(0,"Error","Problems during roll back",QMessageBox::Ok); - } - } - triggerRepaint(); - } - dataProvider->stopEditing(); - updateItemPixmap(); + if(dataProvider) + { + if(!dataProvider->startEditing()) + { + QMessageBox::information(0,"Start editing failed","Provider cannot be opened for editing",QMessageBox::Ok); + } + else + { + updateItemPixmap(); + } + } } -} -bool QgsVectorLayer::isEditable() -{ - if(dataProvider) + void QgsVectorLayer::stopEditing() { - return dataProvider->isEditable(); + if(dataProvider) + { + if(dataProvider->isModified()) + { + //commit or roll back? + int commit=QMessageBox::information(0,"Stop editing","Do you want to save the changes?",QMessageBox::Yes,QMessageBox::No); + if(commit==QMessageBox::Yes) + { + if(!dataProvider->commitChanges()) + { + QMessageBox::information(0,"Error","Could not commit changes",QMessageBox::Ok); + } + } + else if(commit==QMessageBox::No) + { + if(!dataProvider->rollBack()) + { + QMessageBox::information(0,"Error","Problems during roll back",QMessageBox::Ok); + } + } + triggerRepaint(); + } + dataProvider->stopEditing(); + updateItemPixmap(); + } } - else + + bool QgsVectorLayer::isEditable() { - return false; + if(dataProvider) + { + return dataProvider->isEditable(); + } + else + { + return false; + } } -} diff --git a/src/src.pro b/src/src.pro index 552d637a7d2b..9155609f2f2f 100644 --- a/src/src.pro +++ b/src/src.pro @@ -3,7 +3,7 @@ # This file is used by qmake to generate the Makefile for building # QGIS on Windows # -# src.pro,v 1.53 2004/09/30 01:05:33 timlinux Exp +# src.pro,v 1.54 2004/10/04 00:53:49 gsherman Exp ###################################################################### # # For a WIN32 release build do the following: