Skip to content
Permalink
Browse files

merge from trunk r10850:10900

git-svn-id: http://svn.osgeo.org/qgis/branches/symbology-ng-branch@11129 c8812cc2-4d05-0410-92ff-de0c093fc19c
  • Loading branch information
wonder
wonder committed Jul 21, 2009
1 parent aeae910 commit 93e6b077dc477f4f1c1a67a92314caa5fb692798
Showing with 5,121 additions and 1,825 deletions.
  1. +1 −0 CONTRIBUTORS
  2. +298 −0 doc/INSTALL.t2t
  3. +790 −538 i18n/qgis_de.ts
  4. BIN images/themes/default/mActionFromSelectedFeature.png
  5. BIN images/themes/default/mActionMergeFeatures.png
  6. BIN images/themes/default/mActionNodeTool.png
  7. BIN images/themes/default/mActionRemoveSelectedFeature.png
  8. 0 mac/{ → extras}/1-release-extra.sh
  9. 0 mac/{ → extras}/2-release-extra-qt.sh
  10. 0 mac/{ → extras}/3-dmg.sh
  11. 0 mac/{ → extras}/Read Me (Mac).rtf
  12. 0 mac/{ → extras}/install-extra.sh
  13. 0 mac/{ → extras}/release-check.sh
  14. 0 mac/{ → extras}/release-extra-grass.sh
  15. 0 mac/{ → extras}/release-extra-py.sh
  16. 0 mac/{ → extras}/release-extra-qt.sh
  17. 0 mac/{ → extras}/release-extra.sh
  18. 0 mac/{ → extras}/release-strip.sh
  19. +6 −0 mac/readme.txt
  20. +62 −0 mac/xcode/Qgis.xcodeproj/project.pbxproj
  21. +0 −1 mac/xcode/qgis_settings.xcconfig
  22. +8 −0 python/core/qgsrasterdataprovider.sip
  23. +1 −1 python/core/qgssymbol.sip
  24. +7 −4 python/core/qgsvectordataprovider.sip
  25. +1 −1 python/core/qgsvectorlayer.sip
  26. +3 −2 python/gui/qgsmapcanvas.sip
  27. +6 −0 src/app/CMakeLists.txt
  28. +7 −7 src/app/attributetable/qgsattributetabledelegate.cpp
  29. +12 −12 src/app/attributetable/qgsattributetabledelegate.h
  30. +5 −4 src/app/attributetable/qgsattributetabledialog.cpp
  31. +2 −2 src/app/attributetable/qgsattributetablememorymodel.cpp
  32. +2 −2 src/app/attributetable/qgsattributetablememorymodel.h
  33. +1 −1 src/app/attributetable/qgsattributetablemodel.cpp
  34. +1 −1 src/app/attributetable/qgsattributetablemodel.h
  35. +1 −1 src/app/attributetable/qgsattributetableview.h
  36. +6 −1 src/app/composer/qgscomposer.cpp
  37. +6 −6 src/app/composer/qgscomposermapwidget.cpp
  38. +8 −2 src/app/legend/qgslegend.cpp
  39. +10 −10 src/app/legend/qgslegendlayer.cpp
  40. +5 −7 src/app/legend/qgslegendlayer.h
  41. +178 −2 src/app/qgisapp.cpp
  42. +13 −0 src/app/qgisapp.h
  43. +52 −16 src/app/qgsaddattrdialog.cpp
  44. +7 −2 src/app/qgsaddattrdialog.h
  45. +63 −63 src/app/qgsconfigureshortcutsdialog.cpp
  46. +9 −9 src/app/qgsconfigureshortcutsdialog.h
  47. +12 −12 src/app/qgsmaptooldeletepart.cpp
  48. +1 −1 src/app/qgsmaptooldeletepart.h
  49. +12 −12 src/app/qgsmaptooldeletering.cpp
  50. +1 −1 src/app/qgsmaptooldeletering.h
  51. +899 −0 src/app/qgsmaptoolnodetool.cpp
  52. +268 −0 src/app/qgsmaptoolnodetool.h
  53. +154 −152 src/app/qgsmaptoolsimplify.cpp
  54. +61 −60 src/app/qgsmaptoolsimplify.h
  55. +532 −0 src/app/qgsmergeattributesdialog.cpp
  56. +78 −0 src/app/qgsmergeattributesdialog.h
  57. +6 −4 src/app/qgsnewconnection.cpp
  58. +1 −1 src/app/qgsnewhttpconnection.cpp
  59. +3 −0 src/app/qgsoptions.cpp
  60. +60 −23 src/app/qgsprojectproperties.cpp
  61. +2 −2 src/app/qgspythondialog.cpp
  62. +4 −4 src/app/qgsrasterlayerproperties.cpp
  63. +52 −52 src/app/qgsserversourceselect.cpp
  64. +1 −1 src/app/qgsserversourceselect.h
  65. +8 −8 src/app/qgsshortcutsmanager.cpp
  66. +20 −20 src/app/qgsshortcutsmanager.h
  67. +1 −1 src/app/qgssnappingdialog.h
  68. +4 −4 src/app/qgsvectorlayerproperties.cpp
  69. +3 −4 src/app/qgsvectorlayerproperties.h
  70. +73 −71 src/core/composer/qgscomposeritem.cpp
  71. +2 −2 src/core/composer/qgscomposeritem.h
  72. +6 −7 src/core/composer/qgscomposermap.cpp
  73. +1 −5 src/core/composer/qgscomposermap.h
  74. +1 −1 src/core/qgsdatasourceuri.cpp
  75. +23 −10 src/core/qgsgeometry.cpp
  76. +31 −2 src/core/qgsmaplayer.cpp
  77. +1 −1 src/core/qgsoverlayobject.h
  78. +2 −2 src/core/qgsoverlayobjectpositionmanager.h
  79. +4 −4 src/core/qgspalgeometry.cpp
  80. +13 −13 src/core/qgspalgeometry.h
  81. +10 −10 src/core/qgspalobjectpositionmanager.cpp
  82. +39 −1 src/core/qgsprojectfiletransform.cpp
  83. +1 −0 src/core/qgsprojectfiletransform.h
  84. +2 −2 src/core/qgsrasterdataprovider.cpp
  85. +12 −0 src/core/qgsrasterdataprovider.h
  86. +19 −3 src/core/qgsvectordataprovider.cpp
  87. +29 −10 src/core/qgsvectordataprovider.h
  88. +48 −36 src/core/qgsvectorlayer.cpp
  89. +10 −3 src/core/qgsvectorlayer.h
  90. +2 −2 src/core/raster/qgscolorrampshader.h
  91. +2 −0 src/core/raster/qgsrasterlayer.cpp
  92. +37 −1 src/core/symbology/qgssymbol.cpp
  93. +2 −2 src/core/symbology/qgssymbol.h
  94. +49 −16 src/gui/qgscomposerview.cpp
  95. +2 −0 src/gui/qgscomposerview.h
  96. +8 −4 src/gui/qgsmapcanvas.cpp
  97. +4 −2 src/gui/qgsmapcanvas.h
  98. +16 −17 src/plugins/diagram_overlay/qgsdiagramoverlay.cpp
  99. +1 −0 src/plugins/grass/CMakeLists.txt
  100. +1 −1 src/plugins/grass/config/default.qgc
  101. BIN src/plugins/grass/modules/qgis.v.out.ogr.pg.1.png
  102. BIN src/plugins/grass/modules/qgis.v.out.ogr.pg.2.png
  103. +13 −0 src/plugins/grass/modules/qgis.v.out.ogr.pg.qgm
  104. +38 −32 src/plugins/grass/qgsgrassmodule.cpp
  105. +9 −9 src/plugins/grass/qgsgrassmodule.h
  106. +61 −60 src/plugins/grass/qgsgrassshell.cpp
  107. +10 −10 src/plugins/grass/qgsgrassshell.h
  108. +6 −6 src/plugins/grass/qgsgrasstools.cpp
  109. +1 −2 src/plugins/grass/qtermwidget/Session.cpp
  110. +8 −8 src/plugins/grass/qtermwidget/TerminalDisplay.cpp
  111. +1 −1 src/plugins/grass/qtermwidget/Vt102Emulation.cpp
  112. +1 −4 src/plugins/grass/scripts/qgis.db.connect-login.pg.py
  113. +138 −0 src/plugins/grass/scripts/qgis.v.out.ogr.pg.py
  114. +2 −2 src/plugins/wfs/qgswfsplugin.h
  115. +4 −4 src/plugins/wfs/qgswfssourceselect.cpp
  116. +1 −0 src/providers/grass/CMakeLists.txt
  117. +3 −3 src/providers/grass/qgsgrassprovider.cpp
  118. +11 −15 src/providers/memory/qgsmemoryprovider.cpp
  119. +1 −1 src/providers/memory/qgsmemoryprovider.h
  120. +26 −23 src/providers/ogr/qgsogrprovider.cpp
  121. +1 −1 src/providers/ogr/qgsogrprovider.h
  122. +56 −14 src/providers/postgres/qgspostgresprovider.cpp
  123. +1 −1 src/providers/postgres/qgspostgresprovider.h
  124. +14 −9 src/providers/spatialite/qgsspatialiteprovider.cpp
  125. +1 −1 src/providers/spatialite/qgsspatialiteprovider.h
  126. +81 −48 src/providers/wfs/qgswfsdata.cpp
  127. +3 −4 src/providers/wfs/qgswfsdata.h
  128. +21 −6 src/providers/wfs/qgswfsprovider.cpp
  129. +9 −3 src/providers/wms/qgswmsprovider.cpp
  130. +1 −1 src/providers/wms/qgswmsprovider.h
  131. +79 −29 src/ui/qgsaddattrdialogbase.ui
  132. +134 −0 src/ui/qgsmergeattributesdialogbase.ui
  133. +45 −108 src/ui/qgsoptionsbase.ui
  134. +136 −135 src/ui/qgsprojectpropertiesbase.ui
@@ -23,6 +23,7 @@ Markus Neteler
Maurizio Napolitano
Paul Ramsey
Peter Ersts
Richard Kostecky
Stefanie Tellex
Tom Russo
Tyler Mitchell
@@ -1009,6 +1009,304 @@ $HOME/apps/bin/qgis
If all has worked properly the QGIS application should start up and appear
on your screen.


== A practical case: Building QGIS and GRASS from source on Ubuntu with ECW and MrSID formats support ==

The following procedure has been tested on Ubuntu 8.04, 8.10 and 9.04 32bit. If you want
to use different versions of the software (gdal, grass, qgis), just make the
necessary adjustments to the following code. This guide assumes that you don't have
installed any previous version of gdal, grass and qgis.

=== Step 1: install base packages ===

First you need to install the necessary packages required to download the source
code and compile it. Open the terminal and issue the following command:

```
sudo apt-get install build-essential g++ subversion
```

=== Step 2: compile and install the ecw libraries ===

Go to the ERDAS web site http://www.erdas.com/ and follow the links
"'''products --> ECW JPEG2000 Codec SDK --> downloads'''"
then download the "'''Image Compression SDK Source Code 3.3'''" (you'll need to make a registration
and accept a license).

Uncompress the arquive in a proper location (this guide assumes
that all the downloaded source code will be placed in the user home)
and the enter the newly created folder

```
cd /libecwj2-3.3
```

Compile the code with the standard commands

```
./configure
```

then

```
make
```

then

```
sudo make install
```

leave the folder

```
cd ..
```

=== Step 3: download the MrSID binaries ===

Go to the LIZARDTECH web site http://www.lizardtech.com/ and follow the links
"'''download --> Developer SDKs'''",
then download the "'''GeoExpress SDK for Linux (x86) - gcc 4.1 32-bit'''"
(you'll need to make a registration and accept a license).

Uncompress the downloaded file. The resulting directory name should be similar to "Geo_DSDK-7.0.0.2167"

=== Step 4: compile and install the gdal libraries ===

Download the latest gdal source code

```
svn checkout https://svn.osgeo.org/gdal/trunk/gdal gdal
```

then copy a few files from the MrSID binaries folder to the folder with the gdal source code
('''replace "USERNAME" with your actual account username''')

```
cp /home/USERNAME/Geo_DSDK-7.0.0.2167/include/*.* /home/USERNAME/gdal/frmts/mrsid/
```

enter the gdal source code folder

```
cd /gdal
```

and run configure with a few specific parameters

```
./configure --without-grass --with-mrsid=../Geo_DSDK-7.0.0.2167 --without-jp2mrsid
```

at the end of the configuration process you should read something like

```
...
GRASS support: no
...
...
...
ECW support: yes
MrSID support yes
...
```

then compile normally

```
make
```

and

```
sudo make install
```

finish the process by creating the necessary links to the most recent shared libraries

```
sudo ldconfig
```

at this point you may want to check if gdal was compiled correctly with MrSID and ECW
support by issuing one (or both) of the following commands

```
gdalinfo --formats | grep 'ECW'
```

```
gdalinfo --formats | grep 'SID'
```

leave the folder

```
cd ..
```

=== Step 5: compile and install GRASS ===

Before downloading and compile GRASS source code you need to install a few
other libraries and programs. We can do this trough apt

```
sudo apt-get install flex bison libreadline5-dev libncurses5-dev lesstif2-dev debhelper dpatch libtiff4-dev \
tcl8.4-dev tk8.4-dev fftw-dev xlibmesa-gl-dev libfreetype6-dev autoconf2.13 autotools-dev \
libgdal1-dev proj libjpeg62-dev libpng12-dev libpq-dev unixodbc-dev doxygen fakeroot cmake \
python-dev python-qt4-common python-qt4-dev python-sip4 python2.5-dev sip4 libglew1.5-dev libxmu6 \
libqt4-dev libgsl0-dev python-qt4 swig python-wxversion python-wxgtk2.8 libwxgtk2.8-0 libwxbase2.8-0 tcl8.4-dev \
tk8.4-dev tk8.4 libfftw3-dev libfftw3-3
```

At this point we can get the GRASS source code: you may want to download it
trough svn or maybe you want just to download the latest available source code arquive.
For example the GRASS 6.4rc4 is available at http://grass.itc.it/grass64/source/grass-6.4.0RC4.tar.gz

Uncompress the arquive, enter the newly created folder and run configure with a few specific parameters

```
./configure --with-tcltk-includes=/usr/include/tcl8.4 --with-proj-share=/usr/share/proj --with-gdal=/usr/local/bin/gdal-config --with-python=/usr/bin/python2.5-config
```

then as usual (it will take a while)

```
make
```

and

```
sudo make install
```

leave the folder

```
cd ..
```

you have now compiled and installed GRASS (also with the new wxpyhton interface) so you
may want to give it a try

```
grass64 -wxpython
```

=== Step 6: compile and install the GDAL-GRASS libraries ===

Create a plain text file named "grass.conf" inside the folder "/etc/ld.so.conf.d"

```
sudo gedit /etc/ld.so.conf.d/grass.conf
```

and add the following line

```
/usr/local/grass-6.4.0RC4/lib/
```

save and exit.

Download the latest version of the gdal-grass library (gdal-grass-1.4.3.tar.gz) from
http://download.osgeo.org/gdal/

uncompress the arquive and enter the newly created folder

```
cd /gdal-grass-1.4.3
```

run configure

```
./configure --with-grass=/usr/local/grass-6.4.0RC4
```

then as usual

```
make
```

and

```
sudo make install
```

and finish the process by creating the necessary links to the most recent shared libraries

```
sudo ldconfig
```

leave the folder

```
cd ..
```

=== Step 6: compile and install QGIS ===

As for GRASS you can obtain the QGIS source code from different sources,
for instance from svn or just by downloading one of the source code arquives available
at http://www.qgis.org/download/sources.html

For example download the QGIS 1.1.0 source code here http://download.osgeo.org/qgis/src/qgis_1.1.0.tar.gz

uncompress the arquive and enter the newly created folder

```
cd /qgis_1.1.0
```

then run ccmake

```
ccmake .
```

press the "c" key, then when the option list will appear we need to manually
configure the "GRASS_PREFIX" parameter. Scroll down until the "GRASS_PREFIX" will appear,
press enter and manually set it to

```
/usr/local/grass-6.4.0RC4
```

then press enter again.

Press the "c" again and the option "Press [g] to generate and exit" will appear.
Press the "g" key to generate and exit.

then as usual (it will take a while)

```
make
```

and

```
sudo make install
```

At the end of the process you should have QGIS and GRASS working with MrSID and ECW
raster format support.

To run QGIS just use this command

```
qgis
```

% -----------------------------------------------------------------------------
% ----Please leave this break marker here for clarity - it wont be rendered ---
% -----------------------------------------------------------------------------

0 comments on commit 93e6b07

Please sign in to comment.
You can’t perform that action at this time.