sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-04-14 00:07:35 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merged master fixed conflict.

Browse Source
This commit is contained in:
alisovenko 2017-02-03 18:11:49 +03:00
commit d780ba7593
3066 changed files with 52563 additions and 93305 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
.travis.yml
View File

@ -23,6 +23,7 @@ matrix:
- llvm-toolchain-precise-3.8
- ubuntu-toolchain-r-test
- george-edison55-precise-backports # doxygen 1.8.3
- sourceline: 'ppa:nomeata/travis-backports'
# - laurent-boulard-devtools (for silver-search, not whitelisted yet https://github.com/travis-ci/apt-source-whitelist/pull/345)
packages:
- doxygen
@ -31,7 +32,7 @@ matrix:
- graphviz
- libpq-dev
- libfcgi-dev
- libfftw3-3
- libfftw3-3
- pkg-config
- perl # lookahead regex in spell check script
- poppler-utils
@ -42,12 +43,13 @@ matrix:
# used for spell checks
# - silversearcher-ag not available in precise nor in a white listed ppa (in osgeo4travis as for now)
- expect-dev # unbuffer
- coreutils
# OSX based build with QT4 and Python 2
# - os: osx
# env:
# - BUILD=osx
# - IGNORE_BUILD_FAILURES=YES
git:
depth: 30

19
CMakeLists.txt
View File

@ -96,7 +96,7 @@ SET (WITH_BINDINGS TRUE CACHE BOOL "Determines whether python bindings should be
IF (WITH_BINDINGS)
# By default bindings will be installed only to QGIS directory
# Someone might want to install it to python site-packages directory
# as otherwise user has to use PYTHONPATH environemnt variable to add
# as otherwise user has to use PYTHONPATH environment variable to add
# QGIS bindings to package search path
SET (BINDINGS_GLOBAL_INSTALL FALSE CACHE BOOL "Install bindings to global python directory? (might need root)")
SET (WITH_STAGED_PLUGINS TRUE CACHE BOOL "Stage-install core Python plugins to run from build directory? (utilities and console are always staged)")
@ -451,7 +451,7 @@ IF (WIN32)
SET (DEFAULT_BIN_SUBDIR bin)
SET (DEFAULT_CGIBIN_SUBDIR bin)
# put all the build products into a single directory
# under build (doesnt affect install target) to make for
# under build (doesn't affect install target) to make for
# easier debugging.
# Turn on defines for non standard maths stuff
@ -569,15 +569,16 @@ IF(COMMAND cmake_policy)
IF(NOT "${CMAKE_VERSION}" VERSION_LESS "3.3")
cmake_policy(SET CMP0063 NEW)
ENDIF(NOT "${CMAKE_VERSION}" VERSION_LESS "3.3")
IF(MSVC)
cmake_policy(SET CMP0020 NEW)
ENDIF(MSVC)
ENDIF(COMMAND cmake_policy)
IF (WIN32)
IF(PEDANTIC AND NOT APPLE)
SET(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Wl,--no-undefined")
SET(CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS} -Wl,--no-undefined")
SET(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,--no-undefined")
ENDIF(PEDANTIC AND NOT APPLE)
ENDIF(WIN32)
IF (PEDANTIC AND NOT WIN32 AND NOT APPLE)
SET(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Wl,--no-undefined")
SET(CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS} -Wl,--no-undefined")
SET(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,--no-undefined")
ENDIF(PEDANTIC AND NOT WIN32 AND NOT APPLE)
SET(CMAKE_CXX_VISIBILITY_PRESET hidden)
INCLUDE(GenerateExportHeader)

2
CONTRIBUTE.md
View File

@ -13,7 +13,7 @@ by running the prepare commit script **before** issuing `git commit`.
This can be automated by setting up the pre-commit hook properly.
ln -s scripts/prepare-commit.sh .git/hooks/pre-commit
ln -s ../../scripts/prepare-commit.sh .git/hooks/pre-commit
Getting your pull request merged
--------------------------------

72
INSTALL
View File

@ -1,16 +1,16 @@
QGIS
Building QGIS from source - step by step
Monday January 09, 2017
Wednesday January 25, 2017
Last Updated: Monday January 09, 2017
Last Change : Monday January 09, 2017
Last Updated: Wednesday January 25, 2017
Last Change : Friday January 20, 2017
1. Introduction
2. Overview
3. Building on GNU/Linux
3.1. Building QGIS with Qt 4.x
3.1. Building QGIS with Qt 5.x
3.2. Prepare apt
3.3. Install build dependencies
3.4. Setup ccache (Optional)
@ -18,9 +18,7 @@ Last Change : Monday January 09, 2017
3.6. Check out the QGIS Source Code
3.7. Starting the compile
3.8. Building Debian packages
3.9. Building QGIS with Qt 5.x
3.10. On Debian Linux
3.11. On Fedora Linux
3.9. On Fedora Linux
4. Building on Windows
4.1. Building with Microsoft Visual Studio
4.2. Building using MinGW
@ -139,13 +137,13 @@ those formats in GDAL.
========================
3.1. Building QGIS with Qt 4.x
3.1. Building QGIS with Qt 5.x
==============================
Requires: Ubuntu / Debian derived distro
/!\ Note: Refer to the section Building Debian packages for building
debian packages. Unless you plan to develop on QGIS, that is probably the
debian packages. Unless you plan to develop on QGIS, that is probably the
easiest option to compile and install QGIS.
These notes are for Ubuntu - other versions and Debian derived distros may
@ -263,6 +261,11 @@ be pressed several times before the 'g' option becomes available.
After the 'g' generation is complete, press 'q' to exit the ccmake
interactive dialog.
/!\ Warning: Make sure that your build directory is completely empty when you
enter the command. Do never try to "re-use" an existing Qt4 build directory.
If you want to use `ccmake` or other interactive tools, run the command in
the empty build directory once before starting to use the interactive tools.
Now on with the build:
make -jX
@ -349,56 +352,15 @@ Install them using dpkg. E.g.:
sudo debi
3.9. Building QGIS with Qt 5.x
==============================
/!\ Warning: Qt 5 is not officially supported. Building against Qt 5
libraries seems to work quite well already but be prepared that you are one
of very few with this setup. We strongly recommend using QGIS with Qt 4 for
production work.
Python bindings in particular are not expected to be compatible. When Qt 5
is enabled, the build system automatically activates Python 3 and PyQt5 as well.
There are no plugins and not even the python code shipped along the QGIS source
code is compatible with PyQt5.
You have been warned.
3.10. On Debian Linux
=====================
We assume that you have the source code of QGIS ready and created a new
subdirectory called `build` or `build-qt5` in it.
3.10.1. Install build dependencies
==================================
apt-get install git build-essential cmake flex bison pyqt5-dev qttools5-dev qtpositioning5-dev libqt5svg5-dev libqt5webkit5-dev libqt5gui5 libqt5scripttools5 qtscript5-dev libqca-qt5-2-dev grass-dev libgeos-dev libgdal-dev libqt5xmlpatterns5-dev libqt5scintilla2-dev pyqt5.qsci-dev python3-pyqt5.qsci libgsl-dev txt2tags libproj-dev libqwt-qt5-dev libspatialindex-dev pyqt5-dev-tools qttools5-dev-tools qt5-default python3-future python3-pyqt5.qtsql python3-psycopg2 python3-sip-dev
Make sure that your build directory is completely empty when you enter the
following command. Do never try to "re-use" an existing Qt4 build directory.
If you want to use `ccmake` or other interactive tools, run the following
command in the empty build directory once before starting to use the
interactive tools.
cmake
If everything went ok you can finally start to compile. (As usual append a -jX where X is the number of available cores option to make to speed up your build process)
make
3.11. On Fedora Linux
=====================
3.9. On Fedora Linux
====================
We assume that you have the source code of QGIS ready and created a
new subdirectory called `build` or `build-qt5` in it.
3.11.1. Install build dependencies
==================================
3.9.1. Install build dependencies
=================================
dnf install qt5-qtwebkit-devel qt5-qtlocation-devel qt5-qttools-static
qt5-qtscript-devel qca-qt5-devel python3-qt5-devel python3-qscintilla-qt5-devel
@ -753,7 +715,7 @@ to get versions that match your current Qt installed version.
===========================
/!\ You can delete the directories with unpacked SIP and PyQt4 sources after a
successfull install, they're not needed anymore.
successful install, they're not needed anymore.
4.2.5. git

88
NEWS
View File

@ -56,7 +56,7 @@ This release has following new features:
- User Interface: Improved color pickers
- User Interface: Copy cell contents from attribute table
- User Interface: Improved HiDPI support
- User Interface: Improved map select tool behaviour
- User Interface: Improved map select tool behavior
- Symbology: Arrow symbol layer
- Symbology: New "Filled marker" symbol layer type
- Symbology: New accessibility and low vision symbols
@ -74,9 +74,9 @@ This release has following new features:
- Rendering: New options for on the fly simplification
- Rendering: Quantile based classification for raster layers
- Rendering: Live hillshade renderer
- Digitising: "Repeating" locking mode for constraints
- Digitising: Extend linestring geometries with reshape tool
- Digitising: Segmentation tolerance
- Digitizing: "Repeating" locking mode for constraints
- Digitizing: Extend linestring geometries with reshape tool
- Digitizing: Segmentation tolerance
- Data management: New configuration options for attribute table
- Data management: Multiple columns in attribute forms
- Data management: Control over attributes to export when saving a vector layer
@ -163,10 +163,10 @@ This release has following new features:
- Data management : Vector joins are now saved within QLR layer-definition-files
- Data management : N:M relation editing
- Data management : External Resource widget
- Digitising : Configurable rubber band color
- Digitising : Autotrace
- Digitising : Trace digitising tool
- General : Changed behaviour of strpos function
- Digitizing : Configurable rubber band color
- Digitizing : Autotrace
- Digitizing : Trace digitizing tool
- General : Changed behavior of strpos function
- General : Field calculator can be used to update feature's geometry
- General : Virtual layers
- General : Zoom to feature with right-click in attribute table
@ -230,7 +230,7 @@ This release has following new features:
- Data management : DBManager Improvements
- Data management : Conditional formatting for attribute table cells
- Data management : Support for relative paths in widgets
- Digitising : Digitising improvements
- Digitizing : Digitizing improvements
- General : New welcome screen
- General : Ongoing improvements to code quality
- General : Advanced settings editor
@ -333,7 +333,7 @@ This is a minor release increment with the following feature:
- New field calculator bar in attribute table.
- DXF export improvements.
- Advanced digitizing tools.
- Improved snapping options and behaviour.
- Improved snapping options and behavior.
- Better simplify tool - including support for on the fly reprojection being enabled.
- Qt5 support (optional - default packages are still currently built against Qt4).
- Spatial bookmark import/export.
@ -427,7 +427,7 @@ This is the minor release sports a number of great new features:
- When pasting a selection, it is now possible to create a new layer on the fly
from the pasted features.
- WMS Legend is now available via a getLegendGraphic request.
- It is now possible to digitise a new feature as an interior ring of an
- It is now possible to digitize a new feature as an interior ring of an
existing feature.
- Recent expressions are saved in the expression builder for quick re-use.
- You can now set the color for the zebra map border style in composer.
@ -571,7 +571,7 @@ key new features.
- Heatmap tool - a new core plugin has been added for generating raster heatmaps from point data. You may need to activate this plugin using the plugin manager.
- GPS Tracking - The GPS live tracking user interface was overhauled and many fixes and improvements were added to it.
- Menu Re-organisation - The menus were re-organised a little - we now have separate menus for Vector and Raster and many plugins were updated to place their menus in the new Vector and Raster top level menus.
- Offset Curves - a new digitising tool for creating offset curves was added.
- Offset Curves - a new digitizing tool for creating offset curves was added.
- Terrain Analysis Plugin - a new core plugin was added for doing terrain analysis - and it can make really good looking colored relief maps.
- Ellipse renderer - symbollayer to render ellipse shapes (and also rectangles, triangles, crosses by specifying width and height). Moreover, the symbol layer allows setting all parameters (width, height, colors, rotation, outline with) from data fields, in mm or map units
- New scale selector with predefined scales
@ -636,7 +636,7 @@ were made.
- Allow setting I/O encoding for OGR layers in vector layer properties.
- Fix #4414 (SVG indicators for arrows are not shown)
- Label direction symbol shouldn't depend on "map" vs. "line" orientation.
- Set prompt as default behaviour for unknown CRS
- Set prompt as default behavior for unknown CRS
- For EPSG initialize GDAL CRS from authid instead of proj.4 string
- Fix #4439 (Crash when changing style in Layer Properties)
- Fix #4444 (Error when loading Python plugins)
@ -647,7 +647,7 @@ were made.
- Fix #4496 (Refresh map list in composer table widget in showEvent)
- OS X build/install updates
- GRASS version support
- Intializing from WKT favourize EPSG instead of PROJ.4
- Initializing from WKT favourize EPSG instead of PROJ.4
- Add What's this to Help menu (implement #4179)
- fTools: update layers lists after adding new layer to TOC (fix #4318)
- Don't block QGIS main window when running Merge shapefiles tool. Partially addresses #4383
@ -711,7 +711,7 @@ http://linfiniti.com/2011/08/improvements-to-raster-performance-in-qgis-master/]
- Tweak for layer cache
- [backport] Fix bug where histogram can be assigned negative frequency for a pixel range. Also fix potential memory leak as new histogram vector was assigned to band stats without clearing the old.
- Added section on using QtCreator
- Fix bugs causing a crash when histogram is gathered due to uninitilised histogram vector
- Fix bugs causing a crash when histogram is gathered due to uninitialized histogram vector
- Added missing QUrl include
- A neater fix for missing map parameter as suggested by Juergen
- Fixed a bug where map= was not being published in onlineresource url when project files are not in the same dir as cgi
@ -1007,7 +1007,7 @@ pixels or map units
- Allow postgres layers without saved username & password by asking for credentials
- Support NULL values in search strings
- Optionally add new layers to the selected group
- Map composer can add attribute Tables in layouts. It is possibile to show
- Map composer can add attribute Tables in layouts. It is possible to show
only visible features in composer table or all features
- Identify tool attribute form now non-modal in view mode (since r12796)
- Identified features' highlight disappear when window is deactivate or
@ -1063,7 +1063,7 @@ features for you.
Probably the biggest new feature is the addition of the new vector symbology
infrastructure. This is provided alongside the old implementation - you can
switch using a button in the vector layer properties dialog. It does't replace
switch using a button in the vector layer properties dialog. It doesn't replace
the old symbology implementation completely yet because there are various isues
that need to be resolved and a large amount of testinhen it is considered
ready.
@ -1143,7 +1143,7 @@ such it contains new features and extends the programmatic interface over
QGIS 1.0.x. If stability and long term support is more important to you
then cool new and untested features, we recommend that you use a copy
of QGIS from our stable 1.0.x release series.
This release includes over 140 bug fixes and enchancements
This release includes over 140 bug fixes and enhancements
over the QGIS 1.1.0 release. In addition we have added
the following new features:
@ -1276,7 +1276,7 @@ QGIS 1.0.x. If stability and long term support is more important to you
then cool new and untested features, we recommend that you use a copy
of QGIS from our stable 1.0.x release series.
This release includes many bug fixes and enchancements
This release includes many bug fixes and enhancements
over the QGIS 1.0.0 release. In addition we have added
the following new features:
@ -1372,11 +1372,11 @@ QGIS 0.10.0 release. In addition we have made the following changes:
22. Version 0.10.0 'Io'
=======================
This release includes over 120 bug fixes and enchancements
This release includes over 120 bug fixes and enhancements
over the QGIS 0.9.1 release. In addition we have added
the following new features:
- Improvements to digitising capabilities.
- Improvements to digitizing capabilities.
- Supporting default and defined styles (.qml) files for file based
vector layers. With styles you can save the symbolisation
and other settings associated with a vector layer and they
@ -1393,10 +1393,10 @@ improvements 'under the hood'.
23. Version 0.9.2rc1 'Ganymede'
===============================
- This release candidate includes over 40 bug fixes and enchancements
- This release candidate includes over 40 bug fixes and enhancements
over the QGIS 0.9.1 release. In addition we have added
the following new features:
- Imrovements to digitising capabilities.
- Improvements to digitizing capabilities.
- Supporting default and defined styles (.qml) files for file based
vector layers. With styles you can save the symbolisation
and other settings associated with a vector layer and they
@ -1887,7 +1887,7 @@ Added remove all layers from overview button.
Extents are now correctly restored when project is loaded
2004-06-24 [ts] 0.3.0devel51
Completion of projectio fixes to freeze canvas and restore zorder correctly.
Completion of projection fixes to freeze canvas and restore zorder correctly.
Small issue with restoring extents properly needs to be resolved still.
2004-06-23 [mcoletti] 0.3.0devel50
@ -1898,11 +1898,11 @@ linking with -rdynamic and using dlopen()'s RTLD_GLOBAL flag.
2004-06-21 [ts] 0.3.0devel49
Revised raster stats emiting of progress update to not do it when stats are
Revised raster stats emitting of progress update to not do it when stats are
fetched from cache. QGisApp progress bar now updates as each layer is rendered
in the mapCanvas.
Some minor updates to projectio
Some minor updates to projection
2004-06-21 [larsl] 0.3.0devel48
Hooked up the GPS gui to code that uses gpsbabel to import lots of GPS file
@ -1914,7 +1914,7 @@ fixed wrong versions and DOS endlines
2004-06-21 [ts] 0.3.0devel46
Got tired of always resetting my gidbase dir everytime qgis restarts -
Got tired of always resetting my gidbase dir every time qgis restarts -
added it to qsettings.
2004-06-21 [ts] 0.3.0devel45
@ -1926,13 +1926,13 @@ Complete buffering so that bar as well as text will be visible on both
Fix for bug [ 973922 ] Overview shows layers in wrong order
Fixed show stopper bug where maplayerregistry wasnt being cleared properly on file new
Fixed show stopper bug where maplayerregistry wasn't being cleared properly on file new
Added setZOrder which will be used in next commit to fix projectio zorder problem
Added setZOrder which will be used in next commit to fix projection zorder problem
2004-06-20 [ts] 0.3.0devel43
Fix anoying 'mapcanvas isnt freezing while loading rasters' bug
Fix anoying 'mapcanvas isn't freezing while loading rasters' bug
2004-06-19 [ts] 0.3.0devel42
@ -1947,12 +1947,12 @@ Added an option for setting the length of the scale bar to closest
Win32 support for package path - which will hopefully ensure pyramid and overview mini
icons are displayed on legend entry now.
Beginnings of generic vector file writer - incomplete and doesnt do anything useful
yet except has abilty to make a shapefile with a couple of user defined fields e.g.
Beginnings of generic vector file writer - incomplete and doesn't do anything useful
yet except has ability to make a shapefile with a couple of user defined fields e.g.
to create a new point shapefile:
QgsVectorFileWriter myFileWriter("/tmp/test.shp", wkbPoint);
if (myFileWriter.initialise())
if (myFileWriter.initialize())
{
myFileWriter.createField("TestInt",OFTInteger,8,0);
myFileWriter.createField("TestRead",OFTReal,8,3);
@ -2012,7 +2012,7 @@ Implemented a new map cursor type : Capture Point (little pencil icon on your to
are placed into the system clipboard.
In release 0.5 this will be extended to provide simple point vector file data capture /
digitising facility. This will be implemented by means of a plugin which will utilise the
digitizing facility. This will be implemented by means of a plugin which will utilise the
aforementioned xyClickCoordinate(QgsPoint) signal.
2004-06-12 [gsherman] 0.3.0devel30
@ -2030,7 +2030,7 @@ Added acetate layer support to the map canvas. Currently there is only one
QgsAcetateObject. More acetate types will follow...
2004-06-10 [ts] 0.3.0devel27
Modified projectio (serialisation and deserialisation of project files) to
Modified projection (serialisation and deserialisation of project files) to
use maplayerregistry and not mapcanvas.
Implemented state handling of 'showInOverview' property in project io.
@ -2184,7 +2184,7 @@ Fixed some more instances of the same bug in raster layer
Disable overview widget for release. Minor bugfix in rasterlayer picker up by
Larsl which is only encountered bu i8n users. Miscellaneous other fixes
including proper rotation support for north arrows in all 4 corners of
display, inproved refresh behaviour of n-arrow and copyright plugin, better
display, inproved refresh behavior of n-arrow and copyright plugin, better
state hadnling for copyright plugin.
2004-05-25 [larsl] 0.2.0devel34
@ -2394,7 +2394,7 @@ updated German translation
!! otherwise it's not detected by the plugins autogen.sh (more exactly
!! aclocal)
!! It can be cheated by adding -I path/to/qgis.m4 to the aclocal of
!! autogen.sh. But be carefull not to commit that to CVS
!! autogen.sh. But be careful not to commit that to CVS
2004-04-18 [jobi] 0.1.0devel33
Added internationalisations stuff
@ -2408,7 +2408,7 @@ Fix for crash when opening singleband grayscale images introduced by Steves
grayscale
2004-04-06 [ts] 0.1.0devel31
Added new plugin (grid_maker) to build arbitary sized graticules and add
Added new plugin (grid_maker) to build arbitrary sized graticules and add
them to the current map view.
2004-04-05 [jobi] 0.1.0devel30
@ -2444,7 +2444,7 @@ endian-ness.
2004-04-02 [stevehalasz] 0.1.0devel25
2004-04-01 [jobi] 0.1.0devel24
changed qgiscommit to hopefuly fix all problems
changed qgiscommit to hopefully fix all problems
2004-04-01 [jobi] 0.1.0devel23
Extended tools/qgiscommit to pass parameters to cvs
@ -2498,7 +2498,7 @@ Added gps_importer plugin (still a work in progress)
2004-03-22 [mac] 0.1.0devel8
s/config.h/qgsconfig.h/
qgsconfig.h now has header sentinals
qgsconfig.h now has header sentinels
now will install headers in $(prefix)/qgis/include and libqis.* library in
$(prefix)/lib
"src/Makefile" no longer relies on explicit dependencies and uses better
@ -2603,9 +2603,9 @@ QGIS can load layers and / or a project on start up by specifying these
Symbol renderers for simple, graduated, and continuous symbols
Raster support for most GDAL formats
Raster implementation supports a variety of rendering settings including
semi transparent overlays, pallette inversion, flexible band to color mapping
semi transparent overlays, palette inversion, flexible band to color mapping
in multiband images and creation of pseudocolor.
Change to a data provider architecture for vector layers. Addtional data
Change to a data provider architecture for vector layers. Additional data
types can be supported by writing a provider plugin
Buffer plugin for PostGIS layers
PostgreSQL port number can be specified when making connections
@ -2637,7 +2637,7 @@ Features in shapefiles can be selected by dragging a selection
box or selecting the records in the attribute table
Zoom to extent of selected features (Shapefiles only)
Bug fix: Bug that prevented reopening of the attribute table once
it was initally displayed and closed
it was initially displayed and closed
Bug fix: Bug that prevented lines from being drawn with widths
other than 1 pixel
Build system has changed for building with PostgreSQL support.
@ -2724,7 +2724,7 @@ July 20, 2002
July 18, 2002
Point, line and polygon PostGis layers can be drawn. Still issues with
map exent and positioning of layers on the canvas. Drawing is manual and
map extent and positioning of layers on the canvas. Drawing is manual and
not tied to the paint event. No zooming or panning yet.
July 10, 2002

2
README.md
View File

@ -76,4 +76,4 @@ repository, and then [issue a pull request](http://help.github.com/pull-requests
review your contribution and commit it upstream as appropriate.
If you commit a new feature, add [FEATURE] to your commit message AND give a clear description of the new feature. A webhook will automatically create an issue on the QGIS-Documentation repo to tell people to write about it.
If you are not a developer, there are many other possibilities which do not require programing skills to help QGIS to evolve. Check our [project homepage for more information](http://qgis.org/en/site/getinvolved/index.html).
If you are not a developer, there are many other possibilities which do not require programming skills to help QGIS to evolve. Check our [project homepage for more information](http://qgis.org/en/site/getinvolved/index.html).

10
ci/travis/check_spelling.sh
View File

@ -6,11 +6,15 @@ export PATH=${HOME}/osgeo4travis/bin:${PATH}
echo "Spell check"
if [[ ! -z $TRAVIS_PULL_REQUEST_BRANCH ]]; then
if [[ ! -z $TRAVIS_PULL_REQUEST_BRANCH ]]; then
# if on a PR, just analyse the changed files
echo "TRAVIS PR BRANCH: $TRAVIS_PULL_REQUEST_BRANCH"
FILES=$(git diff --diff-filter=AM --name-only $(git merge-base HEAD master) | tr '\n' ' ' )
else
echo "TRAVIS COMMIT RANGE: $TRAVIS_COMMIT_RANGE"
FILES=$(git diff --diff-filter=AM --name-only ${TRAVIS_COMMIT_RANGE/.../..} | tr '\n' ' ' )
fi
./scripts/chkspelling_ag.sh $FILES
if [[ ! -z $FILES ]]; then
./scripts/spell_check/check_spelling.sh -r $FILES
fi

2
ci/travis/linux/before_install.sh
View File

@ -32,4 +32,4 @@ wget https://www.orfeo-toolbox.org/packages/archives/OTB/OTB-5.6.0-Linux64.run -
popd
pip install psycopg2 numpy nose2 pyyaml mock future termcolor
pip install psycopg2 numpy nose2 pyyaml mock future termcolor autopep8

2
cmake/FindProj.cmake
View File

@ -41,7 +41,7 @@ FIND_PATH(PROJ_INCLUDE_DIR proj_api.h
"$ENV{LIB_DIR}/include"
)
FIND_LIBRARY(PROJ_LIBRARY NAMES proj proj_i PATHS
FIND_LIBRARY(PROJ_LIBRARY NAMES proj_i proj PATHS
"$ENV{LIB}"
"$ENV{LIB_DIR}/lib"
)

2
cmake/FindPyQt4.cmake
View File

@ -12,7 +12,7 @@
# This file defines the following variables:
#
# PYQT4_VERSION - The version of PyQt4 found expressed as a 6 digit hex number
# suitable for comparision as a string
# suitable for comparison as a string
#
# PYQT4_VERSION_STR - The version of PyQt4 as a human readable string.
#

2
cmake/FindPyQt5.cmake
View File

@ -12,7 +12,7 @@
# This file defines the following variables:
#
# PYQT5_VERSION - The version of PyQt5 found expressed as a 6 digit hex number
# suitable for comparision as a string
# suitable for comparison as a string
#
# PYQT5_VERSION_STR - The version of PyQt5 as a human readable string.
#

2
cmake/FindQCA.cmake
View File

@ -72,7 +72,7 @@ else(NOT QCA_FOUND)
file(STRINGS "${_qca_version_h}" _qca_version_str REGEX "^.*QCA_VERSION_STR +\"[^\"]+\".*$")
string(REGEX REPLACE "^.*QCA_VERSION_STR +\"([^\"]+)\".*$" "\\1" QCA_VERSION_STR "${_qca_version_str}")
else()
# qca_core.h contains hexidecimal version in <= 2.0.3
# qca_core.h contains hexadecimal version in <= 2.0.3
set(_qca_core_h "${QCA_INCLUDE_DIR}/qca_core.h")
if(EXISTS "${_qca_core_h}")
file(STRINGS "${_qca_core_h}" _qca_version_str REGEX "^#define +QCA_VERSION +0x[0-9a-fA-F]+.*")

2
cmake/FindQScintilla.cmake
View File

@ -69,7 +69,7 @@ ELSE(EXISTS QSCINTILLA_VERSION_STR)
ENDIF(QSCINTILLA_LIBRARY AND QSCINTILLA_INCLUDE_DIR)
IF(QSCINTILLA_INCLUDE_DIR AND NOT EXISTS QSCINTILLA_VERSION_STR)
# get QScintilla2 version from header, is optinally retrieved via bindings
# get QScintilla2 version from header, is optionally retrieved via bindings
# with Qsci PyQt4 module
FILE(READ ${QSCINTILLA_INCLUDE_DIR}/Qsci/qsciglobal.h qsci_header)
STRING(REGEX REPLACE "^.*QSCINTILLA_VERSION_STR +\"([^\"]+)\".*$" "\\1" QSCINTILLA_VERSION_STR "${qsci_header}")

2
cmake/FindQwt.cmake
View File

@ -34,7 +34,7 @@ FIND_PATH(QWT_INCLUDE_DIR NAMES qwt.h PATHS
/usr/local/include
"$ENV{LIB_DIR}/include"
"$ENV{INCLUDE}"
PATH_SUFFIXES qwt-qt4 qwt qwt5 qwt6
PATH_SUFFIXES qwt-qt5 qwt qwt5 qwt6
)
IF (QWT_INCLUDE_DIR AND QWT_LIBRARY)

2
cmake/FindSIP.cmake
View File

@ -9,7 +9,7 @@
# This file defines the following variables:
#
# SIP_VERSION - The version of SIP found expressed as a 6 digit hex number
# suitable for comparision as a string.
# suitable for comparison as a string.
#
# SIP_VERSION_STR - The version of SIP found as a human readable string.
#

6
cmake/PythonMacros.cmake
View File

@ -14,13 +14,13 @@
GET_FILENAME_COMPONENT(PYTHON_MACROS_MODULE_PATH ${CMAKE_CURRENT_LIST_FILE} PATH)
MACRO(PYTHON_INSTALL SOURCE_FILE DESINATION_DIR)
MACRO(PYTHON_INSTALL SOURCE_FILE DESTINATION_DIR)
FIND_FILE(_python_compile_py PythonCompile.py PATHS ${CMAKE_MODULE_PATH})
# Install the source file.
INSTALL(FILES ${SOURCE_FILE} DESTINATION ${DESINATION_DIR})
INSTALL(FILES ${SOURCE_FILE} DESTINATION ${DESTINATION_DIR})
# Byte compile and install the .pyc file.
GET_FILENAME_COMPONENT(_absfilename ${SOURCE_FILE} ABSOLUTE)
@ -57,5 +57,5 @@ MACRO(PYTHON_INSTALL SOURCE_FILE DESINATION_DIR)
)
ENDIF(_abs_bin_py STREQUAL ${_absfilename})
INSTALL(FILES ${_bin_pyc} DESTINATION ${DESINATION_DIR})
INSTALL(FILES ${_bin_pyc} DESTINATION ${DESTINATION_DIR})
ENDMACRO(PYTHON_INSTALL)

8
cmake/SIPMacros.cmake
View File

@ -16,7 +16,7 @@
# which is typically a shared library, should be linked to. The built
# module will also be install into Python's site-packages directory.
#
# The behaviour of the ADD_SIP_PYTHON_MODULE macro can be controlled by a
# The behavior of the ADD_SIP_PYTHON_MODULE macro can be controlled by a
# number of variables:
#
# SIP_INCLUDES - List of directories which SIP will scan through when looking
@ -97,12 +97,6 @@ MACRO(GENERATE_SIP_PYTHON_MODULE_CODE MODULE_NAME MODULE_SIP CPP_FILES)
ENDIF(MSVC)
SET(SIPCMD ${SIP_BINARY_PATH} ${_sip_tags} -w -e ${_sip_x} ${SIP_EXTRA_OPTIONS} -j ${SIP_CONCAT_PARTS} -c ${CMAKE_CURRENT_BINARY_DIR}/${_module_path} ${_sip_includes} ${_abs_module_sip})
SET(SUPPRESS_SIP_WARNINGS FALSE CACHE BOOL "Hide SIP warnings")
MARK_AS_ADVANCED(SUPPRESS_SIP_WARNINGS)
IF(SUPPRESS_SIP_WARNINGS)
SET(SIPCMD ${SIPCMD} 2> /dev/null || true)
ENDIF(SUPPRESS_SIP_WARNINGS)
ADD_CUSTOM_COMMAND(
OUTPUT ${_sip_output_files}
COMMAND ${CMAKE_COMMAND} -E echo ${message}

2
cmake/Txt2Tags.cmake
View File

@ -27,7 +27,7 @@ MACRO(FIND_TXT2TAGS)
FIND_PROGRAM(PDFLATEX_EXECUTABLE pdflatex)
ENDIF (NOT PDFLATEX_EXECUTABLE)
IF (NOT PDFLATEX_EXECUTABLE)
MESSAGE(ERROR "pdflatex not found - txt2tags documention pdf cannot be generated")
MESSAGE(ERROR "pdflatex not found - txt2tags documentation pdf cannot be generated")
ENDIF(NOT PDFLATEX_EXECUTABLE)
ENDIF(WITH_TXT2TAGS_PDF)
ENDMACRO(FIND_TXT2TAGS)

2
cmake/UsePythonTest.cmake
View File

@ -2,7 +2,7 @@
# SET(ENV{PYTHONPATH} ${LIBRARY_OUTPUT_PATH})
# SET(my_test "from test_mymodule import *\;test_mymodule()")
# ADD_TEST(PYTHON-TEST-MYMODULE python -c ${my_test})
# Since cmake is only transmitting the ADD_TEST line to ctest thus you are loosing
# Since cmake is only transmitting the ADD_TEST line to ctest thus you are losing
# the env var. The only way to store the env var is to physically write in the cmake script
# whatever PYTHONPATH you want and then add the test as 'cmake -P python_test.cmake'
#

2
cmake/modules/ECMQt4To5Porting.cmake
View File

@ -30,7 +30,7 @@
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#=============================================================================
# The automoc_qt4 macro is superceeded by CMAKE_AUTOMOC from CMake 2.8.6
# The automoc_qt4 macro is superseded by CMAKE_AUTOMOC from CMake 2.8.6
# A Qt 5 version is not provided by CMake or Qt.
include(MacroAddFileDependencies)

6
cmake_templates/Doxyfile.in
View File

@ -159,9 +159,9 @@ QT_AUTOBRIEF = NO
# The MULTILINE_CPP_IS_BRIEF tag can be set to YES to make Doxygen
# treat a multi-line C++ special comment block (i.e. a block of //! or ///
# comments) as a brief description. This used to be the default behaviour.
# comments) as a brief description. This used to be the default behavior.
# The new default is to treat a multi-line C++ comment block as a detailed
# description. Set this tag to YES if you prefer the old behaviour instead.
# description. Set this tag to YES if you prefer the old behavior instead.
MULTILINE_CPP_IS_BRIEF = NO
@ -1038,7 +1038,7 @@ EXT_LINKS_IN_WINDOW = NO
FORMULA_FONTSIZE = 10
# Use the FORMULA_TRANPARENT tag to determine whether or not the images
# Use the FORMULA_TRANSPARENT tag to determine whether or not the images
# generated for formulas are transparent PNGs. Transparent PNGs are
# not supported properly for IE 6.0, but are supported on all modern browsers.
# Note that when changing this option you need to delete any form_*.png files

2
debian/changelog vendored
View File

@ -279,7 +279,7 @@ qgis (1.3.0) UNRELEASED; urgency=low
* new upstream release
* add analysis library and raster terrain analysis plugin
* alternativly depend on libgdal1-1.6.0-grass
* alternatively depend on libgdal1-1.6.0-grass
* include CONTRIBUTORS, TRANSLATORS and DONORS
* reverse order of libgdal1-*-grass dependencies

1
debian/control vendored
View File

@ -319,7 +319,6 @@ Depends:
gdal-bin,
python3-gdal,
python3-matplotlib,
python3-shapely,
libqgis-customwidgets,
${misc:Depends}
XB-Python-Version: ${python:Versions}

1
debian/control.in vendored
View File

@ -348,7 +348,6 @@ Depends:
gdal-bin,
python3-gdal,
python3-matplotlib,
python3-shapely,
libqgis-customwidgets,
${misc:Depends}
XB-Python-Version: ${python:Versions}

2
debian/copyright vendored
View File

@ -595,7 +595,7 @@ License: ElvenSword
this situation.)
.
* Do not remove my name on it (preview). I saw some Turkish and
Russian forum sites delete artists names though, and they puting
Russian forum sites delete artists names though, and they put
their own cursed crappy logos on the previews. It is not sharing.
It is ...
.

1
debian/qgis-server.install vendored
View File

@ -2,3 +2,4 @@ usr/lib/cgi-bin/qgis_mapserv.fcgi
usr/lib/cgi-bin/admin.sld
usr/lib/cgi-bin/wms_metadata.xml
usr/lib/cgi-bin/schemaExtension.xsd
usr/lib/qgis/server/*.so

8
doc/CMakeLists.txt
View File

@ -48,6 +48,7 @@ IF(WITH_APIDOC)
SET(DOXYGEN_INPUT
${CMAKE_SOURCE_DIR}/doc
${CMAKE_SOURCE_DIR}/src/core
${CMAKE_SOURCE_DIR}/src/core/annotations
${CMAKE_SOURCE_DIR}/src/core/auth
${CMAKE_SOURCE_DIR}/src/core/composer
${CMAKE_SOURCE_DIR}/src/core/diagram
@ -84,11 +85,16 @@ IF(WITH_APIDOC)
${DOXYGEN_INPUT}
${CMAKE_SOURCE_DIR}/src/server/qgsserver.h
${CMAKE_SOURCE_DIR}/src/server/qgscapabilitiescache.h
${CMAKE_SOURCE_DIR}/src/server/qgsmapserviceexception.h
${CMAKE_SOURCE_DIR}/src/server/qgsserverexception.h
${CMAKE_SOURCE_DIR}/src/server/qgsrequesthandler.h
${CMAKE_SOURCE_DIR}/src/server/qgsserverfilter.h
${CMAKE_SOURCE_DIR}/src/server/qgsaccesscontrolfilter.h
${CMAKE_SOURCE_DIR}/src/server/qgsserverinterface.h
${CMAKE_SOURCE_DIR}/src/server/qgsserverrequest.h
${CMAKE_SOURCE_DIR}/src/server/qgsserverresponse.h
${CMAKE_SOURCE_DIR}/src/server/qgsserverrequest.h
${CMAKE_SOURCE_DIR}/src/server/qgsservice.h
${CMAKE_SOURCE_DIR}/src/server/qgsserviceregistry.h
)
ENDIF(WITH_SERVER_PLUGINS)

177
doc/INSTALL.html
View File

@ -5,7 +5,7 @@
<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=utf-8">
<TITLE>QGIS</TITLE>
<!-- Included /home/fischer/src/qgis3/doc/style.css -->
<!-- Included doc/style.css -->
<STYLE TYPE="text/css">
body{ background: white;
color: black;
@ -77,13 +77,13 @@ label{ background-color: #FFFFCC;
<DIV CLASS="header" ID="header">
<H1>QGIS</H1>
<H2>Building QGIS from source - step by step</H2>
<H3>Monday January 09, 2017</H3>
<H3>Wednesday January 25, 2017</H3>
</DIV>
<DIV CLASS="body" ID="body">
<P>
Last Updated: Monday January 09, 2017
Last Change : Monday January 09, 2017
Last Updated: Wednesday January 25, 2017
Last Change : Friday January 20, 2017
</P>
<DIV CLASS="toc">
@ -92,7 +92,7 @@ Last Change : Monday January 09, 2017
<LI><A HREF="#toc2">Overview</A>
<LI><A HREF="#toc3">Building on GNU/Linux</A>
<UL>
<LI><A HREF="#toc4">3.1. Building QGIS with Qt 4.x</A>
<LI><A HREF="#toc4">3.1. Building QGIS with Qt 5.x</A>
<LI><A HREF="#toc5">3.2. Prepare apt</A>
<LI><A HREF="#toc6">3.3. Install build dependencies</A>
<LI><A HREF="#toc7">3.4. Setup ccache (Optional)</A>
@ -100,39 +100,37 @@ Last Change : Monday January 09, 2017
<LI><A HREF="#toc9">3.6. Check out the QGIS Source Code</A>
<LI><A HREF="#toc10">3.7. Starting the compile</A>
<LI><A HREF="#toc11">3.8. Building Debian packages</A>
<LI><A HREF="#toc12">3.9. Building QGIS with Qt 5.x</A>
<LI><A HREF="#toc13">3.10. On Debian Linux</A>
<LI><A HREF="#toc14">3.11. On Fedora Linux</A>
<LI><A HREF="#toc12">3.9. On Fedora Linux</A>
</UL>
<LI><A HREF="#toc15">Building on Windows</A>
<LI><A HREF="#toc13">Building on Windows</A>
<UL>
<LI><A HREF="#toc16">4.1. Building with Microsoft Visual Studio</A>
<LI><A HREF="#toc17">4.2. Building using MinGW</A>
<LI><A HREF="#toc18">4.3. Creation of MSYS environment for compilation of QGIS</A>
<LI><A HREF="#toc14">4.1. Building with Microsoft Visual Studio</A>
<LI><A HREF="#toc15">4.2. Building using MinGW</A>
<LI><A HREF="#toc16">4.3. Creation of MSYS environment for compilation of QGIS</A>
</UL>
<LI><A HREF="#toc19">Building on MacOS X</A>
<LI><A HREF="#toc17">Building on MacOS X</A>
<UL>
<LI><A HREF="#toc20">5.1. Install Developer Tools</A>
<LI><A HREF="#toc21">5.2. Install Qt4 from disk image</A>
<LI><A HREF="#toc22">5.3. Install CMake for OSX</A>
<LI><A HREF="#toc23">5.4. Install development frameworks for QGIS dependencies</A>
<LI><A HREF="#toc24">5.5. API documentation</A>
<LI><A HREF="#toc25">5.6. QGIS source</A>
<LI><A HREF="#toc26">5.7. Configure the build</A>
<LI><A HREF="#toc27">5.8. Building</A>
<LI><A HREF="#toc28">5.9. Post-Install</A>
<LI><A HREF="#toc18">5.1. Install Developer Tools</A>
<LI><A HREF="#toc19">5.2. Install Qt4 from disk image</A>
<LI><A HREF="#toc20">5.3. Install CMake for OSX</A>
<LI><A HREF="#toc21">5.4. Install development frameworks for QGIS dependencies</A>
<LI><A HREF="#toc22">5.5. API documentation</A>
<LI><A HREF="#toc23">5.6. QGIS source</A>
<LI><A HREF="#toc24">5.7. Configure the build</A>
<LI><A HREF="#toc25">5.8. Building</A>
<LI><A HREF="#toc26">5.9. Post-Install</A>
</UL>
<LI><A HREF="#toc29">Setting up the WCS test server on GNU/Linux</A>
<LI><A HREF="#toc27">Setting up the WCS test server on GNU/Linux</A>
<UL>
<LI><A HREF="#toc30">6.1. Preparation</A>
<LI><A HREF="#toc31">6.2. Setup mapserver</A>
<LI><A HREF="#toc32">6.3. Create a home page</A>
<LI><A HREF="#toc33">6.4. Now deploy it</A>
<LI><A HREF="#toc34">6.5. Debugging</A>
<LI><A HREF="#toc28">6.1. Preparation</A>
<LI><A HREF="#toc29">6.2. Setup mapserver</A>
<LI><A HREF="#toc30">6.3. Create a home page</A>
<LI><A HREF="#toc31">6.4. Now deploy it</A>
<LI><A HREF="#toc32">6.5. Debugging</A>
</UL>
<LI><A HREF="#toc35">Setting up a Jenkins Build Server</A>
<LI><A HREF="#toc36">Debug output and running tests</A>
<LI><A HREF="#toc37">Authors and Acknowledgments</A>
<LI><A HREF="#toc33">Setting up a Jenkins Build Server</A>
<LI><A HREF="#toc34">Debug output and running tests</A>
<LI><A HREF="#toc35">Authors and Acknowledgments</A>
</OL>
</DIV>
@ -253,14 +251,14 @@ those formats in GDAL.
<H1>3. Building on GNU/Linux</H1>
<A NAME="toc4"></A>
<H2>3.1. Building QGIS with Qt 4.x</H2>
<H2>3.1. Building QGIS with Qt 5.x</H2>
<P>
<B>Requires:</B> Ubuntu / Debian derived distro
</P>
<P>
/!\ <B>Note:</B> Refer to the section Building Debian packages for building
debian packages. Unless you plan to develop on QGIS, that is probably the
debian packages. Unless you plan to develop on QGIS, that is probably the
easiest option to compile and install QGIS.
</P>
<P>
@ -433,6 +431,12 @@ After the 'g' generation is complete, press 'q' to exit the ccmake
interactive dialog.
</P>
<P>
/!\ <B>Warning:</B> Make sure that your build directory is completely empty when you
enter the command. Do never try to "re-use" an existing <B>Qt4</B> build directory.
If you want to use `ccmake` or other interactive tools, run the command in
the empty build directory once before starting to use the interactive tools.
</P>
<P>
Now on with the build:
</P>
@ -574,67 +578,14 @@ sudo debi
</PRE></div>
<A NAME="toc12"></A>
<H2>3.9. Building QGIS with Qt 5.x</H2>
<P>
/!\ <B>Warning:</B> Qt 5 is not officially supported. Building against Qt 5
libraries seems to work quite well already but be prepared that you are one
of very few with this setup. We strongly recommend using QGIS with Qt 4 for
production work.
</P>
<P>
Python bindings in particular are not expected to be compatible. When Qt 5
is enabled, the build system automatically activates Python 3 and PyQt5 as well.
There are no plugins and not even the python code shipped along the QGIS source
code is compatible with PyQt5.
</P>
<P>
You have been warned.
</P>
<A NAME="toc13"></A>
<H2>3.10. On Debian Linux</H2>
<P>
We assume that you have the source code of QGIS ready and created a new
subdirectory called `build` or `build-qt5` in it.
</P>
<H3>3.10.1. Install build dependencies</H3>
<div class="code"><PRE>
apt-get install git build-essential cmake flex bison pyqt5-dev qttools5-dev qtpositioning5-dev libqt5svg5-dev libqt5webkit5-dev libqt5gui5 libqt5scripttools5 qtscript5-dev libqca-qt5-2-dev grass-dev libgeos-dev libgdal-dev libqt5xmlpatterns5-dev libqt5scintilla2-dev pyqt5.qsci-dev python3-pyqt5.qsci libgsl-dev txt2tags libproj-dev libqwt-qt5-dev libspatialindex-dev pyqt5-dev-tools qttools5-dev-tools qt5-default python3-future python3-pyqt5.qtsql python3-psycopg2 python3-sip-dev
</PRE></div>
<P>
Make sure that your build directory is completely empty when you enter the
following command. Do never try to "re-use" an existing Qt4 build directory.
If you want to use `ccmake` or other interactive tools, run the following
command in the empty build directory once before starting to use the
interactive tools.
</P>
<div class="code"><PRE>
cmake
</PRE></div>
<P>
If everything went ok you can finally start to compile. (As usual append a -jX where X is the number of available cores option to make to speed up your build process)
</P>
<div class="code"><PRE>
make
</PRE></div>
<A NAME="toc14"></A>
<H2>3.11. On Fedora Linux</H2>
<H2>3.9. On Fedora Linux</H2>
<P>
We assume that you have the source code of QGIS ready and created a
new subdirectory called `build` or `build-qt5` in it.
</P>
<H3>3.11.1. Install build dependencies</H3>
<H3>3.9.1. Install build dependencies</H3>
<div class="code"><PRE>
dnf install qt5-qtwebkit-devel qt5-qtlocation-devel qt5-qttools-static
@ -692,10 +643,10 @@ Or install to your system
make install
</PRE></div>
<A NAME="toc15"></A>
<A NAME="toc13"></A>
<H1>4. Building on Windows</H1>
<A NAME="toc16"></A>
<A NAME="toc14"></A>
<H2>4.1. Building with Microsoft Visual Studio</H2>
<P>
@ -953,7 +904,7 @@ look at:
<I>ms-windows/osgeo4w/package.cmd</I>
</P>
<A NAME="toc17"></A>
<A NAME="toc15"></A>
<H2>4.2. Building using MinGW</H2>
<P>
@ -1094,7 +1045,7 @@ make install
<P>
/!\ You can delete the directories with unpacked SIP and PyQt4 sources after a
successfull install, they're not needed anymore.
successful install, they're not needed anymore.
</P>
<H3>4.2.5. git</H3>
@ -1222,7 +1173,7 @@ tree. Read the READMEfile there and follow the instructions. Next right click
on qgis.nsi and choose the option 'Compile NSIS Script'.
</P>
<A NAME="toc18"></A>
<A NAME="toc16"></A>
<H2>4.3. Creation of MSYS environment for compilation of QGIS</H2>
<H3>4.3.1. Initial setup</H3>
@ -1479,7 +1430,7 @@ We're done with preparation of MSYS environment. Now you can delete all stuff in
of space and it's not necessary at all.
</P>
<A NAME="toc19"></A>
<A NAME="toc17"></A>
<H1>5. Building on MacOS X</H1>
<P>
@ -1546,7 +1497,7 @@ so it's just 'make', or using a smaller number. Sometimes make can hiccup on to
many threads.
</P>
<A NAME="toc20"></A>
<A NAME="toc18"></A>
<H2>5.1. Install Developer Tools</H2>
<P>
@ -1603,7 +1554,7 @@ If you have trouble building some of the dependencies listed below with clang
(e.g. OSG &amp; osgEarth), try using only the LLVM compilers.
</P>
<A NAME="toc21"></A>
<A NAME="toc19"></A>
<H2>5.2. Install Qt4 from disk image</H2>
<P>
@ -1663,7 +1614,7 @@ may need some help by adding '-L/usr/local/lib' to CMAKE_SHARED_LINKER_FLAGS,
CMAKE_MODULE_LINKER_FLAGS and CMAKE_EXE_LINKER_FLAGS in the cmake build.
</P>
<A NAME="toc22"></A>
<A NAME="toc20"></A>
<H2>5.3. Install CMake for OSX</H2>
<P>
@ -1745,7 +1696,7 @@ If you have trouble building some of the dependencies listed below (e.g. OSG &am
osgEarth), try bypassing ccache.
</P>
<A NAME="toc23"></A>
<A NAME="toc21"></A>
<H2>5.4. Install development frameworks for QGIS dependencies</H2>
<P>
@ -2418,7 +2369,7 @@ folder in the include/ folder to /Library/Application Support/OpenSceneGraph/Hea
And as for OSG, you can leave the bin/ executables where they are.
</P>
<A NAME="toc24"></A>
<A NAME="toc22"></A>
<H2>5.5. API documentation</H2>
<P>
@ -2454,7 +2405,7 @@ QGIS.app bundling on install, inside the app in:
QGIS.app/Contents/Resources/doc
</P>
<A NAME="toc25"></A>
<A NAME="toc23"></A>
<H2>5.6. QGIS source</H2>
<P>
@ -2489,7 +2440,7 @@ git merge qgisupstream
</PRE></div>
<A NAME="toc26"></A>
<A NAME="toc24"></A>
<H2>5.7. Configure the build</H2>
<P>
@ -2630,7 +2581,7 @@ non-standard, libs (ie postgres' libpq) set the bundle value to 2:
-D QGIS_MACAPP_BUNDLE=2 \
</PRE></div>
<A NAME="toc27"></A>
<A NAME="toc25"></A>
<H2>5.8. Building</H2>
<P>
@ -2658,7 +2609,7 @@ or, for an /Applications build:
sudo make install
</PRE></div>
<A NAME="toc28"></A>
<A NAME="toc26"></A>
<H2>5.9. Post-Install</H2>
<P>
@ -2694,7 +2645,7 @@ for instructions on setting up Apache fastcgi and testing Mapserver, including
installing the mod-fastcgi that is missing on Lion.
</P>
<A NAME="toc29"></A>
<A NAME="toc27"></A>
<H1>6. Setting up the WCS test server on GNU/Linux</H1>
<P>
@ -2705,7 +2656,7 @@ These notes are for Ubuntu - other versions and Debian derived distros may
require slight variations in package names.
</P>
<A NAME="toc30"></A>
<A NAME="toc28"></A>
<H2>6.1. Preparation</H2>
<P>
@ -2725,7 +2676,7 @@ is integrated into master.
cd cgi-bin/
</P>
<A NAME="toc31"></A>
<A NAME="toc29"></A>
<H2>6.2. Setup mapserver</H2>
<P>
@ -2791,7 +2742,7 @@ Then create /var/www/wcs/7-wcs.qgis.org.conf setting the contents to this:
&lt;/VirtualHost&gt;
</PRE></div>
<A NAME="toc32"></A>
<A NAME="toc30"></A>
<H2>6.3. Create a home page</H2>
<div class="code"><PRE>
@ -2809,7 +2760,7 @@ Set the contents to:
http://wcs.qgis.org/1.9.0/wcs
</PRE></div>
<A NAME="toc33"></A>
<A NAME="toc31"></A>
<H2>6.4. Now deploy it</H2>
<div class="code"><PRE>
@ -2822,14 +2773,14 @@ Set the contents to:
sudo /etc/init.d/apache2 reload
</PRE></div>
<A NAME="toc34"></A>
<A NAME="toc32"></A>
<H2>6.5. Debugging</H2>
<div class="code"><PRE>
sudo tail -f /var/log/apache2/wcs_qgis.org/error.log
</PRE></div>
<A NAME="toc35"></A>
<A NAME="toc33"></A>
<H1>7. Setting up a Jenkins Build Server</H1>
<P>
@ -2931,7 +2882,7 @@ I based some of the set up from this nice blog article here:
<A HREF="http://alexott.blogspot.com/2012/03/jenkins-cmakectest.html">http://alexott.blogspot.com/2012/03/jenkins-cmakectest.html</A>
</UL>
<A NAME="toc36"></A>
<A NAME="toc34"></A>
<H1>8. Debug output and running tests</H1>
<P>
@ -2997,7 +2948,7 @@ ctest --show-only
ctest --verbose --tests-regex SomeTestName
</PRE></div>
<A NAME="toc37"></A>
<A NAME="toc35"></A>
<H1>9. Authors and Acknowledgments</H1>
<P>
@ -3063,5 +3014,5 @@ The following people have contributed to this document:
</DIV>
<!-- html code generated by txt2tags 2.6 (http://txt2tags.org) -->
<!-- cmdline: txt2tags -\-encoding=utf-8 -o/home/fischer/src/qgis3/debian/build-master-ninja/doc/INSTALL.html -t html /home/fischer/src/qgis3/doc/INSTALL.t2t -->
<!-- cmdline: txt2tags -\-encoding=utf-8 -o doc/INSTALL.html -t html doc/INSTALL.t2t -->
</BODY></HTML>

301
doc/api_break.dox
View File

@ -102,7 +102,7 @@ Renamed Classes {#qgis_api_break_3_0_renamed_classes}
<tr><td>QgsGraduatedSymbolRendererV2ViewStyle<td>QgsGraduatedSymbolRendererViewStyle
<tr><td>QgsGraduatedSymbolRendererV2Widget<td>QgsGraduatedSymbolRendererWidget
<tr><td>QgsLabelingEngineV2<td>QgsLabelingEngine
<td><td>QgsLegendModelV2<td>QgsLegendModel
<tr><td>QgsLegendModelV2<td>QgsLegendModel
<tr><td>QgsLegendSymbolItemV2<td>QgsLegendSymbolItem
<tr><td>QgsLineStringV2<td>QgsLineString
<tr><td>QgsLineSymbolLayerV2<td>QgsLineSymbolLayer
@ -170,7 +170,6 @@ Renamed Classes {#qgis_api_break_3_0_renamed_classes}
<tr><td>QgsSymbolV2RenderContext<td>QgsSymbolRenderContext
<tr><td>QgsSymbolV2SelectorDialog<td>QgsSymbolSelectorDialog
<tr><td>QgsSymbolV2SelectorWidget<td>QgsSymbolSelectorWidget
<tr><td>QgsSymbologyV2Conversion<td>QgsSymbologyConversion
<tr><td>QgsVectorColorBrewerColorRampV2<td>QgsColorBrewerColorRamp
<tr><td>QgsVectorColorBrewerColorRampV2Dialog<td>QgsColorBrewerColorRampDialog
<tr><td>QgsVectorColorBrewerColorRampV2DialogBase<td>QgsColorBrewerColorRampDialogBase
@ -180,14 +179,15 @@ Renamed Classes {#qgis_api_break_3_0_renamed_classes}
<tr><td>QgsVectorGradientColorRampV2Dialog<td>QgsGradientColorRampDialog
<tr><td>QgsVectorGradientColorRampV2DialogBase<td>QgsGradientColorRampDialogBase
<tr><td>QgsVectorGradientRampV2<td>QgsVectorGradientRamp
<tr><td>QgsVectorJoinInfo<td>QgsVectorLayerJoinInfo
<tr><td>QgsVectorLayersetRendererV2<td>QgsVectorLayersetRenderer
<tr><td>QgsVectorRandomColorRampV2<td>QgsLimitedRandomColorRamp
<tr><td>QgsVectorRandomColorRampV2Dialog<td>QgsLimitedRandomColorRampDialog
<tr><td>QgsVectorRandomColorRampV2DialogBase<td>QgsLimitedRandomColorRampDialogBase
<tr><th>QgsSymbolV2<th>QgsSymbol
<tr><th>QgsArcProperter<th>QgsStrategy
<tr><th>QgsDistanceArcProperter<th>QgsDistanceStrategy
<tr><th>QgsGraphArc<th>QgsGraphEdge
<tr><td>QgsSymbolV2<td>QgsSymbol
<tr><td>QgsArcProperter<td>QgsStrategy
<tr><td>QgsDistanceArcProperter<td>QgsDistanceStrategy
<tr><td>QgsGraphArc<td>QgsGraphEdge
</table>
<table>
@ -233,6 +233,7 @@ Renamed Classes {#qgis_api_break_3_0_renamed_classes}
Removed Classes {#qgis_api_break_3_0_removed_classes}
---------------
- QgsAnnotationItem was removed. This was replaced by QgsAnnotation and QgsMapCanvasAnnotationItem.
- QgsAttributeAction was removed, and replaced by QgsActionManager.
- QgsAttributeEditor was removed. Use QgsEditorWidgetRegistry::create() instead.
- QgsColorbutton was removed. QgsColorButtonV2 has now been renamed to QgsColorButton. Hence, QgsColorButtonV2 does not exist anymore.
@ -248,6 +249,9 @@ Use QgsComposerAttributeTableV2 instead.
- QgsCRSCache was removed. QgsCoordinateReferenceSystem now internally uses a cache for CRS creation,
so there is no longer a need for the separate cache class. Code which previously called QgsCRSCache::updateCRSCache()
should now call QgsCoordinateReferenceSystem::invalidateCache() and QgsCoordinateTransformCache::instance()->invalidateCrs( authid ).
- QgsFileNameWidgetWrapper was removed. Use QgsExternalResourceWidgetWrapper instead.
- QgsFormAnnotationItem. Use QgsFormAnnotation instead.
- QgsHtmlAnnotationItem. Use QgsHtmlAnnotation instead.
- QgsHttpTransaction. This class was outdated and code should be ported to native Qt or Python implementations.
- QgsLabel and QgsLabelAttributes. Replaced by labeling based on PAL library, see QgsLabelingEngine.
- QgsLabelingEngineInterface. Replaced by QgsLabelingEngine.
@ -261,12 +265,17 @@ should now call QgsCoordinateReferenceSystem::invalidateCache() and QgsCoordinat
- QgsMapCanvasMap. It is an internal class used by map canvas.
- QgsMapLayerRegistry. Its functionality has been moved to QgsProject.
- QgsMapRenderer. It has been replaced by QgsMapRendererJob with subclasses and QgsMapSettings.
- QgsPhotoWidgetWrapper was removed. Use QgsExternalResourceWidgetWrapper instead.
- QgsPseudoColorShader. This shader has been broken for some time and was replaced by QgsSingleBandPseudoColorRenderer.
- QgsProjectBadLayerGuiHandler was removed. It was unused in QGIS code and barely useful. Implement your own QgsProjectBadLayerHandler subclass if needed.
- QgsRendererV2DataDefinedMenus was removed. Use QgsDataDefinedButton instead.
- QgsLegacyHelpers.
- QgsProviderCountCalcEvent and QgsProviderExtentCalcEvent. These classes were unused in QGIS core and unmaintained.
- QgsWebviewWidgetWrapper was removed. Use QgsExternalResourceWidgetWrapper instead.
- QgsEditorWidgetConfig was removed. Use QVariantMap instead.
- QgsSvgAnnotationItem. Use QgsSvgAnnotation instead.
- QgsSymbologyV2Conversion was removed. Reading of renderers from pre-1.0 versions is not supported anymore.
- QgsTextAnnotationItem. Use QgsTextAnnotation instead.
General changes {#qgis_api_break_3_0_global}
@ -347,12 +356,6 @@ QgisInterface {#qgis_api_break_3_0_QgisInterface}
- actionRemoveLayer was removed as it no longer exists.
QgsAnnotation {#qgis_api_break_3_0_QgsAnnotation}
-------------
- mapPositionFixed() has been renamed to hasFixedMapPosition()
QgsAbstractGeometry {#qgis_api_break_3_0_QgsAbstractGeometry}
-------------------
@ -399,7 +402,8 @@ QgsAdvancedDigitizingDockWidget {#qgis_api_break_3_0_QgsAdvancedDigitizin
QgsAtlasComposition {#qgis_api_break_3_0_QgsAtlasComposition}
-------------------
- readXMLMapSettings() has been renamed to readXmlMapSettings()
- readXMLMapSettings() was removed. QGIS no longer supports upgrading pre 2.2 compositions and if this is a
requirement the projects should first be upgraded by opening and saving in 2.18.
- composerMap() and setComposerMap() were removed. Use QgsComposerMap::atlasDriven() and setAtlasDriven()
instead
- fixedScale() and setFixedScale() were removed. Use QgsComposerMap::atlasScalingMode() and setAtlasScalingMode()
@ -475,6 +479,16 @@ QgsColorBrewerColorRampDialog {#qgis_api_break_3_0_QgsColorBrewerColorRam
and the new ramp can be retrieved after executing the dialog by calling ramp().
- Some internal methods which were previously public or protected were made private.
QgsColorBrewerPalette {#qgis_api_break_3_0_QgsColorBrewerPalette}
---------------------
- brewerString was renamed to BREWER_STRING
QgsColorButton {#qgis_api_break_3_0_QgsColorButton}
--------------
- Behaviour enum and its corresponding setter/getter have been renamed to Behavior <!--#spellok-->
QgsColorRampShader {#qgis_api_break_3_0_QgsColorRampShader}
------------------
@ -558,6 +572,11 @@ and should be accessed using QgsComposerMap::overview() or QgsComposerMap::overv
instead.
- atlasFixedScale() and setAtlasFixedScale() were removed. Use atlasScalingMode()
and setAtlasScalingMode() instead.
- storeCurrentLayerSet() was removed. Use setLayers() instead.
- The layersChanged() slot was removed.
- setMapCanvas() was removed. This is no longer required to draw map annotations, which are instead retrieved from the composition's
associated project's annotationManager()
- setDrawCanvasItems() and drawCanvasItems() were renamed to setDrawAnnotations() and drawAnnotations()
QgsComposerMapGrid {#qgis_api_break_3_0_QgsComposerMapGrid}
@ -584,6 +603,13 @@ QgsComposerNodesItem {#qgis_api_break_3_0_QgsComposerNodesItem}
- _writeXMLStyle() has been renamed to _writeXMLStyle()
- unselectNode() has been renamed to deselectNode() <!--#spellok-->
QgsComposerObject {#qgis_api_break_3_0_QgsComposerObject}
-----------------
- dataDefinedProperty() and setDataDefinedProperty() no longer use QgsDataDefined objects.
Instead these methods have been ported to the QgsProperty framework.
- dataDefinedEvaluate() was removed. Use the QgsProperty evaluation methods instead.
QgsComposerPicture {#qgis_api_break_3_0_QgsComposerPicture}
------------------
@ -598,6 +624,13 @@ QgsComposerObject::dataDefinedProperty instead.
QgsComposerObject::setDataDefinedProperty() instead.
- updatePictureExpression() was removed.
QgsComposerScaleBar {#qgis_api_break_3_0_QgsComposerScaleBar}
-------------------
- setBrush() was removed. Use setFillColor() instead.
- setBrush2() was removed. Use setFillColor2() instead.
- setPen() was removed. Use setLineColor() and setLineWidth() instead.
QgsComposerTable {#qgis_api_break_3_0_QgsComposerTable}
----------------
@ -611,17 +644,33 @@ QgsComposerTableV2 {#qgis_api_break_3_0_QgsComposerTableV2}
- rowsVisible(), rowRange(), drawHorizontalGridLines() and
drawVerticalGridLines() were removed.
- WrapBehaviour enum and its setter and getter methods has been renamed to WrapBehavior <!--#spellok-->
- EmptyTableBehaviour enum and its setter and getter methods has been renamed to EmptyTableBehavior <!--#spellok-->
QgsComposerView {#qgis_api_break_3_0_QgsComposerView}
--------------------
- unselectNode() has been renamed to deselectNode() <!--#spellok-->
QgsComposerUtils {#qgis_api_break_3_0_QgsComposerUtils}
-----------------
- readDataDefinedPropertyMap() was renamed to readOldDataDefinedPropertyMap() and the signature has changed
to use a QgsPropertyCollection object.
- readDataDefinedProperty() was renamed to readOldDataDefinedProperty() and the signature has changed
to use the QgsProperty framework objects.
- writeDataDefinedPropertyMap() was removed. This is now handled by QgsPropertyCollection::writeXml()
QgsComposition {#qgis_api_break_3_0_QgsComposition}
--------------
- constructor requires QgsProject instance as the second argument
- The constructor no longer takes a reference to a QgsMapSettings object. This is no longer
used by compositions. To set the layers to show in composer maps, the QgsComposerMap::setLayers()
method should be used instead.
- constructor requires QgsProject instance
- addItemsFromXML() has been renamed to addItemsFromXml()
- Constructor with QgsMapRenderer parameter has been removed. Use the variant with QgsMapSettings parameter.
- mapRenderer() has been removed. Use mapSettings() instead.
@ -632,6 +681,10 @@ were removed. Use setSnapTolerance() and snapTolerance() instead.
- sortZList() was removed. Use refreshZList() instead.
- addComposerTable(), composerTableAdded() were removed.
- setAllUnselected() has been renamed to setAllDeselected. <!--#spellok-->
- worldFileMap() and setWorldFileMap() have been renamed to referenceMap() and setReferenceMap()
- dataDefinedProperty() and setDataDefinedProperty() now use the QgsProperty framework instead
of QgsDataDefined objects.
- mapSettings() was removed. Use QgsComposerMap::mapSettings() instead.
QgsCoordinateReferenceSystem {#qgis_api_break_3_0_QgsCoordinateReferenceSystem}
@ -651,7 +704,7 @@ called if changes are made to the CRS database.
QgsCoordinateTransform {#qgis_api_break_3_0_QgsCoordinateTransform}
----------------------
- QgsCoordinateTransform is no longer a QObject. readXml, writeXml and initialise are all normal public members now,
- QgsCoordinateTransform is no longer a QObject. readXml, writeXml and initialize are all normal public members now,
not slots. The invalidTransformInput() signal has been removed.
- The extra QgsCoordinateTransform constructors (those not taking QgsCoordinateReferenceSystem arguments) have been
removed. Now, QgsCoordinateTransform must be created using an already existing source and destination
@ -659,7 +712,7 @@ QgsCoordinateReferenceSystem object.
- QgsCoordinateTransform::clone() has been removed. Just use direct copies instead.
- sourceCrs() and destCrs() now return a copy instead of a reference to the CRS. This has no effect on PyQGIS code, but c++
plugins calling these methods will need to be updated.
- isInitialised() has been renamed to isValid()
- isInitialised() has been renamed to isValid() <!--#spellok-->
- theCRS parameter in setSourceCrs has been renamed to 'crs'
- setDestCRS() has been renamed to setDestinationCrs() for consistency
- destCRS() has been renamed to destinationCrs() for consistency
@ -735,7 +788,6 @@ QgsDataDefinedButton {#qgis_api_break_3_0_QgsDataDefinedButton}
- registerGetExpressionContextCallback has been removed in favor of registerExpressionContextGenerator
QgsDataDefinedSymbolDialog {#qgis_api_break_3_0_QgsDataDefinedSymbolDialog}
--------------------------
@ -743,6 +795,12 @@ QgsDataDefinedSymbolDialog {#qgis_api_break_3_0_QgsDataDefinedSymbolDialo
instead.
QgsDataDefinedValueDialog {#qgis_api_break_3_0_QgsDataDefinedValueDialog}
--------------------------
- These classes and subclasses now use QgsProperty objects instead of QgsDataDefined.
QgsDataItem {#qgis_api_break_3_0_QgsDataItem}
-----------
@ -795,8 +853,10 @@ QgsDiagramInterpolationSettings {#qgis_api_break_3_0_QgsDiagramInterpolat
QgsDiagramRenderer {#qgis_api_break_3_0_QgsDiagramRenderer}
------------------
- xform, fields were no longer required and are removed.
- referencedFields() no longer takes a QgsFields argument.
- renderDiagram() now takes an optional data defined overrides collection argument.
QgsDiagramLayerSettings {#qgis_api_break_3_0_QgsDiagramLayerSettings}
@ -816,6 +876,18 @@ place of a null pointer.
- The dist member variable was removed. setDistance() and distance() should be used instead.
- The renderer member variable was removed, and getRenderer() was renamed to renderer()
- The showAll member variable was removed. setShowAllDiagrams() and showAllDiagrams() should be used instead.
- The xPosColumn, yPosColumn and showColumn attributes were removed. Use setDataDefinedProperties() for
setting data defined properties instead.
- The LinePlacementFlags enum was renamed to LinePlacementFlag
- The placement member variable was removed, and getPlacement() was renamed to placement()
- The placementFlags member variable was removed
- The priority member variable was removed, and getPriority() was renamed to priority()
- The zIndex member variable was removed, and getZIndex() was renamed to zIndex()
- The obstacle member variable was removed. setIsObstacle() and isObstacle() should be used instead.
- The dist member variable was removed. setDistance() and distance() should be used instead.
- The renderer member variable was removed, and getRenderer() was renamed to renderer()
- The showAll member variable was removed. setShowAllDiagrams() and showAllDiagrams() should be used instead.
- referencedFields() no longer requires a QgsFields argument.
QgsDiagramSettings {#qgis_api_break_3_0_QgsDiagramSettings}
------------------
@ -894,6 +966,11 @@ QgsExpression::Function {#qgis_api_break_3_0_QgsExpression_Function}
- `QStringList QgsExpression::Function::referencedColumns()` has been changed to `QSet<QString> QgsExpression::Function::referencedColumns( const NodeFunction* node )`
- `QgsExpression::Function::helptext()` has been renamed to `helpText()`
QgsExpressionItem {#qgis_api_break_3_0_QgsExpressionItem}
-----------------
- CustomSortRole was renamed to CUSTOM_SORT_ROLE
- ItemTypeRole was renamed to ITEM_TYPE_ROLE
QgsExpressionContextUtils {#qgis_api_break_3_0_QgsExpressionContextUtils}
-------------------------
@ -914,6 +991,12 @@ None will need to be modified, as the method will return an empty geometry if th
- The temporary constGeometry() method has been removed. Use geometry() instead.
- setFields( const QgsFields*, bool ) has been removed, use setFields( const QgsFields&, bool ) instead.
- fields() no longer returns a pointer, but instead a QgsFields value.
- The duplicate method setFeatureId() was removed. Use setId() instead.
QgsFeatureListViewDelegate {#qgis_api_break_3_0_QgsFeatureListViewDelegate}
--------------------------
- sIconSize was rename to ICON_SIZE
QgsFeatureRendererV2 {#qgis_api_break_3_0_QgsFeatureRendererV2}
@ -930,8 +1013,14 @@ QgsFeatureRendererV2 {#qgis_api_break_3_0_QgsFeatureRendererV2}
- symbolsForFeature( QgsFeature& feat ) has been removed. The symbolsForFeature( QgsFeature& feat, QgsRenderContext& context ) method should be used instead (previously available as symbolsForFeature2 in PyQGIS bindings).
- originalSymbolsForFeature( QgsFeature& feat ) has been removed. The originalSymbolsForFeature( QgsFeature& feat, QgsRenderContext& context ) method should be used instead (previously available as originalSymbolsForFeature2 in PyQGIS bindings).
- copyPaintEffect() was removed. copyRendererData() should be used instead.
- usedAttributes() now requires a QgsRenderContext argument.
QgsFeatureRequest {#qgis_api_break_3_0_QgsFeatureRequest}
-----------------
- AllAttributes was renamed to ALL_ATTRIBUTES
QgsFieldCombobox {#qgis_api_break_3_0_QgsFieldCombobox}
----------------
@ -963,8 +1052,10 @@ QgsGeometry {#qgis_api_break_3_0_QgsGeometry}
- All QgsGeometry methods now accept geometry references instead of pointers, and return a QgsGeometry
value instead of a pointer. The biggest impact with this change is that PyQGIS code should not compare a geometry
result to None, but instead either use a boolean test (`if g.buffer(10):`) or explicitly use the isEmpty()
result to None, but instead either use a boolean test (`if g.buffer(10):`) or explicitly use the isNull()
method to determine if a geometry is valid.
- isEmpty() was renamed to isNull() to differentiate a missing geometry from a geometry which is empty (eg an
empty geometry collection)
- wkbSize() and asWkb() has been replaced by exportToWkb(). WKB representation is no longer cached within QgsGeometry
- asGeos() has been replaced by exportToGeos(). GEOS representation is no longer cached within QgsGeometry
- int addPart( const QList<QgsPoint> &points, QgsWkbTypes::GeometryType geomType ) has been renamed to addPoints
@ -974,6 +1065,7 @@ method to determine if a geometry is valid.
- static bool compare( const QgsMultiPolygon& p1, const QgsMultiPolygon& p2, double epsilon ) has been renamed to compareMultiPolygons
- smoothLine and smoothPolygon are no longer public API (use smooth() instead)
- avoidIntersections() got an extra argument: list of layers to include in the operation (previously read from active QgsProject)
- isGeosEmpty() was removed. Use isEmpty() instead.
QgsGeometryAnalyzer {#qgis_api_break_3_0_QgsGeometryAnalyzer}
@ -1036,6 +1128,19 @@ QgsEditorWidgetFactory {#qgis_api_break_3_0_QgsEditorWidgetFactory}
- `alignmentFlag` has been removed. Use QgsFieldFormatter::representValue() instead
- `createCache` has been removed. Use QgsFieldFormatter::representValue() instead
QgsFeedback {#qgis_api_break_3_0_QgsFeedback}
-----------
- cancelled() and isCancelled() has been renamed to canceled() and isCanceled(), respectively <!--#spellok-->
QgsGeometryUtils {#qgis_api_break_3_0_QgsGeometryUtils}
----------------
- componentType enum has been renamed to ComponentType and its members were CamelCased too: VERTEX, RING and PART become Vertex, Ring and Part, respectively.
QgsGPSConnectionRegistry {#qgis_api_break_3_0_QgsGPSConnectionRegistry}
------------------------
@ -1087,6 +1192,12 @@ QgsLabelingEngineInterface {#qgis_api_break_3_0_QgsLabelingEngineInterfac
- labelsWithinRect() was removed. Use takeResults() and methods of QgsLabelingResults.
QgsLayerDefinition {#qgis_api_break_3_0_QgsLayerDefinition}
------------------
- loadLayerDefinition() now also requires QgsProject as the second argument
QgsLayerPropertiesWidget {#qgis_api_break_3_0_QgsLayerPropertiesWidget}
------------------------
@ -1100,6 +1211,7 @@ QgsLayerTreeGroup {#qgis_api_break_3_0_QgsLayerTreeGroup}
- isVisible() is moved to QgsLayerTreeNode
- setVisible() is replaced by QgsLayerTreeNode::setItemVisibilityChecked()
- protected methods updateVisibilityFromChildren() and updateChildVisibility() removed
- readXml() and readChildrenFromXml() do not resolve layers from the layer IDs anymore. Call resolveReferences() or use readXml() override with QgsProject as the second argument.
QgsLayerTreeLayer {#qgis_api_break_3_0_QgsLayerTreeLayer}
-----------------
@ -1107,6 +1219,12 @@ QgsLayerTreeLayer {#qgis_api_break_3_0_QgsLayerTreeLayer}
- setLayerName(), layerName() were renamed to setName(), name()
- isVisible() is moved to QgsLayerTreeNode
- setVisible() is replaced by QgsLayerTreeNode::setItemVisibilityChecked()
- readXml() does not resolve layer from the layer ID anymore. Call resolveReferences() or use readXml() override with QgsProject as the second argument.
QgsLayerTreeNode {#qgis_api_break_3_0_QgsLayerTreeNode}
----------------
- readXml() does not resolve layers from the layer IDs anymore. Call resolveReferences() or use readXml() override with QgsProject as the second argument.
QgsLayerTreeModel {#qgis_api_break_3_0_QgsLayerTreeMode}
@ -1145,7 +1263,7 @@ and the new ramp can be retrieved after executing the dialog by calling ramp().
QgsLinearlyInterpolatedDiagramRenderer {#qgis_api_break_3_0_QgsLinearlyInterpolatedDiagramRenderer}
--------------------------------------
- The classificationAttribute() and setClassificationAttribute() methods were replace by
- The classificationAttribute() and setClassificationAttribute() methods were replace by
classificationField() and setClassificationField() which use the field names instead of field
indexes.
@ -1197,6 +1315,7 @@ screenUpdateRequested() were removed. These members have had no effect for a num
- readLayerXML() was renamed to readLayerXml()
- writeLayerXML() was renamed to writeLayerXml()
- capitaliseLayerName() was renamed to capitalizeLayerName() <!--#spellok-->
- asLayerDefinition(), fromLayerDefinition(), fromLayerDefinitionFile() were moved to QgsLayerDefinition class and renamed to exportLayerDefinitionLayers() resp. loadLayerDefinitionLayers()
QgsMapLayerRegistry {#qgis_api_break_3_0_QgsMapLayerRegistry}
@ -1220,10 +1339,20 @@ be returned instead of a null pointer if no transformation is required.
- destinationSrsChanged() was renamed to destinationCrsChanged()
- getCompositionMode(), getBlendModeEnum() and BlendMode enum have been moved to QgsPainting utility class.
QgsMapRendererCache {#qgis_api_break_3_0_QgsMapRendererCache}
-------------------
- All protected members have been made private. This class is not designed to be subclassed.
- setCacheImage no longer uses layer IDs for cache keys. Cache keys can now be any arbitrary string.
A new parameter for setCacheImage is used to list all layers on which the cache image is dependent. This
allows for cache images which have either no layer dependencies or multiple layer dependencies.
QgsMapRendererJob {#qgis_api_break_3_0_QgsMapRendererJob}
-----------------
- All protected members are now considered private, and are no longer exposed to the Python bindings. QgsMapRendererJob
and subclasses are not designed to be subclassed in PyQGIS.
- reprojectToLayerExtent() now takes a QgsCoordinateTransform reference, not a pointer. An invalid QgsCoordinateTransform should
be used instead of a null pointer if no transformation is required.
- prepareJobs() and drawLabeling() (neither available in PyQGIS) do not take QgsPalLabeling parameter anymore. All drawing of labels is done by QgsLabelingEngine.
@ -1354,6 +1483,8 @@ QgsPalLabeling {#qgis_api_break_3_0_QgsPalLabeling}
- labelsAtPosition() was removed. Use takeResults() and methods of QgsLabelingResults instead.
- labelsWithinRect() was removed. Use takeResults() and methods of QgsLabelingResults instead.
- isStoredWithProject() and setStoredWithProject() had no effect and were removed.
- staticWillUseLayer(QString) was removed. Use the variant with QgsVectorLayer argument.
- clearEngineSettings() was replaced by QgsLabelingEngine::clearSettingsInProject().
QgsPalLayerSettings {#qgis_api_break_3_0_QgsPalLayerSettings}
@ -1362,6 +1493,13 @@ QgsPalLayerSettings {#qgis_api_break_3_0_QgsPalLayerSettings}
- ct is now a QgsCoordinateTransform object, not a pointer. An invalid QgsCoordinateTransform will
be used instead of a null pointer if no transformation is required.
- prepareGeometry() and geometryRequiresPreparation() now take a QgsCoordinateTransform reference, not a pointer. An invalid QgsCoordinateTransform should be used instead of a null pointer if no transformation is required.
- The DataDefinedProperties enum was renamed to Property
- dataDefinedProperty(), setDataDefinedProperty(), removeDataDefinedProperty(),
removeAllDataDefinedProperties(), updateDataDefinedString(), dataDefinedMap(),
dataDefinedValue(), dataDefinedEvaluate(), dataDefinedIsActive(),
dataDefinedUseExpression(), dataDefinedProperties() and dataDefinedNames()
members were removed. Use the QgsProperty framework through dataDefinedProperties()
and setDataDefinedProperties() instead.
QgsPanelWidgetStack {#qgis_api_break_3_0_QgsPanelWidgetStack}
@ -1411,6 +1549,7 @@ QgsProject {#qgis_api_break_3_0_QgsProject}
- read( QDomNode& layerNode ) was renamed to readLayer( const QDomNode& layerNode ).
- read( const QFileInfo& file ) was replaced by read( const QString& filename ).
- write( const QFileInfo& file ) was replaced by write( const QString& filename ).
- createEmbeddedLayer() does not take vectorLayerList as the third parameter anymore.
QgsProjectPropertyValue {#qgis_api_break_3_0_QgsProjectPropertyValue}
@ -1426,12 +1565,24 @@ QgsRaster {#qgis_api_break_3_0_QgsRaster}
- QgsRaster::contrastEnhancementLimitsFromString() has been removed, use QgsRasterMinMaxOrigin::limitsFromString()
QgsRasterBlock {#qgis_api_break_3_0_QgsRasterBlock}
--------------
- The constructor and reset() do not take no data value as the fourth argument anymore. There is new call setNoDataValue() to set it.
QgsRasterCalcNode {#qgis_api_break_3_0_QgsRasterCalcNode}
-----------------
- QgsRasterCalcNode::calculate has been removed, use method with QgsRasterBlocks instead.
QgsRasterCalculator {#qgis_api_break_3_0_QgsRasterCalcNode}
-------------------
- Cancelled (Result enum value) has been renamed to Canceled <!--#spellok-->
QgsRasterDataProvider {#qgis_api_break_3_0_QgsRasterDataProvider}
---------------------
@ -1440,6 +1591,7 @@ QgsRasterDataProvider {#qgis_api_break_3_0_QgsRasterDataProvider}
- useSrcNoDataValue() has been renamed to useSourceNoDataValue()
- setUseSrcNoDataValue() has been renamed to setUseSourceNoDataValue()
- srcNoDataValue() has been renamed to sourceNoDataValue()
- draw() has been removed from the interface as it was not used anywhere.
QgsRasterInterface {#qgis_api_break_3_0_QgsRasterInterface}
@ -1453,6 +1605,9 @@ QgsRasterInterface {#qgis_api_break_3_0_QgsRasterInterface}
QgsRasterLayer {#qgis_api_break_3_0_QgsRasterLayer}
--------------
- The constructor variant with loadDefaultStyleFlag as the 3rd parameter was removed. Use the
constructor variant which accepts a data provider string and loadDefaultStyleFlag as the
4th parameter instead.
- setDrawingStyle() was removed. Use setRendererForDrawingStyle() or setRenderer() instead.
- previewAsPixmap() was removed. Use previewAsImage() instead.
- updateProgress() had no effect and was removed.
@ -1495,6 +1650,15 @@ QgsRenderContext {#qgis_api_break_3_0_QgsRenderContext}
- coordinateTransform() now returns a QgsCoordinateTransform object, not a pointer. An invalid QgsCoordinateTransform will
be returned instead of a null pointer if no transformation is required.
- setCoordinateTransform() now takes a QgsCoordinateTransform reference, not a pointer. An invalid QgsCoordinateTransform should be used instead of a null pointer if no transformation is required.
- rasterScaleFactor() and setRasterScaleFactor() were removed. In QGIS 3.0 QPainter destinations should always be constructed so that 1 painter unit = 1 pixel.
- The constPainter() getter was removed. Const QPainters cannot be painted to or modified, so this
method was of little use.
QgsRendererRangeLabelFormat {#qgis_api_break_3_0_QgsRendererRangeLabelFormat}
---------------------------
- MaxPrecision was renamed to MAX_PRECISION
- MinPrecision was renamed to MIN_PRECISION
QgsRendererRegistry {#qgis_api_break_3_0_QgsRendererRegistry}
@ -1586,6 +1750,12 @@ QgsSvgCache {#qgis_api_break_3_0_QgsSvgCache}
- This class is no longer a singleton and instance() has been removed. Instead use QgsApplication::svgCache() to access an application-wide cache.
- containsParamsV2() was removed. Use containsParamsV3() instead.
- The rasterScaleFactor parameter was removed from all methods
QgsSvgCacheEntry {#qgis_api_break_3_0_QgsSvgCacheEntry}
----------------
- The rasterScaleFactor member was removed.
QgsStyle (renamed from QgsStyleV2) {#qgis_api_break_3_0_QgsStyle}
----------------------------------
@ -1606,6 +1776,9 @@ parameters or QgsSymbol::OutputUnitList parameters now take QgsUnitTypes::Render
data defined rotation.
- setRenderHints() and renderHints() now accept and return a QgsSymbol::RenderHints flag rather
than an integer value
- usedAttributes() now requires a QgsRenderContext argument.
- setDataDefinedAngle(), dataDefinedAngle(), setDataDefinedSize(), dataDefinedSize(), setDataDefinedWidth() and dataDefinedWidth()
now work with QgsProperty objects instead of QgsDataDefined.
QgsSymbolLayer (renamed from QgsSymbolLayerV2) {#qgis_api_break_3_0_QgsSymbolLayer}
@ -1613,10 +1786,17 @@ QgsSymbolLayer (renamed from QgsSymbolLayerV2) {#qgis_api_break_3_0_QgsSy
- The deprecated prepareExpressions( const QgsFields* fields, double scale = -1.0 ) method has been removed. Use
the variant which takes QgsSymbolRenderContext instead.
- The deprecated methods dataDefinedProperty( const QString& property ) and dataDefinedPropertyString() were removed. Use getDataDefinedProperty() instead.
- setDataDefinedProperty( const QString& property, const QString& expressionString ) was removed. Use setDataDefinedProperty( const QString& property, QgsDataDefined* dataDefined ) instead.
- evaluateDataDefinedProperty( const QString& property, const QgsFeature* feature ) was removed. Use the variant which takes QgsSymbolRenderContext instead.
- expression() was removed. Use getDataDefinedProperty or evaluateDataDefinedProperty instead.
- The deprecated methods dataDefinedProperty( const QString& property ) and dataDefinedPropertyString() were removed. Use dataDefinedProperties() instead.
- setDataDefinedProperty now requires a QgsSymbolLayer.Property argument instead of the string based key.
- removeDataDefinedProperty(), removeDataDefinedProperties(), hasDataDefinedProperties(), hasDataDefinedProperty(), evaluateDataDefinedProperty()
were removed. Use the QgsProperty/QgsPropertyCollection methods instead.
- getDataDefinedProperty() was removed. Use dataDefinedProperties() instead.
- expression() was removed.
- usedAttributes() now requires a QgsRenderContext argument
- saveDataDefinedProperties() was removed. This is no longer required.
- restoreDataDefinedProperties() was renamed to restoreOldDataDefinedProperties()
- estimateMaxBleed() now requires a QgsRenderContext argument (since the bleed depends on render context for non-pixel units)
QgsSymbolLayerRegistry {#qgis_api_break_3_0_QgsSymbolLayerRegistry}
----------------------
@ -1645,12 +1825,20 @@ QgsSymbolLayerUtils (renamed from QgsSymbolLayerUtilsV2) {#qgis_api_break
- encodeOutputUnit() and decodeOutputUnit() were removed. QgsUnitTypes::encodeUnit() and QgsUnitTypes::decodeRenderUnit() should be used instead.
- The signatures for wellKnownMarkerToSld() and wellKnownMarkerFromSld() were changed.
- The symbolPreviewPixmap() customContext is now the fourth parameter
- createRenderContext() was moved to QgsRenderContext::fromQPainter()
- lineWidthScaleFactor() and convertToPainterUnits() were moved to QgsRenderContext::convertToPainterUnits()
- convertToMapUnits() was moved to QgsRenderContext::convertToMapUnits()
- convertFromMapUnits() was moved to QgsRenderContext::convertFromMapUnits()
- pixelSizeScaleFactor() was removed. Use QgsRenderContext::convertToPainterUnits() instead.
- mapUnitScaleFactor() was removed. Use QgsRenderContext::convertToMapUnits() instead.
- estimateMaxSymbolBleed() now requires a QgsRenderContext argument (since the bleed depends on render context for non-pixel units)
QgsSymbolSelectorWidget {#qgis_api_break_3_0_QgsSymbolSelectorWidget}
-----------------------
- saveSymbol() was removed.
- registerDataDefinedButton now works with QgsPropertyOverrideButton and QgsProperty keys
QgsSymbolSelectorDialog {#qgis_api_break_3_0_QgsSymbolSelectorDialog}
@ -1714,12 +1902,19 @@ capabilities have been removed, as they were unused and had no effect.
- capabilities() now returns a typesafe QgsVectorDataProvider::Capabilities object, not an integer.
- convertToProviderType() now takes a geometry reference, not a pointer.
- geometryType() has been renamed to wkbType() to be in line with QgsVectorLayer
- The behaviour of defaultValue() has changed from 2.x. In 2.x, defaultValue() would return a SQL
- The behavior of defaultValue() has changed from 2.x. In 2.x, defaultValue() would return a SQL
clause fragment which must be evaluated by the provider in order to calculate the default value. In
QGIS 3.0 defaultValue() only returns literal, constant defaultValues. A new method defaultValueClause
has been added which returns the SQL clause fragments which must be evaluated by the provider itself.
QgsVectorJoinInfo {#qgis_api_break_3_0_QgsVectorJoinInfo}
-----------------
- class has been renamed to QgsVectorLayerJoinInfo
- member variables are now accessible through pairs of getters and setters rather than using direct read/write
QgsVectorLayer {#qgis_api_break_3_0_QgsVectorLayer}
--------------
@ -1759,6 +1954,9 @@ displayExpression instead. For the map tip use mapTipTemplate() instead.
- loadNamedStyle(): theResultFlag argument is correctly declared as output argument
- The duplicate selectionChanged() signal was removed. Use selectionChanged( const QgsFeatureIds&, const QgsFeatureIds&, const bool ) instead.
- featureCount() now requires a legend key string instead of a QgsSymbol pointer argument.
- createJoinCaches() has been removed. Caches are created/updated when needed internally.
- checkJoinLayerRemove() has been removed. Joins are removed internally when joined layer is deleted.
- readXml() does not resolve references to joined layers. Call resolveReferences() when joined layers are available.
QgsVectorLayerEditBuffer {#qgis_api_break_3_0_QgsVectorLayerEditBuffer}
------------------------
@ -1783,6 +1981,13 @@ QgsVectorLayerImport {#qgis_api_break_3_0_QgsVectorLayerImport}
QgsCoordinateReferenceSystem is now implicitly shared, using references to QgsCoordinateReferenceSystem rather than
pointers makes for more robust, safer code. Use an invalid (default constructed) QgsCoordinateReferenceSystem
in code which previously passed a null pointer to QgsVectorLayerImport.
- ErrUserCancelled (ImportError enum value) has been renamed to ErrUserCanceled <!--#spellok-->
QgsVectorLayerJoinBuffer {#qgis_api_break_3_0_QgsVectorLayerJoinBuffer}
------------------------
- readXml() does not resolve layer IDs to layers anymore. You need to call resolveReferences() afterwards.
QgsVectorLayerUndoCommand {#qgis_api_break_3_0_QgsVectorLayerUndoCommand}
@ -1814,6 +2019,11 @@ QgsWMSLegendNode {#qgis_api_break_3_0_QgsWMSLegendNode}
- QgsWMSLegendNode has been renamed to QgsWmsLegendNode
QgsZipItem {#qgis_api_break_3_0_QgsZipItem}
----------
- mProviderNames was rename to sProviderNames
QgsRenderer {#qgis_api_break_3_0_QgsRenderer}
-----------
@ -1826,6 +2036,14 @@ optional property map passing down layer level properties to the SLD encoders. I
- setScaleMethodToSymbol was removed. This is now handled using data defined scaling at a symbol layer level
- usedAttributes is now a const method and returns QSet<QString> instead of QStringList
QgsRequestHandler {#qgis_api_break_3_0_QgsRequestHandler}
-----------------
- Removed infoFormat and setInfoFormat methods: the format of the response is given and set with the "Content-Type" header.
- Removed setCoverageResponse
Processing {#qgis_api_break_3_0_Processing}
----------
@ -1838,6 +2056,27 @@ object of type QgsProcessingFeedback, and will need to adapt their use of progre
- SilentProgress was removed. Use the base QgsProcessingFeedback class instead.
Triangulation {#qgis_api_break_3_0_Triangulation}
-------------
- forcedCrossBehaviour enum and its setter and getter have been renamed to ForcedCrossBehavior. Its members have been renamed: SnappingType_VERTICE: SnappingTypeVertex, DELETE_FIRST: DeleteFirst, INSERT_VERTEX: InsertVertex. <!--#spellok-->
QgsZonalStatistics {#qgis_api_break_3_0_QgsZonalStatistics}
------------------
- QgsZonalStatistics() сonstructor now accepts pointer to the QgsRasterLayer instance instead of path to the raster file
QGIS 2.6 {#qgis_api_break_2_6}
========
Legend Refactoring {#qgis_api_break_legend_refactoring}
------------------
- QgsComposerLegend::model() - not being used anymore. The model was replaced by one based on QgsLayerTreeModel class
and is available in QgsComposerLegend::modelV2()
QGIS 2.4 {#qgis_api_break_2_4}
========
@ -1852,16 +2091,4 @@ The client code doing refresh() in order to later save map image should be updat
method instead of using QgsPluginLayer::draw().
QGIS 2.6 {#qgis_api_break_2_6}
========
Legend Refactoring {#qgis_api_break_legend_refactoring}
------------------
- QgsComposerLegend::model() - not being used anymore. The model was replaced by one based on QgsLayerTreeModel class
and is available in QgsComposerLegend::modelV2()
*/

2
doc/contributors.json
View File

@ -207,7 +207,7 @@
"properties": {
"Name": "Marco Hugentobler",
"Committer": "Yes",
"First Commit Message": "Changes in the display behaviour of qgsmapcanvas (updating the screen, avoid flickering when paning).",
"First Commit Message": "Changes in the display behavior of qgsmapcanvas (updating the screen, avoid flickering when paning).",
"First Commit Date": "15-06-2003",
"GIT Nickname": "mhugent"
},

1
doc/index.dox
View File

@ -29,6 +29,7 @@ See \ref api_break for information about incompatible changes to API between rel
Earlier versions of the documentation are also available on the QGIS
website:
<a href="http://qgis.org/api/2.18">2.18</a>,
<a href="http://qgis.org/api/2.14">2.14 (LTR)</a>,
<a href="http://qgis.org/api/2.12">2.12</a>,
<a href="http://qgis.org/api/2.10">2.10</a>,

50
doc/linux.t2t
View File

@ -1,12 +1,12 @@
= Building on GNU/Linux =
== Building QGIS with Qt 4.x ==
== Building QGIS with Qt 5.x ==
**Requires:** Ubuntu / Debian derived distro
/!\ **Note:** Refer to the section ''Building Debian packages'' for building
debian packages. Unless you plan to develop on QGIS, that is probably the
debian packages. Unless you plan to develop on QGIS, that is probably the
easiest option to compile and install QGIS.
These notes are for Ubuntu - other versions and Debian derived distros may
@ -129,6 +129,11 @@ be pressed several times before the 'g' option becomes available.
After the 'g' generation is complete, press 'q' to exit the ccmake
interactive dialog.
/!\ **Warning:** Make sure that your build directory is completely empty when you
enter the command. Do never try to "re-use" an existing **Qt4** build directory.
If you want to use `ccmake` or other interactive tools, run the command in
the empty build directory once before starting to use the interactive tools.
Now on with the build:
```
@ -238,47 +243,6 @@ Install them using dpkg. E.g.:
sudo debi
```
== Building QGIS with Qt 5.x ==
/!\ **Warning:** Qt 5 is not officially supported. Building against Qt 5
libraries seems to work quite well already but be prepared that you are one
of very few with this setup. We strongly recommend using QGIS with Qt 4 for
production work.
Python bindings in particular are not expected to be compatible. When Qt 5
is enabled, the build system automatically activates Python 3 and PyQt5 as well.
There are no plugins and not even the python code shipped along the QGIS source
code is compatible with PyQt5.
You have been warned.
== On Debian Linux ==
We assume that you have the source code of QGIS ready and created a new
subdirectory called `build` or `build-qt5` in it.
=== Install build dependencies ===
```
apt-get install git build-essential cmake flex bison pyqt5-dev qttools5-dev qtpositioning5-dev libqt5svg5-dev libqt5webkit5-dev libqt5gui5 libqt5scripttools5 qtscript5-dev libqca-qt5-2-dev grass-dev libgeos-dev libgdal-dev libqt5xmlpatterns5-dev libqt5scintilla2-dev pyqt5.qsci-dev python3-pyqt5.qsci libgsl-dev txt2tags libproj-dev libqwt-qt5-dev libspatialindex-dev pyqt5-dev-tools qttools5-dev-tools qt5-default python3-future python3-pyqt5.qtsql python3-psycopg2 python3-sip-dev
```
Make sure that your build directory is completely empty when you enter the
following command. Do never try to "re-use" an existing Qt4 build directory.
If you want to use `ccmake` or other interactive tools, run the following
command in the empty build directory once before starting to use the
interactive tools.
```
cmake
```
If everything went ok you can finally start to compile. (As usual append a -jX where X is the number of available cores option to make to speed up your build process)
```
make
```
== On Fedora Linux ==
We assume that you have the source code of QGIS ready and created a

2
doc/msys.t2t
View File

@ -108,7 +108,7 @@ make install
==== Final python notes ====
/!\ You can delete the directories with unpacked SIP and PyQt4 sources after a
successfull install, they're not needed anymore.
successful install, they're not needed anymore.
=== git ===

88
doc/news.html
View File

@ -136,7 +136,7 @@ This release has following new features:
<LI>User Interface: Improved color pickers
<LI>User Interface: Copy cell contents from attribute table
<LI>User Interface: Improved HiDPI support
<LI>User Interface: Improved map select tool behaviour
<LI>User Interface: Improved map select tool behavior
<LI>Symbology: Arrow symbol layer
<LI>Symbology: New "Filled marker" symbol layer type
<LI>Symbology: New accessibility and low vision symbols
@ -154,9 +154,9 @@ This release has following new features:
<LI>Rendering: New options for on the fly simplification
<LI>Rendering: Quantile based classification for raster layers
<LI>Rendering: Live hillshade renderer
<LI>Digitising: "Repeating" locking mode for constraints
<LI>Digitising: Extend linestring geometries with reshape tool
<LI>Digitising: Segmentation tolerance
<LI>Digitizing: "Repeating" locking mode for constraints
<LI>Digitizing: Extend linestring geometries with reshape tool
<LI>Digitizing: Segmentation tolerance
<LI>Data management: New configuration options for attribute table
<LI>Data management: Multiple columns in attribute forms
<LI>Data management: Control over attributes to export when saving a vector layer
@ -246,10 +246,10 @@ This release has following new features:
<LI>Data management : Vector joins are now saved within QLR layer-definition-files
<LI>Data management : N:M relation editing
<LI>Data management : External Resource widget
<LI>Digitising : Configurable rubber band color
<LI>Digitising : Autotrace
<LI>Digitising : Trace digitising tool
<LI>General : Changed behaviour of strpos function
<LI>Digitizing : Configurable rubber band color
<LI>Digitizing : Autotrace
<LI>Digitizing : Trace digitizing tool
<LI>General : Changed behavior of strpos function
<LI>General : Field calculator can be used to update feature's geometry
<LI>General : Virtual layers
<LI>General : Zoom to feature with right-click in attribute table
@ -316,7 +316,7 @@ This release has following new features:
<LI>Data management : DBManager Improvements
<LI>Data management : Conditional formatting for attribute table cells
<LI>Data management : Support for relative paths in widgets
<LI>Digitising : Digitising improvements
<LI>Digitizing : Digitizing improvements
<LI>General : New welcome screen
<LI>General : Ongoing improvements to code quality
<LI>General : Advanced settings editor
@ -425,7 +425,7 @@ This is a minor release increment with the following feature:
<LI>New field calculator bar in attribute table.
<LI>DXF export improvements.
<LI>Advanced digitizing tools.
<LI>Improved snapping options and behaviour.
<LI>Improved snapping options and behavior.
<LI>Better simplify tool - including support for on the fly reprojection being enabled.
<LI>Qt5 support (optional - default packages are still currently built against Qt4).
<LI>Spatial bookmark import/export.
@ -528,7 +528,7 @@ This is the minor release sports a number of great new features:
<LI>When pasting a selection, it is now possible to create a new layer on the fly
from the pasted features.
<LI>WMS Legend is now available via a getLegendGraphic request.
<LI>It is now possible to digitise a new feature as an interior ring of an
<LI>It is now possible to digitize a new feature as an interior ring of an
existing feature.
<LI>Recent expressions are saved in the expression builder for quick re-use.
<LI>You can now set the color for the zebra map border style in composer.
@ -679,7 +679,7 @@ key new features.
<LI>Heatmap tool - a new core plugin has been added for generating raster heatmaps from point data. You may need to activate this plugin using the plugin manager.
<LI>GPS Tracking - The GPS live tracking user interface was overhauled and many fixes and improvements were added to it.
<LI>Menu Re-organisation - The menus were re-organised a little - we now have separate menus for Vector and Raster and many plugins were updated to place their menus in the new Vector and Raster top level menus.
<LI>Offset Curves - a new digitising tool for creating offset curves was added.
<LI>Offset Curves - a new digitizing tool for creating offset curves was added.
<LI>Terrain Analysis Plugin - a new core plugin was added for doing terrain analysis - and it can make really good looking colored relief maps.
<LI>Ellipse renderer - symbollayer to render ellipse shapes (and also rectangles, triangles, crosses by specifying width and height). Moreover, the symbol layer allows setting all parameters (width, height, colors, rotation, outline with) from data fields, in mm or map units
<LI>New scale selector with predefined scales
@ -747,7 +747,7 @@ were made.
<LI>Allow setting I/O encoding for OGR layers in vector layer properties.
<LI>Fix #4414 (SVG indicators for arrows are not shown)
<LI>Label direction symbol shouldn't depend on "map" vs. "line" orientation.
<LI>Set prompt as default behaviour for unknown CRS
<LI>Set prompt as default behavior for unknown CRS
<LI>For EPSG initialize GDAL CRS from authid instead of proj.4 string
<LI>Fix #4439 (Crash when changing style in Layer Properties)
<LI>Fix #4444 (Error when loading Python plugins)
@ -758,7 +758,7 @@ were made.
<LI>Fix #4496 (Refresh map list in composer table widget in showEvent)
<LI>OS X build/install updates
<LI>GRASS version support
<LI>Intializing from WKT favourize EPSG instead of PROJ.4
<LI>Initializing from WKT favourize EPSG instead of PROJ.4
<LI>Add What's this to Help menu (implement #4179)
<LI>fTools: update layers lists after adding new layer to TOC (fix #4318)
<LI>Don't block QGIS main window when running Merge shapefiles tool. Partially addresses #4383
@ -825,7 +825,7 @@ were made.
<LI>Tweak for layer cache
<LI>[backport] Fix bug where histogram can be assigned negative frequency for a pixel range. Also fix potential memory leak as new histogram vector was assigned to band stats without clearing the old.
<LI>Added section on using QtCreator
<LI>Fix bugs causing a crash when histogram is gathered due to uninitilised histogram vector
<LI>Fix bugs causing a crash when histogram is gathered due to uninitialized histogram vector
<LI>Added missing QUrl include
<LI>A neater fix for missing map parameter as suggested by Juergen
<LI>Fixed a bug where map= was not being published in onlineresource url when project files are not in the same dir as cgi
@ -1133,7 +1133,7 @@ pixels or map units
<LI>Allow postgres layers without saved username &amp;amp; password by asking for credentials
<LI>Support NULL values in search strings
<LI>Optionally add new layers to the selected group
<LI>Map composer can add attribute Tables in layouts. It is possibile to show
<LI>Map composer can add attribute Tables in layouts. It is possible to show
only visible features in composer table or all features
<LI>Identify tool attribute form now non-modal in view mode (since r12796)
<LI>Identified features' highlight disappear when window is deactivate or
@ -1192,7 +1192,7 @@ features for you.
<P>
Probably the biggest new feature is the addition of the new vector symbology
infrastructure. This is provided alongside the old implementation - you can
switch using a button in the vector layer properties dialog. It does't replace
switch using a button in the vector layer properties dialog. It doesn't replace
the old symbology implementation completely yet because there are various isues
that need to be resolved and a large amount of testinhen it is considered
ready.
@ -1281,7 +1281,7 @@ such it contains new features and extends the programmatic interface over
QGIS 1.0.x. If stability and long term support is more important to you
then cool new and untested features, we recommend that you use a copy
of QGIS from our stable 1.0.x release series.
This release includes over 140 bug fixes and enchancements
This release includes over 140 bug fixes and enhancements
over the QGIS 1.1.0 release. In addition we have added
the following new features:
</P>
@ -1423,7 +1423,7 @@ QGIS 1.0.x. If stability and long term support is more important to you
then cool new and untested features, we recommend that you use a copy
of QGIS from our stable 1.0.x release series.
<P></P>
This release includes many bug fixes and enchancements
This release includes many bug fixes and enhancements
over the QGIS 1.0.0 release. In addition we have added
the following new features:
<P></P>
@ -1526,13 +1526,13 @@ QGIS 0.10.0 release. In addition we have made the following changes:
<H1>22. Version 0.10.0 'Io'</H1>
<P>
This release includes over 120 bug fixes and enchancements
This release includes over 120 bug fixes and enhancements
over the QGIS 0.9.1 release. In addition we have added
the following new features:
</P>
<UL>
<LI>Improvements to digitising capabilities.
<LI>Improvements to digitizing capabilities.
<LI>Supporting default and defined styles (.qml) files for file based
vector layers. With styles you can save the symbolisation
and other settings associated with a vector layer and they
@ -1550,10 +1550,10 @@ improvements 'under the hood'.
<H1>23. Version 0.9.2rc1 'Ganymede'</H1>
<UL>
<LI>This release candidate includes over 40 bug fixes and enchancements
<LI>This release candidate includes over 40 bug fixes and enhancements
over the QGIS 0.9.1 release. In addition we have added
the following new features:
<LI>Imrovements to digitising capabilities.
<LI>Improvements to digitizing capabilities.
<LI>Supporting default and defined styles (.qml) files for file based
vector layers. With styles you can save the symbolisation
and other settings associated with a vector layer and they
@ -2060,7 +2060,7 @@ Added remove all layers from overview button.
Extents are now correctly restored when project is loaded
<P></P>
2004-06-24 [ts] 0.3.0devel51
Completion of projectio fixes to freeze canvas and restore zorder correctly.
Completion of projection fixes to freeze canvas and restore zorder correctly.
Small issue with restoring extents properly needs to be resolved still.
<P></P>
2004-06-23 [mcoletti] 0.3.0devel50
@ -2071,11 +2071,11 @@ linking with -rdynamic and using dlopen()'s RTLD_GLOBAL flag.
<P></P>
2004-06-21 [ts] 0.3.0devel49
<P></P>
Revised raster stats emiting of progress update to not do it when stats are
Revised raster stats emitting of progress update to not do it when stats are
fetched from cache. QGisApp progress bar now updates as each layer is rendered
in the mapCanvas.
<P></P>
Some minor updates to projectio
Some minor updates to projection
<P></P>
2004-06-21 [larsl] 0.3.0devel48
Hooked up the GPS gui to code that uses gpsbabel to import lots of GPS file
@ -2087,7 +2087,7 @@ fixed wrong versions and DOS endlines
<P></P>
2004-06-21 [ts] 0.3.0devel46
<P></P>
Got tired of always resetting my gidbase dir everytime qgis restarts -
Got tired of always resetting my gidbase dir every time qgis restarts -
added it to qsettings.
<P></P>
2004-06-21 [ts] 0.3.0devel45
@ -2099,13 +2099,13 @@ Complete buffering so that bar as well as text will be visible on both
<P></P>
Fix for bug [ 973922 ] Overview shows layers in wrong order
<P></P>
Fixed show stopper bug where maplayerregistry wasnt being cleared properly on file new
Fixed show stopper bug where maplayerregistry wasn't being cleared properly on file new
<P></P>
Added setZOrder which will be used in next commit to fix projectio zorder problem
Added setZOrder which will be used in next commit to fix projection zorder problem
<P></P>
2004-06-20 [ts] 0.3.0devel43
<P></P>
Fix anoying 'mapcanvas isnt freezing while loading rasters' bug
Fix anoying 'mapcanvas isn't freezing while loading rasters' bug
<P></P>
2004-06-19 [ts] 0.3.0devel42
<P></P>
@ -2120,12 +2120,12 @@ Added an option for setting the length of the scale bar to closest
Win32 support for package path - which will hopefully ensure pyramid and overview mini
icons are displayed on legend entry now.
<P></P>
Beginnings of generic vector file writer - incomplete and doesnt do anything useful
yet except has abilty to make a shapefile with a couple of user defined fields e.g.
Beginnings of generic vector file writer - incomplete and doesn't do anything useful
yet except has ability to make a shapefile with a couple of user defined fields e.g.
to create a new point shapefile:
<P></P>
QgsVectorFileWriter myFileWriter("/tmp/test.shp", wkbPoint);
if (myFileWriter.initialise())
if (myFileWriter.initialise()) <!--#spellok-->
{
myFileWriter.createField("TestInt",OFTInteger,8,0);
myFileWriter.createField("TestRead",OFTReal,8,3);
@ -2203,7 +2203,7 @@ Implemented a new map cursor type : Capture Point (little pencil icon on your to
</P>
<P>
In release 0.5 this will be extended to provide simple point vector file data capture /
digitising facility. This will be implemented by means of a plugin which will utilise the
digitizing facility. This will be implemented by means of a plugin which will utilise the
aforementioned xyClickCoordinate(QgsPoint) signal.
</P>
<P>
@ -2225,7 +2225,7 @@ Added acetate layer support to the map canvas. Currently there is only one
</P>
<P>
2004-06-10 [ts] 0.3.0devel27
Modified projectio (serialisation and deserialisation of project files) to
Modified projection (serialisation and deserialisation of project files) to
use maplayerregistry and not mapcanvas.
</P>
<P>
@ -2421,7 +2421,7 @@ Fixed some more instances of the same bug in raster layer
Disable overview widget for release. Minor bugfix in rasterlayer picker up by
Larsl which is only encountered bu i8n users. Miscellaneous other fixes
including proper rotation support for north arrows in all 4 corners of
display, inproved refresh behaviour of n-arrow and copyright plugin, better
display, inproved refresh behavior of n-arrow and copyright plugin, better
state hadnling for copyright plugin.
</P>
<P>
@ -2682,7 +2682,7 @@ updated German translation
!! otherwise it's not detected by the plugins autogen.sh (more exactly
!! aclocal)
!! It can be cheated by adding -I path/to/qgis.m4 to the aclocal of
!! autogen.sh. But be carefull not to commit that to CVS
!! autogen.sh. But be careful not to commit that to CVS
</P>
<P>
2004-04-18 [jobi] 0.1.0devel33
@ -2699,7 +2699,7 @@ Fix for crash when opening singleband grayscale images introduced by Steves
</P>
<P>
2004-04-06 [ts] 0.1.0devel31
Added new plugin (grid_maker) to build arbitary sized graticules and add
Added new plugin (grid_maker) to build arbitrary sized graticules and add
them to the current map view.
</P>
<P>
@ -2745,7 +2745,7 @@ endian-ness.
</P>
<P>
2004-04-01 [jobi] 0.1.0devel24
changed qgiscommit to hopefuly fix all problems
changed qgiscommit to hopefully fix all problems
</P>
<P>
2004-04-01 [jobi] 0.1.0devel23
@ -2815,7 +2815,7 @@ Added gps_importer plugin (still a work in progress)
<P>
2004-03-22 [mac] 0.1.0devel8
s/config.h/qgsconfig.h/
qgsconfig.h now has header sentinals
qgsconfig.h now has header sentinels
now will install headers in $(prefix)/qgis/include and libqis.* library in
$(prefix)/lib
"src/Makefile" no longer relies on explicit dependencies and uses better
@ -2934,9 +2934,9 @@ QGIS can load layers and / or a project on start up by specifying these
Symbol renderers for simple, graduated, and continuous symbols
Raster support for most GDAL formats
Raster implementation supports a variety of rendering settings including
semi transparent overlays, pallette inversion, flexible band to color mapping
semi transparent overlays, palette inversion, flexible band to color mapping
in multiband images and creation of pseudocolor.
Change to a data provider architecture for vector layers. Addtional data
Change to a data provider architecture for vector layers. Additional data
types can be supported by writing a provider plugin
Buffer plugin for PostGIS layers
PostgreSQL port number can be specified when making connections
@ -2970,7 +2970,7 @@ Features in shapefiles can be selected by dragging a selection
box or selecting the records in the attribute table
Zoom to extent of selected features (Shapefiles only)
Bug fix: Bug that prevented reopening of the attribute table once
it was initally displayed and closed
it was initially displayed and closed
Bug fix: Bug that prevented lines from being drawn with widths
other than 1 pixel
Build system has changed for building with PostgreSQL support.
@ -3070,7 +3070,7 @@ July 20, 2002
<P>
July 18, 2002
Point, line and polygon PostGis layers can be drawn. Still issues with
map exent and positioning of layers on the canvas. Drawing is manual and
map extent and positioning of layers on the canvas. Drawing is manual and
not tied to the paint event. No zooming or panning yet.
</P>
<P>

88
doc/news.t2t
View File

@ -50,7 +50,7 @@ This release has following new features:
- User Interface: Improved color pickers
- User Interface: Copy cell contents from attribute table
- User Interface: Improved HiDPI support
- User Interface: Improved map select tool behaviour
- User Interface: Improved map select tool behavior
- Symbology: Arrow symbol layer
- Symbology: New "Filled marker" symbol layer type
- Symbology: New accessibility and low vision symbols
@ -68,9 +68,9 @@ This release has following new features:
- Rendering: New options for on the fly simplification
- Rendering: Quantile based classification for raster layers
- Rendering: Live hillshade renderer
- Digitising: "Repeating" locking mode for constraints
- Digitising: Extend linestring geometries with reshape tool
- Digitising: Segmentation tolerance
- Digitizing: "Repeating" locking mode for constraints
- Digitizing: Extend linestring geometries with reshape tool
- Digitizing: Segmentation tolerance
- Data management: New configuration options for attribute table
- Data management: Multiple columns in attribute forms
- Data management: Control over attributes to export when saving a vector layer
@ -157,10 +157,10 @@ This release has following new features:
- Data management : Vector joins are now saved within QLR layer-definition-files
- Data management : N:M relation editing
- Data management : External Resource widget
- Digitising : Configurable rubber band color
- Digitising : Autotrace
- Digitising : Trace digitising tool
- General : Changed behaviour of strpos function
- Digitizing : Configurable rubber band color
- Digitizing : Autotrace
- Digitizing : Trace digitizing tool
- General : Changed behavior of strpos function
- General : Field calculator can be used to update feature's geometry
- General : Virtual layers
- General : Zoom to feature with right-click in attribute table
@ -224,7 +224,7 @@ This release has following new features:
- Data management : DBManager Improvements
- Data management : Conditional formatting for attribute table cells
- Data management : Support for relative paths in widgets
- Digitising : Digitising improvements
- Digitizing : Digitizing improvements
- General : New welcome screen
- General : Ongoing improvements to code quality
- General : Advanced settings editor
@ -325,7 +325,7 @@ This is a minor release increment with the following feature:
- New field calculator bar in attribute table.
- DXF export improvements.
- Advanced digitizing tools.
- Improved snapping options and behaviour.
- Improved snapping options and behavior.
- Better simplify tool - including support for on the fly reprojection being enabled.
- Qt5 support (optional - default packages are still currently built against Qt4).
- Spatial bookmark import/export.
@ -417,7 +417,7 @@ This is the minor release sports a number of great new features:
- When pasting a selection, it is now possible to create a new layer on the fly
from the pasted features.
- WMS Legend is now available via a getLegendGraphic request.
- It is now possible to digitise a new feature as an interior ring of an
- It is now possible to digitize a new feature as an interior ring of an
existing feature.
- Recent expressions are saved in the expression builder for quick re-use.
- You can now set the color for the zebra map border style in composer.
@ -557,7 +557,7 @@ key new features.
- Heatmap tool - a new core plugin has been added for generating raster heatmaps from point data. You may need to activate this plugin using the plugin manager.
- GPS Tracking - The GPS live tracking user interface was overhauled and many fixes and improvements were added to it.
- Menu Re-organisation - The menus were re-organised a little - we now have separate menus for Vector and Raster and many plugins were updated to place their menus in the new Vector and Raster top level menus.
- Offset Curves - a new digitising tool for creating offset curves was added.
- Offset Curves - a new digitizing tool for creating offset curves was added.
- Terrain Analysis Plugin - a new core plugin was added for doing terrain analysis - and it can make really good looking colored relief maps.
- Ellipse renderer - symbollayer to render ellipse shapes (and also rectangles, triangles, crosses by specifying width and height). Moreover, the symbol layer allows setting all parameters (width, height, colors, rotation, outline with) from data fields, in mm or map units
- New scale selector with predefined scales
@ -621,7 +621,7 @@ were made.
- Allow setting I/O encoding for OGR layers in vector layer properties.
- Fix #4414 (SVG indicators for arrows are not shown)
- Label direction symbol shouldn't depend on "map" vs. "line" orientation.
- Set prompt as default behaviour for unknown CRS
- Set prompt as default behavior for unknown CRS
- For EPSG initialize GDAL CRS from authid instead of proj.4 string
- Fix #4439 (Crash when changing style in Layer Properties)
- Fix #4444 (Error when loading Python plugins)
@ -632,7 +632,7 @@ were made.
- Fix #4496 (Refresh map list in composer table widget in showEvent)
- OS X build/install updates
- GRASS version support
- Intializing from WKT favourize EPSG instead of PROJ.4
- Initializing from WKT favourize EPSG instead of PROJ.4
- Add What's this to Help menu (implement #4179)
- fTools: update layers lists after adding new layer to TOC (fix #4318)
- Don't block QGIS main window when running Merge shapefiles tool. Partially addresses #4383
@ -697,7 +697,7 @@ http://linfiniti.com/2011/08/improvements-to-raster-performance-in-qgis-master/]
- Tweak for layer cache
- [backport] Fix bug where histogram can be assigned negative frequency for a pixel range. Also fix potential memory leak as new histogram vector was assigned to band stats without clearing the old.
- Added section on using QtCreator
- Fix bugs causing a crash when histogram is gathered due to uninitilised histogram vector
- Fix bugs causing a crash when histogram is gathered due to uninitialized histogram vector
- Added missing QUrl include
- A neater fix for missing map parameter as suggested by Juergen
- Fixed a bug where map= was not being published in onlineresource url when project files are not in the same dir as cgi
@ -976,7 +976,7 @@ pixels or map units
- Allow postgres layers without saved username &amp; password by asking for credentials
- Support NULL values in search strings
- Optionally add new layers to the selected group
- Map composer can add attribute Tables in layouts. It is possibile to show
- Map composer can add attribute Tables in layouts. It is possible to show
only visible features in composer table or all features
- Identify tool attribute form now non-modal in view mode (since r12796)
- Identified features' highlight disappear when window is deactivate or
@ -1032,7 +1032,7 @@ features for you.
Probably the biggest new feature is the addition of the new vector symbology
infrastructure. This is provided alongside the old implementation - you can
switch using a button in the vector layer properties dialog. It does't replace
switch using a button in the vector layer properties dialog. It doesn't replace
the old symbology implementation completely yet because there are various isues
that need to be resolved and a large amount of testinhen it is considered
ready.
@ -1117,7 +1117,7 @@ such it contains new features and extends the programmatic interface over
QGIS 1.0.x. If stability and long term support is more important to you
then cool new and untested features, we recommend that you use a copy
of QGIS from our stable 1.0.x release series.
This release includes over 140 bug fixes and enchancements
This release includes over 140 bug fixes and enhancements
over the QGIS 1.1.0 release. In addition we have added
the following new features:
@ -1234,7 +1234,7 @@ QGIS 1.0.x. If stability and long term support is more important to you
then cool new and untested features, we recommend that you use a copy
of QGIS from our stable 1.0.x release series.
This release includes many bug fixes and enchancements
This release includes many bug fixes and enhancements
over the QGIS 1.0.0 release. In addition we have added
the following new features:
@ -1327,11 +1327,11 @@ QGIS 0.10.0 release. In addition we have made the following changes:
= Version 0.10.0 'Io' =
This release includes over 120 bug fixes and enchancements
This release includes over 120 bug fixes and enhancements
over the QGIS 0.9.1 release. In addition we have added
the following new features:
- Improvements to digitising capabilities.
- Improvements to digitizing capabilities.
- Supporting default and defined styles (.qml) files for file based
vector layers. With styles you can save the symbolisation
and other settings associated with a vector layer and they
@ -1347,10 +1347,10 @@ improvements 'under the hood'.
= Version 0.9.2rc1 'Ganymede' =
- This release candidate includes over 40 bug fixes and enchancements
- This release candidate includes over 40 bug fixes and enhancements
over the QGIS 0.9.1 release. In addition we have added
the following new features:
- Imrovements to digitising capabilities.
- Improvements to digitizing capabilities.
- Supporting default and defined styles (.qml) files for file based
vector layers. With styles you can save the symbolisation
and other settings associated with a vector layer and they
@ -1838,7 +1838,7 @@ Added remove all layers from overview button.
Extents are now correctly restored when project is loaded
2004-06-24 [ts] 0.3.0devel51
Completion of projectio fixes to freeze canvas and restore zorder correctly.
Completion of projection fixes to freeze canvas and restore zorder correctly.
Small issue with restoring extents properly needs to be resolved still.
2004-06-23 [mcoletti] 0.3.0devel50
@ -1849,11 +1849,11 @@ linking with -rdynamic and using dlopen()'s RTLD_GLOBAL flag.
2004-06-21 [ts] 0.3.0devel49
Revised raster stats emiting of progress update to not do it when stats are
Revised raster stats emitting of progress update to not do it when stats are
fetched from cache. QGisApp progress bar now updates as each layer is rendered
in the mapCanvas.
Some minor updates to projectio
Some minor updates to projection
2004-06-21 [larsl] 0.3.0devel48
Hooked up the GPS gui to code that uses gpsbabel to import lots of GPS file
@ -1865,7 +1865,7 @@ fixed wrong versions and DOS endlines
2004-06-21 [ts] 0.3.0devel46
Got tired of always resetting my gidbase dir everytime qgis restarts -
Got tired of always resetting my gidbase dir every time qgis restarts -
added it to qsettings.
2004-06-21 [ts] 0.3.0devel45
@ -1877,13 +1877,13 @@ Complete buffering so that bar as well as text will be visible on both
Fix for bug [ 973922 ] Overview shows layers in wrong order
Fixed show stopper bug where maplayerregistry wasnt being cleared properly on file new
Fixed show stopper bug where maplayerregistry wasn't being cleared properly on file new
Added setZOrder which will be used in next commit to fix projectio zorder problem
Added setZOrder which will be used in next commit to fix projection zorder problem
2004-06-20 [ts] 0.3.0devel43
Fix anoying 'mapcanvas isnt freezing while loading rasters' bug
Fix anoying 'mapcanvas isn't freezing while loading rasters' bug
2004-06-19 [ts] 0.3.0devel42
@ -1898,12 +1898,12 @@ Added an option for setting the length of the scale bar to closest
Win32 support for package path - which will hopefully ensure pyramid and overview mini
icons are displayed on legend entry now.
Beginnings of generic vector file writer - incomplete and doesnt do anything useful
yet except has abilty to make a shapefile with a couple of user defined fields e.g.
Beginnings of generic vector file writer - incomplete and doesn't do anything useful
yet except has ability to make a shapefile with a couple of user defined fields e.g.
to create a new point shapefile:
QgsVectorFileWriter myFileWriter("/tmp/test.shp", wkbPoint);
if (myFileWriter.initialise())
if (myFileWriter.initialise()) //#spellok
{
myFileWriter.createField("TestInt",OFTInteger,8,0);
myFileWriter.createField("TestRead",OFTReal,8,3);
@ -1964,7 +1964,7 @@ Implemented a new map cursor type : Capture Point (little pencil icon on your to
are placed into the system clipboard.
In release 0.5 this will be extended to provide simple point vector file data capture /
digitising facility. This will be implemented by means of a plugin which will utilise the
digitizing facility. This will be implemented by means of a plugin which will utilise the
aforementioned xyClickCoordinate(QgsPoint) signal.
2004-06-12 [gsherman] 0.3.0devel30
@ -1982,7 +1982,7 @@ Added acetate layer support to the map canvas. Currently there is only one
QgsAcetateObject. More acetate types will follow...
2004-06-10 [ts] 0.3.0devel27
Modified projectio (serialisation and deserialisation of project files) to
Modified projection (serialisation and deserialisation of project files) to
use maplayerregistry and not mapcanvas.
Implemented state handling of 'showInOverview' property in project io.
@ -2138,7 +2138,7 @@ Fixed some more instances of the same bug in raster layer
Disable overview widget for release. Minor bugfix in rasterlayer picker up by
Larsl which is only encountered bu i8n users. Miscellaneous other fixes
including proper rotation support for north arrows in all 4 corners of
display, inproved refresh behaviour of n-arrow and copyright plugin, better
display, inproved refresh behavior of n-arrow and copyright plugin, better
state hadnling for copyright plugin.
2004-05-25 [larsl] 0.2.0devel34
@ -2348,7 +2348,7 @@ updated German translation
!! otherwise it's not detected by the plugins autogen.sh (more exactly
!! aclocal)
!! It can be cheated by adding -I path/to/qgis.m4 to the aclocal of
!! autogen.sh. But be carefull not to commit that to CVS
!! autogen.sh. But be careful not to commit that to CVS
2004-04-18 [jobi] 0.1.0devel33
Added internationalisations stuff
@ -2362,7 +2362,7 @@ Fix for crash when opening singleband grayscale images introduced by Steves
grayscale
2004-04-06 [ts] 0.1.0devel31
Added new plugin (grid_maker) to build arbitary sized graticules and add
Added new plugin (grid_maker) to build arbitrary sized graticules and add
them to the current map view.
2004-04-05 [jobi] 0.1.0devel30
@ -2399,7 +2399,7 @@ endian-ness.
2004-04-01 [jobi] 0.1.0devel24
changed qgiscommit to hopefuly fix all problems
changed qgiscommit to hopefully fix all problems
2004-04-01 [jobi] 0.1.0devel23
Extended tools/qgiscommit to pass parameters to cvs
@ -2453,7 +2453,7 @@ Added gps_importer plugin (still a work in progress)
2004-03-22 [mac] 0.1.0devel8
s/config.h/qgsconfig.h/
qgsconfig.h now has header sentinals
qgsconfig.h now has header sentinels
now will install headers in $(prefix)/qgis/include and libqis.* library in
$(prefix)/lib
"src/Makefile" no longer relies on explicit dependencies and uses better
@ -2556,9 +2556,9 @@ QGIS can load layers and / or a project on start up by specifying these
Symbol renderers for simple, graduated, and continuous symbols
Raster support for most GDAL formats
Raster implementation supports a variety of rendering settings including
semi transparent overlays, pallette inversion, flexible band to color mapping
semi transparent overlays, palette inversion, flexible band to color mapping
in multiband images and creation of pseudocolor.
Change to a data provider architecture for vector layers. Addtional data
Change to a data provider architecture for vector layers. Additional data
types can be supported by writing a provider plugin
Buffer plugin for PostGIS layers
PostgreSQL port number can be specified when making connections
@ -2590,7 +2590,7 @@ Features in shapefiles can be selected by dragging a selection
box or selecting the records in the attribute table
Zoom to extent of selected features (Shapefiles only)
Bug fix: Bug that prevented reopening of the attribute table once
it was initally displayed and closed
it was initially displayed and closed
Bug fix: Bug that prevented lines from being drawn with widths
other than 1 pixel
Build system has changed for building with PostgreSQL support.
@ -2677,7 +2677,7 @@ July 20, 2002
July 18, 2002
Point, line and polygon PostGis layers can be drawn. Still issues with
map exent and positioning of layers on the canvas. Drawing is manual and
map extent and positioning of layers on the canvas. Drawing is manual and
not tied to the paint event. No zooming or panning yet.
July 10, 2002

BIN
images/designer_widget_icons/projectionselector.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 707 B

32
images/images.qrc
View File

@ -85,9 +85,8 @@
<file>themes/default/console/iconSearchPrevEditorConsole.png</file>
<file>themes/default/console/iconSyntaxErrorConsole.png</file>
<file>themes/default/console/iconResetColorConsole.png</file>
<file>themes/default/copyright_label.png</file>
<file>themes/default/copyright_label.svg</file>
<file>themes/default/extents.svg</file>
<file>themes/default/geographic.png</file>
<file>themes/default/gpsicons/barchart.svg</file>
<file>themes/default/gpsicons/polarchart.svg</file>
<file>themes/default/grass_location.png</file>
@ -161,12 +160,10 @@
<file>themes/default/mActionCapturePolygon.svg</file>
<file>themes/default/mActionNewTableRow.svg</file>
<file>themes/default/mActionChangeLabelProperties.svg</file>
<file>themes/default/mActionCheckQgisVersion.png</file>
<file>themes/default/mActionCollapseTree.svg</file>
<file>themes/default/mActionComposerManager.svg</file>
<file>themes/default/mActionConditionalFormatting.svg</file>
<file>themes/default/mActionContextHelp.png</file>
<file>themes/default/mActionCopySelected.png</file>
<file>themes/default/mActionCreateMemory.svg</file>
<file>themes/default/mActionCustomProjection.svg</file>
<file>themes/default/mActionDecreaseBrightness.svg</file>
@ -200,11 +197,12 @@
<file>themes/default/mActionFullCumulativeCutStretch.svg</file>
<file>themes/default/mActionFullHistogramStretch.svg</file>
<file>themes/default/mActionGroupItems.svg</file>
<file>themes/default/mActionHelpAbout.png</file>
<file>themes/default/mActionHelpAbout.svg</file>
<file>themes/default/mActionHelpContents.svg</file>
<file>themes/default/mActionHelpSponsors.png</file>
<file>themes/default/mActionHideAllLayers.svg</file>
<file>themes/default/mActionHideSelectedLayers.png</file>
<file>themes/default/mActionHideSelectedLayers.svg</file>
<file>themes/default/mActionHideDeselectedLayers.svg</file>
<file>themes/default/mActionHistory.svg</file>
<file>themes/default/mActionHtmlAnnotation.svg</file>
<file>themes/default/mActionIdentify.svg</file>
@ -288,8 +286,9 @@
<file>themes/default/mActionShowHideLabels.svg</file>
<file>themes/default/mActionShowPinnedLabels.svg</file>
<file>themes/default/mActionShowPluginManager.svg</file>
<file>themes/default/mActionInstallPluginFromZip.svg</file>
<file>themes/default/mActionShowRasterCalculator.png</file>
<file>themes/default/mActionShowSelectedLayers.png</file>
<file>themes/default/mActionShowSelectedLayers.svg</file>
<file>themes/default/mActionSimplify.svg</file>
<file>themes/default/mActionSplitFeatures.svg</file>
<file>themes/default/mActionSplitParts.svg</file>
@ -320,8 +319,7 @@
<file>themes/default/mIconCertificateMissing.svg</file>
<file>themes/default/mIconCertificateTrusted.svg</file>
<file>themes/default/mIconCertificateUntrusted.svg</file>
<file>themes/default/mIconClear.svg</file>
<file>themes/default/mIconCollapse.png</file>
<file>themes/default/mIconCollapse.svg</file>
<file>themes/default/mIconCollapseSmall.svg</file>
<file>themes/default/mIconColorBox.svg</file>
<file>themes/default/mIconColorPicker.svg</file>
@ -342,7 +340,7 @@
<file>themes/default/mIconDeselected.svg</file>
<file>themes/default/mIconDropDownMenu.svg</file>
<file>themes/default/mIconEditableEdits.svg</file>
<file>themes/default/mIconExpand.png</file>
<file>themes/default/mIconExpand.svg</file>
<file>themes/default/mIconExpandSmall.svg</file>
<file>themes/default/mIconExpression.svg</file>
<file>themes/default/mIconExpressionFilter.svg</file>
@ -355,7 +353,7 @@
<file>themes/default/mIconFieldInteger.svg</file>
<file>themes/default/mIconFieldText.svg</file>
<file>themes/default/mIconFieldTime.svg</file>
<file>themes/default/mIconInfo.png</file>
<file>themes/default/mIconInfo.svg</file>
<file>themes/default/mIconImport.gif</file>
<file>themes/default/mIconLabelQuadrantCenter.svg</file>
<file>themes/default/mIconLabelQuadrantOffset.svg</file>
@ -370,8 +368,8 @@
<file>themes/default/mIconPointLayer.svg</file>
<file>themes/default/mIconPolygonLayer.svg</file>
<file>themes/default/mIconPostgis.svg</file>
<file>themes/default/mIconProjectionDisabled.png</file>
<file>themes/default/mIconProjectionEnabled.png</file>
<file>themes/default/mIconProjectionDisabled.svg</file>
<file>themes/default/mIconProjectionEnabled.svg</file>
<file>themes/default/mIconProperties.svg</file>
<file>themes/default/mIconPyramid.png</file>
<file>themes/default/mIconRaster.svg</file>
@ -404,7 +402,7 @@
<file>themes/default/propertyicons/CRS.svg</file>
<file>themes/default/propertyicons/datadefined.svg</file>
<file>themes/default/propertyicons/diagram.svg</file>
<file>themes/default/propertyicons/digitising.png</file>
<file>themes/default/propertyicons/digitizing.png</file>
<file>themes/default/propertyicons/display.svg</file>
<file>themes/default/propertyicons/gdal.svg</file>
<file>themes/default/propertyicons/general.svg</file>
@ -429,7 +427,7 @@
<file>themes/default/propertyicons/plugin-upgrade.svg</file>
<file>themes/default/propertyicons/plugins.svg</file>
<file>themes/default/propertyicons/pyramids.png</file>
<file>themes/default/propertyicons/rendering.png</file>
<file>themes/default/propertyicons/rendering.svg</file>
<file>themes/default/propertyicons/render.svg</file>
<file>themes/default/propertyicons/settings.svg</file>
<file>themes/default/propertyicons/stylepreset.svg</file>
@ -453,7 +451,6 @@
<file>themes/default/repositoryConnected.png</file>
<file>themes/default/repositoryDisabled.png</file>
<file>themes/default/repositoryUnavailable.png</file>
<file>themes/default/scale_bar.png</file>
<file>themes/default/stars_empty.png</file>
<file>themes/default/stars_full.png</file>
<file>themes/default/styleicons/color.svg</file>
@ -503,7 +500,7 @@
<file>themes/default/cadtools/lock.png</file>
<file>themes/default/cadtools/parallel.png</file>
<file>themes/default/cadtools/perpendicular.png</file>
<file>themes/default/mIconSuccess.png</file>
<file>themes/default/mIconSuccess.svg</file>
<file>themes/default/mIconWarning.svg</file>
<file>themes/default/mIconPaintEffects.svg</file>
<file>themes/default/mActionCircularStringCurvePoint.svg</file>
@ -554,7 +551,6 @@
<file>themes/default/providerGrass.svg</file>
<file>themes/default/providerQgis.svg</file>
<file>themes/default/providerR.svg</file>
<file>themes/default/providerTaudem.svg</file>
<file>themes/default/processingModel.svg</file>
<file>themes/default/processingScript.svg</file>
<file>themes/default/processingAlgorithm.svg</file>

3
images/svg/religion/place_of_worship_pastafarian.svg Normal file
View File

@ -0,0 +1,3 @@
<svg enable-background="new 0 0 579.997 579.997" height="579.997" viewBox="0 0 579.997 579.997" width="579.997" xmlns="http://www.w3.org/2000/svg">
<path d="m557.992 286.147c-.224-1.538-2.404-15.438-9.869-29.688-11.264-21.501-29.22-33.31-50.598-33.31-.198 0-.399.001-.6.003-21.622.204-39.302 10.283-49.781 28.379-.735 1.27-1.407 2.536-2.027 3.791-18.014-19.915-39.404-36.078-62.975-47.803l5.405-12.836c27.037-.474 48.888-22.592 48.888-49.747 0-27.415-22.303-49.742-49.734-49.77-27.424 0-49.734 22.318-49.734 49.733-.026 13.279 5.124 25.773 14.503 35.181.713.715 1.449 1.396 2.196 2.063l-5.115 12.146c-19.19-5.722-39.298-8.747-59.803-8.747-22.474 0-44.471 3.625-65.302 10.461l-5.852-13.895c10.254-9.127 16.731-22.414 16.731-37.189 0-27.434-22.326-49.752-49.788-49.752-27.414.027-49.717 22.354-49.717 49.787 0 27.144 21.861 49.266 48.906 49.73l6.513 15.464c-21.407 11.385-40.89 26.487-57.514 44.778-.713-1.491-1.502-3.004-2.379-4.52-10.472-18.099-28.146-28.186-49.772-28.401-.19-.002-.379-.003-.568-.003-21.401 0-39.367 11.817-50.635 33.326-7.465 14.251-9.645 28.15-9.868 29.688-1.437 9.862 5.389 19.063 15.252 20.499.886.129 1.766.191 2.635.191 8.81 0 16.511-6.432 17.818-15.409.05-.322 5.223-32.202 24.833-32.202.06 0 .118 0 .178.001 8.66.086 14.348 3.061 18.44 9.644 3.748 6.026 4.546 12.621 4.554 12.687l-.019-.183 10.393-.975-6.784 10.039 6.824 10.104c3.354 4.965 6.914 9.744 10.641 14.359-.21.06-.419.117-.629.178-26.337 7.566-42.169 18.023-48.412 31.993-8.634 19.389 3.708 38.63 14.598 55.605 3.796 5.918 9.913 15.454 11.104 20.082-2.33 1.805-9.014 5.181-23.102 7.575-12.354 2.101-23.619 2.293-23.714 2.295-9.967.131-17.939 8.316-17.808 18.282.13 9.886 8.184 17.81 18.04 17.81.081 0 .162-.001.242-.002.607-.008 15.062-.229 30.968-3.096 25.65-4.623 41.461-13.529 48.341-27.24 9.521-19.007-2.812-38.232-13.692-55.194-4.189-6.532-11.061-17.243-11.675-21.82 1.856-2.092 8.876-7.038 25.878-11.828 7.536-2.123 14.778-3.584 19.772-4.47 12.552 10.318 26.231 19.143 40.776 26.288 6.866 10.514 19.637 35.863 13.319 54.189-2.637 7.648-8.983 11.054-20.911 16.897-15.155 7.425-35.912 17.594-42.945 45.727-2.418 9.669 3.462 19.468 13.131 21.885 1.47.367 2.941.543 4.391.543 8.086 0 15.444-5.474 17.494-13.674 2.832-11.328 10.111-15.357 23.81-22.067 14.05-6.884 31.536-15.45 39.154-37.547 5.851-16.973 4.017-34.452-.348-49.398 15.147 3.391 30.791 5.167 46.696 5.167 16.595 0 32.903-1.94 48.663-5.627-4.461 15.047-6.393 32.713-.481 49.859 7.618 22.096 25.107 30.662 39.16 37.545 13.698 6.709 20.978 10.738 23.803 22.061 2.047 8.204 9.406 13.682 17.496 13.682 1.446 0 2.916-.175 4.383-.541 9.671-2.413 15.554-12.209 13.141-21.879-7.021-28.141-27.785-38.311-42.945-45.736-11.93-5.843-18.277-9.249-20.914-16.896-6.629-19.228 7.752-46.177 14.282-55.62 13.556-6.913 26.342-15.28 38.123-24.982 4.898.851 12.278 2.308 20.09 4.488 17.288 4.826 24.402 9.831 26.269 11.939-.611 4.574-7.485 15.289-11.678 21.822-10.881 16.959-23.215 36.182-13.688 55.199 6.874 13.699 22.685 22.605 48.335 27.229 15.906 2.867 30.361 3.088 30.969 3.096.081.001.161.002.242.002 9.855-.001 17.91-7.925 18.04-17.81.132-9.966-7.841-18.151-17.808-18.282-.108-.002-11.172-.199-23.308-2.226-14.357-2.397-21.151-5.817-23.508-7.643 1.192-4.627 7.309-14.159 11.104-20.074 10.896-16.982 23.245-36.23 14.587-55.638-6.233-13.947-22.068-24.405-48.412-31.972-.439-.126-.877-.249-1.314-.372 3.67-4.554 7.18-9.267 10.487-14.161l6.83-10.106-5.968-8.828 9.555.901-.019.183c.008-.066.809-6.661 4.56-12.688 4.096-6.581 9.784-9.552 18.459-9.634.063-.001.125-.001.187-.001 19.598 0 24.769 31.861 24.807 32.104 1.308 8.981 9.02 15.449 17.836 15.448.865 0 1.742-.063 2.623-.19 9.864-1.433 16.695-10.592 15.258-20.456zm-171.309-154.885c7.532.008 13.659 6.143 13.659 13.693 0 7.53-6.134 13.657-13.674 13.658-3.643-.008-7.064-1.434-9.638-4.015-2.567-2.575-3.978-5.993-3.97-9.679.001-7.53 6.12-13.657 13.623-13.657zm-215.768 13.676c0-7.533 6.128-13.668 13.642-13.676 7.541 0 13.676 6.127 13.676 13.676 0 7.527-6.118 13.659-13.643 13.676-7.541-.002-13.675-6.129-13.675-13.676zm-20.02 144.363c33.309-42.587 83.969-67.664 137.854-67.664 53.865 0 104.527 25.08 137.85 67.664-32.936 41.895-83.581 66.559-137.85 66.559-54.284-.001-104.933-24.667-137.854-66.559z" fill="param(fill)" fill-opacity="param(fill-opacity)" stroke="param(outline)" stroke-opacity="param(outline-opacity)" stroke-width="param(outline-width)"/>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 4.2 KiB

BIN
images/themes/default/clear_input.svg
View File

Binary file not shown.

BIN
images/themes/default/copyright_label.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 1.2 KiB

1
images/themes/default/copyright_label.svg Normal file
View File

@ -0,0 +1 @@
<svg enable-background="new" height="6.7733335mm" viewBox="0 0 24.000001 24.000001" width="6.7733335mm" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"><filter id="a" color-interpolation-filters="sRGB"><feBlend in2="BackgroundImage" mode="multiply"/></filter><path d="m21.594458 12.136429c-.000001 5.638195-4.061318 9.69969-9.699514 9.69969-5.6381954-.000001-9.6997076-4.061495-9.6997082-9.69969.0000002-5.6381957 4.0614155-9.6996904 9.6996112-9.6996907 5.638196 0 9.699611 4.0614943 9.699611 9.6996907z" fill="#f0f0a0" filter="url(#a)" transform="matrix(.97942076 0 0 .97941278 .34994064 .11342731)"/><path d="m12.400391 7.0410156c-1.067742 0-2.019256.2125535-2.8476566.6386719-.8227386.4213218-1.4641488 1.0151176-1.9160156 1.7773437-.4519996.7624508-.6757813 1.6359388-.6757813 2.6132808 0 1.588784.4767195 2.859002 1.4335937 3.78711v.002c.9626286.923991 2.2976828 1.382813 3.9824218 1.382813.671935 0 1.279999-.0841 1.826172-.253907.54523-.169517 1.013731-.411804 1.400391-.726562.383198-.311943.702221-.666592.955078-1.0625.252107-.399326.451255-.843117.597656-1.332031l-.0957-.128907h-1.851563l-.09961.08594c-.06716.465369-.364977.86727-.919922 1.216797-.549817.344663-1.159206.517578-1.835937.517578-.642506 0-1.213788-.151844-1.722657-.457032-.509941-.305831-.9061958-.720898-1.1914059-1.25-.2851757-.53341-.4277343-1.127295-.4277343-1.787109 0-1.005041.2971955-1.803492.890625-2.4179686.5970382-.6130619 1.4113462-.921875 2.4667972-.921875.656175 0 1.203226.1231452 1.648437.3652344l.002.00195c.451201.2426505.74655.5658161.902344.9785152l.09375.06445h1.851563l.0957-.13086c-.284193-.8967402-.827617-1.6189724-1.62114-2.1562918-.795674-.5387749-1.779004-.8066406-2.941406-.8066406z" fill="#bebe00" overflow="visible"/><path d="m12 2.5c-4.965829.0000003-8.6725502 3.220995-9.3710938 7.884766a9.0156254 9.0156254 0 0 0 4.9707032 1.5 9.0156254 9.0156254 0 0 0 8.9804686-8.3242191c-1.334596-.6805593-2.883257-1.0605469-4.580078-1.0605469z" fill="#f6f6c3"/><path d="m21.500001 12.000001c-.000001 5.52212-3.977739 9.5-9.499905 9.5-5.5221659-.000001-9.5000953-3.97788-9.5000958-9.5.0000002-5.5221209 3.9778346-9.5000008 9.5000008-9.5000011 5.522166 0 9.5 3.9778795 9.5 9.5000011z" fill="none" stroke="#bebe00" stroke-miterlimit="0" stroke-width="1.00000012"/><g transform="matrix(.76923082 0 0 .76923082 -.61538475 -.61538404)"><rect fill="#5a8c5a" height="13" rx="2.6149371" ry="2.6149368" width="13" x="19" y="19"/><path d="m21.6 25.499999h7.8" style="overflow:visible;fill:#fff;fill-rule:evenodd;stroke:#fff;stroke-width:2.5999999;stroke-linecap:round;stroke-linejoin:round"/><path d="m25.5 29.399999v-7.799999" style="overflow:visible;fill:#fff;fill-rule:evenodd;stroke:#fff;stroke-width:2.5999999;stroke-linecap:round;stroke-linejoin:round"/><path d="m20.3 25.499999h10.4c0 0 0 0 0-2.6 0-2.599999-.65-2.599999-5.2-2.599999-4.55 0-5.2 0-5.2 2.599999 0 2.6 0 2.6 0 2.6z" fill="#fcffff" fill-rule="evenodd" opacity=".3"/></g><path d="m12.400391 7.0410156c-1.067742 0-2.019256.2125535-2.8476566.6386719-.8227386.4213218-1.4641489 1.0151177-1.9160156 1.7773437-.4182465.7055148-.6311604 1.5104218-.6621094 2.4003908a9.0156249 9.0156249 0 0 0 .625.027344 9.0156249 9.0156249 0 0 0 1.4355468-.128907c.0572026-.857066.3377865-1.561197.8671876-2.1093746.5970382-.6130619 1.4113462-.921875 2.4667972-.921875.656175 0 1.203226.1231452 1.648437.3652344l.001953.0019531c.021361.0114873.037931.0252602.058594.0371093a9.0156249 9.0156249 0 0 0 1.089844-1.3789062c-.764879-.4668801-1.685298-.7089844-2.767578-.7089844z" fill="none" overflow="visible"/><path d="m12.400391 7.0410156c-1.067742 0-2.019256.2125535-2.8476566.6386719-.8227386.4213218-1.4641489 1.0151177-1.9160156 1.7773437-.4182465.7055148-.6311604 1.5104218-.6621094 2.4003908a9.0156249 9.0156249 0 0 0 .625.027344 9.0156249 9.0156249 0 0 0 1.4355468-.128907c.0572026-.857066.3377865-1.561197.8671876-2.1093746.5970382-.6130619 1.4113462-.921875 2.4667972-.921875.656175 0 1.203226.1231452 1.648437.3652344l.001953.0019531c.021361.0114873.037931.0252602.058594.0371093a9.0156249 9.0156249 0 0 0 1.089844-1.3789062c-.764879-.4668801-1.685298-.7089844-2.767578-.7089844z" fill="#d6d65f"/></svg>
Side by Side

After

Width:  |  Height:  |  Size: 4.1 KiB

BIN
images/themes/default/geographic.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 3.5 KiB

BIN
images/themes/default/mActionCheckQgisVersion.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 769 B

BIN
images/themes/default/mActionCopySelected.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 526 B

BIN
images/themes/default/mActionHelpAbout.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 2.1 KiB

1
images/themes/default/mActionHelpAbout.svg Normal file
View File

File diff suppressed because one or more lines are too long
Side by Side

After

Width:  |  Height:  |  Size: 6.9 KiB

1
images/themes/default/mActionHideDeselectedLayers.svg Normal file
View File

@ -0,0 +1 @@
<svg height="24" viewBox="0 0 24 24" width="24" xmlns="http://www.w3.org/2000/svg"><path d="m11.5 11.5h12v12h-12z" fill="#ebebeb" overflow="visible" stroke="#898989" stroke-linecap="round"/><g transform="translate(0 -8)"><path d="m23.920726 22.589049s-.204601-.652217-1.183864-1.741642c-.626778-.697285 1.133965-4.759717-4.203989-7.462595-2.843013-1.439563-8.9684055.115819-11.2570483.515667-5.0919021.889605-4.9405237 1.461199-5.466197 2.832546-.3947767 1.029871-.205755 4.210676-.193479 4.489383-.01888.230131 1.214539 2.152487 2.867438 3.325547 1.508743 1.070752 3.592552 2.336622 5.9029663 2.73289 2.79582.479522 3.821514.379776 6.481198-.469869 1.39945-.447059 3.888123-2.570867 3.888123-2.570867s.521038-.348323 1.332925-.951893c.700164-.520511 1.831927-.699167 1.831927-.699167z" fill="#eeeeec" fill-rule="evenodd"/><path d="m1.1431106 15.424331c5.0059781-1.495379 8.5535321-2.062068 10.9931454-2.285946 5.222126-.479224 7.062158.400175 8.402611 1.388166 1.448462 1.0676 1.763071 1.760039 1.763071 1.760039" fill="none" stroke="#888a85" stroke-width=".99999994"/><path d="m23.514476 22.589049c-.0074-1.621158-1.489833-.70922-2.121364-.366642-1.345528.583965-4.05405 3.175877-5.922739 3.568655-2.150462.452003-4.650818.144881-6.7882983-.765583-2.09114-.890725-3.6035308-2.157143-5.122447-3.292454-.983278-.734949-1.955755-.414323-1.943479-.135617-.01888.230131 1.214539 1.777488 2.867438 2.950547 1.508743 1.070753 3.592552 2.336622 5.9029663 2.73289 2.79582.479522 3.821514.379776 6.481198-.469869 1.39945-.447059 3.888123-2.570867 3.888123-2.570867s.521038-.348323 1.332925-.951893c.700164-.520511 1.425677-.699167 1.425677-.699167z" fill="none" stroke="#888a85" stroke-width=".99999994"/></g></svg>
Side by Side

After

Width:  |  Height:  |  Size: 1.7 KiB

BIN
images/themes/default/mActionHideSelectedLayers.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 805 B

1
images/themes/default/mActionHideSelectedLayers.svg Normal file
View File

@ -0,0 +1 @@
<svg height="24" viewBox="0 0 24 24" width="24" xmlns="http://www.w3.org/2000/svg"><path d="m11.5 11.5h12v12h-12z" fill="#fce94f" overflow="visible" stroke="#c4a000" stroke-linecap="round"/><g transform="translate(0 -8)"><path d="m23.920726 22.589049s-.204601-.652217-1.183864-1.741642c-.626778-.697285 1.133965-4.759717-4.203989-7.462595-2.843013-1.439563-8.9684055.115819-11.2570483.515667-5.0919021.889605-4.9405237 1.461199-5.466197 2.832546-.3947767 1.029871-.205755 4.210676-.193479 4.489383-.01888.230131 1.214539 2.152487 2.867438 3.325547 1.508743 1.070752 3.592552 2.336622 5.9029663 2.73289 2.79582.479522 3.821514.379776 6.481198-.469869 1.39945-.447059 3.888123-2.570867 3.888123-2.570867s.521038-.348323 1.332925-.951893c.700164-.520511 1.831927-.699167 1.831927-.699167z" fill="#eeeeec" fill-rule="evenodd"/><path d="m1.1431106 15.424331c5.0059781-1.495379 8.5535321-2.062068 10.9931454-2.285946 5.222126-.479224 7.062158.400175 8.402611 1.388166 1.448462 1.0676 1.763071 1.760039 1.763071 1.760039" fill="none" stroke="#888a85" stroke-width=".99999994"/><path d="m23.514476 22.589049c-.0074-1.621158-1.489833-.70922-2.121364-.366642-1.345528.583965-4.05405 3.175877-5.922739 3.568655-2.150462.452003-4.650818.144881-6.7882983-.765583-2.09114-.890725-3.6035308-2.157143-5.122447-3.292454-.983278-.734949-1.955755-.414323-1.943479-.135617-.01888.230131 1.214539 1.777488 2.867438 2.950547 1.508743 1.070753 3.592552 2.336622 5.9029663 2.73289 2.79582.479522 3.821514.379776 6.481198-.469869 1.39945-.447059 3.888123-2.570867 3.888123-2.570867s.521038-.348323 1.332925-.951893c.700164-.520511 1.425677-.699167 1.425677-.699167z" fill="none" stroke="#888a85" stroke-width=".99999994"/></g></svg>
Side by Side

After

Width:  |  Height:  |  Size: 1.7 KiB

89
images/themes/default/mActionInstallPluginFromZip.svg Normal file
View File

@ -0,0 +1,89 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<svg
xmlns:dc="http://purl.org/dc/elements/1.1/"
xmlns:cc="http://creativecommons.org/ns#"
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:svg="http://www.w3.org/2000/svg"
xmlns="http://www.w3.org/2000/svg"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
height="24"
width="24"
id="svg4142"
version="1.1"
inkscape:version="0.91 r13725"
sodipodi:docname="mActionInstallPluginFromZip.svg"
inkscape:export-filename="/home/alex/plugin.png"
inkscape:export-xdpi="90"
inkscape:export-ydpi="90">
<metadata
id="metadata4158">
<rdf:RDF>
<cc:Work
rdf:about="">
<dc:format>image/svg+xml</dc:format>
<dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
<dc:title></dc:title>
</cc:Work>
</rdf:RDF>
</metadata>
<defs
id="defs4156" />
<sodipodi:namedview
pagecolor="#ffffff"
bordercolor="#666666"
borderopacity="1"
objecttolerance="10"
gridtolerance="10"
guidetolerance="10"
inkscape:pageopacity="0"
inkscape:pageshadow="2"
inkscape:window-width="1366"
inkscape:window-height="731"
id="namedview4154"
showgrid="false"
inkscape:zoom="9.8333333"
inkscape:cx="10.372881"
inkscape:cy="12"
inkscape:window-x="0"
inkscape:window-y="18"
inkscape:window-maximized="1"
inkscape:current-layer="svg4142" />
<g
fill="#73d216"
stroke-linecap="round"
stroke-linejoin="round"
stroke-width=".75"
transform="translate(0 -6)"
id="g4144">
<path
d="m11.5 1c-1.380712 0-2.5 1.1192881-2.5 2.5 0 .3597817.363178.6908983.5 1l-5 0 0 5c .3091017-.1368217.6402183-.5 1-.5 1.3807119 0 2.5 1.119288 2.5 2.5 0 1.380712-1.1192881 2.5-2.5 2.5-.3597817 0-.6908983-.363178-1-.5l0 5 14 0 0-5c .309102.136822.640218.5 1 .5 1.380712 0 2.5-1.119288 2.5-2.5 0-1.380712-1.119288-2.5-2.5-2.5-.359782 0-.690898.363178-1 .5l0-5-5 0c .136822-.3091017.5-.6402183.5-1 0-1.3807119-1.119288-2.5-2.5-2.5z"
overflow="visible"
stroke="#4e9a06"
transform="translate(0 8)"
id="path4146" />
<path
d="m5.5 15.5l0-2 3 0"
overflow="visible"
stroke="#eeeeec"
id="path4148" />
<path
d="m5.5 17.5l0-2"
overflow="visible"
stroke="#eeeeec"
transform="translate(0 8)"
id="path4150" />
<path
d="m13.5 5.5l3 0 0 0 0 0"
overflow="visible"
stroke="#eeeeec"
transform="translate(0 8)"
id="path4152" />
</g>
<path
inkscape:connector-curvature="0"
id="path3782"
d="m 11.808709,13.026632 0.857159,0 0,-0.857141 -0.857159,0 0,-0.85714 0.857159,0 0,-0.857139 -0.857159,0 0,-0.8571416 0.857159,0 0,-0.857153 -0.857159,0 0,-0.8571407 0.857159,0 0,-0.8571428 -0.857159,0 0,-0.8571425 -0.857141,0 0,0.8571425 -0.857138,0 0,0.8571428 0.857138,0 0,0.8571407 -0.857138,0 0,0.857153 0.857138,0 0,0.8571416 -0.857138,0 0,0.857139 0.857138,0 0,0.85714 -0.857138,0 0,0.857141 0.857138,0 0,0.857139 -1.7142799,0 0,2.14286 c 0,1.181581 0.9612799,2.14286 2.1428609,2.14286 1.18156,0 2.142859,-0.961279 2.142859,-2.14286 l 0,-2.14286 -1.714299,0 0,-0.857139 z m 0.857159,2.999999 c 0,0.70886 -0.57686,1.28572 -1.285719,1.28572 -0.70886,0 -1.285719,-0.57686 -1.285719,-1.28572 l 0,-1.28572 2.571438,0 0,1.28572 z"
style="fill:#555753" />
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 3.5 KiB

BIN
images/themes/default/mActionShowSelectedLayers.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 1003 B

1
images/themes/default/mActionShowSelectedLayers.svg Normal file
View File

@ -0,0 +1 @@
<svg height="24" viewBox="0 0 24 24" width="24" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"><radialGradient id="a" cx="16.5" cy="-12.5" gradientTransform="matrix(.71392723 1.0641605 -.69302733 .45911438 -10.291955 4.6155606)" gradientUnits="userSpaceOnUse" r="7.0000001"><stop offset="0" stop-color="#bed1e5"/><stop offset="1" stop-color="#6d97c4"/></radialGradient><path d="m11.5 11.5h12v12h-12z" fill="#fce94f" overflow="visible" stroke="#c4a000" stroke-linecap="round"/><g transform="translate(0 -8)"><path d="m23.920726 22.589049s-1.892101-.277217-2.871364-1.366642c-.626778-.697285-3.678535-3.947217-5.453989-4.650095-2.962962-1.172997-5.321805-1.134553-7.5695483-.546833-2.09114.546775-3.530204 1.337547-4.903697 2.645046-.639528.608801-1.518255 2.273176-1.505979 2.551883-.01888.230131 1.214539 2.152487 2.867438 3.325547 1.508743 1.070752 3.592552 2.336622 5.9029663 2.73289 2.79582.479522 3.821514.379776 6.481198-.469869 1.39945-.447059 3.888123-2.570867 3.888123-2.570867s.521038-.348323 1.332925-.951893c.700164-.520511 1.831927-.699167 1.831927-.699167z" fill="#eeeeec" fill-rule="evenodd"/><path d="m10.703793 15.636921c-.7881923.02907-1.0668593.04567-1.9065573.207793-.480734.09555-1.032406.24279-1.259721.314658-.82902.985202-1.232344 2.302381-1.232555 3.586626.000334 3.02468 2.467746 5.476585 5.5115563 5.476917 3.043809-.000333 5.511221-2.452237 5.511555-5.476917-.0019-.802706.04206-1.574914-.302154-2.301101-.523643-.400667-1.160508-.754077-1.584197-.91776-1.870192-.722509-3.334895-.941964-4.737927-.890216z" fill="url(#a)" stroke="#415a75" stroke-linecap="round" stroke-linejoin="round"/><ellipse cx="11.816514" cy="19.659227" rx="2.2263777" ry="2.2123857"/><path d="m1.1431106 15.424331c5.0059781-1.495379 8.5535321-2.062068 10.9931454-2.285946 5.222126-.479224 7.062158.400175 8.402611 1.388166 1.448462 1.0676 1.763071 1.760039 1.763071 1.760039" fill="none" stroke="#888a85" stroke-width=".99999994"/><path d="m23.920726 22.589049s-1.892101-.277217-2.871364-1.366642c-.626778-.697285-3.678535-3.947217-5.453989-4.650095-2.962962-1.172997-5.321805-1.134553-7.5695483-.546833-2.09114.546775-3.530204 1.337547-4.903697 2.645046-.639528.608801-1.518255 2.273177-1.505979 2.551883-.01888.230131 1.214539 2.152488 2.867438 3.325547 1.508743 1.070753 3.592552 2.336622 5.9029663 2.73289 2.79582.479522 3.821514.379776 6.481198-.469869 1.39945-.447059 3.888123-2.570867 3.888123-2.570867s.521038-.348323 1.332925-.951893c.700164-.520511 1.831927-.699167 1.831927-.699167z" fill="none" stroke="#888a85" stroke-width=".99999994"/><ellipse cx="11.169984" cy="18.742189" fill="#eeeeec" rx=".89055109" ry=".88495421"/></g></svg>
Side by Side

After

Width:  |  Height:  |  Size: 2.6 KiB

7
images/themes/default/mIconClear.svg
View File

@ -1,7 +0,0 @@
<svg height="10" width="10" xmlns="http://www.w3.org/2000/svg">
<g transform="matrix(.7 0 0 .7 1.5 -728.15354)">
<path d="m9.5.5h-6.5l-2.5 4.5 2.5 4.5h6.5z" fill="#969696" stroke="#969696" stroke-width=".5" transform="translate(0 1042.3622)"/>
<path d="m3 8l5.5-6" fill="none" stroke="#fff" transform="translate(0 1042.3622)"/>
<path d="m3 2l5.5 6" fill="none" stroke="#fff" transform="translate(0 1042.3622)"/>
</g>
</svg>
Side by Side

Before

Width:  |  Height:  |  Size: 424 B

BIN
images/themes/default/mIconCollapse.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 346 B

1
images/themes/default/mIconCollapse.svg Normal file
View File

@ -0,0 +1 @@
<svg height="16" width="16" xmlns="http://www.w3.org/2000/svg"><path d="m .99999988 4.1312752h14.00000012v1.3567281l-6.9691627 8.4493367-7.03083742-8.4493367z" fill="#0a0a0a" fill-opacity=".94509804"/><path d="m2.9118943 5.5496854h10.2995597l-5.1806167 6.2290596z" fill="#484848"/></svg>
Side by Side

After

Width:  |  Height:  |  Size: 287 B

BIN
images/themes/default/mIconExpand.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 395 B

1
images/themes/default/mIconExpand.svg Normal file
View File

@ -0,0 +1 @@
<svg height="16" width="16" xmlns="http://www.w3.org/2000/svg"><g transform="matrix(0 -1 1 0 -.27926138 16)"><path d="m .99999988 4.1312752h14.00000012v1.3567281l-6.9691627 8.4493367-7.03083742-8.4493367z" fill="#0a0a0a" fill-opacity=".94509804"/><path d="m2.9118943 5.5496854h10.2995597l-5.1806167 6.2290596z" fill="#484848"/></g></svg>
Side by Side

After

Width:  |  Height:  |  Size: 337 B

BIN
images/themes/default/mIconInfo.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 726 B

1
images/themes/default/mIconInfo.svg Normal file
View File

@ -0,0 +1 @@
<svg height="6.7733335mm" viewBox="0 0 24.000001 24.000001" width="6.7733335mm" xmlns="http://www.w3.org/2000/svg"><g transform="translate(-845.32635 -969.08167)"><path d="m850.32635 971.5817c-1.36408 0-2.5 1.13592-2.5 2.5v8c0 1.36409 1.13592 2.5 2.5 2.5h4s .40959 1.04767 0 2.45581c-.41914 1.44095-2 2.54419-2 2.54419s4.10002-.55306 5.5-2c .98337-1.01635 1.17915-1.8983 1.5-3h5c1.36408 0 2.5-1.13591 2.5-2.5v-8c0-1.36408-1.13592-2.5-2.5-2.5z" fill="#fff" fill-opacity=".58823532" stroke="#999" stroke-linejoin="round"/><path d="m850.34845 979.08167-.0221-3c0-2 0-2 2-2h4" fill="none" stroke="#fff" stroke-linecap="round" stroke-opacity=".78431373" stroke-width="2.00000024"/></g></svg>
Side by Side

After

Width:  |  Height:  |  Size: 686 B

BIN
images/themes/default/mIconProjectionDisabled.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 1.1 KiB

1
images/themes/default/mIconProjectionDisabled.svg Normal file
View File

@ -0,0 +1 @@
<svg enable-background="new 0 0 24 24" height="16" viewBox="0 0 16 16" width="16" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"><linearGradient id="a" gradientTransform="matrix(.66608453 0 0 .65964018 .00697546 .13907045)" gradientUnits="userSpaceOnUse" x1=".98339999" x2="23.6108" y1="6.6645999" y2="8.6442003"><stop offset="0" stop-color="#f5f5f5"/><stop offset=".2503" stop-color="#e4e4e4"/><stop offset=".7217" stop-color="#c9c9c9"/><stop offset="1" stop-color="#bfbfbf"/></linearGradient><path d="m14.027389 8.3562082c0 3.2896258-2.700307 5.9624878-6.0273991 5.9624878-3.3290905 0-6.0273989-2.672862-6.0273989-5.9624878 0-3.2949027 2.6989744-5.967105 6.0273989-5.967105 3.3270921 0 6.0273991 2.6722023 6.0273991 5.967105z" fill="#e6e6e6" stroke="#ccc" stroke-linecap="round" stroke-linejoin="round" stroke-width=".99999994"/><path d="m7.9999899 2.7030919c3.1718941 3.1418662 3.1718941 8.1597481 0 11.3029341" fill="none" stroke="#ccc" stroke-linecap="round" stroke-linejoin="round" stroke-width=".99999994"/><path d="m7.9999899 2.7030919c-3.1725606 3.1418662-3.1725606 8.1597481 0 11.3029341" fill="none" stroke="#ccc" stroke-linecap="round" stroke-linejoin="round" stroke-width=".99999994"/><path d="m2.2896472 8.3562082c1.268891 0 10.1511278 0 11.4206848 0" fill="none" stroke="#ccc" stroke-linecap="round" stroke-linejoin="round" stroke-width=".99999994"/><path d="m12.440775 4.5883435c-1.781776 1.2651899-6.866665 1.3634762-8.8822368 0" fill="none" stroke="#ccc" stroke-linecap="round" stroke-linejoin="round" stroke-width=".74999994"/><path d="m12.440775 12.120115c-2.295993-1.231548-6.4663482-1.315982-8.8822368 0" fill="none" stroke="#ccc" stroke-linecap="round" stroke-linejoin="round" stroke-width=".99999994"/><path d="m15.593353 7.4254559c0 0-2.966074 1.3278557-7.5933631 1.3278557-1.959484 0-3.6209248-.238043-4.8854319-.5125542-1.7220354-.3738353-2.70793182-.8153015-2.70793182-.8153015l5.64773072-5.7579992c0 0 1.165648.2803472 1.945633.2803472.779985 0 1.9462993-.2803472 1.9462993-.2803472z" style="fill-opacity:.8;stroke:#b3b3b3;stroke-width:.99999994;stroke-linecap:round;stroke-linejoin:bevel;fill:url(#a)"/><path d="m7.9999899 8.7533116v-3.7909522-3.0152152" fill="none" stroke="#b3b3b3" stroke-linecap="round" stroke-linejoin="round" stroke-width=".99999994"/><path d="m13.60176 5.4584089c0 0-2.186755.9070053-5.6017701.9070053-3.4143493 0-5.6017709-.9070053-5.6017709-.9070053" fill="none" stroke="#b3b3b3" stroke-linecap="round" stroke-linejoin="round" stroke-width=".99999994"/><path d="m11.704085 3.4352925c0 0-1.445403.5290314-3.7040951.5290314-2.2580266 0-3.7047622-.5290314-3.7047622-.5290314" fill="none" stroke="#b3b3b3" stroke-linecap="round" stroke-linejoin="round" stroke-width=".99999994"/><path d="m8.8432529 1.8752435l3.2038661 6.5324167" fill="none" stroke="#b3b3b3" stroke-linecap="round" stroke-linejoin="round"/><path d="m7.158059 1.8752435l-3.2058649 6.5324167" fill="none" stroke="#b3b3b3" stroke-linecap="round" stroke-linejoin="round" stroke-width=".99999994"/><path d="m1.569747 1.569748l12.860506 12.860504" fill="none" stroke="#666" stroke-width="2"/><path d="m14.430252 1.569747l-12.860504 12.860506" fill="none" stroke="#666" stroke-width="2"/></svg>
Side by Side

After

Width:  |  Height:  |  Size: 3.2 KiB

BIN
images/themes/default/mIconProjectionEnabled.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 1005 B

1
images/themes/default/mIconProjectionEnabled.svg Normal file
View File

@ -0,0 +1 @@
<svg enable-background="new 0 0 24 24" height="16" viewBox="0 0 16 16" width="16" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"><linearGradient id="a" gradientTransform="matrix(.66608453 0 0 .65964018 .00697546 .13907045)" gradientUnits="userSpaceOnUse" x1=".98339999" x2="23.6108" y1="6.6645999" y2="8.6442003"><stop offset="0" stop-color="#f5f5f5"/><stop offset=".2503" stop-color="#e4e4e4"/><stop offset=".7217" stop-color="#c9c9c9"/><stop offset="1" stop-color="#bfbfbf"/></linearGradient><path d="m14.027389 8.3562082c0 3.2896258-2.700307 5.9624878-6.0273991 5.9624878-3.3290905 0-6.0273989-2.672862-6.0273989-5.9624878 0-3.2949027 2.6989744-5.967105 6.0273989-5.967105 3.3270921 0 6.0273991 2.6722023 6.0273991 5.967105z" fill="#e6e6e6" stroke="#808080" stroke-linecap="round" stroke-linejoin="round" stroke-width=".99999994"/><path d="m7.9999899 2.7030919c3.1718941 3.1418662 3.1718941 8.1597481 0 11.3029341" fill="none" stroke="#808080" stroke-linecap="round" stroke-linejoin="round" stroke-width=".99999994"/><path d="m7.9999899 2.7030919c-3.1725606 3.1418662-3.1725606 8.1597481 0 11.3029341" fill="none" stroke="#808080" stroke-linecap="round" stroke-linejoin="round" stroke-width=".99999994"/><path d="m2.2896472 8.3562082c1.268891 0 10.1511278 0 11.4206848 0" fill="none" stroke="#808080" stroke-linecap="round" stroke-linejoin="round" stroke-width=".99999994"/><path d="m12.440775 4.5883435c-1.781776 1.2651899-6.866665 1.3634762-8.8822368 0" fill="none" stroke="#808080" stroke-linecap="round" stroke-linejoin="round" stroke-width=".74999994"/><path d="m12.440775 12.120115c-2.295993-1.231548-6.4663482-1.315982-8.8822368 0" fill="none" stroke="#808080" stroke-linecap="round" stroke-linejoin="round" stroke-width=".99999994"/><path d="m15.593353 7.4254559c0 0-2.966074 1.3278557-7.5933631 1.3278557-1.959484 0-3.6209248-.238043-4.8854319-.5125542-1.7220354-.3738353-2.70793182-.8153015-2.70793182-.8153015l5.64773072-5.7579992c0 0 1.165648.2803472 1.945633.2803472.779985 0 1.9462993-.2803472 1.9462993-.2803472z" style="fill-opacity:.8;stroke:#666;stroke-width:.99999994;stroke-linecap:round;stroke-linejoin:bevel;fill:url(#a)"/><path d="m7.9999899 8.7533116v-3.7909522-3.0152152" fill="none" stroke="#666" stroke-linecap="round" stroke-linejoin="round" stroke-width=".99999994"/><path d="m13.60176 5.4584089c0 0-2.186755.9070053-5.6017701.9070053-3.4143493 0-5.6017709-.9070053-5.6017709-.9070053" fill="none" stroke="#666" stroke-linecap="round" stroke-linejoin="round" stroke-width=".99999994"/><path d="m11.704085 3.4352925c0 0-1.445403.5290314-3.7040951.5290314-2.2580266 0-3.7047622-.5290314-3.7047622-.5290314" fill="none" stroke="#666" stroke-linecap="round" stroke-linejoin="round" stroke-width=".99999994"/><path d="m8.8432529 1.8752435l3.2038661 6.5324167" fill="none" stroke="#666" stroke-linecap="round" stroke-linejoin="round"/><path d="m7.158059 1.8752435l-3.2058649 6.5324167" fill="none" stroke="#666" stroke-linecap="round" stroke-linejoin="round" stroke-width=".99999994"/></svg>
Side by Side

After

Width:  |  Height:  |  Size: 3.0 KiB

BIN
images/themes/default/mIconSuccess.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 769 B

1
images/themes/default/mIconSuccess.svg Normal file
View File

@ -0,0 +1 @@
<svg height="6.208889mm" viewBox="0 0 22 22" width="6.208889mm" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"><linearGradient id="a" gradientUnits="userSpaceOnUse" x1="5" x2="12" y1="18" y2="-7"><stop offset="0" stop-color="#00e100"/><stop offset="1" stop-color="#00e100" stop-opacity="0"/></linearGradient><path d="m1 5 6 6 14-6.9999999-16 13.9999999z" fill="url(#a)" fill-rule="evenodd" stroke="#006b00" stroke-linejoin="round" stroke-opacity=".91764706"/></svg>
Side by Side

After

Width:  |  Height:  |  Size: 496 B

0
images/themes/default/propertyicons/digitising.png → images/themes/default/propertyicons/digitizing.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 3.8 KiB

After

Width:  |  Height:  |  Size: 3.8 KiB

BIN
images/themes/default/propertyicons/rendering.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 3.6 KiB

1
images/themes/default/propertyicons/rendering.svg Normal file
View File

@ -0,0 +1 @@
<svg height="64" viewBox="0 0 16.933333 16.933334" width="64" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"><linearGradient id="a" gradientTransform="matrix(.72567525 .68803737 -.68803737 .72567525 200.63488 73.348432)" gradientUnits="userSpaceOnUse" x1="11.125094" x2="6.481286" y1="286.60989" y2="286.00851"><stop offset="0" stop-color="#bf7b10"/><stop offset="1" stop-color="#e8b86d"/></linearGradient><linearGradient id="b" gradientTransform="matrix(.72567525 .68803737 -.68803737 .72567525 200.63488 73.348432)" gradientUnits="userSpaceOnUse" x1="11.509375" x2="5.2471313" y1="294.75101" y2="291.61029"><stop offset="0" stop-color="#e2af61"/><stop offset="1" stop-color="#f1d8b2"/></linearGradient><g stroke="#976009" transform="matrix(1.1652737 0 0 1.1652737 -.0449293 -328.611977)"><path d="m7.3488466 288.29569 4.3540224-4.76315c.638058-.67296 1.848869.4389 1.192763 1.1309l-4.5245605 4.60145c1.9744655 1.87206 1.4540054 2.04932.7239703 2.81929l-4.6000124-4.36142c.7301315-.77008.91071-1.2694 2.8538172.57293z" fill="url(#a)" fill-rule="evenodd" stroke-width=".26458332"/><path d="m4.4918833 287.71977-2.9126893 3.07203 4.608038 4.36903 2.9126892-3.07202z" fill="url(#b)" fill-rule="evenodd" stroke-width=".26458332"/><g fill="none" stroke-width=".13229167"><path d="m4.9764608 288.36233-2.7298623 2.8792"/><path d="m5.5524655 288.90846-2.7298622 2.8792"/><path d="m6.1284703 289.45459-2.7298622 2.8792"/><path d="m6.704475 290.00072-2.7298622 2.8792"/><path d="m7.2804797 290.54685-2.7298622 2.8792"/><path d="m7.8569042 291.09254-2.7306467 2.88002"/><path d="m8.4332737 291.63828-2.73064 2.88002"/></g></g></svg>
Side by Side

After

Width:  |  Height:  |  Size: 1.6 KiB

4
images/themes/default/providerGrass.svg
View File

@ -15,7 +15,7 @@
version="1.1"
inkscape:version="0.48.5 r10040"
sodipodi:docname="grass.svg"
inkscape:export-filename="/home/vincent/Documents/developpement/grass/grass_splash/logo/logo_variant_bw_bg.png"
inkscape:export-filename="/home/vincent/Documents/development/grass/grass_splash/logo/logo_variant_bw_bg.png"
inkscape:export-xdpi="600"
inkscape:export-ydpi="600">
<defs
@ -63,7 +63,7 @@
<g
transform="matrix(0.37476995,0,0,0.37476995,232.61522,307.09071)"
id="g5376"
inkscape:export-filename="/home/vincent/Documents/developpement/grass/grass_splash/logo/logo_variant_bg.png"
inkscape:export-filename="/home/vincent/Documents/development/grass/grass_splash/logo/logo_variant_bg.png"
inkscape:export-xdpi="600"
inkscape:export-ydpi="600">
<g

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 37 KiB

After

Width:  |  Height:  |  Size: 37 KiB

129
images/themes/default/providerTaudem.svg
View File

@ -1,129 +0,0 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!-- Created with Inkscape (http://www.inkscape.org/) -->
<svg
xmlns:osb="http://www.openswatchbook.org/uri/2009/osb"
xmlns:dc="http://purl.org/dc/elements/1.1/"
xmlns:cc="http://creativecommons.org/ns#"
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:svg="http://www.w3.org/2000/svg"
xmlns="http://www.w3.org/2000/svg"
xmlns:xlink="http://www.w3.org/1999/xlink"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
id="svg3399"
version="1.1"
inkscape:version="0.92pre3 r"
width="25.4mm"
height="25.4mm"
viewBox="0 0 89.999998 89.999999"
sodipodi:docname="providerTaudem.svg">
<metadata
id="metadata3405">
<rdf:RDF>
<cc:Work
rdf:about="">
<dc:format>image/svg+xml</dc:format>
<dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
<dc:title />
</cc:Work>
</rdf:RDF>
</metadata>
<defs
id="defs3403">
<linearGradient
id="linearGradient5607"
osb:paint="solid">
<stop
style="stop-color:#000000;stop-opacity:1;"
offset="0"
id="stop5609" />
</linearGradient>
<linearGradient
id="linearGradient5589"
osb:paint="solid">
<stop
style="stop-color:#ffffff;stop-opacity:1;"
offset="0"
id="stop5591" />
</linearGradient>
<linearGradient
inkscape:collect="always"
id="linearGradient4138">
<stop
style="stop-color:#990000;stop-opacity:1;"
offset="0"
id="stop4140" />
<stop
style="stop-color:#6e0000;stop-opacity:1"
offset="1"
id="stop4142" />
</linearGradient>
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient4138"
id="linearGradient4144"
x1="0.33333334"
y1="700.4278"
x2="90"
y2="699.9278"
gradientUnits="userSpaceOnUse"
gradientTransform="translate(0,-654.09448)" />
</defs>
<sodipodi:namedview
pagecolor="#ffffff"
bordercolor="#666666"
borderopacity="1"
objecttolerance="10"
gridtolerance="10"
guidetolerance="10"
inkscape:pageopacity="0"
inkscape:pageshadow="2"
inkscape:window-width="1920"
inkscape:window-height="1016"
id="namedview3401"
showgrid="false"
fit-margin-top="0"
fit-margin-left="0"
fit-margin-right="0"
fit-margin-bottom="0"
units="mm"
inkscape:zoom="2.1213203"
inkscape:cx="37.400126"
inkscape:cy="64.418719"
inkscape:window-x="0"
inkscape:window-y="27"
inkscape:window-maximized="1"
inkscape:current-layer="layer3" />
<g
inkscape:groupmode="layer"
id="layer1"
inkscape:label="back">
<rect
style="fill:url(#linearGradient4144);fill-opacity:1;stroke:none;image-rendering:optimizeQuality"
id="rect3417"
width="90"
height="90"
x="0"
y="0" />
</g>
<g
inkscape:groupmode="layer"
id="layer2"
inkscape:label="tau">
<g
transform="matrix(1.0471214,0,0,0.95499911,-4.424218e-7,-654.09448)"
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:152.20530701px;line-height:125%;font-family:'Times New Roman';-inkscape-font-specification:'Times New Roman, ';letter-spacing:0px;word-spacing:0px;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
id="text3409">
<path
d="m 50.072425,707.8088 -2.155251,21.32955 q -0.520233,5.57392 -0.520233,11.14785 0,10.62761 2.452527,12.9315 2.526846,2.22957 5.722562,2.22957 7.134624,0 8.472366,-8.9926 l 2.749803,0 q -2.452527,20.66069 -16.424498,20.66069 -14.640843,0 -14.640843,-16.7961 0,-8.47236 1.635018,-21.10659 l 2.749803,-21.40387 -7.357581,0 q -6.094158,0 -9.512831,2.08093 -3.344355,2.00661 -6.242796,8.17509 l -2.675484,0 q 2.378208,-8.17509 5.648244,-12.93151 3.270036,-4.83073 6.242795,-6.46575 2.97276,-1.70934 8.843961,-1.70934 l 36.564947,0 0,10.85058 -21.552509,0 z"
id="path3336"
inkscape:connector-curvature="0" />
</g>
</g>
<g
inkscape:groupmode="layer"
id="layer3"
inkscape:label="dem" />
</svg>
Side by Side

Before

Width:  |  Height:  |  Size: 4.3 KiB

BIN
images/themes/default/scale_bar.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 428 B

461
images/themes/default/transformed.svg
View File

@ -1,24 +1,439 @@
<svg height="32" width="32" xmlns="http://www.w3.org/2000/svg">
<g fill="none" stroke="#cfcfcf" transform="translate(.88 .94432)">
<rect height="28.92" opacity=".9264214" ry="1.0600001" stroke-linejoin="round" width="30" x=".47999999" y=".56"/>
<path d="m .44 6.04h30"/>
<path d="m .52 15.36l29.72.04"/>
<path d="m .64 23.48l29.68-.04"/>
<path d="m6.56.6v28.48"/>
<path d="m15.48.48l.12 28.64"/>
<path d="m23.56.68l.12 28.52"/>
</g>
<path d="m674598 1046995h375942v375108h-375942z"/>
<path d="m674599 1046736h375942v375108h-375942z"/>
<path d="m674599 1046736h375942v375108h-375942z"/>
<path d="m313420 236536h375942v375108h-375942z"/>
<g fill="none" stroke="#000" transform="translate(.16 .04)">
<rect height="28.92" opacity=".9264214" ry="1.0600001" stroke-linejoin="round" width="30" x=".47999999" y=".56"/>
<path d="m .44 6.04h30"/>
<path d="m .52 15.36l29.72.04"/>
<path d="m .64 23.48l29.68-.04"/>
<path d="m6.56.6v28.48"/>
<path d="m15.48.48l.12 28.64"/>
<path d="m23.56.68l.12 28.52"/>
</g>
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<svg
xmlns:dc="http://purl.org/dc/elements/1.1/"
xmlns:cc="http://creativecommons.org/ns#"
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:svg="http://www.w3.org/2000/svg"
xmlns="http://www.w3.org/2000/svg"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
version="1.0"
id="svg2"
sodipodi:version="0.32"
inkscape:version="0.91 r13725"
width="22"
height="22"
sodipodi:docname="transformed.svg"
inkscape:output_extension="org.inkscape.output.svg.inkscape">
<metadata
id="metadata15">
<rdf:RDF>
<cc:Work
rdf:about="">
<dc:format>image/svg+xml</dc:format>
<dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
<dc:title></dc:title>
</cc:Work>
</rdf:RDF>
</metadata>
<defs
id="defs13">
<inkscape:perspective
sodipodi:type="inkscape:persp3d"
inkscape:vp_x="0 : 526.18109 : 1"
inkscape:vp_y="0 : 1000 : 0"
inkscape:vp_z="744.09448 : 526.18109 : 1"
inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
id="perspective17" />
</defs>
<sodipodi:namedview
inkscape:window-height="1029"
inkscape:window-width="1627"
inkscape:pageshadow="2"
inkscape:pageopacity="0.0"
guidetolerance="10.0"
gridtolerance="10.0"
objecttolerance="10.0"
borderopacity="1.0"
bordercolor="#666666"
pagecolor="#ffffff"
id="base"
showgrid="true"
inkscape:zoom="16"
inkscape:cx="24.072685"
inkscape:cy="11.62004"
inkscape:window-x="1973"
inkscape:window-y="21"
inkscape:current-layer="g3344"
inkscape:window-maximized="1">
<inkscape:grid
type="xygrid"
id="grid4171" />
</sodipodi:namedview>
<!-- Generator: Xara Xtreme 2.0, SVG Export Plug-In Version: 0.4 -->
<!-- Generated 2008-08-06 12:16:14 -->
<!-- not very useful exporter for now... -->
<!-- entity tag="40" -->
<!-- entity tag="1" -->
<!-- entity tag="4114" -->
<!-- entity tag="4116" -->
<!-- entity tag="4124" -->
<!-- entity tag="80" -->
<!-- entity tag="41" -->
<!-- entity tag="1" -->
<!-- entity tag="42" -->
<!-- entity tag="1" -->
<!-- entity tag="45" -->
<!-- entity tag="53" -->
<!-- entity tag="4031" -->
<!-- entity tag="43" -->
<!-- entity tag="1" -->
<!-- entity tag="48" -->
<!-- entity tag="51" -->
<!-- entity tag="115" -->
<!-- entity tag="1" -->
<!-- entity tag="111" -->
<!-- entity tag="152" -->
<!-- entity tag="150" -->
<!-- entity tag="151" -->
<!-- entity tag="0" -->
<!-- entity tag="115" -->
<!-- entity tag="1" -->
<!-- entity tag="111" -->
<!-- entity tag="152" -->
<!-- entity tag="150" -->
<!-- entity tag="151" -->
<!-- entity tag="0" -->
<!-- entity tag="115" -->
<!-- entity tag="1" -->
<!-- entity tag="111" -->
<!-- entity tag="152" -->
<!-- entity tag="150" -->
<!-- entity tag="151" -->
<!-- entity tag="0" -->
<!-- entity tag="115" -->
<!-- entity tag="1" -->
<!-- entity tag="111" -->
<!-- entity tag="152" -->
<!-- entity tag="150" -->
<!-- entity tag="151" -->
<!-- entity tag="0" -->
<!-- entity tag="115" -->
<!-- entity tag="1" -->
<!-- entity tag="111" -->
<!-- entity tag="152" -->
<!-- entity tag="150" -->
<!-- entity tag="151" -->
<!-- entity tag="0" -->
<!-- entity tag="104" -->
<!-- entity tag="1" -->
<!-- entity tag="151" -->
<!-- entity tag="152" -->
<!-- entity tag="1100" -->
<rect
x="674598"
y="1046985"
width="375942"
height="375108"
id="rect4" />
<!-- entity tag="1" -->
<!-- entity tag="176" -->
<!-- entity tag="0" -->
<!-- entity tag="115" -->
<!-- entity tag="1" -->
<!-- entity tag="111" -->
<!-- entity tag="150" -->
<!-- entity tag="0" -->
<!-- entity tag="115" -->
<!-- entity tag="1" -->
<!-- entity tag="111" -->
<!-- entity tag="150" -->
<!-- entity tag="0" -->
<!-- entity tag="115" -->
<!-- entity tag="1" -->
<!-- entity tag="111" -->
<!-- entity tag="150" -->
<!-- entity tag="0" -->
<!-- entity tag="0" -->
<!-- entity tag="104" -->
<!-- entity tag="1" -->
<!-- entity tag="151" -->
<!-- entity tag="152" -->
<!-- entity tag="1100" -->
<rect
x="674599"
y="1046726"
width="375942"
height="375108"
id="rect6" />
<!-- entity tag="1" -->
<!-- entity tag="176" -->
<!-- entity tag="0" -->
<!-- entity tag="115" -->
<!-- entity tag="1" -->
<!-- entity tag="111" -->
<!-- entity tag="150" -->
<!-- entity tag="0" -->
<!-- entity tag="115" -->
<!-- entity tag="1" -->
<!-- entity tag="111" -->
<!-- entity tag="150" -->
<!-- entity tag="0" -->
<!-- entity tag="115" -->
<!-- entity tag="1" -->
<!-- entity tag="111" -->
<!-- entity tag="150" -->
<!-- entity tag="0" -->
<!-- entity tag="0" -->
<!-- entity tag="104" -->
<!-- entity tag="1" -->
<!-- entity tag="151" -->
<!-- entity tag="152" -->
<!-- entity tag="1100" -->
<rect
x="674599"
y="1046726"
width="375942"
height="375108"
id="rect8" />
<!-- entity tag="1" -->
<!-- entity tag="176" -->
<!-- entity tag="0" -->
<!-- entity tag="115" -->
<!-- entity tag="1" -->
<!-- entity tag="111" -->
<!-- entity tag="150" -->
<!-- entity tag="0" -->
<!-- entity tag="115" -->
<!-- entity tag="1" -->
<!-- entity tag="111" -->
<!-- entity tag="150" -->
<!-- entity tag="0" -->
<!-- entity tag="115" -->
<!-- entity tag="1" -->
<!-- entity tag="111" -->
<!-- entity tag="150" -->
<!-- entity tag="0" -->
<!-- entity tag="0" -->
<!-- entity tag="4050" -->
<!-- entity tag="1" -->
<!-- entity tag="151" -->
<!-- entity tag="152" -->
<!-- entity tag="4051" -->
<!-- entity tag="1" -->
<!-- entity tag="166" -->
<!-- entity tag="150" -->
<!-- entity tag="0" -->
<!-- entity tag="104" -->
<!-- entity tag="1" -->
<!-- entity tag="104" -->
<!-- entity tag="1" -->
<!-- entity tag="1100" -->
<rect
x="313420"
y="236526"
width="375942"
height="375108"
id="rect10" />
<!-- entity tag="1" -->
<!-- entity tag="176" -->
<!-- entity tag="0" -->
<!-- entity tag="115" -->
<!-- entity tag="1" -->
<!-- entity tag="111" -->
<!-- entity tag="150" -->
<!-- entity tag="0" -->
<!-- entity tag="115" -->
<!-- entity tag="1" -->
<!-- entity tag="111" -->
<!-- entity tag="150" -->
<!-- entity tag="0" -->
<!-- entity tag="115" -->
<!-- entity tag="1" -->
<!-- entity tag="111" -->
<!-- entity tag="150" -->
<!-- entity tag="0" -->
<!-- entity tag="0" -->
<!-- entity tag="115" -->
<!-- entity tag="1" -->
<!-- entity tag="111" -->
<!-- entity tag="150" -->
<!-- entity tag="0" -->
<!-- entity tag="115" -->
<!-- entity tag="1" -->
<!-- entity tag="111" -->
<!-- entity tag="150" -->
<!-- entity tag="0" -->
<!-- entity tag="115" -->
<!-- entity tag="1" -->
<!-- entity tag="111" -->
<!-- entity tag="150" -->
<!-- entity tag="0" -->
<!-- entity tag="0" -->
<!-- entity tag="0" -->
<!-- entity tag="0" -->
<!-- entity tag="46" -->
<!-- entity tag="47" -->
<!-- entity tag="0" -->
<!-- entity tag="4070" -->
<!-- entity tag="1" -->
<!-- entity tag="4087" -->
<!-- entity tag="0" -->
<!-- entity tag="0" -->
<!-- entity tag="4119" -->
<!-- entity tag="1" -->
<!-- entity tag="180" -->
<!-- entity tag="160" -->
<!-- entity tag="193" -->
<!-- entity tag="4120" -->
<!-- entity tag="150" -->
<!-- entity tag="4120" -->
<!-- entity tag="152" -->
<!-- entity tag="2906" -->
<!-- entity tag="166" -->
<!-- entity tag="4120" -->
<!-- entity tag="2000" -->
<!-- entity tag="2907" -->
<!-- entity tag="163" -->
<!-- entity tag="0" -->
<!-- entity tag="4119" -->
<!-- entity tag="1" -->
<!-- entity tag="160" -->
<!-- entity tag="150" -->
<!-- entity tag="4120" -->
<!-- entity tag="151" -->
<!-- entity tag="4120" -->
<!-- entity tag="152" -->
<!-- entity tag="166" -->
<!-- entity tag="4120" -->
<!-- entity tag="163" -->
<!-- entity tag="180" -->
<!-- entity tag="0" -->
<!-- entity tag="51" -->
<!-- entity tag="51" -->
<!-- entity tag="51" -->
<!-- entity tag="51" -->
<!-- entity tag="51" -->
<!-- entity tag="51" -->
<!-- entity tag="51" -->
<!-- entity tag="51" -->
<!-- entity tag="51" -->
<!-- entity tag="51" -->
<!-- entity tag="51" -->
<!-- entity tag="51" -->
<!-- entity tag="51" -->
<!-- entity tag="51" -->
<!-- entity tag="51" -->
<!-- entity tag="51" -->
<!-- entity tag="51" -->
<!-- entity tag="51" -->
<!-- entity tag="51" -->
<!-- entity tag="51" -->
<!-- entity tag="51" -->
<!-- entity tag="51" -->
<!-- entity tag="51" -->
<!-- entity tag="51" -->
<!-- entity tag="51" -->
<!-- entity tag="51" -->
<!-- entity tag="51" -->
<!-- entity tag="51" -->
<!-- entity tag="51" -->
<!-- entity tag="51" -->
<!-- entity tag="51" -->
<!-- entity tag="51" -->
<!-- entity tag="51" -->
<!-- entity tag="51" -->
<!-- entity tag="87" -->
<!-- entity tag="91" -->
<!-- entity tag="92" -->
<!-- entity tag="93" -->
<!-- entity tag="3506" -->
<!-- entity tag="3507" -->
<!-- entity tag="82" -->
<!-- entity tag="0" -->
<g
id="g4153"
transform="translate(0,-10)">
<g
transform="translate(0.16,0.04)"
id="g3344">
<g
id="g4243-7"
transform="translate(0.99999997,1.0000001)"
style="stroke:#d0d0d0;stroke-opacity:0.99607843">
<rect
rx="0.72834456"
ry="0.72834456"
y="10.467433"
x="0.34743276"
height="19.985134"
width="19.985134"
id="rect3330-5"
style="opacity:0.9264214;fill:#171717;fill-opacity:0;fill-rule:nonzero;stroke:#d0d0d0;stroke-width:1.01486552;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0.99607843" />
<path
inkscape:connector-curvature="0"
id="path3332-3"
d="m 0.31263977,14.814958 20.50787723,0"
style="fill:none;fill-rule:evenodd;stroke:#d0d0d0;stroke-width:0.99999994px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:0.99607843" />
<path
inkscape:connector-curvature="0"
id="path3334-5"
d="M 0.36732744,21.18734 20.683798,21.21469"
style="fill:none;fill-rule:evenodd;stroke:#d0d0d0;stroke-width:0.99999994px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:0.99607843" />
<path
inkscape:connector-curvature="0"
id="path3336-6"
d="M 0.44935895,26.739245 20.738485,26.711896"
style="fill:none;fill-rule:evenodd;stroke:#d0d0d0;stroke-width:0.99999994px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:0.99607843" />
<path
inkscape:connector-curvature="0"
id="path3338-2"
d="m 4.34,10.46 0,20"
style="fill:none;fill-rule:evenodd;stroke:#d0d0d0;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.99607843" />
<path
inkscape:connector-curvature="0"
id="path3338-3-9"
d="m 10.34,10.46 0,20"
style="fill:none;fill-rule:evenodd;stroke:#d0d0d0;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.99607843" />
<path
inkscape:connector-curvature="0"
id="path3338-3-6-1"
d="m 16.34,10.46 0,20"
style="fill:none;fill-rule:evenodd;stroke:#d0d0d0;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.99607843" />
</g>
<g
id="g4243">
<rect
rx="0.72834456"
ry="0.72834456"
y="10.467433"
x="0.34743276"
height="19.985134"
width="19.985134"
id="rect3330"
style="opacity:0.9264214;fill:#171717;fill-opacity:0;fill-rule:nonzero;stroke:#000000;stroke-width:1.01486552;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
<path
inkscape:connector-curvature="0"
id="path3332"
d="m 0.31263977,14.814958 20.50787723,0"
style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.99999994px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
<path
inkscape:connector-curvature="0"
id="path3334"
d="M 0.36732744,21.18734 20.683798,21.21469"
style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.99999994px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
<path
inkscape:connector-curvature="0"
id="path3336"
d="M 0.44935895,26.739245 20.738485,26.711896"
style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.99999994px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
<path
inkscape:connector-curvature="0"
id="path3338"
d="m 4.34,10.46 0,20"
style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
<path
inkscape:connector-curvature="0"
id="path3338-3"
d="m 10.34,10.46 0,20"
style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
<path
inkscape:connector-curvature="0"
id="path3338-3-6"
d="m 16.34,10.46 0,20"
style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
</g>
</g>
</g>
</svg>

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1006 B

After

Width:  |  Height:  |  Size: 14 KiB

15
images/themes/default/zoomMaster.svg
View File

@ -1,15 +0,0 @@
<svg height="24" width="24" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<linearGradient id="a" gradientTransform="matrix(.19094498 0 0 .19541227 -.69244255 7.049408)" gradientUnits="userSpaceOnUse" x1="126.82207" x2="9.2386274" y1="125.44" y2="53.936554">
<stop offset="0" stop-color="#55d0ff"/>
<stop offset="1" stop-color="#1a94e5"/>
</linearGradient>
<g transform="translate(0 -8)">
<path d="m .38633145 17.054518l11.69794855-.138003 11.529389 14.697154h-18.7773978z" fill="url(#a)" fill-rule="evenodd" stroke="#000" stroke-linejoin="round" stroke-width=".77266276"/>
<g transform="matrix(0 -1 1 0 -8 32)">
<path d="m17.96122 7a5.9612203 6.0742435 0 1 1 -11.9224403 0 5.9612203 6.0742435 0 1 1 11.9224403 0z" style="opacity:.8;fill:#e6e6e6;stroke:#505050;stroke-width:.75218332;stroke-linecap:round;stroke-linejoin:round;stroke-dashoffset:7" transform="matrix(1.3420071 0 0 1.3170365 -1.1040853 7.7799271)"/>
<path d="m8.0000001 22.000818c0 2 1.9999999 2 1.9999999 2 0 0-6.9999999 7-6.9999999 7l-2-2z" fill="#ffcc30" fill-rule="evenodd" stroke="#505050" stroke-linejoin="round"/>
<path d="m10.5 12.500818c2-3.0000001 4.442248-3.3980551 6-2 1.557752 1.398055-2 1-4 3-2 2 0 6-2 6-1.9999999 0-1.9999999-4 0-7z" fill="#fcffff" fill-rule="evenodd" opacity=".7"/>
<path d="m2.5000001 28.500818l4-4" opacity=".5" overflow="visible" stroke="#fcffff" stroke-linecap="round" stroke-linejoin="round"/>
</g>
</g>
</svg>
Side by Side

Before

Width:  |  Height:  |  Size: 1.4 KiB

2
ms-windows/QGIS-Installer.nsi
View File

@ -413,7 +413,7 @@ Function DownloadDataSet
Goto end
cancel_download:
MessageBox MB_OK "Download Cancelled.$\r$\n${QGIS_BASE} will be installed without the $EXTENDED_ARCHIVE_NAME sample data set."
MessageBox MB_OK "Download Canceled.$\r$\n${QGIS_BASE} will be installed without the $EXTENDED_ARCHIVE_NAME sample data set."
Goto end
untar_failed:

4
ms-windows/osgeo4w/browser-grass.bat.tmpl
View File

@ -1,8 +1,10 @@
@echo off
call "%~dp0\o4w_env.bat"
call "%OSGEO4W_ROOT%"\apps\grass\grass-@grassversion@\etc\env.bat
call "%~dp0\qt5_env.bat"
call "%~dp0\py3_env.bat"
@echo off
path %OSGEO4W_ROOT%\apps\@package@\bin;%OSGEO4W_ROOT%\apps\grass\grass-@grassversion@\lib;%OSGEO4W_ROOT%\apps\grass\grass-@grassversion@\bin;%PATH%
set QGIS_PREFIX_PATH=%OSGEO4W_ROOT:\=/%/apps/@package@
set QT_PLUGIN_PATH=%OSGEO4W_ROOT%\apps\@package@\qtplugins;%OSGEO4W_ROOT%\apps\qt4\plugins
set QT_PLUGIN_PATH=%OSGEO4W_ROOT%\apps\@package@\qtplugins;%OSGEO4W_ROOT%\apps\qt5\plugins
start "QGIS Browser" /B "%OSGEO4W_ROOT%"\bin\@package@-browser-bin.exe %*

4
ms-windows/osgeo4w/browser.bat.tmpl
View File

@ -1,7 +1,9 @@
@echo off
call "%~dp0\o4w_env.bat"
call "%~dp0\qt5_env.bat"
call "%~dp0\py3_env.bat"
@echo off
path %OSGEO4W_ROOT%\apps\@package@\bin;%PATH%
set QGIS_PREFIX_PATH=%OSGEO4W_ROOT:\=/%/apps/@package@
set QT_PLUGIN_PATH=%OSGEO4W_ROOT%\apps\@package@\qtplugins;%OSGEO4W_ROOT%\apps\qt4\plugins
set QT_PLUGIN_PATH=%OSGEO4W_ROOT%\apps\@package@\qtplugins;%OSGEO4W_ROOT%\apps\qt5\plugins
start "QGIS Browser" /B "%OSGEO4W_ROOT%"\bin\@package@-browser-bin.exe %*

2
ms-windows/osgeo4w/creatensis.pl
View File

@ -446,7 +446,7 @@ $cmd .= " -DBINARY_REVISION=$binary";
$cmd .= sprintf( " -DVERSION_INT='%d%02d%02d%02d'", $pmajor, $pminor, $ppatch, $binary );
$cmd .= sprintf( " -DQGIS_BASE='$packagename %d.%d'", $pmajor, $pminor );
$cmd .= " -DINSTALLER_NAME='$packagename-OSGeo4W-$version-$binary-Setup$archpostfix.exe'";
$cmd .= " -DDISPLAYED_NAME='$packagename \'$releasename\' ($version)'";
$cmd .= " -DDISPLAYED_NAME=\"$packagename '$releasename' ($version)\"";
$cmd .= " -DSHORTNAME='$shortname'";
$cmd .= " -DINSTALLER_TYPE=OSGeo4W";
$cmd .= " -DPACKAGE_FOLDER=osgeo4w/$unpacked";

3
ms-windows/osgeo4w/designer.bat.tmpl
View File

@ -1,6 +1,7 @@
@echo off
call "%~dp0\o4w_env.bat"
call "%~dp0\qt5_env.bat"
path %OSGEO4W_ROOT%\apps\@package@\bin;%PATH%
set QGIS_PREFIX_PATH=%OSGEO4W_ROOT:\=/%/apps/@package@
set QT_PLUGIN_PATH=%OSGEO4W_ROOT%\apps\@package@\qtplugins;%OSGEO4W_ROOT%\apps\qt4\plugins
set QT_PLUGIN_PATH=%OSGEO4W_ROOT%\apps\@package@\qtplugins;%OSGEO4W_ROOT%\apps\qt5\plugins
start "Qt Designer with QGIS custom widgets" /B "%OSGEO4W_ROOT%"\bin\designer.exe %*

7
ms-windows/osgeo4w/ninja/ninja.bat Normal file
View File

@ -0,0 +1,7 @@
@echo off
call %OSGEO4W_ROOT%\bin\o4w_env.bat
call py3_env.bat
call qt5_env.bat
call "c:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" amd64
path %PATH%;c:\cygwin\bin;c:\program files\cmake\bin
%OSGEO4W_ROOT%\bin\ninja -j4 -C ..\build-qgis-dev-x86_64

22
ms-windows/osgeo4w/ninja/ninja.sln Normal file
View File

@ -0,0 +1,22 @@

Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 14
VisualStudioVersion = 14.0.25420.1
MinimumVisualStudioVersion = 10.0.40219.1
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ninja", "ninja.vcxproj", "{02B448C7-945C-46D6-954C-AEAE0653BA59}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
RelWithDebInfo|Win32 = RelWithDebInfo|Win32
RelWithDebInfo|x64 = RelWithDebInfo|x64
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{02B448C7-945C-46D6-954C-AEAE0653BA59}.RelWithDebInfo|Win32.ActiveCfg = Release|Win32
{02B448C7-945C-46D6-954C-AEAE0653BA59}.RelWithDebInfo|Win32.Build.0 = Release|Win32
{02B448C7-945C-46D6-954C-AEAE0653BA59}.RelWithDebInfo|x64.ActiveCfg = Release|x64
{02B448C7-945C-46D6-954C-AEAE0653BA59}.RelWithDebInfo|x64.Build.0 = Release|x64
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
EndGlobal

108
ms-windows/osgeo4w/ninja/ninja.vcxproj Normal file
View File

@ -0,0 +1,108 @@
<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup Label="ProjectConfigurations">
<ProjectConfiguration Include="Debug|Win32">
<Configuration>Debug</Configuration>
<Platform>Win32</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="Release|Win32">
<Configuration>Release</Configuration>
<Platform>Win32</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="Debug|x64">
<Configuration>Debug</Configuration>
<Platform>x64</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="Release|x64">
<Configuration>Release</Configuration>
<Platform>x64</Platform>
</ProjectConfiguration>
</ItemGroup>
<PropertyGroup Label="Globals">
<ProjectGuid>{02B448C7-945C-46D6-954C-AEAE0653BA59}</ProjectGuid>
<Keyword>MakeFileProj</Keyword>
<WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
<ConfigurationType>Makefile</ConfigurationType>
<UseDebugLibraries>true</UseDebugLibraries>
<PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
<ConfigurationType>Makefile</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries>
<PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
<ConfigurationType>Makefile</ConfigurationType>
<UseDebugLibraries>true</UseDebugLibraries>
<PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
<ConfigurationType>Makefile</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries>
<PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
</ImportGroup>
<ImportGroup Label="Shared">
</ImportGroup>
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
</ImportGroup>
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
</ImportGroup>
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
</ImportGroup>
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
</ImportGroup>
<PropertyGroup Label="UserMacros" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<NMakeBuildCommandLine>ninja -C ../build-qgis-dev-x86 all</NMakeBuildCommandLine>
<NMakeOutput>..\build-qgis-dev-x86\output\bin\qgis.exe</NMakeOutput>
<NMakePreprocessorDefinitions>WIN32;_DEBUG;$(NMakePreprocessorDefinitions)</NMakePreprocessorDefinitions>
<OutDir>..\build-qgis-dev-x86</OutDir>
<IntDir />
<NMakeReBuildCommandLine>ninja -C ../build-qgis-dev-x86 clean all</NMakeReBuildCommandLine>
<NMakeCleanCommandLine>ninja -C ../build-qgis-dev-x86 clean</NMakeCleanCommandLine>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<NMakeBuildCommandLine>ninja -C ../build-qgis-dev-x86 all</NMakeBuildCommandLine>
<NMakeOutput>..\build-qgis-dev-x86\output\bin\qgis.exe</NMakeOutput>
<NMakePreprocessorDefinitions>WIN32;NDEBUG;$(NMakePreprocessorDefinitions)</NMakePreprocessorDefinitions>
<OutDir>..\build-qgis-dev-x86</OutDir>
<IntDir />
<NMakeReBuildCommandLine>ninja -C ../build-qgis-dev-x86 clean all</NMakeReBuildCommandLine>
<NMakeCleanCommandLine>ninja -C ../build-qgis-dev-x86 clean</NMakeCleanCommandLine>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<NMakeBuildCommandLine>ninja -C ../build-qgis-dev-x86_64 -j4 -k1000 all</NMakeBuildCommandLine>
<NMakeReBuildCommandLine>ninja -C ../build-qgis-dev-x86_64 -j4 -k1000 clean all</NMakeReBuildCommandLine>
<NMakeCleanCommandLine>ninja -C ../build-qgis-dev-x86_64 clean</NMakeCleanCommandLine>
<NMakeOutput>..\build-qgis-dev-x86_64\output\bin\qgis.exe</NMakeOutput>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<NMakeBuildCommandLine>ninja -C ../build-qgis-dev-x86_64 -j4 -k1000 all</NMakeBuildCommandLine>
<NMakeReBuildCommandLine>ninja -C ../build-qgis-dev-x86_64 -j4 -k1000 clean all</NMakeReBuildCommandLine>
<NMakeCleanCommandLine>ninja -C ../build-qgis-dev-x86_64 clean</NMakeCleanCommandLine>
<NMakeOutput>..\build-qgis-dev-x86_64\output\bin\qgis.exe</NMakeOutput>
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<BuildLog>
<Path>x86.log</Path>
</BuildLog>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<BuildLog>
<Path>x86.log</Path>
</BuildLog>
</ItemDefinitionGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>
</Project>

58
ms-windows/osgeo4w/package-nightly.cmd
View File

@ -44,6 +44,8 @@ if not exist "%BUILDDIR%" (echo could not create build directory %BUILDDIR% & go
if not exist "%OSGEO4W_ROOT%\bin\o4w_env.bat" (echo o4w_env.bat not found & goto error)
call "%OSGEO4W_ROOT%\bin\o4w_env.bat"
call "%OSGEO4W_ROOT%\bin\py3_env.bat"
call "%OSGEO4W_ROOT%\bin\qt5_env.bat"
set O4W_ROOT=%OSGEO4W_ROOT:\=/%
set LIB_DIR=%O4W_ROOT%
@ -56,35 +58,33 @@ if "%ARCH%"=="x86" goto cmake_x86
goto cmake_x86_64
:cmake_x86
set GRASS6_VERSION=6.4.4
call "%PF86%\Microsoft Visual Studio 10.0\VC\vcvarsall.bat" x86
call "%PF86%\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" x86
if exist "c:\Program Files\Microsoft SDKs\Windows\v7.1\Bin\SetEnv.Cmd" call "c:\Program Files\Microsoft SDKs\Windows\v7.1\Bin\SetEnv.Cmd" /x86 /Release
path %path%;%PF86%\Microsoft Visual Studio 10.0\VC\bin
set CMAKE_COMPILER_PATH=%PF86%\Microsoft Visual Studio 10.0\VC\bin
path %path%;%PF86%\Microsoft Visual Studio 14.0\VC\bin
set CMAKE_COMPILER_PATH=%PF86%\Microsoft Visual Studio 14.0\VC\bin
set SETUPAPI_LIBRARY=c:\Program Files (x86)\Windows Kits\10\Lib\10.0.14393.0\um\x86\SetupAPI.Lib
set CMAKE_OPT=^
-D SIP_BINARY_PATH=%O4W_ROOT%/apps/Python27/sip.exe ^
-D QWT_LIBRARY=%O4W_ROOT%/lib/qwt.lib ^
-D SIP_BINARY_PATH=%O4W_ROOT%/apps/Python36/sip.exe ^
-D CMAKE_CXX_FLAGS_RELWITHDEBINFO="/MD /ZI /MP /Od /D NDEBUG /D QGISDEBUG" ^
-D CMAKE_PDB_OUTPUT_DIRECTORY_RELWITHDEBINFO=%BUILDDIR%\apps\%PACKAGENAME%\pdb ^
-D SPATIALINDEX_LIBRARY=%O4W_ROOT%/lib/spatialindex_i.lib
goto cmake
:cmake_x86_64
set GRASS6_VERSION=6.4.3
call "%PF86%\Microsoft Visual Studio 10.0\VC\vcvarsall.bat" amd64
call "%PF86%\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" amd64
if exist "c:\Program Files\Microsoft SDKs\Windows\v7.1\Bin\SetEnv.Cmd" call "c:\Program Files\Microsoft SDKs\Windows\v7.1\Bin\SetEnv.Cmd" /x64 /Release
path %path%;%PF86%\Microsoft Visual Studio 10.0\VC\bin
set CMAKE_COMPILER_PATH=%PF86%\Microsoft Visual Studio 10.0\VC\bin\amd64
set SETUPAPI_LIBRARY=%PF86%\Microsoft SDKs\Windows\v7.0A\Lib\x64\SetupAPI.Lib
path %path%;%PF86%\Microsoft Visual Studio 14.0\VC\bin
set CMAKE_COMPILER_PATH=%PF86%\Microsoft Visual Studio 14.0\VC\bin\amd64
set SETUPAPI_LIBRARY=c:\Program Files (x86)\Windows Kits\10\Lib\10.0.14393.0\um\x64\SetupAPI.Lib
if not exist "%SETUPAPI_LIBRARY%" set SETUPAPI_LIBRARY=%PF86%\Microsoft SDKs\Windows\v7.0A\Lib\x64\SetupAPI.Lib
if not exist "%SETUPAPI_LIBRARY%" set SETUPAPI_LIBRARY=%PROGRAMFILES%\Microsoft SDKs\Windows\v7.1\Lib\x64\SetupAPI.lib
if not exist "%SETUPAPI_LIBRARY%" (echo SETUPAPI_LIBRARY not found & goto error)
set CMAKE_OPT=^
-D SPATIALINDEX_LIBRARY=%O4W_ROOT%/lib/spatialindex-64.lib ^
-D SIP_BINARY_PATH=%O4W_ROOT%/bin/sip.exe ^
-D QWT_LIBRARY=%O4W_ROOT%/lib/qwt5.lib ^
-D SIP_BINARY_PATH=%O4W_ROOT%/apps/Python36/sip.exe ^
-D CMAKE_CXX_FLAGS_RELWITHDEBINFO="/MD /Zi /MP /Od /D NDEBUG /D QGISDEBUG" ^
-D CMAKE_PDB_OUTPUT_DIRECTORY_RELWITHDEBINFO=%BUILDDIR%\apps\%PACKAGENAME%\pdb ^
-D SETUPAPI_LIBRARY="%SETUPAPI_LIBRARY%" ^
@ -94,10 +94,11 @@ set CMAKE_OPT=^
for /f "usebackq tokens=1" %%a in (`%OSGEO4W_ROOT%\bin\grass72 --config path`) do set GRASS72_PATH=%%a
for %%i in ("%GRASS72_PATH%") do set GRASS72_VERSION=%%~nxi
set GRASS72_VERSION=%GRASS72_VERSION:grass-=%
set GRASS_VERSIONS=%GRASS6_VERSION% %GRASS72_VERSION%
set GRASS_VERSIONS=%GRASS72_VERSION%
set PYTHONPATH=
path %PF86%\CMake\bin;%PATH%;c:\cygwin\bin
if exist "%PF86%\CMake\bin" path %PATH%;c:\cygwin\bin;%PF86%\CMake\bin
if exist "%PROGRAMFILES%\CMake\bin" path %PATH%;c:\cygwin\bin;%PROGRAMFILES%\CMake\bin
PROMPT qgis%VERSION%$g
@ -158,33 +159,32 @@ cmake -G Ninja ^
-D CMAKE_CXX_COMPILER="%CMAKE_COMPILER_PATH:\=/%/cl.exe" ^
-D CMAKE_C_COMPILER="%CMAKE_COMPILER_PATH:\=/%/cl.exe" ^
-D CMAKE_LINKER="%CMAKE_COMPILER_PATH:\=/%/link.exe" ^
-D BUILDNAME="%PACKAGENAME%-%VERSION%%SHA%-Nightly-VC10-%ARCH%" ^
-D BUILDNAME="%PACKAGENAME%-%VERSION%%SHA%-Nightly-VC14-%ARCH%" ^
-D SITE="%SITE%" ^
-D PEDANTIC=TRUE ^
-D WITH_QSPATIALITE=TRUE ^
-D WITH_SERVER=TRUE ^
-D SERVER_SKIP_ECW=TRUE ^
-D WITH_GRASS=TRUE ^
-D WITH_GRASS6=TRUE ^
-D WITH_GRASS6=FALSE ^
-D WITH_GRASS7=TRUE ^
-D GRASS_PREFIX=%O4W_ROOT%/apps/grass/grass-%GRASS6_VERSION% ^
-D GRASS_PREFIX7=%GRASS72_PATH:\=/% ^
-D WITH_GLOBE=TRUE ^
-D WITH_GLOBE=FALSE ^
-D WITH_TOUCH=TRUE ^
-D WITH_ORACLE=TRUE ^
-D WITH_QTWEBKIT=FALSE ^
-D WITH_CUSTOM_WIDGETS=TRUE ^
-D CMAKE_BUILD_TYPE=%BUILDCONF% ^
-D CMAKE_CONFIGURATION_TYPES=%BUILDCONF% ^
-D GEOS_LIBRARY=%O4W_ROOT%/lib/geos_c.lib ^
-D SQLITE3_LIBRARY=%O4W_ROOT%/lib/sqlite3_i.lib ^
-D SPATIALITE_LIBRARY=%O4W_ROOT%/lib/spatialite_i.lib ^
-D PYTHON_EXECUTABLE=%O4W_ROOT%/bin/python.exe ^
-D PYTHON_INCLUDE_PATH=%O4W_ROOT%/apps/Python27/include ^
-D PYTHON_LIBRARY=%O4W_ROOT%/apps/Python27/libs/python27.lib ^
-D PYTHON_EXECUTABLE=%O4W_ROOT%/bin/python3.exe ^
-D PYTHON_INCLUDE_PATH=%O4W_ROOT%/apps/Python36/include ^
-D PYTHON_LIBRARY=%O4W_ROOT%/apps/Python36/libs/python36.lib ^
-D QT_BINARY_DIR=%O4W_ROOT%/bin ^
-D QT_LIBRARY_DIR=%O4W_ROOT%/lib ^
-D QT_HEADERS_DIR=%O4W_ROOT%/include/qt4 ^
-D QWT_INCLUDE_DIR=%O4W_ROOT%/include/qwt ^
-D QT_HEADERS_DIR=%O4W_ROOT%/apps/qt5/include ^
-D CMAKE_INSTALL_PREFIX=%O4W_ROOT%/apps/%PACKAGENAME% ^
-D FCGI_INCLUDE_DIR=%O4W_ROOT%/include ^
-D FCGI_LIBRARY=%O4W_ROOT%/lib/libfcgi.lib ^
@ -199,6 +199,10 @@ cmake -G Ninja ^
-D WITH_INTERNAL_MOCK=FALSE ^
-D WITH_INTERNAL_HTTPLIB2=FALSE ^
-D WITH_INTERNAL_FUTURE=FALSE ^
-D QCA_INCLUDE_DIR=%OSGEO4W_ROOT%\apps\Qt5\include\QtCrypto ^
-D QCA_LIBRARY=%OSGEO4W_ROOT%\apps\Qt5\lib\qca.lib ^
-D QSCINTILLA_LIBRARY=%OSGEO4W_ROOT%\apps\Qt5\lib\qscintilla2.lib ^
-D SUPPRESS_SIP_WARNINGS=TRUE ^
%CMAKE_OPT% ^
%SRCDIR:\=/%
if errorlevel 1 (echo cmake failed & goto error)
@ -303,8 +307,8 @@ if not exist %PKGDIR%\qtplugins\designer mkdir %PKGDIR%\qtplugins\designer
move %OSGEO4W_ROOT%\apps\qt4\plugins\designer\qgis_customwidgets.dll %PKGDIR%\qtplugins\designer
if errorlevel 1 (echo move of customwidgets failed & goto error)
if not exist %PKGDIR%\python\PyQt4\uic\widget-plugins mkdir %PKGDIR%\python\PyQt4\uic\widget-plugins
move %OSGEO4W_ROOT%\apps\Python27\Lib\site-packages\PyQt4\uic\widget-plugins\qgis_customwidgets.py %PKGDIR%\python\PyQt4\uic\widget-plugins
if not exist %PKGDIR%\python\PyQt5\uic\widget-plugins mkdir %PKGDIR%\python\PyQt5\uic\widget-plugins
move %OSGEO4W_ROOT%\apps\Python36\Lib\site-packages\PyQt5\uic\widget-plugins\qgis_customwidgets.py %PKGDIR%\python\PyQt5\uic\widget-plugins
if errorlevel 1 (echo move of customwidgets binding failed & goto error)
if not exist %ARCH%\release\qgis\%PACKAGENAME% mkdir %ARCH%\release\qgis\%PACKAGENAME%

60
ms-windows/osgeo4w/package.cmd
View File

@ -44,6 +44,8 @@ if not exist "%BUILDDIR%" (echo could not create build directory %BUILDDIR% & go
if not exist "%OSGEO4W_ROOT%\bin\o4w_env.bat" (echo o4w_env.bat not found & goto error)
call "%OSGEO4W_ROOT%\bin\o4w_env.bat"
call "%OSGEO4W_ROOT%\bin\py3_env.bat"
call "%OSGEO4W_ROOT%\bin\qt5_env.bat"
set O4W_ROOT=%OSGEO4W_ROOT:\=/%
set LIB_DIR=%O4W_ROOT%
@ -56,31 +58,28 @@ if "%ARCH%"=="x86" goto cmake_x86
goto cmake_x86_64
:cmake_x86
set GRASS6_VERSION=6.4.4
call "%PF86%\Microsoft Visual Studio 10.0\VC\vcvarsall.bat" x86
call "%PF86%\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" x86
if exist "c:\Program Files\Microsoft SDKs\Windows\v7.1\Bin\SetEnv.Cmd" call "c:\Program Files\Microsoft SDKs\Windows\v7.1\Bin\SetEnv.Cmd" /x86 /Release
path %path%;%PF86%\Microsoft Visual Studio 10.0\VC\bin
set CMAKE_COMPILER_PATH=%PF86%\Microsoft Visual Studio 10.0\VC\bin
path %path%;%PF86%\Microsoft Visual Studio 14.0\VC\bin
set CMAKE_COMPILER_PATH=%PF86%\Microsoft Visual Studio 14.0\VC\bin
set CMAKE_OPT=^
-D SIP_BINARY_PATH=%O4W_ROOT%/apps/Python27/sip.exe ^
-D QWT_LIBRARY=%O4W_ROOT%/lib/qwt.lib
-D SIP_BINARY_PATH=%O4W_ROOT%/apps/Python36/sip.exe ^
goto cmake
:cmake_x86_64
set GRASS6_VERSION=6.4.3
call "%PF86%\Microsoft Visual Studio 10.0\VC\vcvarsall.bat" amd64
call "%PF86%\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" amd64
if exist "c:\Program Files\Microsoft SDKs\Windows\v7.1\Bin\SetEnv.Cmd" call "c:\Program Files\Microsoft SDKs\Windows\v7.1\Bin\SetEnv.Cmd" /x64 /Release
path %path%;%PF86%\Microsoft Visual Studio 10.0\VC\bin
path %path%;%PF86%\Microsoft Visual Studio 14.0\VC\bin
set CMAKE_COMPILER_PATH=%PF86%\Microsoft Visual Studio 14.0\VC\bin\amd64
set SETUPAPI_LIBRARY=c:\Program Files (x86)\Windows Kits\10\Lib\10.0.14393.0\um\x64\SetupAPI.Lib
set SETUPAPI_LIBRARY=%PF86%\Microsoft SDKs\Windows\v7.0A\Lib\x64\SetupAPI.Lib
if not exist "%SETUPAPI_LIBRARY%" set SETUPAPI_LIBRARY=%PROGRAMFILES%\Microsoft SDKs\Windows\v7.1\Lib\x64\SetupAPI.lib
if not exist "%SETUPAPI_LIBRARY%" (echo SETUPAPI_LIBRARY not found & goto error)
set CMAKE_OPT=^
-D SPATIALINDEX_LIBRARY=%O4W_ROOT%/lib/spatialindex-64.lib ^
-D SIP_BINARY_PATH=%O4W_ROOT%/bin/sip.exe ^
-D QWT_LIBRARY=%O4W_ROOT%/lib/qwt5.lib ^
-D SIP_BINARY_PATH=%O4W_ROOT%/apps/Python36/sip.exe ^
-D SETUPAPI_LIBRARY="%SETUPAPI_LIBRARY%" ^
-D CMAKE_INSTALL_SYSTEM_RUNTIME_LIBS_NO_WARNINGS=TRUE
@ -88,10 +87,10 @@ set CMAKE_OPT=^
for /f "usebackq tokens=1" %%a in (`%OSGEO4W_ROOT%\bin\grass72 --config path`) do set GRASS72_PATH=%%a
for %%i in ("%GRASS72_PATH%") do set GRASS72_VERSION=%%~nxi
set GRASS72_VERSION=%GRASS72_VERSION:grass-=%
set GRASS_VERSIONS=%GRASS6_VERSION% %GRASS72_VERSION%
set GRASS_VERSIONS=%GRASS72_VERSION%
set PYTHONPATH=
path %PF86%\CMake\bin;%PATH%;c:\cygwin\bin
path %PATH%;c:\cygwin\bin;%PF86%\CMake\bin
PROMPT qgis%VERSION%$g
@ -149,20 +148,23 @@ set LIB=%LIB%;%OSGEO4W_ROOT%\lib
set INCLUDE=%INCLUDE%;%OSGEO4W_ROOT%\include
cmake -G Ninja ^
-D BUILDNAME="%PACKAGENAME%-%VERSION%%SHA%-Release-VC10-%ARCH%" ^
-D CMAKE_CXX_COMPILER="%CMAKE_COMPILER_PATH:\=/%/cl.exe" ^
-D CMAKE_C_COMPILER="%CMAKE_COMPILER_PATH:\=/%/cl.exe" ^
-D CMAKE_LINKER="%CMAKE_COMPILER_PATH:\=/%/link.exe" ^
-D BUILDNAME="%PACKAGENAME%-%VERSION%%SHA%-Release-VC14-%ARCH%" ^
-D SITE="%SITE%" ^
-D PEDANTIC=TRUE ^
-D WITH_QSPATIALITE=TRUE ^
-D WITH_SERVER=TRUE ^
-D SERVER_SKIP_ECW=TRUE ^
-D WITH_GRASS=TRUE ^
-D WITH_GRASS6=TRUE ^
-D WITH_GRASS6=FALSE ^
-D WITH_GRASS7=TRUE ^
-D GRASS_PREFIX=%O4W_ROOT%/apps/grass/grass-%GRASS6_VERSION% ^
-D GRASS_PREFIX7=%GRASS72_PATH:\=/% ^
-D WITH_GLOBE=TRUE ^
-D WITH_GLOBE=FALSE ^
-D WITH_TOUCH=TRUE ^
-D WITH_ORACLE=TRUE ^
-D WITH_QTWEBKIT=FALSE ^
-D WITH_CUSTOM_WIDGETS=TRUE ^
-D CMAKE_CXX_FLAGS_RELEASE="/MD /MP /O2 /Ob2 /D NDEBUG" ^
-D CMAKE_BUILD_TYPE=%BUILDCONF% ^
@ -170,13 +172,12 @@ cmake -G Ninja ^
-D GEOS_LIBRARY=%O4W_ROOT%/lib/geos_c.lib ^
-D SQLITE3_LIBRARY=%O4W_ROOT%/lib/sqlite3_i.lib ^
-D SPATIALITE_LIBRARY=%O4W_ROOT%/lib/spatialite_i.lib ^
-D PYTHON_EXECUTABLE=%O4W_ROOT%/bin/python.exe ^
-D PYTHON_INCLUDE_PATH=%O4W_ROOT%/apps/Python27/include ^
-D PYTHON_LIBRARY=%O4W_ROOT%/apps/Python27/libs/python27.lib ^
-D PYTHON_EXECUTABLE=%O4W_ROOT%/bin/python3.exe ^
-D PYTHON_INCLUDE_PATH=%O4W_ROOT%/apps/Python36/include ^
-D PYTHON_LIBRARY=%O4W_ROOT%/apps/Python36/libs/python36.lib ^
-D QT_BINARY_DIR=%O4W_ROOT%/bin ^
-D QT_LIBRARY_DIR=%O4W_ROOT%/lib ^
-D QT_HEADERS_DIR=%O4W_ROOT%/include/qt4 ^
-D QWT_INCLUDE_DIR=%O4W_ROOT%/include/qwt ^
-D QT_HEADERS_DIR=%O4W_ROOT%/apps/qt5/include ^
-D CMAKE_INSTALL_PREFIX=%O4W_ROOT%/apps/%PACKAGENAME% ^
-D FCGI_INCLUDE_DIR=%O4W_ROOT%/include ^
-D FCGI_LIBRARY=%O4W_ROOT%/lib/libfcgi.lib ^
@ -187,7 +188,14 @@ cmake -G Ninja ^
-D WITH_INTERNAL_DATEUTIL=FALSE ^
-D WITH_INTERNAL_PYTZ=FALSE ^
-D WITH_INTERNAL_SIX=FALSE ^
-D WITH_INTERNAL_NOSE2=FALSE ^
-D WITH_INTERNAL_MOCK=FALSE ^
-D WITH_INTERNAL_HTTPLIB2=FALSE ^
-D WITH_INTERNAL_FUTURE=FALSE ^
-D QCA_INCLUDE_DIR=%OSGEO4W_ROOT%\apps\Qt5\include\QtCrypto ^
-D QCA_LIBRARY=%OSGEO4W_ROOT%\apps\Qt5\lib\qca.lib ^
-D QSCINTILLA_LIBRARY=%OSGEO4W_ROOT%\apps\Qt5\lib\qscintilla2.lib ^
-D SUPPRESS_SIP_WARNINGS=TRUE ^
%CMAKE_OPT% ^
%SRCDIR:\=/%
if errorlevel 1 (echo cmake failed & goto error)
@ -208,6 +216,8 @@ if exist ..\skiptests goto skiptests
echo RUN_TESTS: %DATE% %TIME%
set oldtemp=%TEMP%
set oldtmp=%TMP%
set oldpath=%PATH%
for %%g IN (%GRASS_VERSIONS%) do (
set path=!path!;%OSGEO4W_ROOT%\apps\grass\grass-%%g\lib
@ -362,8 +372,8 @@ if not exist %PKGDIR%\qtplugins\designer mkdir %PKGDIR%\qtplugins\designer
move %OSGEO4W_ROOT%\apps\qt4\plugins\designer\qgis_customwidgets.dll %PKGDIR%\qtplugins\designer
if errorlevel 1 (echo move of customwidgets failed & goto error)
if not exist %PKGDIR%\python\PyQt4\uic\widget-plugins mkdir %PKGDIR%\python\PyQt4\uic\widget-plugins
move %OSGEO4W_ROOT%\apps\Python27\Lib\site-packages\PyQt4\uic\widget-plugins\qgis_customwidgets.py %PKGDIR%\python\PyQt4\uic\widget-plugins
if not exist %PKGDIR%\python\PyQt5\uic\widget-plugins mkdir %PKGDIR%\python\PyQt5\uic\widget-plugins
move %OSGEO4W_ROOT%\apps\Python36\Lib\site-packages\PyQt5\uic\widget-plugins\qgis_customwidgets.py %PKGDIR%\python\PyQt5\uic\widget-plugins
if errorlevel 1 (echo move of customwidgets binding failed & goto error)
if not exist %ARCH%\release\qgis\%PACKAGENAME% mkdir %ARCH%\release\qgis\%PACKAGENAME%

1
ms-windows/osgeo4w/postinstall-common.bat
View File

@ -1,4 +1,5 @@
call "%OSGEO4W_ROOT%\bin\o4w_env.bat"
call "%OSGEO4W_ROOT%\bin\qt5_env.bat"
path %PATH%;%OSGEO4W_ROOT%\apps\@package@\bin
set QGIS_PREFIX_PATH=%OSGEO4W_ROOT:\=/%/apps/@package@
"%OSGEO4W_ROOT%\apps\@package@\crssync"

4
ms-windows/osgeo4w/python.bat.tmpl
View File

@ -1,5 +1,7 @@
@echo off
call "%~dp0\o4w_env.bat"
call "%~dp0\qt5_env.bat"
call "%~dp0\py3_env.bat"
@echo off
path %OSGEO4W_ROOT%\apps\@package@\bin;%PATH%
set QGIS_PREFIX_PATH=%OSGEO4W_ROOT:\=/%/apps/@package@
@ -7,6 +9,6 @@ set GDAL_FILENAME_IS_UTF8=YES
rem Set VSI cache to be used as buffer, see #6448
set VSI_CACHE=TRUE
set VSI_CACHE_SIZE=1000000
set QT_PLUGIN_PATH=%OSGEO4W_ROOT%\apps\@package@\qtplugins;%OSGEO4W_ROOT%\apps\qt4\plugins
set QT_PLUGIN_PATH=%OSGEO4W_ROOT%\apps\@package@\qtplugins;%OSGEO4W_ROOT%\apps\qt5\plugins
set PYTHONPATH=%OSGEO4W_ROOT%\apps\@package@\python;%PYTHONPATH%
"%OSGEO4W_ROOT%"\bin\python.exe %*

2
ms-windows/osgeo4w/qgis-grass.bat.tmpl
View File

@ -8,5 +8,5 @@ set GDAL_FILENAME_IS_UTF8=YES
rem Set VSI cache to be used as buffer, see #6448
set VSI_CACHE=TRUE
set VSI_CACHE_SIZE=1000000
set QT_PLUGIN_PATH=%OSGEO4W_ROOT%\apps\@package@\qtplugins;%OSGEO4W_ROOT%\apps\qt4\plugins
set QT_PLUGIN_PATH=%OSGEO4W_ROOT%\apps\@package@\qtplugins;%OSGEO4W_ROOT%\apps\qt5\plugins
start "QGIS" /B "%OSGEO4W_ROOT%"\bin\@package@-bin.exe %*

3
ms-windows/osgeo4w/qgis.bat.tmpl
View File

@ -1,5 +1,6 @@
@echo off
call "%~dp0\o4w_env.bat"
call "%~dp0\qt5_env.bat"
@echo off
path %OSGEO4W_ROOT%\apps\@package@\bin;%PATH%
set QGIS_PREFIX_PATH=%OSGEO4W_ROOT:\=/%/apps/@package@
@ -7,5 +8,5 @@ set GDAL_FILENAME_IS_UTF8=YES
rem Set VSI cache to be used as buffer, see #6448
set VSI_CACHE=TRUE
set VSI_CACHE_SIZE=1000000
set QT_PLUGIN_PATH=%OSGEO4W_ROOT%\apps\@package@\qtplugins;%OSGEO4W_ROOT%\apps\qt4\plugins
set QT_PLUGIN_PATH=%OSGEO4W_ROOT%\apps\@package@\qtplugins;%OSGEO4W_ROOT%\apps\qt5\plugins
start "QGIS" /B "%OSGEO4W_ROOT%"\bin\@package@-bin.exe %*

35
python/CMakeLists.txt
View File

@ -70,9 +70,6 @@ ADD_SUBDIRECTORY(PyQt)
ADD_SUBDIRECTORY(pyplugin_installer)
ADD_SUBDIRECTORY(ext-libs)
ADD_SUBDIRECTORY(testing)
IF (PYQT5_VERSION_NUM)
ADD_SUBDIRECTORY(sip_helpers)
ENDIF (PYQT5_VERSION_NUM)
IF(POLICY CMP0040)
CMAKE_POLICY (POP) # see PUSH above
@ -96,6 +93,7 @@ INCLUDE_DIRECTORIES(SYSTEM
)
INCLUDE_DIRECTORIES(
../src/core
../src/core/annotations
../src/core/auth
../src/core/pal
../src/core/composer
@ -118,8 +116,6 @@ INCLUDE_DIRECTORIES(
../src/gui/effects
../src/gui/layertree
sip_helpers
${CMAKE_BINARY_DIR} # qgsconfig.h, qgsversion.h
${CMAKE_BINARY_DIR}/src/core
${CMAKE_BINARY_DIR}/src/analysis
@ -142,37 +138,12 @@ IF(NOT QT_MOBILITY_LOCATION_FOUND)
SET(SIP_DISABLE_FEATURES ${SIP_DISABLE_FEATURES} MOBILITY_LOCATION)
ENDIF(NOT QT_MOBILITY_LOCATION_FOUND)
IF(PYQT4_VERSION_NUM LESS 263680) # 0x040600
SET(SIP_DISABLE_FEATURES ${SIP_DISABLE_FEATURES} PROXY_FACTORY)
ENDIF(PYQT4_VERSION_NUM LESS 263680)
#
IF(NOT PYQT4_VERSION_NUM LESS 264194) # 0x040802
SET(SIP_DISABLE_FEATURES ${SIP_DISABLE_FEATURES} QSETTYPE_CONVERSION)
ENDIF(NOT PYQT4_VERSION_NUM LESS 264194)
IF(PYQT4_VERSION_NUM LESS 264196) # 0x040804
SET(SIP_DISABLE_FEATURES ${SIP_DISABLE_FEATURES} QLISTCONSTPTR_CONVERSION)
ENDIF(PYQT4_VERSION_NUM LESS 264196)
IF(NOT PYQT4_VERSION_NUM LESS 264453) # 0x040905
SET(SIP_DISABLE_FEATURES ${SIP_DISABLE_FEATURES} QVECTORINT_CONVERSION)
ENDIF(NOT PYQT4_VERSION_NUM LESS 264453)
IF (NOT PYQT5_VERSION_NUM)
SET(SIP_DISABLE_FEATURES ${SIP_DISABLE_FEATURES} CHIMERA_NULL_VARIANT_CONVERSION)
ENDIF (NOT PYQT5_VERSION_NUM)
# core module
FILE(GLOB_RECURSE sip_files_core core/*.sip)
SET(SIP_EXTRA_FILES_DEPEND ${sip_files_core})
SET(SIP_EXTRA_OPTIONS ${PYQT_SIP_FLAGS} -o -a ${CMAKE_BINARY_DIR}/python/qgis.core.api)
GENERATE_SIP_PYTHON_MODULE_CODE(qgis._core core/core.sip cpp_files)
IF (PYQT5_VERSION_NUM)
BUILD_SIP_PYTHON_MODULE(qgis._core core/core.sip ${cpp_files} $<TARGET_OBJECTS:qgis_sip_helpers> qgis_core)
ELSE (PYQT5_VERSION_NUM)
BUILD_SIP_PYTHON_MODULE(qgis._core core/core.sip ${cpp_files} "" qgis_core)
ENDIF (PYQT5_VERSION_NUM)
BUILD_SIP_PYTHON_MODULE(qgis._core core/core.sip ${cpp_files} "" qgis_core)
SET(SIP_CORE_CPP_FILES ${cpp_files})
# additional gui includes
@ -225,7 +196,7 @@ IF (WITH_SERVER AND WITH_SERVER_PLUGINS)
ENDIF (WITH_SERVER AND WITH_SERVER_PLUGINS)
# additional analysis includes
INCLUDE_DIRECTORIES(
INCLUDE_DIRECTORIES(BEFORE
../src/analysis/vector
../src/analysis/raster
../src/analysis/network

1
python/analysis/analysis.sip
View File

@ -1,5 +1,4 @@
%Module(name=qgis._analysis,
version=0,
keyword_arguments="Optional")
%Import QtCore/QtCoremod.sip

4
python/analysis/interpolation/DualEdgeTriangulation.sip
View File

@ -40,8 +40,8 @@ class DualEdgeTriangulation: Triangulation
virtual double getYMin() const;
/** Returns the number of points*/
virtual int getNumberOfPoints() const;
/** Sets the behaviour of the triangulation in case of crossing forced lines*/
virtual void setForcedCrossBehaviour( Triangulation::forcedCrossBehaviour b );
/** Sets the behavior of the triangulation in case of crossing forced lines*/
virtual void setForcedCrossBehavior( Triangulation::ForcedCrossBehavior b );
/** Sets the color of the normal edges*/
virtual void setEdgeColor( int r, int g, int b );
/** Sets the color of the forced edges*/

16
python/analysis/interpolation/NormVecDecorator.sip
View File

@ -5,8 +5,8 @@ class NormVecDecorator : TriDecorator
%End
public:
/** Enumeration for the state of a point. NORMAL means, that the point is not on a breakline, BREAKLINE means that the point is on a breakline (but not an endpoint of it) and ENDPOINT means, that it is an endpoint of a breakline*/
enum pointState {NORMAL, BREAKLINE, ENDPOINT};
//! Enumeration for the state of a point. Normal means, that the point is not on a BreakLine, BreakLine means that the point is on a breakline (but not an end point of it) and EndPoint means, that it is an endpoint of a breakline
enum PointState {Normal, BreakLine, EndPoint};
NormVecDecorator();
NormVecDecorator( Triangulation* tin );
virtual ~NormVecDecorator();
@ -26,14 +26,14 @@ class NormVecDecorator : TriDecorator
bool estimateFirstDerivatives( QProgressDialog* d = 0 );
/** Returns a pointer to the normal vector for the point with the number n*/
Vector3D* getNormal( int n ) const;
/** Finds out, in which triangle a point with coordinates x and y is and assigns the triangle points to p1, p2, p3 and the estimated normals to v1, v2, v3. The vectors are normaly taken from 'mNormVec', exept if p1, p2 or p3 is a point on a breakline. In this case, the normal is calculated on-the-fly. Returns false, if something went wrong and true otherwise*/
/** Finds out, in which triangle a point with coordinates x and y is and assigns the triangle points to p1, p2, p3 and the estimated normals to v1, v2, v3. The vectors are normally taken from 'mNormVec', except if p1, p2 or p3 is a point on a breakline. In this case, the normal is calculated on-the-fly. Returns false, if something went wrong and true otherwise*/
bool getTriangle( double x, double y, Point3D* p1 /Out/, Vector3D* v1 /Out/, Point3D* p2 /Out/, Vector3D* v2 /Out/, Point3D* p3 /Out/, Vector3D* v3 /Out/ );
/** This function behaves similar to the one above. Additionally, the numbers of the points are returned (ptn1, ptn2, ptn3) as well as the pointStates of the triangle points (state1, state2, state3)
/** This function behaves similar to the one above. Additionally, the numbers of the points are returned (ptn1, ptn2, ptn3) as well as the PointStates of the triangle points (state1, state2, state3)
* @note not available in Python bindings
*/
//bool getTriangle( double x, double y, Point3D* p1 /Out/, int* ptn1 /Out/, Vector3D* v1 /Out/, pointState* state1 /Out/, Point3D* p2 /Out/, int* ptn2 /Out/, Vector3D* v2 /Out/, pointState* state2 /Out/, Point3D* p3 /Out/, int* ptn3 /Out/, Vector3D* v3 /Out/, pointState* state3 /Out/);
//bool getTriangle( double x, double y, Point3D* p1 /Out/, int* ptn1 /Out/, Vector3D* v1 /Out/, PointState* state1 /Out/, Point3D* p2 /Out/, int* ptn2 /Out/, Vector3D* v2 /Out/, PointState* state2 /Out/, Point3D* p3 /Out/, int* ptn3 /Out/, Vector3D* v3 /Out/, PointState* state3 /Out/);
/** Returns the state of the point with the number 'pointno'*/
pointState getState( int pointno ) const;
PointState getState( int pointno ) const;
/** Sets an interpolator*/
void setTriangleInterpolator( TriangleInterpolator* inter );
/** Swaps the edge which is closest to the point with x and y coordinates (if this is possible) and forces recalculation of the concerned normals (if alreadyestimated is true)*/
@ -43,6 +43,6 @@ class NormVecDecorator : TriDecorator
virtual bool saveAsShapefile( const QString& fileName ) const;
protected:
/** Sets the state (BREAKLINE, NORMAL, ENDPOINT) of a point*/
void setState( int pointno, pointState s );
/** Sets the state (BreakLine, Normal, EndPoint) of a point*/
void setState( int pointno, PointState s );
};

2
python/analysis/interpolation/TriDecorator.sip
View File

@ -27,7 +27,7 @@ class TriDecorator : Triangulation
virtual double getXMin() const;
virtual double getYMax() const;
virtual double getYMin() const;
virtual void setForcedCrossBehaviour( Triangulation::forcedCrossBehaviour b );
virtual void setForcedCrossBehavior( Triangulation::ForcedCrossBehavior b );
virtual void setEdgeColor( int r, int g, int b );
virtual void setForcedEdgeColor( int r, int g, int b );
virtual void setBreakEdgeColor( int r, int g, int b );

14
python/analysis/interpolation/Triangulation.sip
View File

@ -7,12 +7,12 @@ class Triangulation
public:
//! Enumeration describing the behaviour, if two forced lines cross.
enum forcedCrossBehaviour
//! Enumeration describing the behavior, if two forced lines cross.
enum ForcedCrossBehavior
{
SnappingType_VERTICE, //!< the second inserted forced line is snapped to the closest vertice of the first inserted forced line.
DELETE_FIRST, //!< the status of the first inserted forced line is reset to that of a normal edge (so that the second inserted forced line remain and the first not)
INSERT_VERTICE
SnappingTypeVertex, //!< the second inserted forced line is snapped to the closest vertice of the first inserted forced line.
DeleteFirst, //!< the status of the first inserted forced line is reset to that of a normal edge (so that the second inserted forced line remain and the first not)
InsertVertex
};
virtual ~Triangulation();
@ -91,8 +91,8 @@ class Triangulation
/** Draws the points, edges and the forced lines*/
//virtual void draw(QPainter* p, double xlowleft, double ylowleft, double xupright, double yupright, double width, double height) const=0;
/** Sets the behaviour of the triangulation in case of crossing forced lines*/
virtual void setForcedCrossBehaviour( Triangulation::forcedCrossBehaviour b ) = 0;
/** Sets the behavior of the triangulation in case of crossing forced lines*/
virtual void setForcedCrossBehavior( Triangulation::ForcedCrossBehavior b ) = 0;
/** Sets the color of the normal edges*/
virtual void setEdgeColor( int r, int g, int b ) = 0;
/** Sets the color of the forced edges*/

4
python/analysis/interpolation/qgstininterpolator.sip
View File

@ -5,12 +5,12 @@ class QgsTINInterpolator: QgsInterpolator
%End
public:
//describes the type of interpolation
enum TIN_INTERPOLATION
enum TINInterpolation
{
Linear,
CloughTocher
};
QgsTINInterpolator( const QList<QgsInterpolator::LayerData>& inputData, TIN_INTERPOLATION interpolation = Linear, bool showProgressDialog = false );
QgsTINInterpolator( const QList<QgsInterpolator::LayerData>& inputData, TINInterpolation interpolation = Linear, bool showProgressDialog = false );
~QgsTINInterpolator();
/** Calculates interpolation value for map coordinates x, y

2
python/analysis/openstreetmap/qgsosmimport.sip
View File

@ -3,7 +3,7 @@
* @brief The QgsOSMXmlImport class imports OpenStreetMap XML format to our topological representation
* in a SQLite database (see QgsOSMDatabase for details).
*
* How to use the classs:
* How to use the class:
* 1. set input XML file name and output DB file name (in constructor or with respective functions)
* 2. run import()
* 3. check errorString() if the import failed

2
python/analysis/raster/qgsalignraster.sip
View File

@ -91,7 +91,7 @@ class QgsAlignRaster
{
//! Method to be overridden for progress reporting.
//! @param complete Overall progress of the alignment operation
//! @return false if the execution should be cancelled, true otherwise
//! @return false if the execution should be canceled, true otherwise
virtual bool progress( double complete ) = 0;
virtual ~ProgressHandler();

2
python/analysis/raster/qgsrastercalculator.sip
View File

@ -24,7 +24,7 @@ class QgsRasterCalculator
Success, /*!< Calculation successful */
CreateOutputError, /*!< Error creating output data file */
InputLayerError, /*!< Error reading input layer */
Cancelled, /*!< User cancelled calculation */
Canceled, /*!< User canceled calculation */
ParserError, /*!< Error parsing formula */
MemoryError, /*!< Error allocating memory for result */
};

2
python/analysis/raster/qgsrelief.sip
View File

@ -26,7 +26,7 @@ class QgsRelief
void clearReliefColors();
void addReliefColorClass( const QgsRelief::ReliefColor& color );
const QList< QgsRelief::ReliefColor >& reliefColors() const;
QList< QgsRelief::ReliefColor > reliefColors() const;
void setReliefColors( const QList< QgsRelief::ReliefColor >& c );
/** Calculates class breaks according with the method of Buenzli (2011) using an iterative algorithm for segmented regression

2
python/analysis/vector/qgszonalstatistics.sip
View File

@ -30,7 +30,7 @@ class QgsZonalStatistics
typedef QFlags<QgsZonalStatistics::Statistic> Statistics;
QgsZonalStatistics( QgsVectorLayer* polygonLayer, const QString& rasterFile, const QString& attributePrefix = "", int rasterBand = 1,
QgsZonalStatistics( QgsVectorLayer* polygonLayer, QgsRasterLayer* rasterLayer, const QString& attributePrefix = "", int rasterBand = 1,
QgsZonalStatistics::Statistics stats = QgsZonalStatistics::Statistics( QgsZonalStatistics::Count | QgsZonalStatistics::Sum | QgsZonalStatistics::Mean) );
/** Starts the calculation

24
python/console/console_editor.py
View File

@ -168,7 +168,7 @@ class Editor(QsciScintilla):
self.newShortcutCS.activated.connect(self.autoCompleteKeyBinding)
self.runScut = QShortcut(QKeySequence(Qt.CTRL + Qt.Key_E), self)
self.runScut.setContext(Qt.WidgetShortcut)
self.runScut.activated.connect(self.runSelectedCode) #spellok
self.runScut.activated.connect(self.runSelectedCode) # spellok
self.runScriptScut = QShortcut(QKeySequence(Qt.SHIFT + Qt.CTRL + Qt.Key_E), self)
self.runScriptScut.setContext(Qt.WidgetShortcut)
self.runScriptScut.activated.connect(self.runScriptCode)
@ -258,12 +258,12 @@ class Editor(QsciScintilla):
self.lexer.setPaper(paperColor, style)
self.api = QsciAPIs(self.lexer)
chekBoxAPI = self.settings.value("pythonConsole/preloadAPI", True, type=bool)
chekBoxPreparedAPI = self.settings.value("pythonConsole/usePreparedAPIFile", False, type=bool)
if chekBoxAPI:
checkBoxAPI = self.settings.value("pythonConsole/preloadAPI", True, type=bool)
checkBoxPreparedAPI = self.settings.value("pythonConsole/usePreparedAPIFile", False, type=bool)
if checkBoxAPI:
pap = os.path.join(QgsApplication.pkgDataPath(), "python", "qsci_apis", "pyqgis.pap")
self.api.loadPrepared(pap)
elif chekBoxPreparedAPI:
elif checkBoxPreparedAPI:
self.api.loadPrepared(self.settings.value("pythonConsole/preparedAPIFile"))
else:
apiPath = self.settings.value("pythonConsole/userAPI", [])
@ -307,9 +307,9 @@ class Editor(QsciScintilla):
syntaxCheck = menu.addAction(iconSyntaxCk,
QCoreApplication.translate("PythonConsole", "Check Syntax"),
self.syntaxCheck, 'Ctrl+4')
runSelected = menu.addAction(iconRun, #spellok
runSelected = menu.addAction(iconRun, # spellok
QCoreApplication.translate("PythonConsole", "Run Selected"),
self.runSelectedCode, 'Ctrl+E') #spellok
self.runSelectedCode, 'Ctrl+E') # spellok
menu.addAction(iconRunScript,
QCoreApplication.translate("PythonConsole", "Run Script"),
self.runScriptCode, 'Shift+Ctrl+E')
@ -358,14 +358,14 @@ class Editor(QsciScintilla):
pasteAction.setEnabled(False)
codePadAction.setEnabled(False)
cutAction.setEnabled(False)
runSelected.setEnabled(False) #spellok
runSelected.setEnabled(False) # spellok
copyAction.setEnabled(False)
selectAllAction.setEnabled(False)
undoAction.setEnabled(False)
redoAction.setEnabled(False)
showCodeInspection.setEnabled(False)
if self.hasSelectedText():
runSelected.setEnabled(True) #spellok
runSelected.setEnabled(True) # spellok
copyAction.setEnabled(True)
cutAction.setEnabled(True)
codePadAction.setEnabled(True)
@ -600,7 +600,7 @@ class Editor(QsciScintilla):
self.parent.pc.shell.runCommand(u"exec(open(u'{0}'.encode('{1}')).read())"
.format(filename.replace("\\", "/"), sys.getfilesystemencoding()))
def runSelectedCode(self): #spellok
def runSelectedCode(self): # spellok
cmd = self.selectedText()
self.parent.pc.shell.insertFromDropPaste(cmd)
self.parent.pc.shell.entered()
@ -758,8 +758,8 @@ class EditorTab(QWidget):
self.path = None
self.readOnly = readOnly
self.fileExcuteList = {}
self.fileExcuteList = dict()
self.fileExecuteList = {}
self.fileExecuteList = dict()
self.newEditor = Editor(self)
if filename:

Some files were not shown because too many files have changed in this diff Show More